[Scummvm-cvs-logs] CVS: scummvm/scumm script_v5.cpp,1.237,1.238
Torbj?rn Andersson
eriktorbjorn at users.sourceforge.net
Sun May 2 07:40:12 CEST 2004
- Previous message: [Scummvm-cvs-logs] CVS: scummvm/scumm/imuse_digi dimuse.cpp,1.87,1.88
- Next message: [Scummvm-cvs-logs] CVS: scummvm/saga gfx.cpp,1.11,1.12 gfx_mod.h,1.5,1.6 render.cpp,1.10,1.11 render.h,1.7,1.8
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Update of /cvsroot/scummvm/scummvm/scumm
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23745
Modified Files:
script_v5.cpp
Log Message:
Applied my suggested fix for #933168, since I'm tired of waiting for
feedback. It *is* a bit of a hack, but it does emulate the old behaviour,
and we can always make a better fix later, if there is one.
Index: script_v5.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/script_v5.cpp,v
retrieving revision 1.237
retrieving revision 1.238
diff -u -d -r1.237 -r1.238
--- script_v5.cpp 17 Apr 2004 16:29:03 -0000 1.237
+++ script_v5.cpp 2 May 2004 14:39:48 -0000 1.238
@@ -2703,14 +2703,19 @@
// In SCUMM V1-V3, there were no 'default' values for the text slot
// values. Hence to achieve correct behaviour, we have to keep the
- // 'default' values in sync with the active values. To do that we
- // simply call saveDefault() on the StringTab in question.
+ // 'default' values in sync with the active values.
//
// Note: This is needed for Indy3 (Grail Diary). It's also needed
// for Loom, or the lines Bobbin speaks during the intro are put
// at position 0,0.
+ //
+ // Note: We can't use saveDefault() here because we only want to
+ // save the position and color. In particular, we do not want to
+ // save the 'center' flag. See bug #933168.
if (_version <= 3) {
- _string[textSlot].saveDefault();
+ _string[textSlot]._default.xpos = _string[textSlot].xpos;
+ _string[textSlot]._default.ypos = _string[textSlot].ypos;
+ _string[textSlot]._default.color = _string[textSlot].color;
}
return;
default:
- Previous message: [Scummvm-cvs-logs] CVS: scummvm/scumm/imuse_digi dimuse.cpp,1.87,1.88
- Next message: [Scummvm-cvs-logs] CVS: scummvm/saga gfx.cpp,1.11,1.12 gfx_mod.h,1.5,1.6 render.cpp,1.10,1.11 render.h,1.7,1.8
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the Scummvm-git-logs
mailing list