[Scummvm-cvs-logs] scummvm master -> 0948d068458d2e4f07891dd8739fcd8e2221723f

[Strangerke]

This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
0948d06845 TSAGE: Remove 3 useless variable from Scene, increment savegame version


Commit: 0948d068458d2e4f07891dd8739fcd8e2221723f
    https://github.com/scummvm/scummvm/commit/0948d068458d2e4f07891dd8739fcd8e2221723f
Author: Strangerke (strangerke at scummvm.org)
Date: 2013-12-18T23:00:25-08:00

Commit Message:
TSAGE: Remove 3 useless variable from Scene, increment savegame version

Changed paths:
    engines/tsage/ringworld/ringworld_scenes6.cpp
    engines/tsage/ringworld2/ringworld2_logic.cpp
    engines/tsage/saveload.h
    engines/tsage/scenes.cpp
    engines/tsage/scenes.h



diff --git a/engines/tsage/ringworld/ringworld_scenes6.cpp b/engines/tsage/ringworld/ringworld_scenes6.cpp
index 65c1ed3..777eed2 100644
--- a/engines/tsage/ringworld/ringworld_scenes6.cpp
+++ b/engines/tsage/ringworld/ringworld_scenes6.cpp
@@ -1608,8 +1608,6 @@ Scene5200::Scene5200() :
 void Scene5200::postInit(SceneObjectList *OwnerList) {
 	Scene::postInit();
 	setZoomPercents(0, 150, 199, 150);
-	_fieldA = 5600;
-	_fieldE = 5100;
 
 	_hotspot9._state = 0;
 	_hotspot10._state = 0;
diff --git a/engines/tsage/ringworld2/ringworld2_logic.cpp b/engines/tsage/ringworld2/ringworld2_logic.cpp
index e1d6e79..25eafbb 100644
--- a/engines/tsage/ringworld2/ringworld2_logic.cpp
+++ b/engines/tsage/ringworld2/ringworld2_logic.cpp
@@ -368,7 +368,6 @@ void SceneExt::postInit(SceneObjectList *OwnerList) {
 
 	// Initialize fields
 	_action = NULL;
-	_field12 = 0;
 	_sceneMode = 0;
 
 	static_cast<SceneHandlerExt *>(R2_GLOBALS._sceneHandler)->setupPaletteMaps();
diff --git a/engines/tsage/saveload.h b/engines/tsage/saveload.h
index 25a5279..19022f9 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 13
+#define TSAGE_SAVEGAME_VERSION 14
 
 class SavedObject;
 
diff --git a/engines/tsage/scenes.cpp b/engines/tsage/scenes.cpp
index 1726d6a..b41e817 100644
--- a/engines/tsage/scenes.cpp
+++ b/engines/tsage/scenes.cpp
@@ -275,10 +275,7 @@ Scene::Scene() : _sceneBounds(0, 0, SCREEN_WIDTH, SCREEN_HEIGHT),
 	_oldSceneBounds = Rect(4000, 4000, 4100, 4100);
 	Common::fill(&_zoomPercents[0], &_zoomPercents[256], 0);
 
-	_field12 = 0;
 	_screenNumber = 0;
-	_fieldA = 0;
-	_fieldE = 0;
 }
 
 Scene::~Scene() {
@@ -288,15 +285,23 @@ void Scene::synchronize(Serializer &s) {
 	if (s.getVersion() >= 2)
 		StripCallback::synchronize(s);
 
-	s.syncAsSint32LE(_field12);
+	if (s.getVersion() < 14) {
+		int useless = 0;
+		s.syncAsSint32LE(useless);
+	}
+
 	s.syncAsSint32LE(_screenNumber);
 	s.syncAsSint32LE(_activeScreenNumber);
 	s.syncAsSint32LE(_sceneMode);
 	_backgroundBounds.synchronize(s);
 	_sceneBounds.synchronize(s);
 	_oldSceneBounds.synchronize(s);
-	s.syncAsSint16LE(_fieldA);
-	s.syncAsSint16LE(_fieldE);
+
+	if (s.getVersion() < 14) {
+		int useless = 0;
+		s.syncAsSint16LE(useless);
+		s.syncAsSint16LE(useless);
+	}
 
 	for (int i = 0; i < 256; ++i)
 		s.syncAsUint16LE(_enabledSections[i]);
@@ -309,7 +314,6 @@ void Scene::synchronize(Serializer &s) {
 
 void Scene::postInit(SceneObjectList *OwnerList) {
 	_action = NULL;
-	_field12 = 0;
 	_sceneMode = 0;
 }
 
diff --git a/engines/tsage/scenes.h b/engines/tsage/scenes.h
index d5ac88c..4d36192 100644
--- a/engines/tsage/scenes.h
+++ b/engines/tsage/scenes.h
@@ -35,7 +35,6 @@ class Scene : public StripCallback {
 private:
 	void drawBackgroundObjects();
 public:
-	int _field12;
 	int _screenNumber;
 	int _activeScreenNumber;
 	int _sceneMode;
@@ -49,9 +48,6 @@ public:
 	int _zoomPercents[256];
 	ScenePriorities _priorities;
 	SceneObjectList _bgSceneObjects;
-
-	int _fieldA;
-	int _fieldE;
 public:
 	Scene();
 	virtual ~Scene();