mirror of
https://github.com/libretro/scummvm.git
synced 2025-02-25 22:07:34 +00:00
Disambiguate o6_jump execution (is _scriptPointer read before or after fetchScriptWordSigned() (which modifies _scriptPointer) is being called)
svn-id: r11261
This commit is contained in:
parent
1f53624d88
commit
5d863586dc
@ -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);
|
||||
|
Loading…
x
Reference in New Issue
Block a user