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

[plomrogue] / src / server / world.h

diff --git a/src/server/world.h b/src/server/world.h
index 3bea1f1cf4ce7a9e7084c2f3662515c7df6fbd95..47f7c65cb7670134fdc1c9cd939f44c5cd84746d 100644 (file)
--- a/src/server/world.h
+++ b/src/server/world.h
@@ -7,7 +7,8 @@
 #define MAIN_H
 
 #include <stdint.h> /* uint8_t, uint16_t, uint32_t */
-#include "../common/map.h" /* struct Map */
+#include <stdio.h> /* define FILE */
+#include "map.h" /* struct Map */
 struct MapObjDef;
 struct MapObjAct;
 struct MapObj;
@@ -16,24 +17,27 @@ struct MapObj;
 
 struct World
 {
+    FILE * file_in; /* Input stream on file at .path_in. */
+    FILE * file_out; /* Output stream on file at .path_out. */
     struct Map map;
     struct MapObjDef * map_obj_defs; /* Map object definitions. */
     struct MapObjAct * map_obj_acts; /* Map object action definitions. */
     struct MapObj * map_objs; /* Map objects. */
     char * log; /* Logs the game events from the player's view. */
-    char * path_in; /* Fifo to receive command messages. */
-    char * path_out; /* File to write the game state as visible to clients.*/
+    char * server_test; /* String uniquely identifying server process. */
+    char * path_in; /* File to write client messages into. */
+    char * path_out; /* File to write server messages into. */
+    char * path_worldstate; /* File to represent world state  to clients.*/
     char * path_record; /* Record file from which to read the game history. */
     char * path_map_obj_defs; /* path for map object definitions config file */
     char * path_map_obj_acts; /* path for map object actions config file */
     char * tmp_suffix; /* Appended to paths of files for their tmp versions. */
-    char * queue; /* Stores un-processed messages received via input fifo. */
+    char * queue; /* Stores un-processed messages read from the input file. */
     uint32_t queue_size;/* Length of .queue sequence of \0-terminated strings.*/
     uint32_t seed; /* Randomness seed. */
     uint16_t replay; /* Turn up to which to replay game. No replay if zero. */
     uint16_t turn; /* Current game turn. */
     uint16_t last_update_turn; /* Last turn the .path_out file was updated. */
-    uint16_t score; /* Player's score. */
     uint8_t is_verbose; /* Should server send debugging info to stdout? */
     uint8_t map_obj_count; /* Counts map objects generated so far. */
 };