X-Git-Url: https://plomlompom.com/repos/berlin_corona.txt?a=blobdiff_plain;f=src%2Fmain.h;h=83bdb83d2aa12717e3c857bacaca8e4c15b1da6f;hb=e49cd07e79574ba404a0a8fc867344cc630d7794;hp=fc9bbc377dbec6f3f8cd41e76a4cee0d444006d2;hpb=96cc2077a4b491df2f13e71215db01ed7261cb84;p=plomrogue

diff --git a/src/main.h b/src/main.h
index fc9bbc3..83bdb83 100644
--- a/src/main.h
+++ b/src/main.h
@@ -9,7 +9,9 @@
 
 
 #include <stdint.h> /* for uint32_t*/
+#include "keybindings.h"
 struct WinMeta;
+struct WinConf;
 struct Win;
 struct KeyBinding;
 struct KeysWinData;
@@ -22,10 +24,12 @@ struct MonsterDef;
 struct World
 {
     char interactive;                 /* 1: playing; 0: record playback. */
-    struct KeyBinding * keybindings;  /* Pointer to the keybindings. */
-    struct KeysWinData * keyswindata; /* Pointer to key edit window metadata. */
+    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 ItemDef * item_def;        /* Pointer to the item definitions. */
@@ -33,6 +37,11 @@ struct World
     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. */
 };