From 6dc29e4a0489a62498653a880f38369ce05d41f8 Mon Sep 17 00:00:00 2001
From: Strangerke
Date: Mon, 20 Jun 2011 23:40:22 +0200
Subject: CGE: Remove some statics

---
 engines/cge/cge_main.h | 25 +++++++++++++------------
 1 file changed, 13 insertions(+), 12 deletions(-)

(limited to 'engines/cge/cge_main.h')

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
 
-- 
cgit v1.2.3