Heavily re-structured initialization of windows and how individual windows are identi...

[plomrogue] / src / main.h

diff --git a/src/main.h b/src/main.h
index 0bd2cd8d860fbadb30c5483515748dfdc172949d..ee9fc9055c6377cd860607bb68b1004ff88b3a1f 100644 (file)
--- a/src/main.h
+++ b/src/main.h
@@ -10,6 +10,7 @@
 
 #include <stdint.h> /* for uint32_t*/
 struct WinMeta;
+struct WinConf;
 struct Win;
 struct KeyBinding;
 struct KeysWinData;
@@ -19,17 +20,6 @@ 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. */
@@ -46,7 +36,8 @@ struct World
     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 Wins wins;                 /* Pointers to WinMeta, individual Wins.*/
+    struct WinMeta * wmeta;           /* Pointer to window manager's WinMeta. */
+    struct WinConf * winconfs;        /* Pointer to windows' configurations. */
 };