X-Git-Url: https://plomlompom.com/repos/foo.html?a=blobdiff_plain;f=src%2Fmain.h;h=bf86e0507ce3426ed336e4dbb602d292deaf6127;hb=657d5dbc6d362d7b20693c63b38d8d99f3d2dbbd;hp=83bdb83d2aa12717e3c857bacaca8e4c15b1da6f;hpb=1ae2dac3529b3ead75c5bef1d02d958adcbcc581;p=plomrogue
diff --git a/src/main.h b/src/main.h
index 83bdb83..bf86e05 100644
--- a/src/main.h
+++ b/src/main.h
@@ -13,11 +13,9 @@
struct WinMeta;
struct WinConf;
struct Win;
-struct KeyBinding;
-struct KeysWinData;
struct Map;
-struct ItemDef;
-struct MonsterDef;
+struct MapObjDef;
+struct MapObj;
@@ -32,16 +30,14 @@ 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. */
};