X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fxonotic-data.pk3dir.git;a=blobdiff_plain;f=qcsrc%2Fmenu%2Fitem%2Fnexposee.c;h=97eabd7d66beffd07e0263f5474a63c572db5270;hp=304bf1dd241c053fa707c13a39898f4a0377fcbf;hb=30125332eda7a5e10bd535c63c3f689729155810;hpb=1eadc66440474af5c3d2b2f7e5a24935da3ffbdf diff --git a/qcsrc/menu/item/nexposee.c b/qcsrc/menu/item/nexposee.c index 304bf1dd24..97eabd7d66 100644 --- a/qcsrc/menu/item/nexposee.c +++ b/qcsrc/menu/item/nexposee.c @@ -209,7 +209,7 @@ void Nexposee_draw(entity me) } SUPER(Nexposee).draw(me); -}; +} float Nexposee_mousePress(entity me, vector pos) { @@ -263,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; } @@ -279,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; @@ -305,6 +305,7 @@ 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) || (scan == K_KP_ENTER)); @@ -318,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;