Unify Map struct common to server and client in src/common/map.h.

[plomrogue] / src / client / world.h

diff --git a/src/client/world.h b/src/client/world.h
index d27a0a3ff363ed23eb5161e18103fbe7dc68980f..8d490c85d9bd359c4330e492a88d8e8420df7627 100644 (file)
--- a/src/client/world.h
+++ b/src/client/world.h
@@ -9,7 +9,7 @@
 #include <stdint.h> /* uint8_t, uint16_t */
 #include <stdio.h> /* FILE */
 #include <sys/types.h> /* time_t */
-#include "map.h" /* struct Map */
+#include "../common/map.h" /* struct Map */
 #include "../common/yx_uint8.h" /* struct yx_uint8 */
 #include "keybindings.h" /* stuct KeyBindingDB */
 #include "command_db.h" /* struct CommandDB */
@@ -32,7 +32,6 @@ struct World
     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 */
     uint8_t halfdelay; /* how long to wait for getch() input in io_loop() */