aboutsummaryrefslogtreecommitdiff
path: root/engines
diff options
context:
space:
mode:
authorColin Snover2017-02-08 21:45:13 -0600
committerColin Snover2017-04-22 13:01:37 -0500
commit399551af09420e0b97ce4ee82d0bf368964e1333 (patch)
tree16223040c89878f578a08caf4311112727aa9409 /engines
parent93b337b8335a455d0108c168ebcfae655327753c (diff)
downloadscummvm-rg350-399551af09420e0b97ce4ee82d0bf368964e1333.tar.gz
scummvm-rg350-399551af09420e0b97ce4ee82d0bf368964e1333.tar.bz2
scummvm-rg350-399551af09420e0b97ce4ee82d0bf368964e1333.zip
SCI: Fix compilation when SCI32 is disabled
Diffstat (limited to 'engines')
-rw-r--r--engines/sci/engine/guest_additions.cpp6
-rw-r--r--engines/sci/engine/savegame.cpp2
2 files changed, 6 insertions, 2 deletions
diff --git a/engines/sci/engine/guest_additions.cpp b/engines/sci/engine/guest_additions.cpp
index e24ef4659f..4a3afcdca9 100644
--- a/engines/sci/engine/guest_additions.cpp
+++ b/engines/sci/engine/guest_additions.cpp
@@ -61,7 +61,9 @@ GuestAdditions::GuestAdditions(EngineState *state, GameFeatures *features, Kerne
_features(features),
_kernel(kernel),
_segMan(state->_segMan),
+#ifdef ENABLE_SCI32
_restoring(false),
+#endif
_messageTypeSynced(false) {}
#pragma mark -
@@ -243,6 +245,8 @@ void GuestAdditions::segManSaveLoadScriptHook(Script &script) const {
instantiateScriptHook(script, true);
}
+#endif
+
bool GuestAdditions::kGetEventHook() const {
if (_state->_delayedRestoreGameId != -1) {
return g_sci->_guestAdditions->restoreFromLauncher();
@@ -257,8 +261,6 @@ bool GuestAdditions::kWaitHook() const {
return false;
}
-#endif
-
#pragma mark -
#pragma mark Integrated save & restore
diff --git a/engines/sci/engine/savegame.cpp b/engines/sci/engine/savegame.cpp
index 3b8429bf08..e6a6af7d17 100644
--- a/engines/sci/engine/savegame.cpp
+++ b/engines/sci/engine/savegame.cpp
@@ -299,9 +299,11 @@ void SegManager::saveLoadWithSerializer(Common::Serializer &s) {
}
}
+#ifdef ENABLE_SCI32
if (pass == passes) {
g_sci->_guestAdditions->segManSaveLoadScriptHook(*scr);
}
+#endif
}
}
}