From: Ari Johnson <ari@nveid.com>
Date: Mon, 11 Sep 2006 14:24:21 +0000 (+0000)
Subject: Fixed conflict between NA_INTER_LOCK and NA_EVALONCONTACT
X-Git-Tag: 0.72p1^0
X-Git-Url: https://git.theari.com/?a=commitdiff_plain;h=74c3ac31fe986b6c8c91ad3ef64161058065a09c;p=cobramush.git

Fixed conflict between NA_INTER_LOCK and NA_EVALONCONTACT
---

diff --git a/game/txt/changes.txt b/game/txt/changes.txt
index bc05afe..f58ea7c 100644
--- 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 896ca6d..b5928ba 100644
--- 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 *);