From 5ced810b05ba7b49f8a7658ea2c41b2da7e3739c Mon Sep 17 00:00:00 2001 From: Ari Johnson Date: Sat, 12 Jul 2008 15:33:42 +0000 Subject: [PATCH] Fixed other OOREF calls that caused mixed code and declarations (cherry picked from commit 3a18965d3d6541498ad650f577a986ba9aa9cf88) --- game/txt/changes/0.73p1 | 1 + src/funstr.c | 1 + src/funufun.c | 5 +++-- 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/game/txt/changes/0.73p1 b/game/txt/changes/0.73p1 index 64bc831..d1b3643 100644 --- a/game/txt/changes/0.73p1 +++ b/game/txt/changes/0.73p1 @@ -13,4 +13,5 @@ CobraMUSH Version 0.73p1 recursion depth [AEJ] * Fix compilation issue caused by OOREF calls being incorrectly placed in fun_speak [AEJ] + * Fixed other OOREF calls [AEJ] diff --git a/src/funstr.c b/src/funstr.c index c90b1ee..e4aacf4 100644 --- a/src/funstr.c +++ b/src/funstr.c @@ -2131,6 +2131,7 @@ FUNCTION(fun_speak) char *say_string; char *string; char rbuff[BUFFER_LEN]; + BEGINOOREF_L speaker = match_thing(executor, args[0]); diff --git a/src/funufun.c b/src/funufun.c index 7d85ea0..e88be2c 100644 --- a/src/funufun.c +++ b/src/funufun.c @@ -200,13 +200,14 @@ FUNCTION(fun_ulocal) char rbuff[BUFFER_LEN]; ufun_attrib ufun; + BEGINOOREF_L + if (!fetch_ufun_attrib(args[0], executor, &ufun, 0)) { safe_str(T(ufun.errmess), buff, bp); + ENDOOREF_L return; } - BEGINOOREF_L - /* Save global regs */ save_global_regs("ulocal.save", preserve); -- 2.30.2