aboutsummaryrefslogtreecommitdiff
path: root/scumm
diff options
context:
space:
mode:
authorTorbjörn Andersson2004-05-02 14:39:48 +0000
committerTorbjörn Andersson2004-05-02 14:39:48 +0000
commitfb1b2efb49140da3ea90a3f4881cdf671da5ae23 (patch)
treeb23a2b8a15bb9f3fc35bcf8091087c66a23f118c /scumm
parent7da4eccb1d5297d528bb664ef0d55dae9d5e58f2 (diff)
downloadscummvm-rg350-fb1b2efb49140da3ea90a3f4881cdf671da5ae23.tar.gz
scummvm-rg350-fb1b2efb49140da3ea90a3f4881cdf671da5ae23.tar.bz2
scummvm-rg350-fb1b2efb49140da3ea90a3f4881cdf671da5ae23.zip
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. svn-id: r13747
Diffstat (limited to 'scumm')
-rw-r--r--scumm/script_v5.cpp11
1 files changed, 8 insertions, 3 deletions
diff --git a/scumm/script_v5.cpp b/scumm/script_v5.cpp
index 4f0e9bcd8e..762ba2a678 100644
--- a/scumm/script_v5.cpp
+++ b/scumm/script_v5.cpp
@@ -2703,14 +2703,19 @@ void ScummEngine_v5::decodeParseString() {
// 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: