From: Ari Johnson Date: Fri, 11 Jul 2008 19:43:46 +0000 (+0000) Subject: Re-order ooref calls in fun_speak X-Git-Url: https://git.theari.com/?a=commitdiff_plain;h=54c55b4e32918a969847af9f10518a0ffe503b91;p=cobramush.git Re-order ooref calls in fun_speak --- diff --git a/src/funstr.c b/src/funstr.c index a47d9b6..c90b1ee 100644 --- a/src/funstr.c +++ b/src/funstr.c @@ -2131,16 +2131,20 @@ FUNCTION(fun_speak) char *say_string; char *string; char rbuff[BUFFER_LEN]; + BEGINOOREF_L speaker = match_thing(executor, args[0]); if (speaker == NOTHING || speaker == AMBIGUOUS) { safe_str(T(e_match), buff, bp); + ENDOOREF_L return; } speaker_str = unparse_dbref(speaker); - if (!args[1] || !*args[1]) + if (!args[1] || !*args[1]) { + ENDOOREF_L return; + } string = args[1]; @@ -2149,7 +2153,6 @@ FUNCTION(fun_speak) else say_string = (char *) "says,"; - BEGINOOREF_L if (nargs > 3) { if (args[3] != '\0') { /* we have a transform attr */