X-Git-Url: https://jxself.org/git/?p=open-adventure.git;a=blobdiff_plain;f=advent.h;h=cb2b71b62ea6f4273e77b6fcf31396b1d865eb0e;hp=42491e7533c02db169945321e770a936524ce56c;hb=4d4e8dce96cc9401151181a259c5160291031947;hpb=82c3ae5e65573b97f52d3c14986d45167fa8f884

diff --git a/advent.h b/advent.h
index 42491e7..cb2b71b 100644
--- a/advent.h
+++ b/advent.h
@@ -61,6 +61,7 @@
 #define PROP_SET_FOUND(obj)	(game.objects[obj].prop = STATE_FOUND)
 #define PROP_SET_NOT_FOUND(obj)	(game.objects[obj].prop = STATE_NOTFOUND)
 #define PROP_IS_NOTFOUND2(g, o)	(g.objects[o].prop == STATE_NOTFOUND)
+#define PROP_IS_INVALID(val)	(val < -MAX_STATE - 1 || val > MAX_STATE)
 #else
 #define PROP_STASHED(obj)	(-game.objects[obj].prop)
 #define PROP_IS_STASHED(obj)	(game.objects[obj].prop < 0)
@@ -70,9 +71,8 @@
 #define PROP_SET_FOUND(obj)	do {game.objects[obj].found = true; game.objects[obj].prop = STATE_FOUND;} while(0)
 #define PROP_SET_NOT_FOUND(obj)	game.objects[obj].found = false
 #define PROP_IS_NOTFOUND2(g, o)	(!g.objects[o].found)
+#define PROP_IS_INVALID(val)	(val < -MAX_STATE || val > MAX_STATE)
 #endif
-/* Magic number -2 allows a PROP_STASHED version of state 1 */
-#define PROP_IS_INVALID(val)	(val < -2 || val > 1)
 
 #define PROMPT	"> "