aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFilippos Karapetis2013-06-12 11:18:27 +0300
committerFilippos Karapetis2013-06-12 11:35:48 +0300
commit6bdc262c0728ed025b2c467db8018ede9104d5f3 (patch)
treeded3dafe8d4ab958a92308a457080430924c3fc4
parent323fe8c45bc9e602c7d8a043210e67811bab9d38 (diff)
downloadscummvm-rg350-6bdc262c0728ed025b2c467db8018ede9104d5f3.tar.gz
scummvm-rg350-6bdc262c0728ed025b2c467db8018ede9104d5f3.tar.bz2
scummvm-rg350-6bdc262c0728ed025b2c467db8018ede9104d5f3.zip
NEVERHOOD: Move some more cheat code to the cheat console command
-rw-r--r--engines/neverhood/console.cpp4
-rw-r--r--engines/neverhood/modules/module2800.cpp4
2 files changed, 4 insertions, 4 deletions
diff --git a/engines/neverhood/console.cpp b/engines/neverhood/console.cpp
index eae6b92ba6..411e5eceb7 100644
--- a/engines/neverhood/console.cpp
+++ b/engines/neverhood/console.cpp
@@ -76,6 +76,7 @@ bool Console::Cmd_Cheat(int argc, const char **argv) {
DebugPrintf(" dice - shows the correct dice combination in the teddy bear puzzle, module 1100, scene 6\n");
DebugPrintf(" memory - solves the memory puzzle, module 1400, scene 4\n");
DebugPrintf(" radio - enables the radio, module 3000, scene 9 - same as pulling the rightmost cord in the flytrap room\n");
+ DebugPrintf(" music - shows the correct index in the radio music puzzle, module 2800, scene 1\n");
DebugPrintf(" symbols - solves the symbols puzzle, module 1600, scene 8. Only available in that room\n");
DebugPrintf(" tubes - shows the correct test tube combination in module 2800, scenes 7 and 10, can be used anywhere\n");
return true;
@@ -128,6 +129,9 @@ bool Console::Cmd_Cheat(int argc, const char **argv) {
}
DebugPrintf("Puzzle solved\n");
+ } else if (cheatName == "music") {
+ Scene *scene = (Scene *)((GameModule *)_vm->_gameModule->_childObject)->_childObject;
+ DebugPrintf("Good music index: %d, current radio music index: %d\n", scene->getGlobalVar(V_CURR_RADIO_MUSIC_INDEX), scene->getGlobalVar(V_GOOD_RADIO_MUSIC_INDEX));
} else if (cheatName == "radio") {
Scene *scene = (Scene *)((GameModule *)_vm->_gameModule->_childObject)->_childObject;
scene->setGlobalVar(V_RADIO_ENABLED, 1);
diff --git a/engines/neverhood/modules/module2800.cpp b/engines/neverhood/modules/module2800.cpp
index f359cc3caf..3d76d05762 100644
--- a/engines/neverhood/modules/module2800.cpp
+++ b/engines/neverhood/modules/module2800.cpp
@@ -616,10 +616,6 @@ void Scene2802::update() {
if (prevTuneStatus != _currTuneStatus)
changeTuneStatus(prevTuneStatus, _currTuneStatus);
- //DEBUG>>>
- //debug("_currRadioMusicIndex = %d; V_GOOD_RADIO_MUSIC_INDEX = %d", _currRadioMusicIndex, getGlobalVar(V_GOOD_RADIO_MUSIC_INDEX));
- //DEBUG<<<
-
if (getGlobalVar(V_RADIO_MOVE_DISH_VIDEO) && prevTuneStatus != _currTuneStatus && _currRadioMusicIndex != 0) {
setGlobalVar(V_RADIO_MOVE_DISH_VIDEO, 0);
leaveScene(1);