Server: Check against setting map object id of 0 in config file reading.

[plomrogue] / src / server / world.h

diff --git a/src/server/world.h b/src/server/world.h
index 47f7c65cb7670134fdc1c9cd939f44c5cd84746d..ed019f2fb25742f9e64b944d9eef71b3ac723119 100644 (file)
--- a/src/server/world.h
+++ b/src/server/world.h
@@ -29,8 +29,7 @@ struct World
     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 * 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.*/
@@ -38,6 +37,7 @@ struct World
     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 player_type; /* Map object 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. */
 };