X-Git-Url: https://plomlompom.com/repos/?a=blobdiff_plain;f=src%2Fclient%2Fworld.h;h=5b92f2e6ba046f19b0479264825cbd27811f2da3;hb=f8c8dd2e9da8323251fae5e464098228d1dcce60;hp=a71f772db401b0d7ea5b5adfd432ac5b97c42308;hpb=b6c140e3bd19ede26e3992c03c576515487f0a10;p=plomrogue

diff --git a/src/client/world.h b/src/client/world.h
index a71f772..5b92f2e 100644
--- a/src/client/world.h
+++ b/src/client/world.h
@@ -8,8 +8,8 @@
 
 #include <stdint.h> /* uint8_t, uint16_t */
 #include <sys/types.h> /* time_t */
-#include "../common/map.h" /* struct Map */
-#include "../common/yx_uint16.h" /* struct yx_uint16 */
+#include "map.h" /* struct Map */
+#include "../common/yx_uint8.h" /* struct yx_uint8 */
 #include "keybindings.h" /* stuct KeyBindingDB */
 #include "command_db.h" /* struct CommandDB */
 #include "windows.h" /* WinDB */
@@ -25,14 +25,14 @@ struct World
     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_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 * delim; /* delimiter for multi-line blocks in config files */
+    struct yx_uint8 player_pos; /* coordinates of player on map */
     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 */