diff options
| author | Max Horn | 2002-12-25 21:04:47 +0000 |
|---|---|---|
| committer | Max Horn | 2002-12-25 21:04:47 +0000 |
| commit | fca9ec09e7709ff4400d2a9a7fd76f4f21781006 (patch) | |
| tree | 2c9dd18841983469c4780c75d90762f8a167c048 /scumm/saveload.cpp | |
| parent | f1808d20ac90f4212fd14aeaf544a8aaac6a3fbc (diff) | |
| download | scummvm-rg350-fca9ec09e7709ff4400d2a9a7fd76f4f21781006.tar.gz scummvm-rg350-fca9ec09e7709ff4400d2a9a7fd76f4f21781006.tar.bz2 scummvm-rg350-fca9ec09e7709ff4400d2a9a7fd76f4f21781006.zip | |
moved CharsetRendere into its own header/source file; changed Scumm::_charset into a pointer, to make it possible to use different implementations of it
svn-id: r6147
Diffstat (limited to 'scumm/saveload.cpp')
| -rw-r--r-- | scumm/saveload.cpp | 19 |
1 files changed, 10 insertions, 9 deletions
diff --git a/scumm/saveload.cpp b/scumm/saveload.cpp index cc8c21dde6..965ea2958f 100644 --- a/scumm/saveload.cpp +++ b/scumm/saveload.cpp @@ -21,15 +21,16 @@ */ #include "stdafx.h" -#include "scumm.h" -#include "sound/mididrv.h" -#include "scumm/sound.h" -#include "scumm/imuse.h" #include "actor.h" -#include "config-file.h" +#include "charset.h" +#include "imuse.h" #include "resource.h" #include "saveload.h" +#include "scumm.h" +#include "sound.h" #include "verbs.h" +#include "common/config-file.h" +#include "sound/mididrv.h" struct SaveGameHeader { uint32 type; @@ -358,7 +359,7 @@ void Scumm::saveOrLoad(Serializer *s, uint32 savegameVersion) MKARRAY(Scumm, vm.localvar[0][0], sleUint16, NUM_SCRIPT_SLOT * 17, VER_V9), MKARRAY(Scumm, _resourceMapper[0], sleByte, 128, VER_V8), - MKARRAY(Scumm, _charset._colorMap[0], sleByte, 16, VER_V8), + MKARRAY(Scumm, _charset->_colorMap[0], sleByte, 16, VER_V8), // _charsetData grew from 10*16 to 15*16 bytes MKARRAY_OLD(Scumm, _charsetData[0][0], sleByte, 10 * 16, VER_V8, VER_V9), @@ -386,8 +387,8 @@ void Scumm::saveOrLoad(Serializer *s, uint32 savegameVersion) MKLINE(Scumm, _charsetColor, sleByte, VER_V8), // charset._bufPos was changed from byte to int - MKLINE_OLD(Scumm, _charset._bufPos, sleByte, VER_V8, VER_V9), - MKLINE(Scumm, _charset._bufPos, sleInt16, VER_V10), + MKLINE_OLD(Scumm, _charset->_bufPos, sleByte, VER_V8, VER_V9), + MKLINE(Scumm, _charset->_bufPos, sleInt16, VER_V10), MKLINE(Scumm, _haveMsg, sleByte, VER_V8), MKLINE(Scumm, _useTalkAnims, sleByte, VER_V8), @@ -429,7 +430,7 @@ void Scumm::saveOrLoad(Serializer *s, uint32 savegameVersion) MKARRAY(Scumm, _proc_special_palette[0], sleByte, 256, VER_V8), - MKARRAY(Scumm, _charset._buffer[0], sleByte, 256, VER_V8), + MKARRAY(Scumm, _charset->_buffer[0], sleByte, 256, VER_V8), MKLINE(Scumm, _egoPositioned, sleByte, VER_V8), |