aboutsummaryrefslogtreecommitdiff
path: root/engines/scumm
diff options
context:
space:
mode:
authorTravis Howell2006-03-26 09:06:44 +0000
committerTravis Howell2006-03-26 09:06:44 +0000
commitc1bd25617b5b0c95d74385eefc275d897aa45bb8 (patch)
tree48992278aea29e10be545985032825bb6c1cf398 /engines/scumm
parentd8004bff5163e3c368ce91ba9124afde7360d093 (diff)
downloadscummvm-rg350-c1bd25617b5b0c95d74385eefc275d897aa45bb8.tar.gz
scummvm-rg350-c1bd25617b5b0c95d74385eefc275d897aa45bb8.tar.bz2
scummvm-rg350-c1bd25617b5b0c95d74385eefc275d897aa45bb8.zip
Increase size of _charsetData to 16 * 23 for HE games, fixes subtitle color glitches in Buzzy games
svn-id: r21460
Diffstat (limited to 'engines/scumm')
-rw-r--r--engines/scumm/saveload.cpp5
-rw-r--r--engines/scumm/saveload.h2
-rw-r--r--engines/scumm/scumm.h2
3 files changed, 5 insertions, 4 deletions
diff --git a/engines/scumm/saveload.cpp b/engines/scumm/saveload.cpp
index a6f3f0462a..9949e521f9 100644
--- a/engines/scumm/saveload.cpp
+++ b/engines/scumm/saveload.cpp
@@ -708,9 +708,10 @@ void ScummEngine::saveOrLoad(Serializer *s) {
MKARRAY(ScummEngine, _resourceMapper[0], sleByte, 128, VER(8)),
MKARRAY(ScummEngine, _charsetColorMap[0], sleByte, 16, VER(8)),
- // _charsetData grew from 10*16 to 15*16 bytes
+ // _charsetData grew from 10*16, to 15*16, to 23*16 bytes
MKARRAY_OLD(ScummEngine, _charsetData[0][0], sleByte, 10 * 16, VER(8), VER(9)),
- MKARRAY(ScummEngine, _charsetData[0][0], sleByte, 15 * 16, VER(10)),
+ MKARRAY_OLD(ScummEngine, _charsetData[0][0], sleByte, 15 * 16, VER(10), VER(66)),
+ MKARRAY(ScummEngine, _charsetData[0][0], sleByte, 23 * 16, VER(10)),
MK_OBSOLETE(ScummEngine, _curExecScript, sleUint16, VER(8), VER(62)),
diff --git a/engines/scumm/saveload.h b/engines/scumm/saveload.h
index 3a2090f7bd..4dbb5196b1 100644
--- a/engines/scumm/saveload.h
+++ b/engines/scumm/saveload.h
@@ -47,7 +47,7 @@ namespace Scumm {
* only saves/loads those which are valid for the version of the savegame
* which is being loaded/saved currently.
*/
-#define CURRENT_VER 66
+#define CURRENT_VER 67
/**
* An auxillary macro, used to specify savegame versions. We use this instead
diff --git a/engines/scumm/scumm.h b/engines/scumm/scumm.h
index d3597d5209..c5998736aa 100644
--- a/engines/scumm/scumm.h
+++ b/engines/scumm/scumm.h
@@ -1206,7 +1206,7 @@ public:
byte _charsetColorMap[16];
protected:
byte _charsetColor;
- byte _charsetData[15][16];
+ byte _charsetData[23][16];
int _charsetBufPos;
byte _charsetBuffer[512];