X-Git-Url: https://plomlompom.com/repos/foo.html?a=blobdiff_plain;f=src%2Fserver%2Fconfigfile.c;h=fc2c771f42d952a3c5c5721d8dd533153ee264f1;hb=57a981d4fc0a6f24116c8fad753df57e168551ed;hp=1eb516560ab21bb5fb623bfb85710af3b55164dc;hpb=c5b561a819b971151d824e0aa9622f6fc074ff28;p=plomrogue
diff --git a/src/server/configfile.c b/src/server/configfile.c
index 1eb5165..fc2c771 100644
--- a/src/server/configfile.c
+++ b/src/server/configfile.c
@@ -15,8 +15,8 @@
#include "cleanup.h" /* set_cleanup_flag(), CLEANUP_MAP_OBJ_DEFS,
* CLEANUP_MAP_OBJ_ACTS
*/
-#include "map_object_actions.h" /* struct MapObjAct */
-#include "map_objects.h" /* struct MapObj, struct MapObjDef */
+#include "map_object_actions.h" /* MapObjAct */
+#include "map_objects.h" /* MapObj, MapObjDef, struct MapObjDef */
#include "world.h" /* world global */
@@ -28,18 +28,17 @@ enum flag
{
HEIGHT_SET = 0x02,
WIDTH_SET = 0x04,
- ORTH_SET = 0x08,
- DIAG_SET = 0x10,
NAME_SET = 0x02,
EFFORT_SET = 0x04,
CORPSE_ID_SET = 0x04,
SYMBOL_SET = 0x08,
LIFEPOINTS_SET = 0x10,
CONSUMABLE_SET = 0x20,
+ START_N_SET = 0x40,
READY_ACT = NAME_SET | EFFORT_SET,
READY_OBJ = NAME_SET | CORPSE_ID_SET | SYMBOL_SET | LIFEPOINTS_SET
- | CONSUMABLE_SET,
- READY_MAP = HEIGHT_SET | WIDTH_SET | ORTH_SET | DIAG_SET
+ | CONSUMABLE_SET | START_N_SET,
+ READY_MAP = HEIGHT_SET | WIDTH_SET
};
@@ -91,6 +90,12 @@ 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);
+
/* Try to read tokens as members for the definition currently edited, which may
* be "mod" or "moa" or that of world.map. What member of which of the three is
* set depends on which of the flags has EDIT_STARTED set and on the key name in
@@ -102,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().
*/
@@ -118,6 +120,7 @@ static void tokens_into_entries(char * token0, char * token1)
char * str_act = "ACTION";
char * str_obj = "OBJECT";
char * str_map = "MAP_TYPE";
+ char * str_player = "PLAYER_TYPE";
static struct MapObjAct ** moa_p_p = &world.map_obj_acts;
static struct MapObjDef ** mod_p_p = &world.map_obj_defs;
static uint8_t action_flags = READY_ACT;
@@ -126,7 +129,7 @@ static void tokens_into_entries(char * token0, char * token1)
static struct EntryHead * moa = NULL;
static struct EntryHead * mod = NULL;
if (!token0 || !strcmp(token0, str_act) || !strcmp(token0, str_obj)
- || !strcmp(token0, str_map))
+ || !strcmp(token0, str_map) || !strcmp(token0, str_player))
{
parse_and_reduce_to_readyflag(&action_flags, READY_ACT);
parse_and_reduce_to_readyflag(&object_flags, READY_OBJ);
@@ -137,16 +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_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();
}
@@ -231,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)
@@ -242,15 +250,20 @@ 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))
+ return 0;
+}
+
+
+
+static uint8_t set_player_type(char * token0, char * comparand, char * token1)
+{
+ if (strcmp(token0, comparand))
{
- err_line(0 == atoi(token1), "Value must not be zero.");
- return 1;
+ return 0;
}
- return 0;
+ parsetest_int(token1, '8');
+ world.player_type = atoi(token1);
+ return 1;
}
@@ -280,6 +293,8 @@ static uint8_t set_members(char * token0, char * token1, uint8_t * object_flags,
SYMBOL_SET, 'c', (char *) &mod->char_on_map)
|| parse_val(token0, token1, "EFFORT", action_flags,
EFFORT_SET, '8', (char *) &moa->effort)
+ || parse_val(token0, token1, "START_NUMBER", object_flags,
+ START_N_SET, '8', (char *) &mod->start_n)
|| parse_val(token0, token1, "LIFEPOINTS", object_flags,
LIFEPOINTS_SET, '8', (char *) &mod->lifepoints)
|| parse_val(token0, token1, "CONSUMABLE", object_flags,
@@ -311,6 +326,17 @@ extern void read_config_file()
{
parse_file(world.path_config, tokens_into_entries);
exit_err(!world.map.size.y, "Map not defined in config file.");
+ uint8_t player_type_is_valid = 0;
+ struct MapObjDef * mod;
+ for (mod = world.map_obj_defs; NULL != mod; mod = mod->next)
+ {
+ if (world.player_type == mod->id)
+ {
+ player_type_is_valid = 1;
+ break;
+ }
+ }
+ exit_err(!player_type_is_valid, "No valid map object type set for player.");
set_cleanup_flag(CLEANUP_MAP_OBJECT_ACTS | CLEANUP_MAP_OBJECT_DEFS);
test_corpse_ids();
}