diff options
| author | Filippos Karapetis | 2019-05-27 14:22:04 +0300 |
|---|---|---|
| committer | Filippos Karapetis | 2019-05-27 14:53:39 +0300 |
| commit | e94026e8000243333a1ca594d91ad5eda4e6930a (patch) | |
| tree | 3f8830395e5787bfb4c90169cdd3edf6e402dc1c /engines/macventure/gui.cpp | |
| parent | ea39214f7a252ad60d686a7dac44a50dc2cbad1d (diff) | |
| download | scummvm-rg350-e94026e8000243333a1ca594d91ad5eda4e6930a.tar.gz scummvm-rg350-e94026e8000243333a1ca594d91ad5eda4e6930a.tar.bz2 scummvm-rg350-e94026e8000243333a1ca594d91ad5eda4e6930a.zip | |
MACVENTURE: Fix MSVC warnings
- Added a CHECKME for a code which is never used at the moment
- Add default cases to switch statements
- Remove unused variables
- Fix integer variable assignments from booleans
Diffstat (limited to 'engines/macventure/gui.cpp')
| -rw-r--r-- | engines/macventure/gui.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/engines/macventure/gui.cpp b/engines/macventure/gui.cpp index 0008e34afa..34aa2c90cb 100644 --- a/engines/macventure/gui.cpp +++ b/engines/macventure/gui.cpp @@ -802,6 +802,7 @@ void Gui::updateWindow(WindowReference winID, bool containerOpen) { ObjID child = children[i].obj; BlitMode mode = kBlitDirect; bool off = !_engine->isObjVisible(child); + // CHECKME: Since flag = 0, this always evaluates to false if (flag || !off || !_engine->isObjClickable(child)) { mode = kBlitBIC; if (off || flag) { @@ -1021,9 +1022,8 @@ WindowReference Gui::getObjWindow(ObjID objID) { case 0xfffd: return kSelfWindow; case 0xfffe: return kOutConsoleWindow; case 0xffff: return kCommandsWindow; + default: return findObjWindow(objID); } - - return findObjWindow(objID); } WindowReference Gui::findObjWindow(ObjID objID) { @@ -1250,7 +1250,7 @@ void Gui::invertWindowColors(WindowReference winID) { } bool Gui::tryCloseWindow(WindowReference winID) { - WindowData data = findWindowData(winID); + //WindowData data = findWindowData(winID); Graphics::MacWindow *win = findWindow(winID); _wm.removeWindow(win); if (winID < 0x80) { |