X-Git-Url: https://plomlompom.com/repos/feed.xml?a=blobdiff_plain;f=src%2Fclient%2Fworld.h;h=bf4394a7624fca483be8f3b24c16b66acbb1c38d;hb=edebb2bf9aa780ee2f7006c1d2be9168564d34df;hp=4e92bb2341ea718e56e40f08e0416cdaa398707d;hpb=e8e8f91cff96eebc1b440df18d9c3ef4ced1ca60;p=plomrogue

diff --git a/src/client/world.h b/src/client/world.h
index 4e92bb2..bf4394a 100644
--- a/src/client/world.h
+++ b/src/client/world.h
@@ -7,37 +7,39 @@
 #define WORLD_H
 
 #include <stdint.h> /* uint8_t, uint16_t */
+#include <stdio.h> /* FILE */
 #include <sys/types.h> /* time_t */
 #include "../common/map.h" /* struct Map */
-#include "../common/yx_uint16.h" /* struct yx_uint16 */
+#include "../common/yx_uint8.h" /* struct yx_uint8 */
 #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 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;
+    FILE * file_server_in; /* server input file to write commands to */
+    FILE * file_server_out; /* server output file to read messages from */
+    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 of player's map view */
+    time_t last_update; /* used for comparison with worldstate file's mtime */
+    char * log; /* log of player's activities */
+    char * path_interface; /* 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 */
+    char * mem_map; /* map cells of player's map memory */
+    struct yx_uint8 player_pos; /* coordinates of player on map */
+    uint16_t turn; /* world/game turn */
+    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()*/
+    uint8_t focus_each_turn; /* if !0, re-focus map on player each new turn */
 };