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
scummvm · Dec 13, 2014 · 01e9214 · 01e9214
1 parent 1716cd9
commit 01e9214
Showing 1 changed file with 18 additions and 16 deletions.
diff --git 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);");
+	}
 }
 
 /*------------------------------------------------------------------------*/