X-Git-Url: https://plomlompom.com/repos/foo.html?a=blobdiff_plain;f=src%2Fmain.h;h=bf86e0507ce3426ed336e4dbb602d292deaf6127;hb=657d5dbc6d362d7b20693c63b38d8d99f3d2dbbd;hp=14287d044561705b2d625f2fb978bcdfcb783b6c;hpb=d165f8ae619c78fd1ef98a9ba2abdaeeceff853e;p=plomrogue
diff --git a/src/main.h b/src/main.h
index 14287d0..bf86e05 100644
--- a/src/main.h
+++ b/src/main.h
@@ -1,28 +1,45 @@
+/* main.h
+ *
+ * Contains the World struct holding all game data together.
+ */
+
#ifndef MAIN_H
#define MAIN_H
-#include
+
+#include /* for uint32_t*/
+#include "keybindings.h"
struct WinMeta;
+struct WinConf;
struct Win;
-struct KeyBinding;
-struct KeysWinData;
struct Map;
-struct ItemDef;
-struct MonsterDef;
-
-struct World {
- char interactive;
- struct KeyBinding * keybindings;
- struct KeysWinData * keyswindata;
- uint32_t seed;
- uint32_t turn;
- char * log;
- struct Map * map;
- struct ItemDef * item_def;
- struct Item * item;
- struct MonsterDef * monster_def;
- struct Monster * monster;
- struct Player * player; };
+struct MapObjDef;
+struct MapObj;
+
+
+
+struct World
+{
+ char interactive; /* 1: playing; 0: record playback. */
+ struct KeyBiData kb_global; /* Global keybindings. */
+ struct KeyBiData kb_wingeom; /* Window geometry config keybindings. */
+ struct KeyBiData kb_winkeys; /* Window keybinding config keybindings.*/
+ uint32_t seed; /* Randomness seed. */
+ uint32_t turn; /* Current game turn. */
+ uint16_t score; /* Player's score. */
+ char * log; /* Pointer to the game log string. */
+ struct Map * map; /* Pointer to the game map cells. */
+ 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_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. */
+};
+
+
#endif