Fixed other OOREF calls that caused mixed code and declarations

(cherry picked from commit 3a18965d3d6541498ad650f577a986ba9aa9cf88)

diff --git a/game/txt/changes/0.73p1 b/game/txt/changes/0.73p1
index 64bc8313a0f425a08114e2e1d16d3258ba472272..d1b3643fc65d84816c40aff625f4e3ffab89d1bf 100644 (file)
--- 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 c90b1eea9f68c94864c9dd7b843d0b52bb057b96..e4aacf4611527c2098379b660336da817ae05202 100644 (file)
--- 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 7d85ea0032dcfbe725670bf156ace7f57c219df5..e88be2c076c8fd4dab1f1460ee3e0aebdb01aa32 100644 (file)
--- 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);