From aed05840ae63f90637dbdbc6b861f2e2bcab7904 Mon Sep 17 00:00:00 2001 From: Christoph Oelckers Date: Sun, 1 Dec 2019 10:31:44 +0100 Subject: [PATCH] - removed the mouseInactiveConditional interface function. This was only a crutch to let the input interface work with the original menus. Now that the one in Blood is gone, all the conditions are no longer relevant. (Shadow Warrior never got far enough to implement this) --- source/blood/src/blood.h | 1 - source/blood/src/d_menu.cpp | 6 ------ source/build/include/baselayer.h | 1 - source/duke3d/src/d_menu.cpp | 5 ----- source/duke3d/src/duke3d.h | 1 - source/mact/src/input.cpp | 12 ++++++++---- source/rr/src/d_menu.cpp | 5 ----- source/rr/src/duke3d.h | 1 - source/sw/src/game.cpp | 6 ------ source/sw/src/game.h | 1 - 10 files changed, 8 insertions(+), 31 deletions(-) diff --git a/source/blood/src/blood.h b/source/blood/src/blood.h index 92bc9186f..87dc23c57 100644 --- a/source/blood/src/blood.h +++ b/source/blood/src/blood.h @@ -87,7 +87,6 @@ struct GameInterface : ::GameInterface bool validate_hud(int) override; void set_hud_layout(int size) override; void set_hud_scale(int size) override; - bool mouseInactiveConditional(bool condition) override; FString statFPS() override; FSavegameInfo GetSaveSig() override; diff --git a/source/blood/src/d_menu.cpp b/source/blood/src/d_menu.cpp index 62521b56a..3563cf8d1 100644 --- a/source/blood/src/d_menu.cpp +++ b/source/blood/src/d_menu.cpp @@ -136,12 +136,6 @@ void MenuSetupEpisodeInfo(void) #endif } -bool GameInterface::mouseInactiveConditional(bool condition) -{ - return condition; -} - - FSavegameInfo GameInterface::GetSaveSig() { diff --git a/source/build/include/baselayer.h b/source/build/include/baselayer.h index 40f147f5f..cbdcf7e3f 100644 --- a/source/build/include/baselayer.h +++ b/source/build/include/baselayer.h @@ -211,7 +211,6 @@ struct GameInterface virtual bool validate_hud(int) = 0; virtual void set_hud_layout(int size) = 0; virtual void set_hud_scale(int size) = 0; - virtual bool mouseInactiveConditional(bool condition) { return condition; } virtual FString statFPS() { return "FPS display not available"; } virtual GameStats getStats() { return {}; } virtual void DrawNativeMenuText(int fontnum, int state, int xpos, int ypos, float fontscale, const char* text, int flags) {} diff --git a/source/duke3d/src/d_menu.cpp b/source/duke3d/src/d_menu.cpp index 33b3b0c3c..340216664 100644 --- a/source/duke3d/src/d_menu.cpp +++ b/source/duke3d/src/d_menu.cpp @@ -414,11 +414,6 @@ class MainMenu : public DukeListMenu //---------------------------------------------------------------------------- -bool GameInterface::mouseInactiveConditional(bool condition) // can hopefully go away once the menu refactor is complete -{ - return condition; -} - void GameInterface::MenuOpened() { S_PauseSounds(true); diff --git a/source/duke3d/src/duke3d.h b/source/duke3d/src/duke3d.h index 1a2042485..7c431e595 100644 --- a/source/duke3d/src/duke3d.h +++ b/source/duke3d/src/duke3d.h @@ -151,7 +151,6 @@ struct GameInterface : ::GameInterface bool validate_hud(int) override; void set_hud_layout(int size) override; void set_hud_scale(int size) override; - bool mouseInactiveConditional(bool condition) override; FString statFPS() override; GameStats getStats() override; // Access to the front end specific menu code. Use is restricted to the main menu, the ingame menu and the skill/episode selection. diff --git a/source/mact/src/input.cpp b/source/mact/src/input.cpp index cfe298978..0274e59ed 100644 --- a/source/mact/src/input.cpp +++ b/source/mact/src/input.cpp @@ -31,6 +31,10 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. char typebuf[TYPEBUFSIZE]; +bool mouseInactiveConditional(bool condition) +{ + return condition; +} int32_t I_CheckAllInput(void) { @@ -54,7 +58,7 @@ int32_t I_TextSubmit(void) return inputState.GetKeyStatus(sc_Enter) || inputState.GetKeyStatus(sc_kpad_Enter) - || gi->mouseInactiveConditional(inputState.MouseGetButtons()&LEFT_MOUSE) + || mouseInactiveConditional(inputState.MouseGetButtons()&LEFT_MOUSE) || (JOYSTICK_GetGameControllerButtons()&(1<mouseInactiveConditional(buttonMap.ButtonDown(gamefunc_Fire)) + || mouseInactiveConditional(buttonMap.ButtonDown(gamefunc_Fire)) || buttonMap.ButtonDown(gamefunc_Crouch) || (JOYSTICK_GetGameControllerButtons()&(1<mouseInactiveConditional((inputState.MouseGetButtons()&LEFT_MOUSE) && (inputState.MouseGetButtons()&WHEELUP_MOUSE)) + || mouseInactiveConditional((inputState.MouseGetButtons()&LEFT_MOUSE) && (inputState.MouseGetButtons()&WHEELUP_MOUSE)) #endif ; } @@ -295,7 +299,7 @@ int32_t I_SliderRight(void) return I_MenuRight() #if !defined EDUKE32_TOUCH_DEVICES - || gi->mouseInactiveConditional((inputState.MouseGetButtons()&LEFT_MOUSE) && (inputState.MouseGetButtons()&WHEELDOWN_MOUSE)) + || mouseInactiveConditional((inputState.MouseGetButtons()&LEFT_MOUSE) && (inputState.MouseGetButtons()&WHEELDOWN_MOUSE)) #endif ; } diff --git a/source/rr/src/d_menu.cpp b/source/rr/src/d_menu.cpp index 974c3d8f7..faa7c718b 100644 --- a/source/rr/src/d_menu.cpp +++ b/source/rr/src/d_menu.cpp @@ -342,11 +342,6 @@ class MainMenu : public RedneckListMenu //---------------------------------------------------------------------------- -bool GameInterface::mouseInactiveConditional(bool condition) // can hopefully go away once the menu refactor is complete -{ - return condition; -} - void GameInterface::MenuOpened() { S_PauseSounds(true); diff --git a/source/rr/src/duke3d.h b/source/rr/src/duke3d.h index 11795d75e..aedcb0ece 100644 --- a/source/rr/src/duke3d.h +++ b/source/rr/src/duke3d.h @@ -155,7 +155,6 @@ struct GameInterface : ::GameInterface bool validate_hud(int) override; void set_hud_layout(int size) override; void set_hud_scale(int size) override; - bool mouseInactiveConditional(bool condition) override; FString statFPS() override; GameStats getStats() override; void DrawNativeMenuText(int fontnum, int state, int xpos, int ypos, float fontscale, const char* text, int flags); diff --git a/source/sw/src/game.cpp b/source/sw/src/game.cpp index 308a68e8f..69f0a192c 100644 --- a/source/sw/src/game.cpp +++ b/source/sw/src/game.cpp @@ -4751,12 +4751,6 @@ void Saveable_Init_Dynamic() /*extern*/ void GameInterface::set_hud_layout(int requested_size) { /* the relevant setting is gs.BorderNum */} /*extern*/ void GameInterface::set_hud_scale(int requested_size) { /* the relevant setting is gs.BorderNum */ } -bool GameInterface::mouseInactiveConditional(bool condition) -{ - return condition; -} - - ::GameInterface* CreateInterface() { return new GameInterface; diff --git a/source/sw/src/game.h b/source/sw/src/game.h index 9b55ac67c..b4e07fe38 100644 --- a/source/sw/src/game.h +++ b/source/sw/src/game.h @@ -2381,7 +2381,6 @@ struct GameInterface : ::GameInterface bool validate_hud(int) override; void set_hud_layout(int size) override; void set_hud_scale(int size) override; - bool mouseInactiveConditional(bool condition) override; FSavegameInfo GetSaveSig() override; };