X-Git-Url: https://plomlompom.com/repos/foo.html?a=blobdiff_plain;f=src%2Fclient%2Fworld.h;h=5b92f2e6ba046f19b0479264825cbd27811f2da3;hb=65d60eba28c8e3128e1603e577c1436a2182f6bd;hp=307f53f92d11098786cb58cd09071b505e1de1aa;hpb=d6093b3a7d57aa34d3ee2a84112c59328bf1feed;p=plomrogue
diff --git a/src/client/world.h b/src/client/world.h
index 307f53f..5b92f2e 100644
--- a/src/client/world.h
+++ b/src/client/world.h
@@ -8,8 +8,8 @@
#include /* uint8_t, uint16_t */
#include /* 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,15 +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; /* 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 */