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 3675556cbf256123df0eeacb1d5e67ddfdf4924e..4e91e0fcaacd36a53a64af4354e66fe0b00f1ab2 100644 (file)
--- 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 08ff6f29cb9e3852015ad77feea7bcf0ff9a52fb..6796ddb80dd63acce713d3db0aa99de20bed38fc 100644 (file)
--- 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);