X-Git-Url: https://plomlompom.com/repos/?a=blobdiff_plain;f=src%2Fserver%2Fconfigfile.c;h=ca1b07f840e8117e7f83aa97e81be6c3f62b8062;hb=997edd45d2002dc021d1d74a12473e6055a82a75;hp=fc2c771f42d952a3c5c5721d8dd533153ee264f1;hpb=4266e8b48fc5481ce24c0bf02fdd517217f8390a;p=plomrogue diff --git a/src/server/configfile.c b/src/server/configfile.c index fc2c771..ca1b07f 100644 --- a/src/server/configfile.c +++ b/src/server/configfile.c @@ -8,20 +8,22 @@ #include "../common/parse_file.h" /* EDIT_STARTED, parsetest_int(),parse_file(), * parsetest_too_many_values(),parse_id_uniq() * parse_unknown_arg(), parse_init_entry(), - * parse_and_reduce_to_readyflag(),parse_val() + * parse_and_reduce_to_readyflag(), + * parse_flagval() */ #include "../common/rexit.h" /* exit_err(), exit_trouble() */ #include "../common/try_malloc.h" /* try_malloc() */ -#include "cleanup.h" /* set_cleanup_flag(), CLEANUP_MAP_OBJ_DEFS, - * CLEANUP_MAP_OBJ_ACTS +#include "cleanup.h" /* set_cleanup_flag(), CLEANUP_THING_TYPES, + * CLEANUP_THING_ACTIONS */ -#include "map_object_actions.h" /* MapObjAct */ -#include "map_objects.h" /* MapObj, MapObjDef, struct MapObjDef */ +#include "hardcoded_strings.h" /* s */ +#include "thing_actions.h" /* ThingAction */ +#include "things.h" /* Thing, ThingType */ #include "world.h" /* world global */ -/* Flags defining state of object and action entry reading ((un-)finished / +/* Flags defining state of thing type and action entry reading ((un-)finished / * ready for starting the reading of a new definition etc.) */ enum flag @@ -35,16 +37,15 @@ enum flag 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 | START_N_SET, - READY_MAP = HEIGHT_SET | WIDTH_SET + READY_ACTION = NAME_SET | EFFORT_SET, + READY_THING = NAME_SET | CORPSE_ID_SET | SYMBOL_SET | LIFEPOINTS_SET + | CONSUMABLE_SET | START_N_SET }; -/* What MapObjDef and MapObjAct structs have in common at their top. Use this to - * allow same functions run over structs of both types. +/* What ThingType and ThingAction structs have in common at their top. Use this + * to allow same functions run over structs of both types. */ struct EntryHead { @@ -54,13 +55,13 @@ struct EntryHead -/* Interpret "token0" and "token1" as data to write into the MapObjAct / - * MapObjDef DB. +/* Interpret "token0" and "token1" as data to write into the ThingAction / + * ThingType DB. * - * Individual MapObjDef / MapObjAct DB entries are put together line by line + * Individual ThingType / ThingAction DB entries are put together line by line * before being written. Writing only happens after all necessary members of an * entry have been assembled, and when additionally a) a new entry is started by - * a "token0" of "ACTION" or "OBJECT"; or b) "token0" is NULL. + * a "token0" of "ACTION" or "THINGTYPE"; or b) "token0" is NULL. * * Also check against the line parse_file() read tokens from having more tokens. */ @@ -76,85 +77,78 @@ static uint8_t start_entry(char * token0, char * token1, char * comparand, struct EntryHead ** entry, struct EntryHead * entry_cmp); -/* Start reading map definition if "token0" matches "comparand". Set "map_flags" - * to EDIT_STARTED to mark beginning of map definition reading. - */ -static uint8_t start_map(char * token0, char * comparand, uint8_t * map_flags); - /* Write DB entry pointed to by "entry" to its appropriate location. */ static void write_if_entry(struct EntryHead ** entry, struct EntryHead *** entry_p_p_p); -/* Ensure that all .corpse_id members in the MapObjDef DB fit .id members of - * MapObjDef DB entries. +/* Ensure that all .corpse_id members in the ThingType DB fit .id members of + * ThingType DB entries. */ 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); +/* If "token0" matches "comparand", set world.map.length to int in "token1". */ +static uint8_t set_map_length(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 - * "token0". Return 1 if interpretation succeeds, else 0. + * be "tt" or "ta". What member of which of the two is set depends on which of + * the flags has EDIT_STARTED set and on the key name in "token0". Return 1 if + * interpretation succeeds, else 0. * - * Note that MapObjAct entries' .name also determines their .func. + * Note that ThingAction entries' .name also determines their .func. */ -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); +static uint8_t set_members(char * token0, char * token1, + uint8_t * thing_flags, uint8_t * action_flags, + struct ThingType * tt, struct ThingAction * ta); -/* If "name" fits "moa"->name, set "moa"->func to "func". (Derives MapObjAct +/* If "name" fits "ta"->name, set "ta"->func to "func". (Derives ThingAction * .func from .name for set_members(). */ -static uint8_t try_func_name(struct MapObjAct * moa, - char * name, void (* func) (struct MapObj *)); +static uint8_t try_func_name(struct ThingAction * ta, + char * name, void (* func) (struct Thing *)); static void tokens_into_entries(char * token0, char * token1) { - char * str_act = "ACTION"; - char * str_obj = "OBJECT"; - char * str_map = "MAP_TYPE"; + char * str_action = "ACTION"; + char * str_thing = "THINGTYPE"; 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; - static uint8_t object_flags = READY_OBJ; - static uint8_t map_flags = READY_MAP; - 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_player)) + char * str_map_length = "MAP_LENGTH"; + static struct ThingAction ** ta_p_p = &world.thing_actions; + static struct ThingType ** tt_p_p = &world.thing_types; + static uint8_t action_flags = READY_ACTION; + static uint8_t thing_flags = READY_THING; + static struct EntryHead * ta = NULL; + static struct EntryHead * tt = NULL; + if (!token0 || !strcmp(token0, str_action) || !strcmp(token0, str_thing) + || !strcmp(token0, str_player)) { - parse_and_reduce_to_readyflag(&action_flags, READY_ACT); - parse_and_reduce_to_readyflag(&object_flags, READY_OBJ); - parse_and_reduce_to_readyflag(&map_flags, READY_MAP); - write_if_entry(&moa, (struct EntryHead ***) &moa_p_p); - write_if_entry(&mod, (struct EntryHead ***) &mod_p_p); + parse_and_reduce_to_readyflag(&action_flags, READY_ACTION); + parse_and_reduce_to_readyflag(&thing_flags, READY_THING); + write_if_entry(&ta, (struct EntryHead ***) &ta_p_p); + write_if_entry(&tt, (struct EntryHead ***) &tt_p_p); } 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)) + if (start_entry(token0, token1, str_action, &action_flags, + sizeof(struct ThingAction), (struct EntryHead**) &ta, + (struct EntryHead *) world.thing_actions)) { 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) + else if (!( start_entry(token0, token1, str_thing, &thing_flags, + sizeof(struct ThingType), + (struct EntryHead**) &tt, + (struct EntryHead *) world.thing_types) || set_player_type(token0, str_player, token1) - || set_members(token0, token1, &object_flags, &action_flags, - &map_flags, (struct MapObjDef *)mod, - (struct MapObjAct *) moa))) + || set_map_length(token0, str_map_length, token1) + || set_members(token0, token1, &thing_flags, &action_flags, + (struct ThingType *) tt, + (struct ThingAction *) ta))) { parse_unknown_arg(); } @@ -184,18 +178,6 @@ static uint8_t start_entry(char * token0, char * token1, char * comparand, -static uint8_t start_map(char * token0, char * comparand, uint8_t * map_flags) -{ - if (strcmp(token0, comparand)) - { - return 0; - } - *map_flags = EDIT_STARTED; - return 1; -} - - - static void write_if_entry(struct EntryHead ** entry, struct EntryHead *** entry_p_p_p) { @@ -213,16 +195,16 @@ static void write_if_entry(struct EntryHead ** entry, static void test_corpse_ids() { char * f_name = "test_corpse_ids()"; - char * prefix = "In the object definitions DB, one object corpse ID does " - "not reference any known object in the DB. ID of " - "responsible object: "; + char * prefix = "In the thing types DB, one thing corpse ID does not " + "reference any known thing type in the DB. ID of " + "responsible thing type: "; size_t size = strlen(prefix) + 3 + 1; /* 3: uint8_t representation strlen */ char * err_corpse = try_malloc(size, f_name); - struct MapObjDef * test_entry_0 = world.map_obj_defs; + struct ThingType * test_entry_0 = world.thing_types; for (; test_entry_0; test_entry_0 = test_entry_0->next) { uint8_t corpse_id_found = 0; - struct MapObjDef * test_entry_1 = world.map_obj_defs; + struct ThingType * test_entry_1 = world.thing_types; for (; test_entry_1; test_entry_1 = test_entry_1->next) { if (test_entry_0->corpse_id == test_entry_1->id) @@ -239,68 +221,66 @@ static void test_corpse_ids() -static uint8_t set_map_members(char * token0, char * token1,uint8_t * map_flags) +static uint8_t set_player_type(char * token0, char * comparand, char * token1) { - if ( parse_val(token0, token1, "HEIGHT", map_flags, - HEIGHT_SET, 'i', (char *) &world.map.size.y) - || parse_val(token0, token1, "WIDTH", map_flags, - WIDTH_SET, 'i', (char *) &world.map.size.x)) + if (strcmp(token0, comparand)) { - int test = atoi(token1) > 256 || atoi(token1) < 1; - err_line(test, "Value must be >= 1 and <= 256."); - return 1; + return 0; } - return 0; + parsetest_int(token1, '8'); + world.player_type = atoi(token1); + return 1; } -static uint8_t set_player_type(char * token0, char * comparand, char * token1) +static uint8_t set_map_length(char * token0, char * comparand, char * token1) { if (strcmp(token0, comparand)) { return 0; } - parsetest_int(token1, '8'); - world.player_type = atoi(token1); + parsetest_int(token1, 'i'); + int test = atoi(token1) > 256 || atoi(token1) < 1; + err_line(test, "Value must be >= 1 and <= 256."); + world.map.length = atoi(token1); return 1; } -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) +static uint8_t set_members(char * token0, char * token1, uint8_t * thing_flags, + uint8_t * action_flags, + struct ThingType * tt, struct ThingAction * ta) { if ( *action_flags & EDIT_STARTED - && parse_val(token0, token1, "NAME", action_flags, - NAME_SET, 's', (char *) &moa->name)) + && parse_flagval(token0, token1, "NAME", action_flags, + NAME_SET, 's', (char *) &ta->name)) { - if (!( try_func_name(moa, "move", actor_move) - || try_func_name(moa, "pick_up", actor_pick) - || try_func_name(moa, "drop", actor_drop) - || try_func_name(moa, "use", actor_use))) + if (!( try_func_name(ta, s[S_CMD_MOVE], actor_move) + || try_func_name(ta, s[S_CMD_PICKUP], actor_pick) + || try_func_name(ta, s[S_CMD_DROP], actor_drop) + || try_func_name(ta, s[S_CMD_USE], actor_use))) { - moa->func = actor_wait; + ta->func = actor_wait; } *action_flags = *action_flags | NAME_SET; return 1; } - else if ( set_map_members(token0, token1, map_flags) - || parse_val(token0, token1, "NAME", object_flags, - NAME_SET, 's', (char *) &mod->name) - || parse_val(token0, token1, "SYMBOL", 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, - CONSUMABLE_SET, '8', (char *) &mod->consumable) - || parse_val(token0, token1, "CORPSE_ID", object_flags, - CORPSE_ID_SET, '8', (char *) &mod->corpse_id)) + else if ( parse_flagval(token0, token1, "NAME", thing_flags, + NAME_SET, 's', (char *) &tt->name) + || parse_flagval(token0, token1, "SYMBOL", thing_flags, + SYMBOL_SET, 'c', (char *) &tt->char_on_map) + || parse_flagval(token0, token1, "EFFORT", action_flags, + EFFORT_SET, '8', (char *) &ta->effort) + || parse_flagval(token0, token1, "START_NUMBER", thing_flags, + START_N_SET, '8', (char *) &tt->start_n) + || parse_flagval(token0, token1, "LIFEPOINTS", thing_flags, + LIFEPOINTS_SET, '8', (char *) &tt->lifepoints) + || parse_flagval(token0, token1, "CONSUMABLE", thing_flags, + CONSUMABLE_SET, '8', (char *) &tt->consumable) + || parse_flagval(token0, token1, "CORPSE_ID", thing_flags, + CORPSE_ID_SET, '8', (char *) &tt->corpse_id)) { return 1; } @@ -309,12 +289,12 @@ static uint8_t set_members(char * token0, char * token1, uint8_t * object_flags, -static uint8_t try_func_name(struct MapObjAct * moa, char * name, - void (* func) (struct MapObj *)) +static uint8_t try_func_name(struct ThingAction * ta, char * name, + void (* func) (struct Thing *)) { - if (0 == strcmp(moa->name, name)) + if (0 == strcmp(ta->name, name)) { - moa->func = func; + ta->func = func; return 1; } return 0; @@ -324,19 +304,19 @@ static uint8_t try_func_name(struct MapObjAct * moa, char * name, 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."); + parse_file(s[S_PATH_CONFIG], tokens_into_entries); + exit_err(!world.map.length, "Map size 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) + struct ThingType * tt; + for (tt = world.thing_types; NULL != tt; tt = tt->next) { - if (world.player_type == mod->id) + if (world.player_type == tt->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); + exit_err(!player_type_is_valid, "No valid thing type set for player."); + set_cleanup_flag(CLEANUP_THING_ACTIONS | CLEANUP_THING_TYPES); test_corpse_ids(); }