From: Christian Heller <c.heller@plomlompom.de>
Date: Tue, 25 Mar 2014 15:28:43 +0000 (+0100)
Subject: confserver/defs -> confserver/map_objects; fixed debug values in there.
X-Git-Tag: tce~807
X-Git-Url: https://plomlompom.com/repos/te&quot;st.html?a=commitdiff_plain;h=928ef02c73842f80cbf287bfb24fa97dff59072e;p=plomrogue

confserver/defs -> confserver/map_objects; fixed debug values in there.
---

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/defs
deleted file mode 100644
index 2ca0d5c..0000000
--- a/confserver/defs
+++ /dev/null
@@ -1,49 +0,0 @@
-0
-5
-@
-105
-HUMAN
-0
-%%
-1
-4
-a
-1
-ANT
-0
-%%
-2
-5
-z
-3
-ZOMBIE
-0
-%%
-3
-6
-S
-9
-SHOGGOTH
-0
-%%
-4
-4
-#
-0
-DIRT
-0
-%%
-5
-4
-%
-0
-SKELETON
-0
-%%
-6
-4
-m
-0
-MAGIC MEAT
-5
-%%
diff --git a/confserver/map_objects b/confserver/map_objects
new file mode 100644
index 0000000..c258e79
--- /dev/null
+++ b/confserver/map_objects
@@ -0,0 +1,49 @@
+0
+5
+@
+5
+HUMAN
+0
+%%
+1
+4
+a
+1
+ANT
+0
+%%
+2
+5
+z
+3
+ZOMBIE
+0
+%%
+3
+6
+S
+9
+SHOGGOTH
+0
+%%
+4
+4
+#
+0
+DIRT
+0
+%%
+5
+4
+%
+0
+SKELETON
+0
+%%
+6
+4
+m
+0
+MAGIC MEAT
+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";