X-Git-Url: https://plomlompom.com/repos/?a=blobdiff_plain;f=src%2Fserver%2Fworld.h;h=6e941e60cbbe199284decf3dd54134957bf33b36;hb=c8841380b53dbd999061a8de399e71d5d8272fb0;hp=dcd672aa38c1de2cf1abad5954fb9a6562828b3b;hpb=cc4ed0c49279f08a053a3e3a9a4acba22283a01f;p=plomrogue

diff --git a/src/server/world.h b/src/server/world.h
index dcd672a..6e941e6 100644
--- a/src/server/world.h
+++ b/src/server/world.h
@@ -8,10 +8,10 @@
 
 #include <stdint.h> /* uint8_t, uint16_t, uint32_t */
 #include <stdio.h> /* define FILE */
-#include "map.h" /* struct Map */
-struct MapObjDef;
-struct MapObjAct;
-struct MapObj;
+#include "../common/map.h" /* struct Map */
+struct ThingType;
+struct ThingAction;
+struct Thing;
 
 
 
@@ -19,26 +19,22 @@ 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. */
+    struct Map map; /* Game map. */
+    struct ThingType * thing_types; /* Thing type definitions. */
+    struct ThingAction * thing_actions; /* Thing action definitions. */
+    struct Thing * things; /* All physical things of the game world. */
     char * log; /* Logs the game events from the player's view. */
     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_config; /* Path for map object (action) definitions file. */
-    char * tmp_suffix; /* Appended to paths of files for their tmp versions. */
     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. */
+    uint32_t seed_map; /* Map 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. */
+    uint8_t do_update; /* Update worldstate file if !0. */
+    uint8_t exists; /* If !0, remake_world() has been run successfully. */
+    uint8_t player_type; /* Thing type that player will start as. */
     uint8_t is_verbose; /* Should server send debugging info to stdout? */
-    uint8_t map_obj_count; /* Counts map objects generated so far. */
 };
 
 extern struct World world;