Make grids hexagonal, remove all diagonal movement penalty hassle.

[plomrogue] / src / server / configfile.c

diff --git a/src/server/configfile.c b/src/server/configfile.c
index aad3b7417e6f53823f91258dcd38759f5603d07a..fc2c771f42d952a3c5c5721d8dd533153ee264f1 100644 (file)
--- a/src/server/configfile.c
+++ b/src/server/configfile.c
@@ -28,8 +28,6 @@ enum flag
 {
     HEIGHT_SET     = 0x02,
     WIDTH_SET      = 0x04,
-    ORTH_SET       = 0x08,
-    DIAG_SET       = 0x10,
     NAME_SET       = 0x02,
     EFFORT_SET     = 0x04,
     CORPSE_ID_SET  = 0x04,
@@ -40,7 +38,7 @@ enum flag
     READY_ACT = NAME_SET | EFFORT_SET,
     READY_OBJ = NAME_SET | CORPSE_ID_SET | SYMBOL_SET | LIFEPOINTS_SET
                 | CONSUMABLE_SET | START_N_SET,
-    READY_MAP = HEIGHT_SET | WIDTH_SET | ORTH_SET | DIAG_SET
+    READY_MAP = HEIGHT_SET | WIDTH_SET
 };
 
 
@@ -92,6 +90,9 @@ static void write_if_entry(struct EntryHead ** entry,
  */
 static void test_corpse_ids();
 
+/* set_members() helper specifically for editing world.map members. */
+static uint8_t set_map_members(char * token0,char * token1,uint8_t * map_flags);
+
 /* If "token0" matches "comparand", set world.player_type to int in "token1". */
 static uint8_t set_player_type(char * token0, char * comparand, char * token1);
 
@@ -106,9 +107,6 @@ static uint8_t set_members(char * token0, char * token1, uint8_t * object_flags,
                            uint8_t * action_flags, uint8_t * map_flags,
                            struct MapObjDef * mod, struct MapObjAct * moa);
 
-/* set_members() helper specifically for editing world.map members. */
-static uint8_t set_map_members(char * token0,char * token1,uint8_t * map_flags);
-
 /* If "name" fits "moa"->name, set "moa"->func to "func". (Derives MapObjAct
  * .func from .name for set_members().
  */
@@ -142,17 +140,21 @@ static void tokens_into_entries(char * token0, char * token1)
     if (token0)
     {
         parsetest_too_many_values();
-        if (!(   start_entry(token0, token1, str_act, &action_flags,
-                             sizeof(struct MapObjAct),(struct EntryHead**) &moa,
-                             (struct EntryHead *) world.map_obj_acts)
-              || start_entry(token0, token1, str_obj, &object_flags,
-                             sizeof(struct MapObjDef),(struct EntryHead**) &mod,
-                             (struct EntryHead *) world.map_obj_defs)
-              || start_map(token0, str_map, &map_flags)
-              || set_player_type(token0, str_player, token1)
-              || set_members(token0, token1, &object_flags, &action_flags,
-                              &map_flags, (struct MapObjDef *)mod,
-                              (struct MapObjAct *) moa)))
+        if (start_entry(token0, token1, str_act, &action_flags,
+                        sizeof(struct MapObjAct), (struct EntryHead**) &moa,
+                        (struct EntryHead *) world.map_obj_acts))
+        {
+            err_line(0 == atoi(token1), "Value must not be 0.");
+        }
+        else if (!(   start_entry(token0, token1, str_obj, &object_flags,
+                                  sizeof(struct MapObjDef),
+                                  (struct EntryHead**) &mod,
+                                  (struct EntryHead *) world.map_obj_defs)
+                   || start_map(token0, str_map, &map_flags)
+                   || set_player_type(token0, str_player, token1)
+                   || set_members(token0, token1, &object_flags, &action_flags,
+                                  &map_flags, (struct MapObjDef *)mod,
+                                  (struct MapObjAct *) moa)))
         {
             parse_unknown_arg();
         }
@@ -237,7 +239,7 @@ static void test_corpse_ids()
 
 
 
-static uint8_t set_map_members(char * token0, char * token1, uint8_t * map_flags)
+static uint8_t set_map_members(char * token0, char * token1,uint8_t * map_flags)
 {
     if      (   parse_val(token0, token1, "HEIGHT", map_flags,
                           HEIGHT_SET, 'i', (char *) &world.map.size.y)
@@ -248,14 +250,6 @@ static uint8_t set_map_members(char * token0, char * token1, uint8_t * map_flags
         err_line(test, "Value must be >= 1 and <= 256.");
         return 1;
     }
-    else if (    parse_val(token0, token1, "DIST_ORTHOGONAL", map_flags,
-                           ORTH_SET, '8', (char *) &world.map.dist_orthogonal)
-             ||  parse_val(token0, token1, "DIST_DIAGONAL", map_flags,
-                           DIAG_SET, '8', (char *) &world.map.dist_diagonal))
-    {
-        err_line(0 == atoi(token1), "Value must not be zero.");
-        return 1;
-    }
     return 0;
 }