From e67ab21b5f79b35896c55b10cf39bda990e9142d Mon Sep 17 00:00:00 2001
From: Strangerke
Date: Wed, 9 Nov 2011 08:30:52 +0100
Subject: TSAGE: BF - Cleanup: Remove _uselessVariable in scene 360

---
 engines/tsage/blue_force/blueforce_scenes3.cpp | 11 +++++------
 engines/tsage/blue_force/blueforce_scenes3.h   |  2 --
 engines/tsage/saveload.h                       |  2 +-
 3 files changed, 6 insertions(+), 9 deletions(-)

(limited to 'engines')

diff --git a/engines/tsage/blue_force/blueforce_scenes3.cpp b/engines/tsage/blue_force/blueforce_scenes3.cpp
index 35246f189d..db9425436b 100644
--- 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
index de53db83a9..ea9d5f7311 100644
--- a/engines/tsage/blue_force/blueforce_scenes3.h
+++ b/engines/tsage/blue_force/blueforce_scenes3.h
@@ -676,9 +676,7 @@ public:
 	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
index 207051a182..ff78abf52d 100644
--- 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;
 
-- 
cgit v1.2.3