[Scummvm-cvs-logs] CVS: scummvm/scumm string.cpp,1.231,1.232 script.cpp,1.168,1.169
Max Horn
fingolfin at users.sourceforge.net
Mon Aug 2 13:56:53 CEST 2004
- Previous message: [Scummvm-cvs-logs] CVS: tools descumm.cpp,1.90,1.91
- Next message: [Scummvm-cvs-logs] CVS: scummvm/saga actor.cpp,1.19,1.20 console.cpp,1.9,1.10 font.cpp,1.13,1.14 font.h,1.5,1.6 font_map.cpp,1.2,1.3 ihnm_introproc.cpp,1.11,1.12 interface.cpp,1.16,1.17 ite_introproc.cpp,1.15,1.16 objectmap.cpp,1.15,1.16 render.cpp,1.24,1.25 saga.cpp,1.36,1.37 saga.h,1.26,1.27 sdebug.cpp,1.11,1.12 sprite.cpp,1.13,1.14 text.cpp,1.5,1.6 font_mod.h,1.2,NONE
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Update of /cvsroot/scummvm/scummvm/scumm
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1406
Modified Files:
string.cpp script.cpp
Log Message:
WORKAROUND for bug #985948 (INDY3VGA: Lockup during conversation with drunken nazi)
Index: string.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/string.cpp,v
retrieving revision 1.231
retrieving revision 1.232
diff -u -d -r1.231 -r1.232
--- string.cpp 2 Aug 2004 17:55:14 -0000 1.231
+++ string.cpp 2 Aug 2004 20:55:35 -0000 1.232
@@ -468,6 +468,15 @@
break;
if (chr == 0xFF) {
chr = src[num++];
+
+ // WORKAROUND for bug #985948, a script bug in Indy3. Apparently,
+ // a german 'sz' was encoded incorrectly as 0xFF2E. We replace
+ // this by the correct encoding here. See also ScummEngine::resStrLen().
+ if (_gameId == GID_INDY3 && chr == 0x2E) {
+ *dst++ = 0xE1;
+ continue;
+ }
+
if (chr == 1 || chr == 2 || chr == 3 || chr == 8) {
// Simply copy these special codes
*dst++ = 0xFF;
Index: script.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/script.cpp,v
retrieving revision 1.168
retrieving revision 1.169
diff -u -d -r1.168 -r1.169
--- script.cpp 2 Aug 2004 14:27:10 -0000 1.168
+++ script.cpp 2 Aug 2004 20:55:35 -0000 1.169
@@ -1059,6 +1059,12 @@
chr = *src++;
num++;
+ // WORKAROUND for bug #985948, a script bug in Indy3. See also
+ // the corresponding code in ScummEngine::addMessageToStack().
+ if (_gameId == GID_INDY3 && chr == 0x2E) {
+ continue;
+ }
+
if (chr != 1 && chr != 2 && chr != 3 && chr != 8) {
if (_version == 8) {
src += 4;
- Previous message: [Scummvm-cvs-logs] CVS: tools descumm.cpp,1.90,1.91
- Next message: [Scummvm-cvs-logs] CVS: scummvm/saga actor.cpp,1.19,1.20 console.cpp,1.9,1.10 font.cpp,1.13,1.14 font.h,1.5,1.6 font_map.cpp,1.2,1.3 ihnm_introproc.cpp,1.11,1.12 interface.cpp,1.16,1.17 ite_introproc.cpp,1.15,1.16 objectmap.cpp,1.15,1.16 render.cpp,1.24,1.25 saga.cpp,1.36,1.37 saga.h,1.26,1.27 sdebug.cpp,1.11,1.12 sprite.cpp,1.13,1.14 text.cpp,1.5,1.6 font_mod.h,1.2,NONE
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the Scummvm-git-logs
mailing list