X-Git-Url: https://plomlompom.com/repos/?a=blobdiff_plain;ds=sidebyside;f=src%2Fmain.h;h=83bdb83d2aa12717e3c857bacaca8e4c15b1da6f;hb=e49cd07e79574ba404a0a8fc867344cc630d7794;hp=792f29477777288025bdfcaba0b715807f7c1fc1;hpb=a3f3ab528bed86b504ef831f5db81ea2f68e3cd3;p=plomrogue diff --git a/src/main.h b/src/main.h index 792f294..83bdb83 100644 --- a/src/main.h +++ b/src/main.h @@ -9,6 +9,7 @@ #include /* 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. */ };