X-Git-Url: https://plomlompom.com/repos/foo.html?a=blobdiff_plain;f=src%2Fmain.h;h=b3ffc8968f6c3c4fe1e6e3498be4b3007be7055e;hb=66e6f0d465c4d8af5c69f3eb255f8fe1b481a312;hp=2ae8133b20537c4ee84ed639b6907c14bbc3ab9e;hpb=caf7e50574dc4fb3756a386257863e5b8b42ad98;p=plomrogue
diff --git a/src/main.h b/src/main.h
index 2ae8133..b3ffc89 100644
--- a/src/main.h
+++ b/src/main.h
@@ -9,7 +9,9 @@
#include /* for uint32_t*/
+#include "keybindings.h"
struct WinMeta;
+struct WinConf;
struct Win;
struct KeyBinding;
struct KeysWinData;
@@ -19,22 +21,12 @@ struct MonsterDef;
-struct Wins
-{
- struct WinMeta * meta;
- struct Win * keys;
- struct Win * info;
- struct Win * log;
- struct Win * map;
-};
-
-
-
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. */
@@ -45,7 +37,10 @@ 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 Wins wins; /* Pointers to WinMeta, individual Wins.*/
+ 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. */
};