diff options
author | Paul Gilbert | 2013-11-08 09:23:13 -0500 |
---|---|---|
committer | Paul Gilbert | 2013-11-08 09:23:13 -0500 |
commit | 28bc0d079ca39e16d1110f82a81e6d1d41abc45c (patch) | |
tree | df787c8b3837bc5bdecca47380c96a745dd6ba1e /engines/tsage/ringworld2/ringworld2_scenes1.h | |
parent | 4af998b96cc2b0d3513ded57985c4d434cd362a4 (diff) | |
download | scummvm-rg350-28bc0d079ca39e16d1110f82a81e6d1d41abc45c.tar.gz scummvm-rg350-28bc0d079ca39e16d1110f82a81e6d1d41abc45c.tar.bz2 scummvm-rg350-28bc0d079ca39e16d1110f82a81e6d1d41abc45c.zip |
TSAGE: Further renamings for R2R scene 1550
Diffstat (limited to 'engines/tsage/ringworld2/ringworld2_scenes1.h')
-rw-r--r-- | engines/tsage/ringworld2/ringworld2_scenes1.h | 22 |
1 files changed, 8 insertions, 14 deletions
diff --git a/engines/tsage/ringworld2/ringworld2_scenes1.h b/engines/tsage/ringworld2/ringworld2_scenes1.h index 87972bff12..0a379002f9 100644 --- a/engines/tsage/ringworld2/ringworld2_scenes1.h +++ b/engines/tsage/ringworld2/ringworld2_scenes1.h @@ -422,14 +422,13 @@ public: }; class Scene1550 : public SceneExt { - class SceneActor1550 : public SceneActor { + class Wall : public SceneActor { public: - void subA4D14(int frameNumber, int strip); + void setupWall(int frameNumber, int strip); }; class Junk : public SceneActor { public: - int _fieldA4; int _junkNumber; Junk(); @@ -514,19 +513,14 @@ class Scene1550 : public SceneExt { virtual bool startAction(CursorType action, Event &event); }; - class Wall : public SceneActor1550 { - // Nothing specific found in the original - // TODO: check if it's an useless class - }; - public: SpeakerQuinn _quinnSpeaker; SpeakerSeeker _seekerSpeaker; WorkingShip _intactHull1, _intactHull2; SceneHotspot _background; - SceneActor _landingStrut; - SceneActor _actor2; - SceneActor _actor3; + SceneActor _wreckage2; // also used for Lance of Truth landing strut + SceneActor _wreckage3; + SceneActor _wreckage4; SceneActor _walkway; SceneActor _dishTowerShadow; Wreckage _wreckage; @@ -538,9 +532,9 @@ public: DishTower _dishTower; Dish _dish; Junk _junk[8]; - Wall _actor14; + Wall _wallCorner1; Wall _northWall; // Is also reused for landing strip - Wall _actor16; + Wall _wallCorner2; Wall _westWall; // Is also reused for left hand space Wall _eastWall; Wall _southWall; @@ -550,7 +544,7 @@ public: SequenceManager _sequenceManager2; bool _dontExit; - byte _field414; + int _wallType; int _dishMode; int _sceneResourceId; int _walkRegionsId; |