[Scummvm-cvs-logs] CVS: scummvm/scumm script_v1.cpp,1.13,1.14
James Brown
ender at users.sourceforge.net
Mon Nov 4 00:10:02 CET 2002
Update of /cvsroot/scummvm/scummvm/scumm
In directory usw-pr-cvs1:/tmp/cvs-serv5474/scumm
Modified Files:
script_v1.cpp
Log Message:
Correct Indy3 grail diary fix - this stops those nasty segfaults ;p
Index: script_v1.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/script_v1.cpp,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- script_v1.cpp 3 Nov 2002 15:56:52 -0000 1.13
+++ script_v1.cpp 4 Nov 2002 08:09:01 -0000 1.14
@@ -2692,8 +2692,7 @@
textSlot = 0;
}
- if (_gameId != GID_INDY3_256) // Indy3 seems to need to keep the string positions.
- setStringVars(textSlot); // See, for example, the text positioning in the grail diary
+ setStringVars(textSlot);
while ((_opcode = fetchScriptByte()) != 0xFF) {
switch (_opcode & 0xF) {
@@ -2757,6 +2756,12 @@
unkMessage2();
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;
return;
default:
More information about the Scummvm-git-logs
mailing list