branch-hexの変更をコミット。

[hengband/hengband.git] / src / effects.c

diff --git a/src/effects.c b/src/effects.c
index 2f2b1c7..75534c2 100644 (file)
--- a/src/effects.c
+++ b/src/effects.c
@@ -89,6 +89,15 @@ void set_action(int typ)
 #endif
                                break;
                        }
+                       case ACTION_SPELL:
+                       {
+#ifdef JP
+                               msg_print("¼öʸ¤Î±Ó¾§¤òÃæÃǤ·¤¿¡£");
+#else
+                               msg_print("You stopped spelling all spells.");
+#endif
+                               break;
+                       }
                }
        }
 
@@ -287,14 +296,19 @@ void dispel_player(void)
 #endif
        }
 
-       if (music_singing_any())
+       if (music_singing_any() || hex_spelling_any())
        {
+#ifdef JP
+               cptr str = (music_singing_any()) ? "²Î" : "¼öʸ";
+#else
+               cptr str = (music_singing_any()) ? "singing" : "spelling";
+#endif
                p_ptr->magic_num1[1] = p_ptr->magic_num1[0];
                p_ptr->magic_num1[0] = 0;
 #ifdef JP
-               msg_print("²Î¤¬ÅÓÀڤ줿¡£");
+               msg_format("%s¤¬ÅÓÀڤ줿¡£", str);
 #else
-               msg_print("Your singing is interrupted.");
+               msg_format("Your %s is interrupted.", str);
 #endif
                p_ptr->action = ACTION_NONE;
 
@@ -551,6 +565,9 @@ msg_print("
                        /* Sniper */
                        if (p_ptr->concent) reset_concentration(TRUE);
 
+                       /* Hex */
+                       if (hex_spelling_any()) stop_hex_spell_all();
+
                        notice = TRUE;
                        p_ptr->counter = FALSE;
                        chg_virtue(V_HARMONY, -1);
@@ -760,6 +777,9 @@ msg_print("
                        /* Sniper */
                        if (p_ptr->concent) reset_concentration(TRUE);
 
+                       /* Hex */
+                       if (hex_spelling_any()) stop_hex_spell_all();
+
                        p_ptr->counter = FALSE;
                        notice = TRUE;
                }
@@ -3622,6 +3642,9 @@ msg_print("
                /* Sniper */
                if (p_ptr->concent) reset_concentration(TRUE);
 
+               /* Hex */
+               if (hex_spelling_any()) stop_hex_spell_all();
+
                /* Notice */
                notice = TRUE;
        }