projects / cobramush.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: b751337)
Make some division checks safer
authorYesterday's Voyage <startrekkin@startrekkin.net>
Sun, 15 Feb 2009 19:26:50 +0000 (19:26 +0000)
committerCobraMUSH <cobramush@nveid.com>
Tue, 4 Mar 2008 21:22:14 +0000 (21:22 +0000)
(cherry picked from commit 5534cd3af85f618246a4b15c8e83b8fe92e1a082)

hdrs/dbdefs.h patch | blob | history

diff --git a/hdrs/dbdefs.h b/hdrs/dbdefs.h
index df23cc0b376b1cfa399ae447711322058baeb698..cfd6a94af689ffd6570e0477b9965c9e737bde0e 100644 (file)
--- a/hdrs/dbdefs.h
+++ b/hdrs/dbdefs.h
@@ -66,7 +66,7 @@ extern dbref first_free;      /* pointer to free list */
 #define IsRoom(x)       (!!(Typeof(x) & TYPE_ROOM))
 #define IsThing(x)      (!!(Typeof(x) & TYPE_THING))
 #define IsExit(x)       (!!(Typeof(x) & TYPE_EXIT))
-#define IsDivision(x)  (!!(Typeof(x) & TYPE_DIVISION))
+#define IsDivision(x)  (GoodObject(x) && !!(Typeof(x) & TYPE_DIVISION))
 #define IsMasterDivision(x) (GoodObject(x) && IsDivision(x) && Division(x) == NOTHING)
 
 /* Was Destroyed() */