Skip to content

Commit

Permalink
TSAGE: Further renaming and removal of redundant code in R2R rim scene
Browse files Browse the repository at this point in the history
  • Loading branch information
dreammaster committed Nov 7, 2013
1 parent eba0c0f commit a10d083
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 20 deletions.
25 changes: 7 additions & 18 deletions engines/tsage/ringworld2/ringworld2_scenes1.cpp
Expand Up @@ -10348,15 +10348,13 @@ void Scene1625::process(Event &event) {
*--------------------------------------------------------------------------*/

Scene1700::Scene1700() {
_field77A = 0;
_field77C = 0;
_walkFlag = 0;
}

void Scene1700::synchronize(Serializer &s) {
SceneExt::synchronize(s);

s.syncAsSint16LE(_field77A);
s.syncAsSint16LE(_field77C);
s.syncAsSint16LE(_walkFlag);
}

bool Scene1700::RimTransport::startAction(CursorType action, Event &event) {
Expand Down Expand Up @@ -10440,17 +10438,8 @@ void Scene1700::enterArea() {
_hatch.remove();
}

warning("tmpRect = _v5589E;");
warning("Mouse_hideIfNeeded");
warning("set_pane_p(_paneNumber);");
warning("Big loop calling gfx_draw_slice_p");

if (_field77A == 0)
_field77A = 1;
else
_field77A = 0;

warning("set_pane_p(_paneNumber);");
// The original had manual code here to redraw the background manually when
// changing areas within the scene. Which seems to be totally redundant.

if (_sceneMode != 40 && R2_GLOBALS._rimLocation == 0) {
// Crashed ledge hopper
Expand Down Expand Up @@ -10506,7 +10495,7 @@ void Scene1700::enterArea() {
// Rim transport vechile located
R2_GLOBALS._rimTransportLocation = R2_GLOBALS._rimLocation;
if (!R2_GLOBALS.getFlag(15))
_field77C = 1;
_walkFlag = true;

_rimTransport.postInit();
_rimTransport.setup(1700, 3, 1);
Expand Down Expand Up @@ -10721,11 +10710,11 @@ void Scene1700::signal() {
}
break;
case 3:
if (_field77C == 0) {
if (!_walkFlag) {
R2_GLOBALS._player.enableControl(CURSOR_WALK);
} else {
R2_GLOBALS.setFlag(15);
_field77C = 0;
_walkFlag = false;
_sceneMode = 31;
R2_GLOBALS._events.setCursor(CURSOR_WALK);
if (R2_GLOBALS._player._characterIndex == R2_QUINN)
Expand Down
3 changes: 1 addition & 2 deletions engines/tsage/ringworld2/ringworld2_scenes1.h
Expand Up @@ -761,8 +761,7 @@ class Scene1700 : public SceneExt {
WestExit _westExit;
SequenceManager _sequenceManager;

int _field77A;
int _field77C;
bool _walkFlag;

Scene1700();
void synchronize(Serializer &s);
Expand Down

0 comments on commit a10d083

Please sign in to comment.