aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPaul Gilbert2013-10-28 20:27:55 -0400
committerPaul Gilbert2013-10-28 20:27:55 -0400
commitba60a39844367781d02d6d6fc0d3a9ddba7de3cc (patch)
treefe592d4b30062c357ccc086e5b1aa1ef36436478
parentf938743b06c22e3b2f22a70c6ffa0150bd87cb94 (diff)
downloadscummvm-rg350-ba60a39844367781d02d6d6fc0d3a9ddba7de3cc.tar.gz
scummvm-rg350-ba60a39844367781d02d6d6fc0d3a9ddba7de3cc.tar.bz2
scummvm-rg350-ba60a39844367781d02d6d6fc0d3a9ddba7de3cc.zip
TSAGE: Removed unneeded R2R variable _v56AAB
-rw-r--r--engines/tsage/globals.cpp3
-rw-r--r--engines/tsage/globals.h1
-rw-r--r--engines/tsage/ringworld2/ringworld2_scenes1.cpp8
-rw-r--r--engines/tsage/ringworld2/ringworld2_scenes2.cpp3
-rw-r--r--engines/tsage/ringworld2/ringworld2_scenes3.cpp3
5 files changed, 0 insertions, 18 deletions
diff --git a/engines/tsage/globals.cpp b/engines/tsage/globals.cpp
index b043df0c10..a18d275374 100644
--- a/engines/tsage/globals.cpp
+++ b/engines/tsage/globals.cpp
@@ -424,7 +424,6 @@ Ringworld2Globals::Ringworld2Globals() {
_v56AA6 = 1;
_v56AA7 = 1;
_v56AA8 = 1;
- _v56AAB = 0;
_scene180Mode = -1;
_v57709 = 0;
_v5780C = 0;
@@ -532,7 +531,6 @@ void Ringworld2Globals::reset() {
_v56AA6 = 1;
_v56AA7 = 1;
_v56AA8 = 1;
- _v56AAB = 0;
_scene180Mode = -1;
_v57709 = 0;
_v5780C = 0;
@@ -593,7 +591,6 @@ void Ringworld2Globals::synchronize(Serializer &s) {
s.syncAsSint16LE(_walkwaySceneNumber);
s.syncAsSint16LE(_ventCellPos.x);
s.syncAsSint16LE(_ventCellPos.y);
- s.syncAsSint16LE(_v56AAB);
s.syncAsSint16LE(_scene180Mode);
s.syncAsSint16LE(_v57709);
s.syncAsSint16LE(_v5780C);
diff --git a/engines/tsage/globals.h b/engines/tsage/globals.h
index e514a51120..a4b111c5ab 100644
--- a/engines/tsage/globals.h
+++ b/engines/tsage/globals.h
@@ -295,7 +295,6 @@ public:
byte _v56AA6;
byte _v56AA7;
byte _v56AA8;
- int _v56AAB; // Useless variable
int _scene180Mode; // _v575f7
int _v57709;
int _v5780C;
diff --git a/engines/tsage/ringworld2/ringworld2_scenes1.cpp b/engines/tsage/ringworld2/ringworld2_scenes1.cpp
index 919af14c28..b9906c860c 100644
--- a/engines/tsage/ringworld2/ringworld2_scenes1.cpp
+++ b/engines/tsage/ringworld2/ringworld2_scenes1.cpp
@@ -7910,7 +7910,6 @@ void Scene1550::signal() {
// No break on purpose
case 7:
_field412 = 0;
- R2_GLOBALS._v56AAB = 0;
R2_GLOBALS._player.enableControl(CURSOR_WALK);
break;
case 20:
@@ -10738,7 +10737,6 @@ void Scene1700::signal() {
_stripManager.start(541, this);
break;
case 31:
- R2_GLOBALS._v56AAB = 0;
R2_GLOBALS._player.enableControl(CURSOR_TALK);
break;
case 40:
@@ -14955,7 +14953,6 @@ void Scene1950::enterArea() {
case 0:
_sceneMode = 1950;
if (R2_INVENTORY.getObjectScene(R2_SCRITH_KEY) == 0) {
- R2_GLOBALS._v56AAB = 0;
R2_GLOBALS._player.enableControl(CURSOR_WALK);
} else {
setAction(&_sequenceManager, this, 1950, &R2_GLOBALS._player, NULL);
@@ -14988,7 +14985,6 @@ void Scene1950::enterArea() {
_sceneMode = 18;
_eastExit._enabled = false;
_field418 = Common::Point(60, 152);
- R2_GLOBALS._v56AAB = 0;
R2_GLOBALS._player.enableControl(CURSOR_USE);
R2_GLOBALS._player._canWalk = false;
@@ -15041,7 +15037,6 @@ void Scene1950::enterArea() {
_westExit._enabled = false;
_field418 = Common::Point(259, 152);
- R2_GLOBALS._v56AAB = 0;
R2_GLOBALS._player.enableControl(CURSOR_USE);
R2_GLOBALS._player._canWalk = false;
@@ -15282,13 +15277,11 @@ void Scene1950::signal() {
break;
case 1958:
SceneItem::display(1950, 24, 0, 280, 1, 160, 9, 1, 2, 20, 7, 7, -999);
- R2_GLOBALS._v56AAB = 0;
R2_GLOBALS._player.enableControl(CURSOR_WALK);
_doorExit._enabled = true;
break;
case 1959:
R2_INVENTORY.setObjectScene(R2_SOAKED_FACEMASK, 0);
- R2_GLOBALS._v56AAB = 0;
R2_GLOBALS._player.enableControl(CURSOR_WALK);
_doorExit._enabled = true;
break;
@@ -15343,7 +15336,6 @@ void Scene1950::signal() {
R2_GLOBALS._player.animate(ANIM_MODE_1, NULL);
break;
default:
- R2_GLOBALS._v56AAB = 0;
R2_GLOBALS._player.enableControl(CURSOR_WALK);
break;
}
diff --git a/engines/tsage/ringworld2/ringworld2_scenes2.cpp b/engines/tsage/ringworld2/ringworld2_scenes2.cpp
index 17dca69c45..7c04d190d1 100644
--- a/engines/tsage/ringworld2/ringworld2_scenes2.cpp
+++ b/engines/tsage/ringworld2/ringworld2_scenes2.cpp
@@ -997,8 +997,6 @@ void Scene2000::signal() {
g_globals->_sceneManager.changeScene(2535);
break;
default:
- if (R2_GLOBALS._v56AAB != 0)
- R2_GLOBALS._v56AAB = 0;
R2_GLOBALS._player.enableControl(CURSOR_WALK);
break;
}
@@ -1008,7 +1006,6 @@ void Scene2000::signal() {
g_globals->_sceneManager.changeScene(2350);
break;
default:
- R2_GLOBALS._v56AAB = 0;
R2_GLOBALS._player.enableControl();
break;
}
diff --git a/engines/tsage/ringworld2/ringworld2_scenes3.cpp b/engines/tsage/ringworld2/ringworld2_scenes3.cpp
index 15fc2e9fa8..0f20c93c79 100644
--- a/engines/tsage/ringworld2/ringworld2_scenes3.cpp
+++ b/engines/tsage/ringworld2/ringworld2_scenes3.cpp
@@ -5353,7 +5353,6 @@ void Scene3800::signal() {
enterArea();
break;
case 15:
- R2_GLOBALS._v56AAB = 0;
R2_GLOBALS._player.enableControl();
break;
case 16:
@@ -5363,7 +5362,6 @@ void Scene3800::signal() {
_actor1.show();
_object1.remove();
_object2.remove();
- R2_GLOBALS._v56AAB = 0;
R2_GLOBALS._player.enableControl();
break;
case 3805:
@@ -5629,7 +5627,6 @@ void Scene3900::signal() {
case 11:
// No break on purpose
case 12:
- R2_GLOBALS._v56AAB = 0;
R2_GLOBALS._player.enableControl(CURSOR_WALK);
break;
case 13: