Fixed conflict between NA_INTER_LOCK and NA_EVALONCONTACT

diff --git a/game/txt/changes.txt b/game/txt/changes.txt
index bc05afece5959069e204320444ac160a635798c7..f58ea7c8895e8e064809d594216c309d3fb20cd4 100644 (file)
--- a/game/txt/changes.txt
+++ b/game/txt/changes.txt
@@ -19,6 +19,7 @@ CobraMUSH Version 0.72p1
       isn't detected on certain servers. [RLB]
     * Fixed notify bug that caused the chat system to crash [AEJ]
     * Fixed second notify bug that caused the chat system to crash [AEJ]
+    * Fixed conflict between NA_INTER_LOCK and NA_EVALONCONTACT [AEJ]
 
 & 0.72
 CobraMUSH Version 0.72

diff --git a/hdrs/externs.h b/hdrs/externs.h
index 896ca6da8c0b02f8a9b3bc669f37a7db384fea50..b5928ba2e605c573637abf59b694b77e87a51813 100644 (file)
--- a/hdrs/externs.h
+++ b/hdrs/externs.h
@@ -128,7 +128,7 @@ extern void sql_shutdown(void);
 #define NA_INTER_LOCK  0x10000         /**< Message subject to @lock/interact even if not otherwise marked */
 #define NA_INTERACTION  (NA_INTER_HEAR|NA_INTER_SEE|NA_INTER_PRESENCE|NA_INTER_LOCK)   /**< Message follows interaction rules */
 #define NA_SPOOF        0x8000 /**< @ns* message, overrides NOSPOOF */
-#define NA_EVALONCONTACT 0x10000
+#define NA_EVALONCONTACT 0x20000
 
 /** A notify_anything lookup function type definition */
 typedef dbref (*na_lookup) (dbref, void *);