From: Rick L Bird <nveid@yahoo.com>
Date: Fri, 6 May 2011 04:39:30 +0000 (-0400)
Subject: No issue referenced with this.
X-Git-Url: https://git.theari.com/?a=commitdiff_plain;h=63670730effc34ecc0ad4c1c55c08716412985f5;p=cobramush.git

No issue referenced with this.

This covers the prototypes for messageformat in externs.h
                        and
The Admin() macro which wasn't used much needed parenthesis around
the level checks to suppress certain warnings.
---

diff --git a/hdrs/dbdefs.h b/hdrs/dbdefs.h
index 3675556..4e91e0f 100644
--- a/hdrs/dbdefs.h
+++ b/hdrs/dbdefs.h
@@ -205,7 +205,7 @@ extern dbref first_free;        /* pointer to free list */
 #define God(x)          OOREF(x,TC_God(x),TC_God(ooref))
 #define TC_Director(x)  (God(x) || (LEVEL(x) >= LEVEL_DIRECTOR && div_powover(x,x,"Privilege")))
 #define Director(x)     OOREF(x,TC_Director(x),TC_Director(ooref))
-#define TC_Admin(x)     (LEVEL(x) >= LEVEL_ADMIN && div_powover(x,x,"Privilege"))
+#define TC_Admin(x)     ((LEVEL(x) >= LEVEL_ADMIN) && div_powover(x,x,"Privilege"))
 #define Admin(x)        OOREF(x,TC_Admin(x), TC_Admin(ooref))
 
 #define IsQuiet(x)      (Quiet(x) || Quiet(Owner(x)))
diff --git a/hdrs/externs.h b/hdrs/externs.h
index 08ff6f2..6796ddb 100644
--- a/hdrs/externs.h
+++ b/hdrs/externs.h
@@ -442,6 +442,11 @@ extern void notify_except(dbref first, dbref exception, const char *msg,
                           int flags);
 extern void notify_except2(dbref first, dbref exc1, dbref exc2,
                            const char *msg, int flags);
+int vmessageformat(dbref player, const char *attribute,
+                   dbref executor, int flags, int nargs, ...);
+int messageformat(dbref player, const char *attribute,
+                  dbref executor, int flags, int nargs, char *argv[]);
+
 /* Return thing/PREFIX + msg */
 extern void make_prefixstr(dbref thing, const char *msg, char *tbuf1);
 extern int filter_found(dbref thing, const char *msg, int flag);