thirdparty/scummvm
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Correct Indy3 grail diary fix - this stops those nasty segfaults ;p

Browse source 
svn-id: r5402
This commit is contained in:
James Brown 2002-11-04 08:09:01 +00:00
parent 1cc25f5bbd
commit 2442bce6f3
1 changed files with 7 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

9
scumm/script_v1.cpp
View file

@ -2692,8 +2692,7 @@ void Scumm::decodeParseString()
textSlot = 0; textSlot = 0;
} }
if (_gameId != GID_INDY3_256) // Indy3 seems to need to keep the string positions. setStringVars(textSlot);
setStringVars(textSlot); // See, for example, the text positioning in the grail diary
while ((_opcode = fetchScriptByte()) != 0xFF) { while ((_opcode = fetchScriptByte()) != 0xFF) {
switch (_opcode & 0xF) { switch (_opcode & 0xF) {
@ -2757,6 +2756,12 @@ void Scumm::decodeParseString()
unkMessage2(); unkMessage2();
break; break;
} }
// FIXME: Store positions, this is needed for Indy3 (Grail Diary)..
// I'm not sure whether having this as a generic case will break anything
_string[textSlot].t_xpos = _string[textSlot].xpos;
_string[textSlot].t_ypos = _string[textSlot].ypos;
_scriptPointer = _messagePtr; _scriptPointer = _messagePtr;
return; return;
default: default: