aboutsummaryrefslogtreecommitdiff
path: root/engines/sci/engine/state.cpp
diff options
context:
space:
mode:
authorMatthew Hoops2012-06-24 09:37:53 -0400
committerMatthew Hoops2012-06-24 09:37:53 -0400
commit91efe792d5b231752dd16888729a94f323363fa0 (patch)
treee7346f83d4966ff4f3cf7e593a7f0cfa16c45b20 /engines/sci/engine/state.cpp
parent915a8399c910fb5c8e35de58857ce1577c1a0151 (diff)
parent20b677080881580706652b17dd5a4c3ed3e36c07 (diff)
downloadscummvm-rg350-91efe792d5b231752dd16888729a94f323363fa0.tar.gz
scummvm-rg350-91efe792d5b231752dd16888729a94f323363fa0.tar.bz2
scummvm-rg350-91efe792d5b231752dd16888729a94f323363fa0.zip
Merge remote branch 'upstream/master' into pegasus
Diffstat (limited to 'engines/sci/engine/state.cpp')
-rw-r--r--engines/sci/engine/state.cpp2
1 files changed, 2 insertions, 0 deletions
diff --git a/engines/sci/engine/state.cpp b/engines/sci/engine/state.cpp
index 237c6b54a6..94a3fe3ae5 100644
--- a/engines/sci/engine/state.cpp
+++ b/engines/sci/engine/state.cpp
@@ -122,6 +122,8 @@ void EngineState::reset(bool isRestoring) {
_videoState.reset();
_syncedAudioOptions = false;
+ _vmdPalStart = 0;
+ _vmdPalEnd = 256;
}
void EngineState::speedThrottler(uint32 neededSleep) {