diff options
| author | Vincent Hamm | 2002-03-05 23:41:41 +0000 |
|---|---|---|
| committer | Vincent Hamm | 2002-03-05 23:41:41 +0000 |
| commit | c21e9da1b6c46f145f8061ca77dd5b9b9627e782 (patch) | |
| tree | 824f1ce524979fd09ef6a88e6268cd3c30f97d3f /saveload.cpp | |
| parent | 8d6efb265f1d38599d80eebe80570b5bfba944f8 (diff) | |
| download | scummvm-rg350-c21e9da1b6c46f145f8061ca77dd5b9b9627e782.tar.gz scummvm-rg350-c21e9da1b6c46f145f8061ca77dd5b9b9627e782.tar.bz2 scummvm-rg350-c21e9da1b6c46f145f8061ca77dd5b9b9627e782.zip | |
Next episode in V7 reimplementation. Nearly working
svn-id: r3658
Diffstat (limited to 'saveload.cpp')
| -rw-r--r-- | saveload.cpp | 14 |
1 files changed, 3 insertions, 11 deletions
diff --git a/saveload.cpp b/saveload.cpp index 15dddae3d9..aa96b129fe 100644 --- a/saveload.cpp +++ b/saveload.cpp @@ -128,9 +128,8 @@ bool Scumm::loadState(int slot, bool compat) { _drawObjectQueNr = 0; _verbMouseOver = 0; -#if defined(FULL_THROTTLE) - cameraMoved(); -#endif + if(_features & GF_AFTER_V7) + cameraMoved(); initBGBuffers(); @@ -324,7 +323,6 @@ void Scumm::saveOrLoad(Serializer *s) { MKARRAY(Scumm,_charsetData[0][0],sleByte,10*16), MKLINE(Scumm,_curExecScript,sleUint16), -#if defined(FULL_THROTTLE) MKLINE(Scumm,camera._dest.x,sleInt16), MKLINE(Scumm,camera._dest.y,sleInt16), MKLINE(Scumm,camera._cur.x,sleInt16), @@ -333,12 +331,6 @@ void Scumm::saveOrLoad(Serializer *s) { MKLINE(Scumm,camera._last.y,sleInt16), MKLINE(Scumm,camera._accel.x,sleInt16), MKLINE(Scumm,camera._accel.y,sleInt16), - MKLINE(Scumm,camera._follows,sleByte), - MKLINE(Scumm,camera._movingToActor,sleUint16), -#else - MKLINE(Scumm,camera._dest.x,sleInt16), - MKLINE(Scumm,camera._cur.x,sleInt16), - MKLINE(Scumm,camera._last.x,sleInt16), MKLINE(Scumm,_screenStartStrip,sleInt16), MKLINE(Scumm,_screenEndStrip,sleInt16), MKLINE(Scumm,camera._mode,sleByte), @@ -346,7 +338,7 @@ void Scumm::saveOrLoad(Serializer *s) { MKLINE(Scumm,camera._leftTrigger,sleInt16), MKLINE(Scumm,camera._rightTrigger,sleInt16), MKLINE(Scumm,camera._movingToActor,sleUint16), -#endif + MKLINE(Scumm,_actorToPrintStrFor,sleByte), MKLINE(Scumm,_charsetColor,sleByte), /* XXX Convert into word next time format changes */ |