diff options
author | Matthew Hoops | 2012-03-20 14:18:57 -0400 |
---|---|---|
committer | Matthew Hoops | 2012-03-20 14:49:16 -0400 |
commit | 71756bdf4eae5ba9cc3f329b85e894f04640aaef (patch) | |
tree | 40d464262da107ab5eed82f198685209161ebac1 /engines/tsage/globals.h | |
parent | 03eba05b09e5c9e5a351f8111185934b92a3fed3 (diff) | |
parent | 3c3576a224b92c703b4e8ea20008ac8a069980dd (diff) | |
download | scummvm-rg350-71756bdf4eae5ba9cc3f329b85e894f04640aaef.tar.gz scummvm-rg350-71756bdf4eae5ba9cc3f329b85e894f04640aaef.tar.bz2 scummvm-rg350-71756bdf4eae5ba9cc3f329b85e894f04640aaef.zip |
Merge remote branch 'upstream/master' into pegasus
Diffstat (limited to 'engines/tsage/globals.h')
-rw-r--r-- | engines/tsage/globals.h | 51 |
1 files changed, 49 insertions, 2 deletions
diff --git a/engines/tsage/globals.h b/engines/tsage/globals.h index 9048899953..45226c921b 100644 --- a/engines/tsage/globals.h +++ b/engines/tsage/globals.h @@ -242,20 +242,67 @@ namespace Ringworld2 { #define SPEECH_TEXT 1 #define SPEECH_VOICE 2 +#define k5A78C 15 +#define k5A78D 16 +#define k5A790 18 +#define k5A791 17 + class Ringworld2Globals: public TsAGE2Globals { public: ASoundExt _sound1, _sound2, _sound3, _sound4; PlayStream _playStream; StripProxy _stripProxy; + bool _v1000Flag; + byte _v1000[0x1000]; + byte _palIndexList[10][256]; int _insetUp; + int _frameEdgeColour; // _v421e + Rect _v5589E; + Rect _v558B6; + int _v558C2; + int _animationCtr; + int _v565E1; + int _v565E3; + int _v565E5; + int _v565E7; + int _v565E9; + int _v565EB; int _v565F5; + int _v565F6; + int _v565FA; int _v5657C; byte _v565AE; byte _v56605[14]; + int _v56613[76]; + byte _v566A4; + byte _v566A5; + int _v566A6; + byte _v566A3; + byte _v566A8; + byte _v566A9; + byte _v566AA; + byte _v566AB[1000]; + int _v56A93; + byte _v56A99; + int _scene1925CurrLevel; //_v56A9C + int _v56A9E; + byte _v56AA0; + byte _v56AA1; + int _v56AA2; + int _v56AA4; + byte _v56AA6; + byte _v56AA7; + byte _v56AA8; + int _v56AAB; + int _scene180Mode; // _v575f7 + int _v57709; + int _v5780C; + int _v5780E; + int _v57810; int _v57C2C; - int _v58CE2; int _speechSubtitles; - int _v565F1[4]; + byte _v565EC[5]; + byte _v565F1[4]; byte _stripManager_lookupList[12]; virtual void reset(); |