CGE: Changed MOUSE class from using static fields to an instantiated class

1 files changed, 12 insertions, 8 deletions

diff --git a/engines/cge/events.h b/engines/cge/events.h
index 518c8c8bd1..462571f5ad 100644
--- a/engines/cge/events.h
+++ b/engines/cge/events.h
@@ -46,18 +46,19 @@ namespace CGE {
 
 class Keyboard {
 public:
-	static void (* OldKeyboard)(...);
-	static void NewKeyboard(...);
-	static uint16 _code[0x60];
-	static uint16 _current;
-	static Sprite *_client;
-	static uint8 _key[0x60];
-	static uint16 last() {
+	static const uint16 _code[0x60];
+
+	void NewKeyboard(...);
+	uint16 _current;
+	Sprite *_client;
+	uint8 _key[0x60];
+	uint16 last() {
 		uint16 cur = _current;
 		_current = 0;
 		return cur;
 	}
-	static Sprite *setClient(Sprite *spr);
+	Sprite *setClient(Sprite *spr);
+
 	Keyboard();
 	~Keyboard();
 };
@@ -111,6 +112,9 @@ private:
 	CGEEngine *_vm;
 };
 
+/*----------------- Access variables -----------------*/
+// TODO: Move this into either the CGEEngine class or a suitable 'globals'
+
 } // End of namespace CGE
 
 #endif