aboutsummaryrefslogtreecommitdiff
path: root/scumm/saveload.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'scumm/saveload.cpp')
-rw-r--r--scumm/saveload.cpp7
1 files changed, 7 insertions, 0 deletions
diff --git a/scumm/saveload.cpp b/scumm/saveload.cpp
index 944bf59996..38a339da8d 100644
--- a/scumm/saveload.cpp
+++ b/scumm/saveload.cpp
@@ -707,6 +707,13 @@ void ScummEngine::saveOrLoad(Serializer *s, uint32 savegameVersion) {
_system->warpMouse(_mouse.x, _mouse.y);
}
+ if (s->isLoading()) {
+ // Not all actor data is saved; so when loading, we first reset
+ // all actors, to ensure completely reproducible behaviour (else,
+ // some not saved value in the actor class can cause odd things)
+ for (i = 0; i < _numActors; i++)
+ _actors[i].initActor(-1);
+ }
s->saveLoadArrayOf(_actors, _numActors, sizeof(_actors[0]), actorEntries);
s->saveLoadEntries(_sound, soundEntries);