diff options
| author | Travis Howell | 2006-02-26 05:48:40 +0000 |
|---|---|---|
| committer | Travis Howell | 2006-02-26 05:48:40 +0000 |
| commit | 0f60eaa16646655bbd4493dea52477c60ad05ccb (patch) | |
| tree | 369c40f119f532ac2b8c583de4014082cb10b48d | |
| parent | a3faba9727a5a3d43f2c6d08dc36d3bcd4f538f9 (diff) | |
| download | scummvm-rg350-0f60eaa16646655bbd4493dea52477c60ad05ccb.tar.gz scummvm-rg350-0f60eaa16646655bbd4493dea52477c60ad05ccb.tar.bz2 scummvm-rg350-0f60eaa16646655bbd4493dea52477c60ad05ccb.zip | |
Move debug mode setting to initScummVars(), so it is reset when game is restarted
svn-id: r20905
| -rw-r--r-- | engines/scumm/scumm.cpp | 6 | ||||
| -rw-r--r-- | engines/scumm/vars.cpp | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/engines/scumm/scumm.cpp b/engines/scumm/scumm.cpp index 0f0ef5eadb..2a91dce9c0 100644 --- a/engines/scumm/scumm.cpp +++ b/engines/scumm/scumm.cpp @@ -1254,12 +1254,6 @@ int ScummEngine::init(GameDetector &detector) { scummInit(); initScummVars(); - if (VAR_DEBUGMODE != 0xFF) { - VAR(VAR_DEBUGMODE) = _debugMode; - if (_game.heversion >= 80 && _debugMode) - VAR(85) = 1; - } - if (_imuse) { _imuse->setBase(res.address[rtSound]); } diff --git a/engines/scumm/vars.cpp b/engines/scumm/vars.cpp index 420b3231ac..905477da01 100644 --- a/engines/scumm/vars.cpp +++ b/engines/scumm/vars.cpp @@ -726,6 +726,12 @@ void ScummEngine::initScummVars() { VAR(VAR_ROOM_HEIGHT) = _screenHeight; } + if (VAR_DEBUGMODE != 0xFF) { + VAR(VAR_DEBUGMODE) = _debugMode; + if (_game.heversion >= 80 && _debugMode) + VAR(85) = 1; + } + if (VAR_FADE_DELAY != 0xFF) VAR(VAR_FADE_DELAY) = 3; |