Remove BUTTON(gamefunc_Jump) and KB_KeyPressed(sc_Space) from AdvanceTrigger so you can type spaces in savegame names.

git-svn-id: https://svn.eduke32.com/eduke32@2802 1a8010ca-5511-0410-912e-c29ae57300e0
This commit is contained in:
hendricks266 2012-07-05 17:53:27 +00:00
parent 9a69b481cf
commit 00cb9caa2c

View file

@ -66,7 +66,6 @@ int32_t I_ClearInputWaiting(void)
int32_t I_JoystickAdvanceTrigger(void) int32_t I_JoystickAdvanceTrigger(void)
{ {
return ( return (
BUTTON(gamefunc_Jump) ||
#if defined(GEKKO) #if defined(GEKKO)
(JOYSTICK_GetButtons()&WII_A) (JOYSTICK_GetButtons()&WII_A)
#else #else
@ -77,7 +76,6 @@ int32_t I_JoystickAdvanceTrigger(void)
} }
int32_t I_JoystickAdvanceTriggerClear(void) int32_t I_JoystickAdvanceTriggerClear(void)
{ {
CONTROL_ClearButton(gamefunc_Jump);
#if defined(GEKKO) #if defined(GEKKO)
return JOYSTICK_ClearButton(WII_A); return JOYSTICK_ClearButton(WII_A);
#else #else
@ -131,7 +129,6 @@ int32_t I_JoystickEscapeTriggerClear(void)
int32_t I_AdvanceTrigger(void) int32_t I_AdvanceTrigger(void)
{ {
return ( return (
KB_KeyPressed(sc_Space) ||
KB_KeyPressed(sc_kpad_Enter) || KB_KeyPressed(sc_kpad_Enter) ||
KB_KeyPressed(sc_Enter) || KB_KeyPressed(sc_Enter) ||
(MOUSE_GetButtons()&LEFT_MOUSE) || (MOUSE_GetButtons()&LEFT_MOUSE) ||
@ -141,7 +138,6 @@ int32_t I_AdvanceTrigger(void)
int32_t I_AdvanceTriggerClear(void) int32_t I_AdvanceTriggerClear(void)
{ {
KB_FlushKeyBoardQueue(); KB_FlushKeyBoardQueue();
KB_ClearKeyDown(sc_Space);
KB_ClearKeyDown(sc_kpad_Enter); KB_ClearKeyDown(sc_kpad_Enter);
KB_ClearKeyDown(sc_Enter); KB_ClearKeyDown(sc_Enter);
I_JoystickAdvanceTriggerClear(); I_JoystickAdvanceTriggerClear();