青魔法分類の [その他] のマスクを整理. RF4_XXX_MASKを削除.

[hengband/hengband.git] / src / defines.h

diff --git a/src/defines.h b/src/defines.h
index 3af846b..e3e3b5a 100644 (file)
--- a/src/defines.h
+++ b/src/defines.h
@@ -3673,8 +3673,7 @@
  * Including "bolt", "beam" and "ball" spells
  */
 #define RF4_ATTACK_MASK \
-       (RF4_BOLT_MASK | RF4_BEAM_MASK | RF4_BALL_MASK | \
-        RF4_SHRIEK | RF4_DISPEL)
+       (RF4_BOLT_MASK | RF4_BEAM_MASK | RF4_BALL_MASK | RF4_DISPEL)
 
 #define RF5_ATTACK_MASK \
        (RF5_BOLT_MASK | RF5_BEAM_MASK | RF5_BALL_MASK | \
@@ -3684,7 +3683,7 @@
 
 #define RF6_ATTACK_MASK \
        (RF6_BOLT_MASK | RF6_BEAM_MASK | RF6_BALL_MASK | \
-        RF6_HAND_DOOM | RF6_TELE_TO | RF6_TELE_AWAY | \
+        RF6_HAND_DOOM | RF6_TELE_TO | RF6_TELE_AWAY | RF6_TELE_LEVEL | \
         RF6_DARKNESS | RF6_TRAPS | RF6_FORGET)
 
 /*
@@ -4502,6 +4501,11 @@ extern int PlayerUID;
 
 #define MAX_MANE 16
 #define MAX_MONSPELLS 96
+#define MONSPELL_TYPE_BOLT 1
+#define MONSPELL_TYPE_BALL 2
+#define MONSPELL_TYPE_BREATH 3
+#define MONSPELL_TYPE_SUMMON 4
+#define MONSPELL_TYPE_OTHER 5
 
 #define EATER_EXT 36
 #define EATER_CHARGE 0x10000L