X-Git-Url: https://plomlompom.com/repos/?a=blobdiff_plain;f=src%2Fclient%2Fworld.h;h=a71f772db401b0d7ea5b5adfd432ac5b97c42308;hb=739a39530d192f97828fa21f3eed062d66a193e1;hp=fb8ae4d7530b6a4ee02c93958c0ed05210ed393f;hpb=fb9b40f0535b28b37b64983240c4b78e74ee9a2c;p=plomrogue

diff --git a/src/client/world.h b/src/client/world.h
index fb8ae4d..a71f772 100644
--- a/src/client/world.h
+++ b/src/client/world.h
@@ -12,29 +12,30 @@
 #include "../common/yx_uint16.h" /* struct yx_uint16 */
 #include "keybindings.h" /* stuct KeyBindingDB */
 #include "command_db.h" /* struct CommandDB */
-#include "wincontrol.h" /* WinConfDB */
+#include "windows.h" /* WinDB */
 
 
 
 struct World
 {
-    struct WinConfDB wins;
-    struct CommandDB cmd_db;        /* Command database. */
-    struct KeyBindingDB kb_global;    /* Global keybindings. */
-    struct KeyBindingDB kb_wingeom;   /* Window geometry config keybindings. */
-    struct KeyBindingDB kb_winkeys; /* Window keybinding config keybindings.*/
-    struct Map map;                 /* Pointer to the game map cells. */
-    time_t last_update;
-    struct yx_uint16 player_pos;
-    char * log;
-    char * path_server_in;
-    char * path_interface_conf;
-    char * player_inventory;
-    uint16_t turn;
-    uint16_t score;
-    uint8_t halfdelay;
-    uint8_t player_inventory_select;
-    uint8_t player_lifepoints;
+    struct WinDB winDB; /* data for window management and individual windows */
+    struct CommandDB commandDB; /* data on commands from commands config file */
+    struct KeyBindingDB kb_global; /* globally availabe keybindings */
+    struct KeyBindingDB kb_wingeom; /* Win geometry config view keybindings */
+    struct KeyBindingDB kb_winkeys; /* Win keybindings config view keybindings*/
+    struct Map map; /* game map geometry and content */
+    time_t last_update; /* used for comparison with server outfile' mtime */
+    struct yx_uint16 player_pos; /* coordinates of player on map */
+    char * log; /* log of player's activities */
+    char * path_server_in; /* path of server's input fifo */
+    char * path_interface_conf; /* path of interface configuration file */
+    char * path_commands; /* path of commands config file */
+    char * player_inventory; /* one-item-per-line string list of owned items */
+    uint16_t turn; /* world/game turn */
+    uint16_t player_score; /* player's score*/
+    uint8_t halfdelay; /* how long to wait for getch() input in io_loop() */
+    uint8_t player_inventory_select; /* index of selected item in inventory */
+    uint8_t player_lifepoints; /* how alive the player is */
     uint8_t winch; /* if set, SIGWINCH was registered; trigger reset_windows()*/
 };