X-Git-Url: https://plomlompom.com/repos/foo.html?a=blobdiff_plain;f=src%2Fserver%2Fconfigfile.c;h=ca1b07f840e8117e7f83aa97e81be6c3f62b8062;hb=150b9f88a4c73caad8fcf0b850db8e52e4f4c6ae;hp=f6561aa53d08198ce122b88457d819f2a336063d;hpb=1452d43c6d7c89219cda91362da53ac8e4acb887;p=plomrogue
diff --git a/src/server/configfile.c b/src/server/configfile.c
index f6561aa..ca1b07f 100644
--- a/src/server/configfile.c
+++ b/src/server/configfile.c
@@ -257,10 +257,10 @@ static uint8_t set_members(char * token0, char * token1, uint8_t * thing_flags,
&& parse_flagval(token0, token1, "NAME", action_flags,
NAME_SET, 's', (char *) &ta->name))
{
- if (!( try_func_name(ta, s[CMD_MOVE], actor_move)
- || try_func_name(ta, s[CMD_PICKUP], actor_pick)
- || try_func_name(ta, s[CMD_DROP], actor_drop)
- || try_func_name(ta, s[CMD_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)))
{
ta->func = actor_wait;
}
@@ -304,7 +304,7 @@ static uint8_t try_func_name(struct ThingAction * ta, char * name,
extern void read_config_file()
{
- parse_file(s[PATH_CONFIG], tokens_into_entries);
+ 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 ThingType * tt;