[Scummvm-cvs-logs] scummvm master -> 7e1f280a9b56e48ea2e64a54018794c71bdefc51

Strangerke Strangerke at scummvm.org
Sat Nov 2 16:24:14 CET 2013


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:
7e1f280a9b TSAGE: Ringworld - Remove one useless variable. Savegame compatibility preserved.


Commit: 7e1f280a9b56e48ea2e64a54018794c71bdefc51
    https://github.com/scummvm/scummvm/commit/7e1f280a9b56e48ea2e64a54018794c71bdefc51
Author: Strangerke (strangerke at scummvm.org)
Date: 2013-11-02T08:22:35-07:00

Commit Message:
TSAGE: Ringworld - Remove one useless variable. Savegame compatibility preserved.

Changed paths:
    engines/tsage/ringworld/ringworld_scenes6.cpp
    engines/tsage/ringworld/ringworld_scenes6.h



diff --git a/engines/tsage/ringworld/ringworld_scenes6.cpp b/engines/tsage/ringworld/ringworld_scenes6.cpp
index 9c18830..65c1ed3 100644
--- a/engines/tsage/ringworld/ringworld_scenes6.cpp
+++ b/engines/tsage/ringworld/ringworld_scenes6.cpp
@@ -2032,13 +2032,15 @@ void Scene5300::Hotspot8::doAction(int action) {
 /*--------------------------------------------------------------------------*/
 
 Scene5300::Scene5300() :
-		_hotspot3(0, CURSOR_LOOK, 5300, 3, CURSOR_USE, 5300, 16, LIST_END) {
-	_field1B0A = 1;
+	_hotspot3(0, CURSOR_LOOK, 5300, 3, CURSOR_USE, 5300, 16, LIST_END) {
 }
 
 void Scene5300::synchronize(Serializer &s) {
 	Scene::synchronize(s);
-	s.syncAsSint16LE(_field1B0A);
+	if (s.getVersion() < 11) {
+		int useless = 0;
+		s.syncAsSint16LE(useless);
+	}
 }
 
 void Scene5300::postInit(SceneObjectList *OwnerList) {
@@ -2125,7 +2127,6 @@ void Scene5300::postInit(SceneObjectList *OwnerList) {
 		setAction(&_sequenceManager, this, 5306, &g_globals->_player, &_hotspot3, NULL);
 	}
 
-	_field1B0A = 1;
 	if (RING_INVENTORY._bone._sceneNumber == 5300) {
 		_hotspot5.postInit();
 		_hotspot5.setVisage(5301);
diff --git a/engines/tsage/ringworld/ringworld_scenes6.h b/engines/tsage/ringworld/ringworld_scenes6.h
index 8b08f3b..4c10e4a 100644
--- a/engines/tsage/ringworld/ringworld_scenes6.h
+++ b/engines/tsage/ringworld/ringworld_scenes6.h
@@ -319,9 +319,6 @@ public:
 	Hotspot7 _hotspot7;
 	Hotspot8 _hotspot8;
 
-	// Useless variable, but removing it would break the savegames.
-	int _field1B0A;
-
 	Scene5300();
 	virtual void postInit(SceneObjectList *OwnerList = NULL);
 	virtual void signal();






More information about the Scummvm-git-logs mailing list