diff options
| -rw-r--r-- | scumm/saveload.cpp | 10 | ||||
| -rw-r--r-- | scumm/saveload.h | 2 |
2 files changed, 7 insertions, 5 deletions
diff --git a/scumm/saveload.cpp b/scumm/saveload.cpp index f01ac4ab52..a3242fdddd 100644 --- a/scumm/saveload.cpp +++ b/scumm/saveload.cpp @@ -458,11 +458,13 @@ void ScummEngine::saveOrLoad(Serializer *s, uint32 savegameVersion) { MKLINE(ScummEngine, _egoPositioned, sleByte, VER(8)), - // gdi._imgBufOffs grew from 4 to 5 entries : - MKARRAY_OLD(ScummEngine, gdi._imgBufOffs[0], sleUint16, 4, VER(8), VER(9)), - MKARRAY(ScummEngine, gdi._imgBufOffs[0], sleUint16, 5, VER(10)), + // gdi._imgBufOffs grew from 4 to 5 entries. Then one day we relized + // that we don't have to store it since initBGBuffers() recomputes it. + MK_OBSOLETE_ARRAY(ScummEngine, gdi._imgBufOffs[0], sleUint16, 4, VER(8), VER(9)), + MK_OBSOLETE_ARRAY(ScummEngine, gdi._imgBufOffs[0], sleUint16, 5, VER(10), VER(26)), - MKLINE(ScummEngine, gdi._numZBuffer, sleByte, VER(8)), + // See _imgBufOffs: _numZBuffer is recomputed by initBGBuffers(). + MK_OBSOLETE(ScummEngine, gdi._numZBuffer, sleByte, VER(8), VER(26)), MKLINE(ScummEngine, _screenEffectFlag, sleByte, VER(8)), diff --git a/scumm/saveload.h b/scumm/saveload.h index 428e0e12cd..4f0d73cbd8 100644 --- a/scumm/saveload.h +++ b/scumm/saveload.h @@ -32,7 +32,7 @@ namespace Scumm { // Can be useful for other ports too :) #define VER(x) x -#define CURRENT_VER 26 +#define CURRENT_VER 27 // To work around a warning in GCC 3.2 (and 3.1 ?) regarding non-POD types, // we use a small trick: instead of 0 we use 42. Why? Well, it seems newer GCC |