diff options
| author | Max Horn | 2003-11-11 13:47:53 +0000 |
|---|---|---|
| committer | Max Horn | 2003-11-11 13:47:53 +0000 |
| commit | 5d863586dc1a431dd3d5ec86096140297886bf4d (patch) | |
| tree | 760904c4837b3e7b1553974b0ea8ff94c86ac384 /scumm | |
| parent | 1f53624d88ac05bff0b4f408507eeca331cfdcd5 (diff) | |
| download | scummvm-rg350-5d863586dc1a431dd3d5ec86096140297886bf4d.tar.gz scummvm-rg350-5d863586dc1a431dd3d5ec86096140297886bf4d.tar.bz2 scummvm-rg350-5d863586dc1a431dd3d5ec86096140297886bf4d.zip | |
Disambiguate o6_jump execution (is _scriptPointer read before or after fetchScriptWordSigned() (which modifies _scriptPointer) is being called)
svn-id: r11261
Diffstat (limited to 'scumm')
| -rw-r--r-- | scumm/script_v6.cpp | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/scumm/script_v6.cpp b/scumm/script_v6.cpp index 842740e215..deb1ff7291 100644 --- a/scumm/script_v6.cpp +++ b/scumm/script_v6.cpp @@ -681,7 +681,8 @@ void ScummEngine_v6::o6_ifNot() { } void ScummEngine_v6::o6_jump() { - _scriptPointer += fetchScriptWordSigned(); + int offset = fetchScriptWordSigned(); + _scriptPointer += offset; } void ScummEngine_v6::o6_startScript() { @@ -2872,7 +2873,7 @@ void ScummEngine_v6::o6_openFile() { byte filename[100]; _msgPtrToAdd = filename; - _messagePtr =_scriptPointer; + _messagePtr = _scriptPointer; addMessageToStack(_messagePtr); len = resStrLen(_scriptPointer); @@ -2916,7 +2917,7 @@ void ScummEngine_v6::o6_deleteFile() { byte filename[100]; _msgPtrToAdd = filename; - _messagePtr =_scriptPointer; + _messagePtr = _scriptPointer; addMessageToStack(_messagePtr); len = resStrLen(_scriptPointer); |