X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fcommon%2FGameState.h;h=55ae6dfb3374e5bfb75d7dec673aaa6e407ee382;hb=a3ba4dc677ad7c92eeb78b20b642241563605c9d;hp=f1edf484e474327363b65f64324ce8452d7da98d;hpb=06b6411e5dc8fc6b905530f7adbde8bd0c2bb0ea;p=l2e.git

diff --git a/src/common/GameState.h b/src/common/GameState.h
index f1edf48..55ae6df 100644
--- a/src/common/GameState.h
+++ b/src/common/GameState.h
@@ -1,14 +1,9 @@
-/*
- * GameState.h
- *
- *  Created on: Oct 7, 2012
- *      Author: holy
- */
-
 #ifndef COMMON_GAMESTATE_H_
 #define COMMON_GAMESTATE_H_
 
+#include "Capsule.h"
 #include "Hero.h"
+#include "Inventory.h"
 
 #include <SDL.h>
 
@@ -19,9 +14,38 @@ struct GameState {
 	GameState();
 
 	Hero heroes[7];
+	int NumHeroes() const { return 7; }
 	Hero *party[4];
+	int partySize;
+
+	Capsule capsules[7];
+	int capsule;
+	int NumCapsules() const { return 7; }
+	Capsule &GetCapsule() { return capsules[capsule]; }
+	const Capsule &GetCapsule() const { return capsules[capsule]; }
+
+	Inventory inventory;
 
 	Uint32 money;
+	Uint32 time;
+
+	enum MessageSpeed {
+		MESSAGE_SPEED_FAST,
+		MESSAGE_SPEED_NORMAL,
+		MESSAGE_SPEED_SLOW,
+	};
+	enum Cursor {
+		CURSOR_CLEAR,
+		CURSOR_MEMORY,
+	};
+	enum Music {
+		MUSIC_STEREO,
+		MUSIC_MONO,
+	};
+	int messageSpeed;
+	int battleCursor;
+	int statusCursor;
+	int music;
 
 };