aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStrangerke2013-11-02 11:51:32 +0100
committerStrangerke2013-11-02 11:51:32 +0100
commit90d88078aa1d244eb3b51610c86514ec761200ed (patch)
treef66b07385bb81fcea991a9c4ab3f3c34612dc53b
parent6a8a964ee7d0ca6741d1e3687d05fb3f02e72cc4 (diff)
downloadscummvm-rg350-90d88078aa1d244eb3b51610c86514ec761200ed.tar.gz
scummvm-rg350-90d88078aa1d244eb3b51610c86514ec761200ed.tar.bz2
scummvm-rg350-90d88078aa1d244eb3b51610c86514ec761200ed.zip
TSAGE: Remove some useless variables in Blue Force, fix compilation broken in last commit
-rw-r--r--engines/tsage/blue_force/blueforce_logic.cpp2
-rw-r--r--engines/tsage/blue_force/blueforce_scenes1.cpp6
-rw-r--r--engines/tsage/globals.cpp16
-rw-r--r--engines/tsage/globals.h2
4 files changed, 5 insertions, 21 deletions
diff --git a/engines/tsage/blue_force/blueforce_logic.cpp b/engines/tsage/blue_force/blueforce_logic.cpp
index 867bd4d7ae..8bcf28e173 100644
--- a/engines/tsage/blue_force/blueforce_logic.cpp
+++ b/engines/tsage/blue_force/blueforce_logic.cpp
@@ -1263,8 +1263,6 @@ void BlueForceInvObjectList::alterInventory(int mode) {
setObjectScene(INV_TICKET_BOOK, 60);
setObjectScene(INV_MIRANDA_CARD, 60);
- BF_GLOBALS._v4CEC4 = 0;
-
switch (mode) {
case 2:
if (hasPrintout)
diff --git a/engines/tsage/blue_force/blueforce_scenes1.cpp b/engines/tsage/blue_force/blueforce_scenes1.cpp
index d26e34ae23..f0bf0e2519 100644
--- a/engines/tsage/blue_force/blueforce_scenes1.cpp
+++ b/engines/tsage/blue_force/blueforce_scenes1.cpp
@@ -1833,7 +1833,6 @@ void Scene125::Action2::signal() {
setDelay(20);
break;
case 2: {
- BF_GLOBALS._v501FA = 10;
BF_GLOBALS._v51C44 = 1;
Common::Point destPos(202, 94);
NpcMover *mover = new NpcMover();
@@ -2338,7 +2337,6 @@ void Scene140::postInit(SceneObjectList *OwnerList) {
_object1.hide();
BF_GLOBALS._v5020C = 0;
- BF_GLOBALS._v501F8 = 300;
BF_GLOBALS._v501FC = 90;
BF_GLOBALS._sound1.play(7);
@@ -2789,8 +2787,6 @@ void Scene180::postInit(SceneObjectList *OwnerList) {
if ((BF_GLOBALS._bookmark == bLyleStoppedBy) && (BF_GLOBALS._dayNumber == 1)) {
BF_GLOBALS._v501FC = 87;
- BF_GLOBALS._v501FA = _sceneBounds.left + 10;
- // CHECKME: BF_GLOBALS._v50206 = 18; ??
_sceneMessage.setup(THE_NEXT_DAY);
_sceneMode = 6;
setAction(&_sceneMessage, this);
@@ -2800,8 +2796,6 @@ void Scene180::postInit(SceneObjectList *OwnerList) {
} else if (((BF_GLOBALS._bookmark == bDroppedOffLyle) && (BF_GLOBALS._dayNumber == 3)) ||
((BF_GLOBALS._bookmark == bDoneAtLyles) && (BF_GLOBALS._dayNumber == 4))) {
BF_GLOBALS._v501FC = 87;
- BF_GLOBALS._v501FA = _sceneBounds.left + 10;
- // CHECKME: BF_GLOBALS._v50206 = 18; ??
_sceneMessage.setup(THE_NEXT_DAY);
_sceneMode = 6;
setAction(&_sceneMessage, this);
diff --git a/engines/tsage/globals.cpp b/engines/tsage/globals.cpp
index 598b940887..d155d1d6eb 100644
--- a/engines/tsage/globals.cpp
+++ b/engines/tsage/globals.cpp
@@ -248,8 +248,6 @@ BlueForceGlobals::BlueForceGlobals(): TsAGE2Globals() {
_deathReason = 0;
_driveFromScene = 300;
_driveToScene = 0;
- _v501F8 = 0;
- _v501FA = 0;
_v501FC = 0;
_v5020C = 0;
_v50696 = 0;
@@ -274,7 +272,6 @@ BlueForceGlobals::BlueForceGlobals(): TsAGE2Globals() {
_safeCombination = 0;
_gateStatus = 0;
_greenDay5TalkCtr = 0;
- _v4CEC4 = 0;
_v4CEC8 = 1;
_v4CECA = 0;
_v4CECC = 0;
@@ -282,11 +279,11 @@ BlueForceGlobals::BlueForceGlobals(): TsAGE2Globals() {
void BlueForceGlobals::synchronize(Serializer &s) {
TsAGE2Globals::synchronize(s);
+ int16 useless = 0;
s.syncAsSint16LE(_dayNumber);
if (s.getVersion() < 9) {
- int tmpVar = 0;
- s.syncAsSint16LE(tmpVar);
+ s.syncAsSint16LE(useless);
}
s.syncAsSint16LE(_tonyDialogCtr);
s.syncAsSint16LE(_marinaWomanCtr);
@@ -295,7 +292,7 @@ void BlueForceGlobals::synchronize(Serializer &s) {
s.syncAsSint16LE(_safeCombination);
s.syncAsSint16LE(_gateStatus);
s.syncAsSint16LE(_greenDay5TalkCtr);
- s.syncAsSint16LE(_v4CEC4);
+ s.syncAsSint16LE(useless);
s.syncAsSint16LE(_v4CEC8);
s.syncAsSint16LE(_v4CECA);
s.syncAsSint16LE(_v4CECC);
@@ -310,8 +307,8 @@ void BlueForceGlobals::synchronize(Serializer &s) {
s.syncAsSint16LE(_deathReason);
s.syncAsSint16LE(_driveFromScene);
s.syncAsSint16LE(_driveToScene);
- s.syncAsSint16LE(_v501F8);
- s.syncAsSint16LE(_v501FA);
+ s.syncAsSint16LE(useless);
+ s.syncAsSint16LE(useless);
s.syncAsSint16LE(_v501FC);
s.syncAsSint16LE(_v5020C);
s.syncAsSint16LE(_v50696);
@@ -352,7 +349,6 @@ void BlueForceGlobals::reset() {
_safeCombination = 0;
_gateStatus = 0;
_greenDay5TalkCtr = 0;
- _v4CEC4 = 0;
_v4CEC8 = 1;
_v4CECA = 0;
_v4CECC = 0;
@@ -381,8 +377,6 @@ void BlueForceGlobals::reset() {
_v4CEE8 = 0;
_deziTopic = 0;
_deathReason = 0;
- _v501F8 = 0;
- _v501FA = 0;
_v501FC = 0;
_v5020C = 0;
_v50696 = 0;
diff --git a/engines/tsage/globals.h b/engines/tsage/globals.h
index cc9058a928..1b39ae2144 100644
--- a/engines/tsage/globals.h
+++ b/engines/tsage/globals.h
@@ -207,8 +207,6 @@ public:
int _deathReason;
int _driveFromScene;
int _driveToScene;
- int _v501F8; // Useless variable
- int _v501FA; // Useless variable
int _v501FC; // Useless variable
int _v5020C; // Useless variable
int _v50696; // Useless variable