aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPaul Gilbert2015-03-05 07:49:00 -0500
committerPaul Gilbert2015-03-05 07:49:00 -0500
commitb84d2e8d73c18c427ef1527b2b066642cfc981c4 (patch)
tree5d7e74b02af34066a6ebf031534f913aece006d1
parentbb175b39c1aa9f6b03431bc2e89817ec138f91c3 (diff)
downloadscummvm-rg350-b84d2e8d73c18c427ef1527b2b066642cfc981c4.tar.gz
scummvm-rg350-b84d2e8d73c18c427ef1527b2b066642cfc981c4.tar.bz2
scummvm-rg350-b84d2e8d73c18c427ef1527b2b066642cfc981c4.zip
MADS: Fix timer initialization in two scenes
-rw-r--r--engines/mads/nebular/nebular_scenes2.cpp11
1 files changed, 3 insertions, 8 deletions
diff --git a/engines/mads/nebular/nebular_scenes2.cpp b/engines/mads/nebular/nebular_scenes2.cpp
index b8629a3915..2eb7f93a60 100644
--- a/engines/mads/nebular/nebular_scenes2.cpp
+++ b/engines/mads/nebular/nebular_scenes2.cpp
@@ -1152,8 +1152,9 @@ void Scene205::setup() {
}
Scene205::Scene205(MADSEngine *vm) : Scene2xx(vm) {
- _lastFishTime = 0;
- _chickenTime = 0;
+ _lastFishTime = _scene->_frameStartTime;
+ _chickenTime = _scene->_frameStartTime;
+
_beingKicked = false;
_kernelMessage = -1;
}
@@ -1161,8 +1162,6 @@ Scene205::Scene205(MADSEngine *vm) : Scene2xx(vm) {
void Scene205::synchronize(Common::Serializer &s) {
Scene2xx::synchronize(s);
- s.syncAsUint32LE(_lastFishTime);
- s.syncAsUint32LE(_chickenTime);
s.syncAsByte(_beingKicked);
s.syncAsSint16LE(_kernelMessage);
}
@@ -1191,7 +1190,6 @@ void Scene205::enter() {
_scene->_sequences.setDepth(_globals._sequenceIndexes[5], 11);
if (!_game._visitedScenes._sceneRevisited) {
- _lastFishTime = _scene->_frameStartTime;
_globals._sequenceIndexes[6] = _scene->_sequences.addSpriteCycle(_globals._spriteIndexes[6], false, 7, 1, 0, 0);
idx = _scene->_dynamicHotspots.add(269, 13, _globals._sequenceIndexes[6], Common::Rect(0, 0, 0, 0));
_scene->_dynamicHotspots.setPosition(idx, Common::Point(49, 86), FACING_NORTH);
@@ -1455,7 +1453,6 @@ Scene207::Scene207(MADSEngine *vm) : Scene2xx(vm) {
void Scene207::synchronize(Common::Serializer &s) {
Scene2xx::synchronize(s);
- uint32 unused;
s.syncAsByte(_vultureFl);
s.syncAsByte(_spiderFl);
@@ -1463,8 +1460,6 @@ void Scene207::synchronize(Common::Serializer &s) {
s.syncAsSint32LE(_spiderHotspotId);
s.syncAsSint32LE(_vultureHotspotId);
- s.syncAsSint32LE(unused);
- s.syncAsSint32LE(unused);
}
void Scene207::setup() {