Individual map objects are now identified by unique numbers stored in the savefiles...

[plomrogue] / src / main.h

diff --git a/src/main.h b/src/main.h
index 792f29477777288025bdfcaba0b715807f7c1fc1..83bdb83d2aa12717e3c857bacaca8e4c15b1da6f 100644 (file)
--- a/src/main.h
+++ b/src/main.h
@@ -9,6 +9,7 @@
 
 
 #include <stdint.h> /* for uint32_t*/
+#include "keybindings.h"
 struct WinMeta;
 struct WinConf;
 struct Win;
@@ -23,8 +24,9 @@ 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. */
@@ -39,6 +41,7 @@ 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. */
+    uint8_t map_object_count;         /* Counts loaded/generated map objects. */
 };