Merged Win and WinConf structs, windows.h and wincontrol.h. Also lots of refactoring...

[plomrogue] / src / client / world.h

diff --git a/src/client/world.h b/src/client/world.h
index 80fae714974463649060b0672f48ddb68630303c..9e07efa3a85efa6e31e777c6d729e3de1572e15b 100644 (file)
--- a/src/client/world.h
+++ b/src/client/world.h
@@ -12,15 +12,13 @@
 #include "../common/yx_uint16.h" /* struct yx_uint16 */
 #include "keybindings.h" /* stuct KeyBindingDB */
 #include "command_db.h" /* struct CommandDB */
-#include "windows.h" /* struct WinMeta */
-#include "wincontrol.h" /* WinConfDB */
+#include "windows.h" /* WinDB */
 
 
 
 struct World
 {
-    struct WinMeta wmeta;
-    struct WinConfDB winconf_db;
+    struct WinDB windb;
     struct CommandDB cmd_db;        /* Command database. */
     struct KeyBindingDB kb_global;    /* Global keybindings. */
     struct KeyBindingDB kb_wingeom;   /* Window geometry config keybindings. */
@@ -30,6 +28,7 @@ struct World
     struct yx_uint16 player_pos;
     char * log;
     char * path_server_in;
+    char * path_interface_conf;
     char * player_inventory;
     uint16_t turn;
     uint16_t score;