From 928ef02c73842f80cbf287bfb24fa97dff59072e Mon Sep 17 00:00:00 2001 From: Christian Heller Date: Tue, 25 Mar 2014 16:28:43 +0100 Subject: [PATCH] confserver/defs -> confserver/map_objects; fixed debug values in there. --- TODO | 4 ---- confserver/{defs => map_objects} | 4 ++-- src/server/main.c | 2 +- 3 files changed, 3 insertions(+), 7 deletions(-) rename confserver/{defs => map_objects} (97%) diff --git a/TODO b/TODO index bc87d09..971c47a 100644 --- a/TODO +++ b/TODO @@ -13,8 +13,6 @@ SERVER: - implement field of view / line of sight and obstacles for those on the map -- get rid of the hard-coding of the MAGIC MEAT item type and its use mode - - is it actually useful to define map object action ids in the config file? - make shape of map (and diagonal movement penalty) configurable in config file @@ -22,8 +20,6 @@ SERVER: - for game continuation, replace re-playing of whole record files with loading game state snapshots / save files -- rename confserver/defs to confserver/map_objects - CLIENT: - enable toggling of window borders diff --git a/confserver/defs b/confserver/map_objects similarity index 97% rename from confserver/defs rename to confserver/map_objects index 2ca0d5c..c258e79 100644 --- a/confserver/defs +++ b/confserver/map_objects @@ -1,7 +1,7 @@ 0 5 @ -105 +5 HUMAN 0 %% @@ -45,5 +45,5 @@ SKELETON m 0 MAGIC MEAT -5 +2 %% diff --git a/src/server/main.c b/src/server/main.c index 0c1e639..9bfddae 100644 --- a/src/server/main.c +++ b/src/server/main.c @@ -35,7 +35,7 @@ int main(int argc, char ** argv) exit_err(-1 == test, printf_err); } } - world.path_map_obj_defs = "confserver/defs"; + world.path_map_obj_defs = "confserver/map_objects"; world.path_map_obj_acts = "confserver/map_object_actions"; world.path_worldstate = "server/worldstate"; world.path_out = "server/out"; -- 2.30.2