From 74c3ac31fe986b6c8c91ad3ef64161058065a09c Mon Sep 17 00:00:00 2001 From: Ari Johnson Date: Mon, 11 Sep 2006 14:24:21 +0000 Subject: [PATCH] Fixed conflict between NA_INTER_LOCK and NA_EVALONCONTACT --- game/txt/changes.txt | 1 + hdrs/externs.h | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) 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 *); -- 2.30.2