aboutsummaryrefslogtreecommitdiff
path: root/engines/cge/cge_main.h
diff options
context:
space:
mode:
authorStrangerke2011-06-20 23:40:22 +0200
committerStrangerke2011-06-20 23:40:22 +0200
commit6dc29e4a0489a62498653a880f38369ce05d41f8 (patch)
treeade5ca48edfb8a6408d3a6702d1acf86afcc86bb /engines/cge/cge_main.h
parent77d4dcade26a69a6e2ebcc69a4224059c450f3e4 (diff)
downloadscummvm-rg350-6dc29e4a0489a62498653a880f38369ce05d41f8.tar.gz
scummvm-rg350-6dc29e4a0489a62498653a880f38369ce05d41f8.tar.bz2
scummvm-rg350-6dc29e4a0489a62498653a880f38369ce05d41f8.zip
CGE: Remove some statics
Diffstat (limited to 'engines/cge/cge_main.h')
-rw-r--r--engines/cge/cge_main.h25
1 files changed, 13 insertions, 12 deletions
diff --git a/engines/cge/cge_main.h b/engines/cge/cge_main.h
index 0afdc0f820..3eb38cafce 100644
--- a/engines/cge/cge_main.h
+++ b/engines/cge/cge_main.h
@@ -30,6 +30,7 @@
#include "cge/wav.h"
#include "cge/vga13h.h"
+#include "cge/mouse.h"
namespace CGE {
@@ -119,15 +120,14 @@ namespace CGE {
class SYSTEM : public SPRITE {
int lum;
public:
- static int FunDel;
- static void SetPal(void);
- static void FunTouch(void);
- SYSTEM(void) : SPRITE(NULL) {
- SetPal();
- Tick();
- }
+ int FunDel;
+
+ SYSTEM();
+
+ void SetPal();
+ void FunTouch();
void Touch(uint16 mask, int x, int y);
- void Tick(void);
+ void Tick();
};
@@ -161,17 +161,18 @@ public:
CLUSTER XZ(int x, int y);
CLUSTER XZ(COUPLE xy);
-
-extern WALK *Hero;
-
-
void ExpandSprite(SPRITE *spr);
void ContractSprite(SPRITE *spr);
void cge_main(void);
+extern WALK *Hero;
extern VGA *Vga;
extern HEART *Heart;
+extern SYSTEM *Sys;
extern int OffUseCount;
+extern SPRITE *PocLight;
+extern MOUSE *Mouse;
+extern SPRITE *Pocket[];
} // End of namespace CGE