diff options
author | Strangerke | 2011-07-05 23:13:12 +0200 |
---|---|---|
committer | Alyssa Milburn | 2011-07-07 09:23:09 +0200 |
commit | c86c62b288dd3c8a1a630864142f99b177e4db3a (patch) | |
tree | 90adc86071d51b69a8ca861d8506c58baee52a5e /engines/cge/cge_main.h | |
parent | 2997db0040d4c4e7ead02f37d8e7bd2c0ce6b206 (diff) | |
download | scummvm-rg350-c86c62b288dd3c8a1a630864142f99b177e4db3a.tar.gz scummvm-rg350-c86c62b288dd3c8a1a630864142f99b177e4db3a.tar.bz2 scummvm-rg350-c86c62b288dd3c8a1a630864142f99b177e4db3a.zip |
CGE: Cleanup and renaming. Also move some static and global functions to CGEEngine.
Diffstat (limited to 'engines/cge/cge_main.h')
-rw-r--r-- | engines/cge/cge_main.h | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/engines/cge/cge_main.h b/engines/cge/cge_main.h index e9c96931c3..3ef3679e8e 100644 --- a/engines/cge/cge_main.h +++ b/engines/cge/cge_main.h @@ -109,8 +109,8 @@ namespace CGE { #define SYSTIMERATE 6 // 12 Hz #define HEROFUN0 (40 * 12) #define HEROFUN1 ( 2 * 12) -#define PAIN (_flag[0]) -#define FINIS (_flag[3]) +#define PAIN (_vm->_flag[0]) +//#define FINIS (_vm->_flag[3]) class System : public Sprite { @@ -132,10 +132,10 @@ private: class Cluster : public Couple { public: static uint8 _map[MAP_ZCNT][MAP_XCNT]; - uint8 &cell(void); - Cluster(void) : Couple() { } + uint8 &cell(); + Cluster() : Couple() { } Cluster(int a, int b) : Couple(a, b) { } - bool Protected(void); + bool Protected(); }; @@ -162,9 +162,6 @@ private: Cluster XZ(int x, int y); Cluster XZ(Couple xy); -void ExpandSprite(Sprite *spr); -void ContractSprite(Sprite *spr); - extern WALK *_hero; extern Vga *_vga; extern Heart *_heart; |