X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fmenu%2Fitem%2Fnexposee.c;h=97eabd7d66beffd07e0263f5474a63c572db5270;hb=1633673cc6c65bdca0120f2a4fc33e8c2449f06d;hp=304bf1dd241c053fa707c13a39898f4a0377fcbf;hpb=c45067564a27d2d3148775446992db29d8e41e32;p=xonotic%2Fxonotic-data.pk3dir.git diff --git a/qcsrc/menu/item/nexposee.c b/qcsrc/menu/item/nexposee.c index 304bf1dd2..97eabd7d6 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;