Re-wrote large parts of the server client architecture. No more fifo.

[plomrogue] / src / client / world.h

diff --git a/src/client/world.h b/src/client/world.h
index 5b92f2e6ba046f19b0479264825cbd27811f2da3..d27a0a3ff363ed23eb5161e18103fbe7dc68980f 100644 (file)
--- a/src/client/world.h
+++ b/src/client/world.h
@@ -7,6 +7,7 @@
 #define WORLD_H
 
 #include <stdint.h> /* uint8_t, uint16_t */
+#include <stdio.h> /* FILE */
 #include <sys/types.h> /* time_t */
 #include "map.h" /* struct Map */
 #include "../common/yx_uint8.h" /* struct yx_uint8 */
@@ -18,15 +19,16 @@
 
 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 */
+    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 */