X-Git-Url: https://plomlompom.com/repos/test.html?a=blobdiff_plain;f=src%2Fclient%2Fworld.h;h=508d1af53ab9fa300c9fae27564ced3757cff080;hb=6578cd2cba8e7f9cb4b8dd99b4670aaeccb337a7;hp=307f53f92d11098786cb58cd09071b505e1de1aa;hpb=d6093b3a7d57aa34d3ee2a84112c59328bf1feed;p=plomrogue
diff --git a/src/client/world.h b/src/client/world.h
index 307f53f..508d1af 100644
--- a/src/client/world.h
+++ b/src/client/world.h
@@ -7,9 +7,10 @@
#define WORLD_H
#include /* uint8_t, uint16_t */
+#include /* FILE */
#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 */
@@ -18,22 +19,21 @@
struct World
{
+ 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 */
- time_t last_update; /* used for comparison with server outfile' mtime */
- struct yx_uint16 player_pos; /* coordinates of player on map */
+ time_t last_update; /* used for comparison with worldstate file's mtime */
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 */