X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fmenu%2Fitem%2Fnexposee.c;h=97eabd7d66beffd07e0263f5474a63c572db5270;hb=a7794afc2db05650096d9c22e55cb1ca6d82aa9b;hp=c43f44f509f38b9ee7cd2f902dfcc59fb949e885;hpb=df0a07022b2f24ad36892fd832b490df8351f4db;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/qcsrc/menu/item/nexposee.c b/qcsrc/menu/item/nexposee.c
index c43f44f50..97eabd7d6 100644
--- a/qcsrc/menu/item/nexposee.c
+++ b/qcsrc/menu/item/nexposee.c
@@ -149,8 +149,6 @@ void Nexposee_draw(entity me)
 		me.animationState = 0;
 	}
 
-	//print(ftos(me.animationState), "\n");
-
 	f = min(1, frametime * 5);
 	switch(me.animationState)
 	{
@@ -211,7 +209,7 @@ void Nexposee_draw(entity me)
 	}
 
 	SUPER(Nexposee).draw(me);
-};
+}
 
 float Nexposee_mousePress(entity me, vector pos)
 {
@@ -265,7 +263,7 @@ float Nexposee_mouseMove(entity me, vector pos)
 	if(me.animationState == 0)
 	{
 		if(me.mouseFocusedChild)
-			if(me.mouseFocusedChild != e)
+			if(me.mouseFocusedChild != e || me.mouseFocusedChild != me.selectedChild)
 				me.selectedChild = me.mouseFocusedChild;
 		return 1;
 	}
@@ -281,7 +279,7 @@ float Nexposee_keyUp(entity me, float scan, float ascii, float shift)
 
 float Nexposee_keyDown(entity me, float scan, float ascii, float shift)
 {
-	float nexposeeKey;
+	float nexposeeKey = 0;
 	if(me.animationState == 2)
 		if(SUPER(Nexposee).keyDown(me, scan, ascii, shift))
 			return 1;
@@ -307,9 +305,10 @@ float Nexposee_keyDown(entity me, float scan, float ascii, float shift)
 	}
 	switch(me.animationState)
 	{
+		default:
 		case 0:
 		case 3:
-			nexposeeKey = ((scan == K_SPACE) || (scan == K_ENTER));
+			nexposeeKey = ((scan == K_SPACE) || (scan == K_ENTER) || (scan == K_KP_ENTER));
 			break;
 		case 1:
 		case 2:
@@ -320,6 +319,7 @@ float Nexposee_keyDown(entity me, float scan, float ascii, float shift)
 	{
 		switch(me.animationState)
 		{
+			default:
 			case 0:
 			case 3:
 				me.animationState = 1;