From cbe1908a70db0447e07e6841281e73d3dba8f708 Mon Sep 17 00:00:00 2001 From: Cameron Reikes Date: Sat, 10 Jun 2023 23:38:51 -0700 Subject: [PATCH] Fixes? --- main.c | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/main.c b/main.c index 7518c85..5284e2f 100644 --- a/main.c +++ b/main.c @@ -1026,7 +1026,7 @@ MD_String8 is_action_valid(MD_Arena *arena, Entity *from, Action a) } if(!found) { - return FmtWithLint(arena, "Character you're talking to, '%s', isn't close enough to be talked to", characters[a.talking_to_kind].name); + return FmtWithLint(arena, "Character you're talking to, %s, isn't close enough to be talked to", characters[a.talking_to_kind].enum_name); } } @@ -1060,11 +1060,6 @@ MD_String8 is_action_valid(MD_Arena *arena, Entity *from, Action a) return MD_S8Lit("You can't leave the player unless you joined them."); } - if(a.kind == ACT_joins_player && from->standing == STANDING_JOINED) - { - return MD_S8Lit("You can't join the player, you've already joined them!"); - } - return (MD_String8){0}; } @@ -1564,7 +1559,7 @@ void reset_level() if(!found) { - PushWithLint(scratch.arena, &drama_errors, "Couldn't find NPC '%s' in the current map", characters[want].name); + PushWithLint(scratch.arena, &drama_errors, "Couldn't find NPC of kind %s in the current map", characters[want].enum_name); } } }