diff --git a/source/mact/include/input.h b/source/mact/include/input.h index 1028331e0..183ec8f0a 100644 --- a/source/mact/include/input.h +++ b/source/mact/include/input.h @@ -56,16 +56,6 @@ extern void I_MenuLeftClear(void); extern int32_t I_MenuRight(void); extern void I_MenuRightClear(void); -extern int32_t I_PanelUp(void); -extern void I_PanelUpClear(void); -extern int32_t I_PanelDown(void); -extern void I_PanelDownClear(void); - -extern int32_t I_SliderLeft(void); -extern void I_SliderLeftClear(void); -extern int32_t I_SliderRight(void); -extern void I_SliderRightClear(void); - enum EnterTextFlags_t { INPUT_NUMERIC = 0x00000001, diff --git a/source/mact/src/input.cpp b/source/mact/src/input.cpp index 0274e59ed..6bb72073b 100644 --- a/source/mact/src/input.cpp +++ b/source/mact/src/input.cpp @@ -241,76 +241,6 @@ void I_MenuRightClear(void) } -int32_t I_PanelUp(void) -{ - return - I_MenuUp() - || I_MenuLeft() - || inputState.GetKeyStatus(sc_PgUp) - ; -} - -void I_PanelUpClear(void) -{ - I_MenuUpClear(); - I_MenuLeftClear(); - inputState.ClearKeyStatus(sc_PgUp); -} - - -int32_t I_PanelDown(void) -{ - return - I_MenuDown() - || I_MenuRight() - || inputState.GetKeyStatus(sc_PgDn) - || I_AdvanceTrigger() - ; -} - -void I_PanelDownClear(void) -{ - I_MenuDownClear(); - I_MenuRightClear(); - inputState.ClearKeyStatus(sc_PgDn); - I_AdvanceTriggerClear(); -} - - -int32_t I_SliderLeft(void) -{ - return - I_MenuLeft() -#if !defined EDUKE32_TOUCH_DEVICES - || mouseInactiveConditional((inputState.MouseGetButtons()&LEFT_MOUSE) && (inputState.MouseGetButtons()&WHEELUP_MOUSE)) -#endif - ; -} - -void I_SliderLeftClear(void) -{ - I_MenuLeftClear(); - inputState.MouseClearButton(WHEELUP_MOUSE); -} - - -int32_t I_SliderRight(void) -{ - return - I_MenuRight() -#if !defined EDUKE32_TOUCH_DEVICES - || mouseInactiveConditional((inputState.MouseGetButtons()&LEFT_MOUSE) && (inputState.MouseGetButtons()&WHEELDOWN_MOUSE)) -#endif - ; -} - -void I_SliderRightClear(void) -{ - I_MenuRightClear(); - inputState.MouseClearButton(WHEELDOWN_MOUSE); -} - - int32_t I_EnterText(char *t, int32_t maxlength, int32_t flags) { char ch; diff --git a/source/rr/src/d_menu.cpp b/source/rr/src/d_menu.cpp index faa7c718b..960dd7d41 100644 --- a/source/rr/src/d_menu.cpp +++ b/source/rr/src/d_menu.cpp @@ -478,7 +478,7 @@ void GameInterface::DrawCenteredTextScreen(const DVector2 &origin, const char *t } -END_DUKE_NS +END_RR_NS //---------------------------------------------------------------------------- //