[Scummvm-cvs-logs] scummvm master -> 6a8a964ee7d0ca6741d1e3687d05fb3f02e72cc4

[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:
6a8a964ee7 TSAGE: R2R - Remove useless variable. That breaks savegames compatibility


Commit: 6a8a964ee7d0ca6741d1e3687d05fb3f02e72cc4
    https://github.com/scummvm/scummvm/commit/6a8a964ee7d0ca6741d1e3687d05fb3f02e72cc4
Author: Strangerke (strangerke at scummvm.org)
Date: 2013-11-02T03:37:54-07:00

Commit Message:
TSAGE: R2R - Remove useless variable. That breaks savegames compatibility

Changed paths:
    engines/tsage/globals.cpp
    engines/tsage/globals.h
    engines/tsage/ringworld2/ringworld2_scenes3.cpp



diff --git a/engines/tsage/globals.cpp b/engines/tsage/globals.cpp
index 78a8258..598b940 100644
--- a/engines/tsage/globals.cpp
+++ b/engines/tsage/globals.cpp
@@ -451,7 +451,6 @@ Ringworld2Globals::Ringworld2Globals() {
 	_fadePaletteFlag = false;
 	_insetUp = 0;
 	_frameEdgeColor = 2;
-	_v558C2 = 0;
 	_animationCtr = 0;
 	_electromagnetChangeAmount = 0;
 	_electromagnetZoom = 0;
@@ -492,7 +491,6 @@ void Ringworld2Globals::reset() {
 	_fadePaletteFlag = false;
 	_v5589E.set(0, 0, 0, 0);
 	_v558B6.set(0, 0, 0, 0);
-	_v558C2 = 0;
 	_animationCtr = 0;
 	_electromagnetChangeAmount = 0;
 	_electromagnetZoom = 0;
@@ -602,7 +600,6 @@ void Ringworld2Globals::synchronize(Serializer &s) {
 	_v5589E.synchronize(s);
 	_v558B6.synchronize(s);
 
-	s.syncAsSint16LE(_v558C2);
 	s.syncAsSint16LE(_animationCtr);
 	s.syncAsSint16LE(_electromagnetChangeAmount);
 	s.syncAsSint16LE(_electromagnetZoom);
diff --git a/engines/tsage/globals.h b/engines/tsage/globals.h
index 6493229..cc9058a 100644
--- a/engines/tsage/globals.h
+++ b/engines/tsage/globals.h
@@ -194,7 +194,6 @@ public:
 	int _safeCombination;
 	int _gateStatus;
 	int _greenDay5TalkCtr;
-	int _v4CEC4; // Useless variable
 	int _v4CEC8;
 	int _v4CECA;
 	int _v4CECC;
@@ -262,7 +261,6 @@ public:
 	int _frameEdgeColor;
 	Rect _v5589E;
 	Rect _v558B6;
-	int _v558C2; // Unused variable. The original seems to use it only in the context of the cheat mode
 	int _animationCtr;
 	int _electromagnetChangeAmount;
 	int _electromagnetZoom;
diff --git a/engines/tsage/ringworld2/ringworld2_scenes3.cpp b/engines/tsage/ringworld2/ringworld2_scenes3.cpp
index 0f20c93..68131f9 100644
--- a/engines/tsage/ringworld2/ringworld2_scenes3.cpp
+++ b/engines/tsage/ringworld2/ringworld2_scenes3.cpp
@@ -4665,7 +4665,6 @@ void Scene3600::signal() {
 			_sceneMode = 3607;
 			_protector.setAction(&_sequenceManager1, this, _sceneMode, &_protector, NULL);
 
-			R2_GLOBALS._v558C2 = 1;
 			_protectorSpeaker.proc16();
 			_protectorSpeaker._displayMode = 1;
 			_quinnSpeaker._displayMode = 1;