[Scummvm-cvs-logs] scummvm master -> b453815df572d91057ece59342f2ad2c128c7ae1

[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:
b453815df5 TSAGE: BF - Remove a couple of useless variables. Savegame compatibility preserved.


Commit: b453815df572d91057ece59342f2ad2c128c7ae1
    https://github.com/scummvm/scummvm/commit/b453815df572d91057ece59342f2ad2c128c7ae1
Author: Strangerke (strangerke at scummvm.org)
Date: 2013-11-02T04:22:08-07:00

Commit Message:
TSAGE: BF - Remove a couple of useless variables. Savegame compatibility preserved.

Changed paths:
    engines/tsage/blue_force/blueforce_scenes3.cpp
    engines/tsage/blue_force/blueforce_scenes3.h
    engines/tsage/blue_force/blueforce_scenes5.cpp
    engines/tsage/blue_force/blueforce_scenes5.h



diff --git a/engines/tsage/blue_force/blueforce_scenes3.cpp b/engines/tsage/blue_force/blueforce_scenes3.cpp
index 55526f6..5dd795c 100644
--- a/engines/tsage/blue_force/blueforce_scenes3.cpp
+++ b/engines/tsage/blue_force/blueforce_scenes3.cpp
@@ -976,7 +976,6 @@ Scene315::Scene315() {
 	_invGreenCount = _bookGreenCount = 0;
 	_invGangCount = _bookGangCount = 0;
 
-	_field1390 = 0;
 	_stripNumber = 0;
 	_field1398 = 0;
 	_currentCursor = INV_NONE;
@@ -985,7 +984,10 @@ Scene315::Scene315() {
 void Scene315::synchronize(Serializer &s) {
 	SceneExt::synchronize(s);
 
-	s.syncAsSint16LE(_field1390);
+	if (s.getVersion() < 11) {
+		int useless = 0;
+		s.syncAsSint16LE(useless);
+	}
 	s.syncAsSint16LE(_stripNumber);
 	s.syncAsSint16LE(_field1398);
 	s.syncAsSint16LE(_invGreenCount);
diff --git a/engines/tsage/blue_force/blueforce_scenes3.h b/engines/tsage/blue_force/blueforce_scenes3.h
index fdeabda..d9f0d32 100644
--- a/engines/tsage/blue_force/blueforce_scenes3.h
+++ b/engines/tsage/blue_force/blueforce_scenes3.h
@@ -210,7 +210,6 @@ public:
 	WestExit _westExit;
 	SouthWestExit _swExit;
 	Action1 _action1;
-	int _field1390; // Useless variable
 	int _stripNumber;
 	int _field1398;
 	int _invGreenCount, _bookGreenCount, _invGangCount;
diff --git a/engines/tsage/blue_force/blueforce_scenes5.cpp b/engines/tsage/blue_force/blueforce_scenes5.cpp
index 1d23874..ebaa3e3 100644
--- a/engines/tsage/blue_force/blueforce_scenes5.cpp
+++ b/engines/tsage/blue_force/blueforce_scenes5.cpp
@@ -1772,14 +1772,12 @@ void Scene570::IconManager::refreshList() {
 }
 
 void Scene570::IconManager::addItem(Icon *item) {
-	item->_mode = _mode;
 	_list.push_back(item);
 }
 
 Scene570::Icon::Icon(): NamedObject() {
 	_iconId = _folderId = 0;
 	_parentFolderId = 0;
-	_mode = 0;
 }
 
 void Scene570::Icon::synchronize(Serializer &s) {
@@ -1787,7 +1785,10 @@ void Scene570::Icon::synchronize(Serializer &s) {
 	s.syncAsSint16LE(_iconId);
 	s.syncAsSint16LE(_folderId);
 	s.syncAsSint16LE(_parentFolderId);
-	s.syncAsSint16LE(_mode);
+	if (s.getVersion() < 11) {
+		int useless = 0;
+		s.syncAsSint16LE(useless);
+	}
 }
 
 void Scene570::Icon::remove() {
diff --git a/engines/tsage/blue_force/blueforce_scenes5.h b/engines/tsage/blue_force/blueforce_scenes5.h
index ab78d02..5337b64 100644
--- a/engines/tsage/blue_force/blueforce_scenes5.h
+++ b/engines/tsage/blue_force/blueforce_scenes5.h
@@ -258,7 +258,6 @@ class Scene570: public SceneExt {
 	public:
 		SceneText _sceneText;
 		int _iconId, _folderId, _parentFolderId;
-		int _mode; // Useless variable
 		Common::String _text;
 
 		Icon();