Remove the smap.* files

[bsdgames-darwin.git] / phantasia / phantdefs.h

diff --git a/phantasia/phantdefs.h b/phantasia/phantdefs.h
index 9e597e5133da10ee8b5ea6421c7d03fd9a62cf7e..0f3e078350f18802a7378491d78706b7426f885f 100644 (file)
--- a/phantasia/phantdefs.h
+++ b/phantasia/phantdefs.h
@@ -1,3 +1,5 @@
+/*     $NetBSD: phantdefs.h,v 1.4 2001/09/16 16:34:25 wiz Exp $        */
+
 /*
  * phantdefs.h - important constants for Phantasia
  */
@@ -10,6 +12,15 @@
 #define R_SPOILED      4               /* ring which has gone bad */
 
 /* status constants */
+/* We must #undef these first since setup.c includes headers that reserve S_* */
+#undef S_NOTUSED
+#undef S_OFF
+#undef S_PLAYING
+#undef S_CLOAKED
+#undef S_INBATTLE
+#undef S_MONSTER
+#undef S_TRADING
+#undef S_HUNGUP
 #define        S_NOTUSED       0               /* record not in use */
 #define S_OFF          1               /* not playing */
 #define S_PLAYING      2               /* playing - nothing else */
@@ -17,7 +28,7 @@
 #define S_INBATTLE     4               /* playing - in battle */
 #define S_MONSTER      5               /* playing - fighting monster */
 #define        S_TRADING       6               /* playing - at a trading post */
-#define        S_HUNGUP        7               /* error occured with character */
+#define        S_HUNGUP        7               /* error occurred with character */
 
 /* tampered constants */
 #define T_OFF          0               /* nothing */