X-Git-Url: https://plomlompom.com/repos/?a=blobdiff_plain;f=src%2Fclient%2Fcommand_db.c;h=a7523b79a1a40b2863eac2dbc3dc45cf60fd3527;hb=04ae91b82c603f0928d94a94df3a322a7af8b971;hp=29ef83dbbea5d59a8f15b656e60b4fa8aa6bfc3c;hpb=d361b21fb63d9e1fd2ff7774c2322fab3e4eb239;p=plomrogue diff --git a/src/client/command_db.c b/src/client/command_db.c index 29ef83d..a7523b7 100644 --- a/src/client/command_db.c +++ b/src/client/command_db.c @@ -6,12 +6,12 @@ #include /* uint8_t */ #include /* free() */ #include /* strcmp(), strdup() */ -#include "../common/parse_file.h" /* EDIT_STARTED,parse_init_entry(), - * parse_id_uniq(), parse_unknown_arg(), - * parsetest_too_many_values(), parse_file(), - * parse_and_reduce_to_readyflag(),parse_val() - */ #include "array_append.h" /* array_append() */ +#include "parse.h" /* EDIT_STARTED, parse_init_entry(), parse_id_uniq(), + * parse_unknown_arg(), parsetest_too_many_values(), + * parse_file(), parse_and_reduce_to_readyflag(), + * parse_flagval() + */ #include "world.h" /* global world */ #include "cleanup.h" /* set_cleanup_flag() */ @@ -66,12 +66,12 @@ static void tokens_into_entries(char * token0, char * token1) cmd->dsc_short = strdup(token1); parse_id_uniq(NULL != get_command(cmd->dsc_short)); } - else if (!( parse_val(token0, token1, "DESCRIPTION", &cmd_flags, - DESC_SET, 's', (char *) &cmd->dsc_long) - || parse_val(token0, token1, "SERVER_COMMAND", &cmd_flags, - SERVERCMD_SET, 's', (char *) &cmd->server_msg) - || parse_val(token0, token1, "SERVER_ARGUMENT", &cmd_flags, - SERVERARG_SET, 'c', (char *) &cmd->arg))) + else if (!( parse_flagval(token0, token1, "DESCRIPTION", &cmd_flags, + DESC_SET, 's', (char *) &cmd->dsc_long) + || parse_flagval(token0, token1,"SERVER_COMMAND", &cmd_flags, + SERVERCMD_SET, 's',(char *)&cmd->server_msg) + || parse_flagval(token0, token1,"SERVER_ARGUMENT",&cmd_flags, + SERVERARG_SET, 'c', (char *) &cmd->arg))) { parse_unknown_arg(); }