diff options
| author | Strangerke | 2011-07-04 08:15:56 +0200 |
|---|---|---|
| committer | Strangerke | 2011-07-04 08:15:56 +0200 |
| commit | fae1d7efd885eae98ee9b0c8ae9bc99612942430 (patch) | |
| tree | ef5db813d0e1b3a49b1a1e395236e121a58ed125 /engines/cge/cge_main.h | |
| parent | c313d2cce8d647265f192400c667d72824874dbc (diff) | |
| download | scummvm-rg350-fae1d7efd885eae98ee9b0c8ae9bc99612942430.tar.gz scummvm-rg350-fae1d7efd885eae98ee9b0c8ae9bc99612942430.tar.bz2 scummvm-rg350-fae1d7efd885eae98ee9b0c8ae9bc99612942430.zip | |
CGE: This ends the first renaming pass. Also move some functions to CGEEngine
Diffstat (limited to 'engines/cge/cge_main.h')
| -rw-r--r-- | engines/cge/cge_main.h | 17 |
1 files changed, 8 insertions, 9 deletions
diff --git a/engines/cge/cge_main.h b/engines/cge/cge_main.h index c5be2adc26..e9c96931c3 100644 --- a/engines/cge/cge_main.h +++ b/engines/cge/cge_main.h @@ -113,17 +113,17 @@ namespace CGE { #define FINIS (_flag[3]) -class SYSTEM : public Sprite { - int lum; +class System : public Sprite { + int _lum; public: - int FunDel; + int _funDel; - SYSTEM(CGEEngine *vm); + System(CGEEngine *vm); - void SetPal(); - void FunTouch(); + void setPal(); + void funTouch(); virtual void touch(uint16 mask, int x, int y); - void Tick(); + void tick(); private: CGEEngine *_vm; }; @@ -159,7 +159,6 @@ private: }; - Cluster XZ(int x, int y); Cluster XZ(Couple xy); @@ -169,7 +168,7 @@ void ContractSprite(Sprite *spr); extern WALK *_hero; extern Vga *_vga; extern Heart *_heart; -extern SYSTEM *_sys; +extern System *_sys; extern int _offUseCount; extern Sprite *_pocLight; extern Keyboard *_keyboard; |