aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPaul Gilbert2014-11-28 21:12:59 -0500
committerPaul Gilbert2014-12-12 22:51:15 -0500
commit01e9214c7d98f1b64597d943b35ac8efb3069c47 (patch)
tree744181effaf4296e6f5f20a2c98e1955da180b74
parent1716cd9b30e9fdf97fcbcc854c30c0818ae90011 (diff)
downloadscummvm-rg350-01e9214c7d98f1b64597d943b35ac8efb3069c47.tar.gz
scummvm-rg350-01e9214c7d98f1b64597d943b35ac8efb3069c47.tar.bz2
scummvm-rg350-01e9214c7d98f1b64597d943b35ac8efb3069c47.zip
ACCESS: Only save river scene fields when actually in the river scene
I'm still not happy everything needed is being synchronised, so this way we can work on it further without upsetting other Amazon saves
-rw-r--r--engines/access/amazon/amazon_logic.cpp34
1 files changed, 18 insertions, 16 deletions
diff --git a/engines/access/amazon/amazon_logic.cpp b/engines/access/amazon/amazon_logic.cpp
index cae3373ea8..547026560c 100644
--- a/engines/access/amazon/amazon_logic.cpp
+++ b/engines/access/amazon/amazon_logic.cpp
@@ -1546,22 +1546,24 @@ void River::river() {
}
}
void River::synchronize(Common::Serializer &s) {
- s.syncAsSint16LE(_canoeLane);
- s.syncAsSint16LE(_canoeYPos);
- s.syncAsSint16LE(_hitCount);
- s.syncAsSint16LE(_riverIndex);
- s.syncAsSint16LE(_hitSafe);
- s.syncAsUint16LE(_rScrollRow);
- s.syncAsUint16LE(_rScrollCol);
- s.syncAsSint16LE(_rScrollX);
- s.syncAsSint16LE(_rScrollY);
- s.syncAsUint16LE(_rOldRectCount);
- s.syncAsUint16LE(_rNewRectCount);
- s.syncAsUint16LE(_rKeyFlag);
- s.syncAsUint16LE(_mapOffset);
- s.syncAsUint16LE(_screenVirtX);
- warning("TODO: s.syncAsSint16LE(_topList);");
- warning("TODO: s.syncAsSint16LE(_botList);");
+ if (_vm->_player->_roomNumber == 45) {
+ s.syncAsSint16LE(_canoeLane);
+ s.syncAsSint16LE(_canoeYPos);
+ s.syncAsSint16LE(_hitCount);
+ s.syncAsSint16LE(_riverIndex);
+ s.syncAsSint16LE(_hitSafe);
+ s.syncAsUint16LE(_rScrollRow);
+ s.syncAsUint16LE(_rScrollCol);
+ s.syncAsSint16LE(_rScrollX);
+ s.syncAsSint16LE(_rScrollY);
+ s.syncAsUint16LE(_rOldRectCount);
+ s.syncAsUint16LE(_rNewRectCount);
+ s.syncAsUint16LE(_rKeyFlag);
+ s.syncAsUint16LE(_mapOffset);
+ s.syncAsUint16LE(_screenVirtX);
+ warning("TODO: s.syncAsSint16LE(_topList);");
+ warning("TODO: s.syncAsSint16LE(_botList);");
+ }
}
/*------------------------------------------------------------------------*/