load capsule in battles created by MapState

[l2e.git] / src / common / GameState.h

diff --git a/src/common/GameState.h b/src/common/GameState.h
index 0ef442b200cf008ef7de28dbff702f9a8cc580e0..4e2570d8fb8ea90c336169cb8e6a6b1c2ebf161e 100644 (file)
--- a/src/common/GameState.h
+++ b/src/common/GameState.h
@@ -1,13 +1,7 @@
-/*
- * 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"
 
@@ -21,12 +15,34 @@ struct GameState {
 
        Hero heroes[7];
        Hero *party[4];
+       int partySize;
+
+       Capsule capsules[7];
+       Capsule *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;
+
 };
 
 }