libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2025-02-22 12:12:16 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

CRAB: Fix PVS V768: Handle return values of Button::handleEvents() properly

Browse Source
This commit is contained in:
hax0kartik 2023-08-12 17:56:06 +05:30 committed by Eugene Sandulenko
parent f37039c375
commit efda2cce7a
7 changed files with 16 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
engines/crab/mainmenu.cpp
View File

@ -199,7 +199,8 @@ void MainMenu::handleEvents(Common::Event &event, bool &shouldChangeState, GameS
}
}
if (g_engine->_inputManager->state(IU_BACK) || (_back.handleEvents(event) && (_state != STATE_SAVENAME && _state != STATE_CREDITS))) {
if (g_engine->_inputManager->state(IU_BACK) || ((_back.handleEvents(event) != BUAC_IGNORE) &&
(_state != STATE_SAVENAME && _state != STATE_CREDITS))) {
if (_state == STATE_SAVENAME)
changeState(STATE_DIFF);
else if (_state != STATE_NORMAL)
@ -254,7 +255,7 @@ void MainMenu::handleEvents(Common::Event &event, bool &shouldChangeState, GameS
} break;
case STATE_SAVENAME:
if (_save.handleEvents(event) || _accept.handleEvents(event)) {
if (_save.handleEvents(event) || (_accept.handleEvents(event)) != BUAC_IGNORE) {
if (_save._text != "") {
g_engine->_tempData->_filename = _save._text;
g_engine->_tempData->_ironman = true;
@ -262,7 +263,7 @@ void MainMenu::handleEvents(Common::Event &event, bool &shouldChangeState, GameS
newStateId = GAMESTATE_NEW_GAME;
} else
debug("Please enter a valid filename for the iron man save.");
} else if (_cancel.handleEvents(event))
} else if (_cancel.handleEvents(event) != BUAC_IGNORE)
changeState(STATE_DIFF);
break;

2
engines/crab/ui/ChapterIntro.cpp
View File

@ -48,7 +48,7 @@ void ChapterIntro::load(rapidxml::xml_node<char> *node) {
}
bool ChapterIntro::handleEvents(Common::Event &event) {
if (_traits.handleEvents(event))
if (_traits.handleEvents(event) != BUAC_IGNORE)
_showTraits = true;
return _dialog.handleEvents(event);

4
engines/crab/ui/CreditScreen.cpp
View File

@ -115,9 +115,9 @@ bool CreditScreen::handleEvents(Common::Event &event) {
else if (_reverse.handleEvents(event) == BUAC_LCLICK)
_speed._cur = _speed._reverse;
if (_website.handleEvents(event))
if (_website.handleEvents(event) != BUAC_IGNORE)
g_system->openUrl("http://pyrodactyl.com");
else if (_twitter.handleEvents(event))
else if (_twitter.handleEvents(event) != BUAC_IGNORE)
g_system->openUrl("https://www.twitter.com/pyrodactylgames");
return (_back.handleEvents(event) == BUAC_LCLICK);

2
engines/crab/ui/DevConsole.cpp
View File

@ -111,7 +111,7 @@ void DebugConsole::handleEvents(const Common::Event &event) {
}
}
if (_back.handleEvents(event)) {
if (_back.handleEvents(event) != BUAC_IGNORE) {
_state = STATE_NORMAL;
}
break;

4
engines/crab/ui/GeneralSettingMenu.cpp
View File

@ -79,10 +79,10 @@ void GeneralSettingMenu::handleEvents(const Common::Event &event) {
g_engine->_musicManager->volEffects(_volEffects.Value());
// No need to change screen here
if (_saveOnExit.handleEvents(event))
if (_saveOnExit.handleEvents(event) != BUAC_IGNORE)
g_engine->_screenSettings->_saveOnExit = !g_engine->_screenSettings->_saveOnExit;
if (_mouseTrap.handleEvents(event)) {
if (_mouseTrap.handleEvents(event) != BUAC_IGNORE) {
g_engine->_screenSettings->_mouseTrap = !g_engine->_screenSettings->_mouseTrap;
}

8
engines/crab/ui/GfxSettingMenu.cpp
View File

@ -91,24 +91,24 @@ void GfxSettingMenu::draw() {
// Purpose: Handle input
//------------------------------------------------------------------------
int GfxSettingMenu::handleEvents(const Common::Event &event) {
if (_fullscreen.handleEvents(event)) {
if (_fullscreen.handleEvents(event) != BUAC_IGNORE) {
// Setting video flags is necessary when toggling fullscreen
g_engine->_screenSettings->_fullscreen = !g_engine->_screenSettings->_fullscreen;
}
// Vsync doesn't need to set the change value
if (_vsync.handleEvents(event)) {
if (_vsync.handleEvents(event) != BUAC_IGNORE) {
g_engine->_screenSettings->_vsync = !g_engine->_screenSettings->_vsync;
}
// Quality and resolution can only be changed in the main menu
if (!g_engine->_screenSettings->_inGame) {
if (_quality.handleEvents(event))
if (_quality.handleEvents(event) != BUAC_IGNORE)
g_engine->_screenSettings->_quality = !g_engine->_screenSettings->_quality;
}
// Window border doesn't matter if you are in fullscreen
if (_border.handleEvents(event) && !g_engine->_screenSettings->_fullscreen) {
if (_border.handleEvents(event) && !g_engine->_screenSettings->_fullscreen != BUAC_IGNORE) {
g_engine->_screenSettings->_border = !g_engine->_screenSettings->_border;
}

4
engines/crab/ui/OptionMenu.cpp
View File

@ -201,10 +201,10 @@ bool OptionMenu::handleEvents(Button &back, const Common::Event &event) {
break;
case STATE_CONFIRM:
if (_accept.handleEvents(event)) {
if (_accept.handleEvents(event) != BUAC_IGNORE) {
_state = STATE_GRAPHICS;
_timer.stop();
} else if (_cancel.handleEvents(event)) {
} else if (_cancel.handleEvents(event) != BUAC_IGNORE) {
_gfx.SetInfo();
_state = STATE_GRAPHICS;
}