[Scummvm-cvs-logs] scummvm master -> 1873246a711ab806804d633e738a706cb2a0d015

dreammaster dreammaster at scummvm.org
Tue Oct 29 01:53:55 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:
1873246a71 TSAGE: Removed more unused R2R variables


Commit: 1873246a711ab806804d633e738a706cb2a0d015
    https://github.com/scummvm/scummvm/commit/1873246a711ab806804d633e738a706cb2a0d015
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2013-10-28T17:50:44-07:00

Commit Message:
TSAGE: Removed more unused R2R variables

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



diff --git a/engines/tsage/globals.cpp b/engines/tsage/globals.cpp
index a18d275..ff58144 100644
--- a/engines/tsage/globals.cpp
+++ b/engines/tsage/globals.cpp
@@ -406,7 +406,6 @@ Ringworld2Globals::Ringworld2Globals() {
 	_scannerDialog = new ScannerDialog();
 	_speechSubtitles = SPEECH_TEXT;
 
-	_v5657C = 0;
 	_stripModifier = 0;
 	_flubMazeArea = 1;
 	_flubMazeEntryDirection = 0;
@@ -429,7 +428,6 @@ Ringworld2Globals::Ringworld2Globals() {
 	_v5780C = 0;
 	_v5780E = 0;
 	_v57810 = 0;
-	_v57C2C = 0;
 }
 
 Ringworld2Globals::~Ringworld2Globals() {
@@ -462,7 +460,6 @@ void Ringworld2Globals::reset() {
 	_v558B6.set(0, 0, 0, 0);
 	_v558C2 = 0;
 	_animationCtr = 0;
-	_v5657C = 0;
 	_electromagnetChangeAmount = 0;
 	_electromagnetZoom = 0;
 	_v565E5 = 0;
@@ -536,7 +533,6 @@ void Ringworld2Globals::reset() {
 	_v5780C = 0;
 	_v5780E = 0;
 	_v57810 = 0;
-	_v57C2C = 0;
 	_s1550PlayerArea[R2_QUINN] = Common::Point(27, 4);
 	_s1550PlayerArea[R2_SEEKER] = Common::Point(27, 4);
 	Common::fill(&_scannerFrequencies[0], &_scannerFrequencies[MAX_CHARACTERS], 1);
@@ -574,7 +570,6 @@ void Ringworld2Globals::synchronize(Serializer &s) {
 
 	s.syncAsSint16LE(_v558C2);
 	s.syncAsSint16LE(_animationCtr);
-	s.syncAsSint16LE(_v5657C);
 	s.syncAsSint16LE(_electromagnetChangeAmount);
 	s.syncAsSint16LE(_electromagnetZoom);
 	s.syncAsSint16LE(_v565E5);
@@ -596,7 +591,6 @@ void Ringworld2Globals::synchronize(Serializer &s) {
 	s.syncAsSint16LE(_v5780C);
 	s.syncAsSint16LE(_v5780E);
 	s.syncAsSint16LE(_v57810);
-	s.syncAsSint16LE(_v57C2C);
 
 	s.syncAsByte(_s1550PlayerArea[R2_QUINN].x);
 	s.syncAsByte(_s1550PlayerArea[R2_SEEKER].x);
diff --git a/engines/tsage/globals.h b/engines/tsage/globals.h
index a4b111c..5083eec 100644
--- a/engines/tsage/globals.h
+++ b/engines/tsage/globals.h
@@ -273,7 +273,6 @@ public:
 	int _foodCount;
 	int _rimLocation;
 	int _rimTransportLocation;
-	int _v5657C; // Useless variable
 	byte _stripModifier;
 	byte _spillLocation[14];
 	VampireData _vampireData[18];
@@ -300,7 +299,6 @@ public:
 	int _v5780C;
 	int _v5780E;
 	int _v57810;
-	int _v57C2C; // Useless variable. Seems to be _speechSubtitles
 	int _speechSubtitles;
 	Common::Point _s1550PlayerArea[3]; // only used for Quinn and Seeker
 	byte _scannerFrequencies[4];






More information about the Scummvm-git-logs mailing list