Each map object action now take different numbers of turns to complete. Re-wrote...

[plomrogue] / src / main.h

diff --git a/src/main.h b/src/main.h
index a2900997a76873ec6a66ab7b87fd2eb8050bb418..687dfc8e97f075ee4bb03d2daad8c388e4565411 100644 (file)
--- a/src/main.h
+++ b/src/main.h
@@ -6,16 +6,15 @@
 #ifndef MAIN_H
 #define MAIN_H
 
-
-
 #include <stdint.h> /* for uint32_t*/
-#include "keybindings.h"
+#include "keybindings.h" /* for KeyBiData struct */
 struct WinMeta;
 struct WinConf;
 struct Win;
 struct Map;
 struct MapObjDef;
 struct MapObj;
+struct MapObjAct;
 
 
 
@@ -34,11 +33,12 @@ struct World
     struct WinMeta * wmeta;           /* Pointer to window manager's WinMeta. */
     struct WinConf * winconfs;        /* Pointer to windows' configurations. */
     char * winconf_ids;               /* Pointer to string of Winconfs' ids. */
-    struct Player * player;           /* Pointer to the player data. */
     uint8_t map_obj_count;            /* Counts map objects generated so far. */
     struct MapObjDef * map_obj_defs;  /* Map object type definitions chain. */
-    struct MapObj * map_objs;         /* Map objects chain. */
-};
+    struct MapObj * map_objs;         /* Pointer to map objects chain start. */
+    uint8_t inventory_select;         /* Player's inventory selection index. */
+    struct MapObjAct * map_obj_acts;  /* Pointer to map object actions chain. */
+} world;