thirdparty/scummvm
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

TSAGE: Removed unneeded R2R variable _v56AAB

Browse source
This commit is contained in:
Paul Gilbert 2013-10-28 20:27:55 -04:00
parent f938743b06
commit ba60a39844
5 changed files with 0 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

3
engines/tsage/globals.cpp
View file

@ -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);

1
engines/tsage/globals.h
View file

@ -295,7 +295,6 @@ public:
byte _v56AA6;
byte _v56AA7;
byte _v56AA8;
int _v56AAB; // Useless variable
int _scene180Mode; // _v575f7
int _v57709;
int _v5780C;

8
engines/tsage/ringworld2/ringworld2_scenes1.cpp
View file

@ -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;
}

3
engines/tsage/ringworld2/ringworld2_scenes2.cpp
View file

@ -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;
}

3
engines/tsage/ringworld2/ringworld2_scenes3.cpp
View file

@ -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: