TSAGE: BF - Cleanup: Remove _uselessVariable in scene 360

scummvm · Nov 9, 2011 · e67ab21 · e67ab21
1 parent 3747f10
commit e67ab21
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 9 deletions.
diff --git a/engines/tsage/blue_force/blueforce_scenes3.cpp b/engines/tsage/blue_force/blueforce_scenes3.cpp
@@ -4347,13 +4347,12 @@ void Scene360::Action1::signal() {
 
 /*--------------------------------------------------------------------------*/
 
-Scene360::Scene360() {
-	_uselessVariable = 0;
-}
-
 void Scene360::synchronize(Serializer &s) {
 	SceneExt::synchronize(s);
-	s.syncAsSint16LE(_uselessVariable);
+	if (s.getVersion() < 9) {
+		int tmpVar;
+		s.syncAsSint16LE(tmpVar);
+	}
 }
 
 void Scene360::postInit(SceneObjectList *OwnerList) {
@@ -4432,7 +4431,7 @@ void Scene360::postInit(SceneObjectList *OwnerList) {
 	BF_GLOBALS._player.enableControl();
 
 	if ((BF_GLOBALS._sceneManager._previousScene == 355) || (BF_GLOBALS._sceneManager._previousScene != 370)) {
-		_uselessVariable = 0;
+		// The original was using there a useless variable (now removed)
 		BF_GLOBALS._player.setPosition(Common::Point(253, 135));
 		BF_GLOBALS._player.setStrip(2);
 

diff --git a/engines/tsage/blue_force/blueforce_scenes3.h b/engines/tsage/blue_force/blueforce_scenes3.h
@@ -676,9 +676,7 @@ class Scene360: public SceneExt {
 	Barometer _barometer;
 	Action1 _action1;
 	ASound _sound1;
-	int _uselessVariable;
 
-	Scene360();
 	virtual void synchronize(Serializer &s);
 	virtual void postInit(SceneObjectList *OwnerList = NULL);
 	virtual void signal();

diff --git a/engines/tsage/saveload.h b/engines/tsage/saveload.h
@@ -33,7 +33,7 @@ namespace TsAGE {
 
 typedef void (*SaveNotifierFn)(bool postFlag);
 
-#define TSAGE_SAVEGAME_VERSION 8
+#define TSAGE_SAVEGAME_VERSION 9
 
 class SavedObject;