aboutsummaryrefslogtreecommitdiff
path: root/scumm/saveload.cpp
diff options
context:
space:
mode:
authorMax Horn2003-09-11 10:32:15 +0000
committerMax Horn2003-09-11 10:32:15 +0000
commit81f10baa68d36f42f4988b971dff312439906a2f (patch)
treea58d9b322203713d9bc8a0de0531dfcab7c85904 /scumm/saveload.cpp
parenta3bb9f81e0502f66e368b5e58861ffbb5cfdcd41 (diff)
downloadscummvm-rg350-81f10baa68d36f42f4988b971dff312439906a2f.tar.gz
scummvm-rg350-81f10baa68d36f42f4988b971dff312439906a2f.tar.bz2
scummvm-rg350-81f10baa68d36f42f4988b971dff312439906a2f.zip
cleanup
svn-id: r10169
Diffstat (limited to 'scumm/saveload.cpp')
-rw-r--r--scumm/saveload.cpp25
1 files changed, 15 insertions, 10 deletions
diff --git a/scumm/saveload.cpp b/scumm/saveload.cpp
index 89be05d0db..7d7b4775a3 100644
--- a/scumm/saveload.cpp
+++ b/scumm/saveload.cpp
@@ -21,18 +21,23 @@
*/
#include "stdafx.h"
-#include "actor.h"
-#include "charset.h"
-#include "imuse.h"
-#include "imuse_digi.h"
-#include "resource.h"
-#include "saveload.h"
-#include "scumm.h"
-#include "sound.h"
-#include "verbs.h"
+
#include "common/config-file.h"
+
+#include "scumm/actor.h"
+#include "scumm/charset.h"
+#include "scumm/imuse_digi.h"
+#include "scumm/imuse.h"
+#include "scumm/object.h"
+#include "scumm/resource.h"
+#include "scumm/saveload.h"
+#include "scumm/scumm.h"
+#include "scumm/sound.h"
+#include "scumm/verbs.h"
+
#include "sound/mixer.h"
+
struct SaveGameHeader {
uint32 type;
uint32 size;
@@ -394,7 +399,7 @@ void Scumm::saveOrLoad(Serializer *s, uint32 savegameVersion) {
MKARRAY(Scumm, vm.cutSceneData[0], sleInt16, 5, VER(8)),
MKLINE(Scumm, vm.cutSceneScriptIndex, sleInt16, VER(8)),
- MKLINE(Scumm, _numNestedScripts, sleByte, VER(8)),
+ MKLINE(Scumm, vm.numNestedScripts, sleByte, VER(8)),
MKLINE(Scumm, _userPut, sleByte, VER(8)),
MKLINE(Scumm, _userState, sleUint16, VER(17)),
MKLINE(Scumm, _cursor.state, sleByte, VER(8)),