diff options
| author | Max Horn | 2006-09-17 20:22:47 +0000 |
|---|---|---|
| committer | Max Horn | 2006-09-17 20:22:47 +0000 |
| commit | 8c0b0c012007d938ab500c5ccc64f6e0cbcf13e0 (patch) | |
| tree | 6799b6d3dfe4dd2558a09fc510d6f015212ef3fe /engines/scumm/saveload.cpp | |
| parent | b6a8e38726b55dec5a959ec914c6f9e6fda358d8 (diff) | |
| download | scummvm-rg350-8c0b0c012007d938ab500c5ccc64f6e0cbcf13e0.tar.gz scummvm-rg350-8c0b0c012007d938ab500c5ccc64f6e0cbcf13e0.tar.bz2 scummvm-rg350-8c0b0c012007d938ab500c5ccc64f6e0cbcf13e0.zip | |
Changed ScummEngine::gdi to _gdi and allocate the Gdi object on the heap (i.e. _gdi is a pointer now)
svn-id: r23921
Diffstat (limited to 'engines/scumm/saveload.cpp')
| -rw-r--r-- | engines/scumm/saveload.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/engines/scumm/saveload.cpp b/engines/scumm/saveload.cpp index b75728248b..459823a8ff 100644 --- a/engines/scumm/saveload.cpp +++ b/engines/scumm/saveload.cpp @@ -712,7 +712,7 @@ void ScummEngine::saveOrLoad(Serializer *s) { MKLINE(ScummEngine, _userPut, sleByte, VER(8)), MKLINE(ScummEngine, _userState, sleUint16, VER(17)), MKLINE(ScummEngine, _cursor.state, sleByte, VER(8)), - MK_OBSOLETE(ScummEngine, gdi._cursorActive, sleByte, VER(8), VER(20)), + MK_OBSOLETE(ScummEngine, _gdi->_cursorActive, sleByte, VER(8), VER(20)), MKLINE(ScummEngine, _currentCursor, sleByte, VER(8)), MKARRAY(ScummEngine, _grabbedCursor[0], sleByte, 8192, VER(20)), MKLINE(ScummEngine, _cursor.width, sleInt16, VER(20)), @@ -741,7 +741,7 @@ void ScummEngine::saveOrLoad(Serializer *s) { MKARRAY_OLD(ScummEngine, gfxUsageBits[0], sleUint32, 410, VER(10), VER(13)), MKARRAY(ScummEngine, gfxUsageBits[0], sleUint32, 3 * 410, VER(14)), - MK_OBSOLETE(ScummEngine, gdi._transparentColor, sleByte, VER(8), VER(50)), + MK_OBSOLETE(ScummEngine, _gdi->_transparentColor, sleByte, VER(8), VER(50)), MKARRAY(ScummEngine, _currentPalette[0], sleByte, 768, VER(8)), MKARRAY(ScummEngine, _darkenPalette[0], sleByte, 768, VER(53)), @@ -752,13 +752,13 @@ void ScummEngine::saveOrLoad(Serializer *s) { MKLINE(ScummEngine, _egoPositioned, sleByte, VER(8)), - // gdi._imgBufOffs grew from 4 to 5 entries. Then one day we realized + // _gdi->_imgBufOffs grew from 4 to 5 entries. Then one day we realized // 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)), + 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)), // See _imgBufOffs: _numZBuffer is recomputed by initBGBuffers(). - MK_OBSOLETE(ScummEngine, gdi._numZBuffer, sleByte, VER(8), VER(26)), + MK_OBSOLETE(ScummEngine, _gdi->_numZBuffer, sleByte, VER(8), VER(26)), MKLINE(ScummEngine, _screenEffectFlag, sleByte, VER(8)), |