diff options
author | Kamil Zbróg | 2013-11-09 23:07:48 +0000 |
---|---|---|
committer | Kamil Zbróg | 2013-11-09 23:07:48 +0000 |
commit | 416110d3e087cb18b84c8ca26b63700160d9ac0f (patch) | |
tree | dd3a989b152a23480a079bd6b2689b6bf104b7dc /engines/tsage/globals.h | |
parent | cdc1409dc77c57b083a60e6118c29dd9aad0be9b (diff) | |
parent | 4095ae1ba8e113a06924ec4c87383631c1fa5691 (diff) | |
download | scummvm-rg350-416110d3e087cb18b84c8ca26b63700160d9ac0f.tar.gz scummvm-rg350-416110d3e087cb18b84c8ca26b63700160d9ac0f.tar.bz2 scummvm-rg350-416110d3e087cb18b84c8ca26b63700160d9ac0f.zip |
Merge remote-tracking branch 'sync/master' into prince-malik
Diffstat (limited to 'engines/tsage/globals.h')
-rw-r--r-- | engines/tsage/globals.h | 16 |
1 files changed, 6 insertions, 10 deletions
diff --git a/engines/tsage/globals.h b/engines/tsage/globals.h index b9c8076042..4523a7bca0 100644 --- a/engines/tsage/globals.h +++ b/engines/tsage/globals.h @@ -252,15 +252,11 @@ public: byte _paletteMap[4096]; int _insetUp; int _frameEdgeColor; - Rect _v5589E; - Rect _v558B6; int _animationCtr; int _electromagnetChangeAmount; int _electromagnetZoom; - int _v565E5; - int _v565E7; - int _v565E9; - int _v565EB; // CHECKME: IS it a constant? + bool _tractorField; + bool _cableAttached; int _foodCount; int _rimLocation; int _rimTransportLocation; @@ -279,12 +275,12 @@ public: byte _balloonAltitude; int _scene1925CurrLevel; //_v56A9C int _walkwaySceneNumber; - byte _v56AA0; + byte _mirandaJailState; byte _scientistConvIndex; Common::Point _ventCellPos; - byte _v56AA6; - byte _v56AA7; - byte _v56AA8; + byte _ductMazePanel1State; + byte _ductMazePanel2State; + byte _ductMazePanel3State; int _scene180Mode; // _v575f7 int _v57709; int _v5780C; |