From: nothere <nothere@0568b783-4c39-0410-ac80-bf13821ea2a2>
Date: Sat, 7 Jun 2003 20:16:25 +0000 (+0000)
Subject: 青魔法分類の [その他] のマスクを整理. RF4_XXX_MASKを削除.
X-Git-Tag: v2.1.2~1417
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=c32cb704d83df0f41e55aaf2191d60f7350b2551;p=hengbandforosx%2Fhengbandosx.git

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

diff --git a/src/defines.h b/src/defines.h
index 220f9985e..e3e3b5a6c 100644
--- a/src/defines.h
+++ b/src/defines.h
@@ -3715,14 +3715,6 @@
 	(RF6_BREATH_MASK | RF6_SPECIAL)
 
 
-/*
- * Hack -- unused spells
- */
-
-#define RF4_XXX_MASK \
-	(RF4_XXX1 | RF4_XXX2 | RF4_XXX3 | RF4_XXX4)
-
-
 #define MR1_SINKA 0x01
 
 
diff --git a/src/mspells3.c b/src/mspells3.c
index 190df247b..eb66b0154 100644
--- a/src/mspells3.c
+++ b/src/mspells3.c
@@ -2145,9 +2145,12 @@ void learn_spell(int monspell)
 }
 
 
-void set_rf_masks(s32b *f4,  s32b *f5, s32b *f6, int mode)
+/*
+ * Extract monster spells mask for the given mode
+ */
+void set_rf_masks(s32b *f4, s32b *f5, s32b *f6, int mode)
 {
-	switch(mode)
+	switch (mode)
 	{
 		case MONSPELL_TYPE_BOLT:
 			*f4 = ((RF4_BOLT_MASK | RF4_BEAM_MASK) & ~(RF4_ROCKET));
@@ -2174,9 +2177,9 @@ void set_rf_masks(s32b *f4,  s32b *f5, s32b *f6, int mode)
 			break;
 
 		case MONSPELL_TYPE_OTHER:
-			*f4 = ~(RF4_BOLT_MASK | RF4_BEAM_MASK | RF4_BALL_MASK | RF4_SUMMON_MASK | RF4_INDIRECT_MASK | RF4_RIDING_MASK | RF4_XXX_MASK);
-			*f5 = ~(RF5_BOLT_MASK | RF5_BEAM_MASK | RF5_BALL_MASK | RF5_SUMMON_MASK | RF5_INDIRECT_MASK | RF5_RIDING_MASK);
-			*f6 = (~(RF6_BOLT_MASK | RF6_BEAM_MASK | RF6_BALL_MASK | RF6_SUMMON_MASK | RF6_INDIRECT_MASK | RF6_RIDING_MASK)) | (RF6_TRAPS | RF6_DARKNESS);
+			*f4 = RF4_ATTACK_MASK & ~(RF4_BOLT_MASK | RF4_BEAM_MASK | RF4_BALL_MASK | RF4_INDIRECT_MASK);
+			*f5 = RF5_ATTACK_MASK & ~(RF5_BOLT_MASK | RF5_BEAM_MASK | RF5_BALL_MASK | RF5_INDIRECT_MASK);
+			*f6 = RF6_ATTACK_MASK & ~(RF6_BOLT_MASK | RF6_BEAM_MASK | RF6_BALL_MASK | RF6_INDIRECT_MASK);
 			break;
 	}