ACCESS: Simply river savegame fields

scummvm · Dec 13, 2014 · bf36171 · bf36171
1 parent a1e5e8b
commit bf36171
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 17 deletions.
diff --git a/engines/access/amazon/amazon_logic.cpp b/engines/access/amazon/amazon_logic.cpp
@@ -1351,9 +1351,6 @@ River::River(AmazonEngine *vm): PannedScene(vm) {
 	_rScrollCol = 0;
 	_rScrollX = 0;
 	_rScrollY = 0;
-	_rOldRectCount = 0;
-	_rNewRectCount = 0;
-	_rKeyFlag = 0;
 	_mapOffset = 0;
 	_screenVertX = 0;
 	_saveRiver = false;
@@ -1422,12 +1419,7 @@ void River::initRiver() {
 	_vm->copyBF2Vid();
 	_vm->_screen->forceFadeIn();
 
-	if (_saveRiver) {
-		// Restore draw rects from savegame
-		_vm->_oldRects.resize(_rOldRectCount);
-		_vm->_newRects.resize(_rNewRectCount);
-		// KEYFLG = _vm->_rKeyFlag
-	} else {
+	if (!_saveRiver) {
 		// Reset draw rects
 		_vm->_oldRects.clear();
 		_vm->_newRects.clear();
@@ -1904,13 +1896,8 @@ void River::synchronize(Common::Serializer &s) {
 		s.syncAsUint16LE(_rScrollCol);
 		s.syncAsSint16LE(_rScrollX);
 		s.syncAsSint16LE(_rScrollY);
-		s.syncAsUint16LE(_rOldRectCount);
-		s.syncAsUint16LE(_rNewRectCount);
-		s.syncAsUint16LE(_rKeyFlag);
 		s.syncAsUint16LE(_mapOffset);
 		s.syncAsUint16LE(_screenVertX);
-		warning("TODO: 	s.syncAsSint16LE(_topList);");
-		warning("TODO: 	s.syncAsSint16LE(_botList);");
 
 		_saveRiver = s.isLoading();
 	}

diff --git a/engines/access/amazon/amazon_logic.h b/engines/access/amazon/amazon_logic.h
@@ -181,9 +181,6 @@ class River: public PannedScene {
 	int _rScrollCol;
 	int _rScrollX;
 	int _rScrollY;
-	int _rOldRectCount;
-	int _rNewRectCount;
-	int _rKeyFlag;
 	int _mapOffset;
 	int _screenVertX;