From: terencehill <piuntn@gmail.com>
Date: Fri, 24 Jul 2015 16:36:20 +0000 (+0200)
Subject: Make work the credit list
X-Git-Tag: xonotic-v0.8.1~11^2~14
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=bed221b1f046d14b2812a65f9beac9edc51b7650;p=xonotic%2Fxonotic-data.pk3dir.git

Make work the credit list
---

diff --git a/qcsrc/menu/xonotic/credits.qc b/qcsrc/menu/xonotic/credits.qc
index 57320a018..ba7f7019b 100644
--- a/qcsrc/menu/xonotic/credits.qc
+++ b/qcsrc/menu/xonotic/credits.qc
@@ -41,13 +41,10 @@ void XonoticCreditsList_destroy(entity me)
 }
 void XonoticCreditsList_draw(entity me)
 {
-	float i;
 	if(me.scrolling)
 	{
 		me.scrollPos = bound(0, (time - me.scrolling) * me.itemHeight, me.nItems * me.itemHeight - 1);
-		i = min(me.selectedItem, floor((me.scrollPos + 1) / me.itemHeight - 1));
-		i = max(i, ceil(me.scrollPos / me.itemHeight));
-		me.setSelected(me, i);
+		me.scrollPosTarget = me.scrollPos;
 	}
 	SUPER(XonoticCreditsList).draw(me);
 }
@@ -91,24 +88,19 @@ void XonoticCreditsList_drawListBoxItem(entity me, int i, vector absSize, bool i
 
 float XonoticCreditsList_keyDown(entity me, float key, float ascii, float shift)
 {
-	float i;
 	me.dragScrollTimer = time;
 	me.scrolling = 0;
 	if(key == K_PGUP || key == K_KP_PGUP)
-		me.scrollPos = max(me.scrollPos - 0.5, 0);
+		me.scrollPosTarget = max(me.scrollPosTarget - 0.5, 0);
 	else if(key == K_PGDN || key == K_KP_PGDN)
-		me.scrollPos = min(me.scrollPos + 0.5, me.nItems * me.itemHeight - 1);
+		me.scrollPosTarget = min(me.scrollPosTarget + 0.5, me.nItems * me.itemHeight - 1);
 	else if(key == K_UPARROW || key == K_KP_UPARROW)
-		me.scrollPos = max(me.scrollPos - me.itemHeight, 0);
+		me.scrollPosTarget = max(me.scrollPosTarget - me.itemHeight, 0);
 	else if(key == K_DOWNARROW || key == K_KP_DOWNARROW)
-		me.scrollPos = min(me.scrollPos + me.itemHeight, me.nItems * me.itemHeight - 1);
+		me.scrollPosTarget = min(me.scrollPosTarget + me.itemHeight, me.nItems * me.itemHeight - 1);
 	else
 		return SUPER(XonoticCreditsList).keyDown(me, key, ascii, shift);
 
-	i = min(me.selectedItem, floor((me.scrollPos + 1) / me.itemHeight - 1));
-	i = max(i, ceil(me.scrollPos / me.itemHeight));
-	me.setSelected(me, i);
-
 	return 1;
 }
 #endif