aboutsummaryrefslogtreecommitdiff
path: root/engines/neverhood/gamemodule.cpp
diff options
context:
space:
mode:
authorjohndoe1232013-01-29 11:57:06 +0000
committerWillem Jan Palenstijn2013-05-08 20:47:42 +0200
commitc96d2475b100610271c974043a8a9c4322b8e60b (patch)
tree37b68566c61d3e86cde105e3d24845b7876a4de1 /engines/neverhood/gamemodule.cpp
parent53a81d11b8e5e34478e75a8797b094ec53976c68 (diff)
downloadscummvm-rg350-c96d2475b100610271c974043a8a9c4322b8e60b.tar.gz
scummvm-rg350-c96d2475b100610271c974043a8a9c4322b8e60b.tar.bz2
scummvm-rg350-c96d2475b100610271c974043a8a9c4322b8e60b.zip
NEVERHOOD: Add Screen::saveParams and Screen::restoreParams, called when etnering/leaving the menu
Diffstat (limited to 'engines/neverhood/gamemodule.cpp')
-rw-r--r--engines/neverhood/gamemodule.cpp14
1 files changed, 4 insertions, 10 deletions
diff --git a/engines/neverhood/gamemodule.cpp b/engines/neverhood/gamemodule.cpp
index 493d16d7dd..5eaa7e2d64 100644
--- a/engines/neverhood/gamemodule.cpp
+++ b/engines/neverhood/gamemodule.cpp
@@ -286,8 +286,7 @@ void GameModule::initCubeSymbolsPuzzle() {
}
void GameModule::initCrystalColorsPuzzle() {
- // TODO Maybe move this into the GameModule so all puzzle init code is together
- if (getGlobalVar(V_CRYSTAL_COLORS_INIT) == 0) {
+ if (!getGlobalVar(V_CRYSTAL_COLORS_INIT)) {
TextResource textResource(_vm);
const char *textStart, *textEnd;
textResource.load(0x46691611);
@@ -341,10 +340,6 @@ uint32 GameModule::handleMessage(int messageNum, const MessageParam &param, Enti
_moduleResult = param.asInteger();
_done = true;
break;
- case 0x100A:
- case 0x1023:
- // Unused resource preloading messages
- break;
}
return messageResult;
}
@@ -829,7 +824,7 @@ void GameModule::updateModule() {
break;
case 3000:
// NOTE _moduleResult 2 never used
- // TODO Check if _moduleResult 4 is used
+ // NOTE Check if _moduleResult 4 is used
if (_moduleResult == 1)
createModule(1900, 0);
else if (_moduleResult == 3)
@@ -854,7 +849,7 @@ void GameModule::openMainMenu() {
// If there's no module, create one so there's something to return to
createModule(1000, 0);
}
- // TODO Save FPS, Smacker handle, screen offsets
+ _vm->_screen->saveParams();
_mainMenuRequested = false;
createMenuModule();
}
@@ -871,9 +866,8 @@ void GameModule::createMenuModule() {
void GameModule::updateMenuModule() {
if (!updateChild()) {
- // TODO Restore FPS?
+ _vm->_screen->restoreParams();
_childObject = _prevChildObject;
- // TODO Restore Smacker handle, screen offsets
sendMessage(_childObject, 0x101E, 0);
_prevChildObject = NULL;
_moduleNum = _prevModuleNum;