X-Git-Url: https://plomlompom.com/repos/?a=blobdiff_plain;ds=sidebyside;f=src%2Fmain.h;h=e4d62e29ee87d682a58c2eeb9386562b62709738;hb=f89ac30f0907973b8aa858b053d38eec8e8f5bbf;hp=83bdb83d2aa12717e3c857bacaca8e4c15b1da6f;hpb=1ae2dac3529b3ead75c5bef1d02d958adcbcc581;p=plomrogue

diff --git a/src/main.h b/src/main.h
index 83bdb83..e4d62e2 100644
--- a/src/main.h
+++ b/src/main.h
@@ -6,18 +6,14 @@
 #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 KeyBinding;
-struct KeysWinData;
 struct Map;
-struct ItemDef;
-struct MonsterDef;
+struct MapObjDef;
+struct MapObj;
 
 
 
@@ -32,17 +28,16 @@ struct World
     uint16_t score;                   /* Player's score. */
     char * log;                       /* Pointer to the game log string. */
     struct Map * map;                 /* Pointer to the game map cells. */
-    struct ItemDef * item_def;        /* Pointer to the item definitions. */
-    struct Item * item;               /* Pointer to the items' data. */
-    struct MonsterDef * monster_def;  /* Pointer to the monster definitions. */
-    struct Monster * monster;         /* Pointer to the monsters' data. */
-    struct Player * player;           /* Pointer to the player data. */
     struct CommandDB * cmd_db;        /* Pointer to the command database. */
     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. */
-    uint8_t map_object_count;         /* Counts loaded/generated map objects. */
-};
+    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;         /* Pointer to map objects chain start. */
+    uint8_t inventory_select;         /* Player's inventory selection index. */
+    uint8_t old_inventory_select;     /* Temporarily stores for recordfile */
+} world;                              /* writing inventory selection index. */