diff options
| author | James Brown | 2003-04-22 04:40:30 +0000 |
|---|---|---|
| committer | James Brown | 2003-04-22 04:40:30 +0000 |
| commit | a8dfcb4edad9ae2db35a85f6f9c7416d14d74931 (patch) | |
| tree | df8f9a9666c30f727d5c48f7bfc5ae063851e289 /scumm/scummvm.cpp | |
| parent | b3ac1bf20e1ff6bdce327f9f5016554e8be3963b (diff) | |
| download | scummvm-rg350-a8dfcb4edad9ae2db35a85f6f9c7416d14d74931.tar.gz scummvm-rg350-a8dfcb4edad9ae2db35a85f6f9c7416d14d74931.tar.bz2 scummvm-rg350-a8dfcb4edad9ae2db35a85f6f9c7416d14d74931.zip | |
Add somewhat hacky 'restart' command to debugger. Still needs work :)
svn-id: r7071
Diffstat (limited to 'scumm/scummvm.cpp')
| -rw-r--r-- | scumm/scummvm.cpp | 26 |
1 files changed, 14 insertions, 12 deletions
diff --git a/scumm/scummvm.cpp b/scumm/scummvm.cpp index 3de3ab4271..42695b9fba 100644 --- a/scumm/scummvm.cpp +++ b/scumm/scummvm.cpp @@ -354,8 +354,6 @@ void Scumm::scummInit() { a->initActor(1); } - _vars[VAR_CHARINC] = 4; - _numNestedScripts = 0; vm.cutSceneStackPointer = 0; @@ -386,11 +384,7 @@ void Scumm::scummInit() { virtscr[0].xstart = 0; if (!(_features & GF_AFTER_V7)) { - _vars[VAR_V5_DRAWFLAGS] = 11; - _vars[VAR_59] = 3; - // Setup light - _vars[VAR_CURRENT_LIGHTS] = LIGHTMODE_actor_base | LIGHTMODE_actor_color | LIGHTMODE_screen; _flashlightXStrips = 7; _flashlightYStrips = 7; _flashlight.buffer = NULL; @@ -415,8 +409,6 @@ void Scumm::scummInit() { _varwatch = -1; _screenStartStrip = 0; - _vars[VAR_TALK_ACTOR] = 0; - _talkDelay = 0; _keepText = false; @@ -449,9 +441,6 @@ void Scumm::scummInit() { initScummVars(); - if (!(_features & GF_AFTER_V6)) - _vars[VAR_V5_TALK_STRING_Y] = -0x50; - getGraphicsPerformance(); _sound->_current_cache = 0; @@ -461,6 +450,9 @@ void Scumm::scummInit() { void Scumm::initScummVars() { + if (!(_features & GF_AFTER_V6)) + _vars[VAR_V5_TALK_STRING_Y] = -0x50; + if (!(_features & GF_AFTER_V7)) { _vars[VAR_CURRENTDRIVE] = 0; _vars[VAR_FIXEDDISK] = true; @@ -471,16 +463,26 @@ void Scumm::initScummVars() { _vars[VAR_SOUNDPARAM] = 0; _vars[VAR_SOUNDPARAM2] = 0; _vars[VAR_SOUNDPARAM3] = 0; + if (_features & GF_AFTER_V6) _vars[VAR_V6_EMSSPACE] = 10000; + + _vars[VAR_V5_DRAWFLAGS] = 11; + _vars[VAR_59] = 3; + + // Setup light + _vars[VAR_CURRENT_LIGHTS] = LIGHTMODE_actor_base | LIGHTMODE_actor_color | LIGHTMODE_screen; } else { - _vars[VAR_V6_EMSSPACE] = 10000; + _vars[VAR_V6_EMSSPACE] = 10000; } if (_features & GF_AFTER_V8) { // Fixme: How do we deal with non-cd installs? _vars[VAR_CURRENTDISK] = 1; _vars[VAR_LANGUAGE] = _language; } + + _vars[VAR_CHARINC] = 4; + _vars[VAR_TALK_ACTOR] = 0; } void Scumm::checkRange(int max, int min, int no, const char *str) { |