NoQuota power set to not be inheritable

(cherry picked from commit 6ac1a6c415dee73131494e9a785b28c1af353932)

diff --git a/game/txt/changes/0.72p2 b/game/txt/changes/0.72p2
index 55b440d18f8acacefb77a6ac6834146ca55d4f20..6d89ad3dad8f3f0f24b1a67e9c313321ae8fa1a8 100644 (file)
--- a/game/txt/changes/0.72p2
+++ b/game/txt/changes/0.72p2
@@ -8,3 +8,6 @@ CobraMUSH Version 0.72p2
   Version 0.72p2 is a bugfix/maintenance release of version 0.72.
   It is the second bugfix/maintenance release in that series.
 
+  Fixes:
+    * NoQuota power set to not be inheritable [RLB]
+

diff --git a/hdrs/mushdb.h b/hdrs/mushdb.h
index a44a6d2f5796750f81888ac05a87ddec764238e0..2ccafc6b13f5064732c4f0a5d611526eb8af60c3 100644 (file)
--- a/hdrs/mushdb.h
+++ b/hdrs/mushdb.h
@@ -58,7 +58,7 @@
 #define TC_MoneyAdmin(x)    (NoPay(x) && Prived(x))
 #define MoneyAdmin(x)     OOREF(x,TC_MoneyAdmin(x),TC_MoneyAdmin(ooref))
 #define TC_NoQuota(x)       (div_powover(x,x,"NoQuota") || div_powover(Owner(x),Owner(x),"NoQuota"))
-#define TC_DNoQuota(x)     div_powover(x, x, "NoQuota")
+#define TC_DNoQuota(x)     (!!has_power(x, "NoQuota"))
 #define NoQuota(x)     (IsDivision(x) ? OOREF(x,TC_DNoQuota(x), TC_DNoQuota(ooref)) :  OOREF(x,TC_NoQuota(x),TC_NoQuota(ooref)))
 #define CanSearch(x,y)   OOREF(x,(Owner(x) == Owner(y) || div_powover(x,y,"Search")),(Owner(ooref) == Owner(y) || div_powover(ooref,y,"Search") ))
 #define Global_Funcs(x)  OOREF(x,div_powover(x,x,"GFuncs"),div_powover(ooref,ooref,"GFuncs"))