diff options
| author | Travis Howell | 2002-12-06 15:24:14 +0000 |
|---|---|---|
| committer | Travis Howell | 2002-12-06 15:24:14 +0000 |
| commit | ad1ad142d081846e46a8d734f5d419f4497ebf5d (patch) | |
| tree | 70867104a6c794bb3615db8208a8b31c17186cd9 | |
| parent | 102525f27fa0bf2739df2e69ed993ba4708780f1 (diff) | |
| download | scummvm-rg350-ad1ad142d081846e46a8d734f5d419f4497ebf5d.tar.gz scummvm-rg350-ad1ad142d081846e46a8d734f5d419f4497ebf5d.tar.bz2 scummvm-rg350-ad1ad142d081846e46a8d734f5d419f4497ebf5d.zip | |
Add debug levels for simon games
svn-id: r5860
| -rw-r--r-- | common/gameDetector.cpp | 3 | ||||
| -rw-r--r-- | common/gameDetector.h | 1 | ||||
| -rw-r--r-- | simon/simon.cpp | 9 | ||||
| -rw-r--r-- | simon/simon.h | 1 |
4 files changed, 11 insertions, 3 deletions
diff --git a/common/gameDetector.cpp b/common/gameDetector.cpp index da0f1524cc..2eb515efd0 100644 --- a/common/gameDetector.cpp +++ b/common/gameDetector.cpp @@ -29,9 +29,6 @@ #include "common/config-file.h" -extern uint16 _debugLevel; - - #define CHECK_OPTION() if ((current_option != NULL) || (*s != '\0')) goto ShowHelpAndExit #define HANDLE_OPTION() if ((*s == '\0') && (current_option == NULL)) goto ShowHelpAndExit; \ if ((*s != '\0') && (current_option != NULL)) goto ShowHelpAndExit; \ diff --git a/common/gameDetector.h b/common/gameDetector.h index bf77f24ce2..d84840723b 100644 --- a/common/gameDetector.h +++ b/common/gameDetector.h @@ -119,6 +119,7 @@ public: uint16 _talkSpeed; uint16 _debugMode; + uint16 _debugLevel; bool _noSubtitles; uint16 _bootParam; diff --git a/simon/simon.cpp b/simon/simon.cpp index 43b5345dbf..39c11f69cd 100644 --- a/simon/simon.cpp +++ b/simon/simon.cpp @@ -138,7 +138,9 @@ SimonState::SimonState(GameDetector *detector, OSystem *syst) "Features of the game that depend on sound synchronization will most likely break"); midi.set_volume(detector->_music_volume); set_volume(detector->_sfx_volume); + _debugMode = detector->_debugMode; + _debugLevel = detector->_debugLevel; _effects_paused = false; _ambient_paused = false; @@ -4468,6 +4470,13 @@ void SimonState::go() _continous_mainscript = false; _continous_vgascript = false; + if (_debugLevel == 2) + _continous_mainscript = true; + if (_debugLevel == 3) + _continous_vgascript = true; + if (_debugLevel == 4) + _start_mainscript = true; + if (_sound->hasVoice()) { _vk_t_toggle = false; } else { diff --git a/simon/simon.h b/simon/simon.h index aba6f463d7..29a3053384 100644 --- a/simon/simon.h +++ b/simon/simon.h @@ -175,6 +175,7 @@ public: bool _mouse_pos_changed; uint16 _debugMode; + uint16 _debugLevel; bool _start_mainscript; bool _continous_mainscript; bool _continous_vgascript; |