階の雰囲気計算で, 判明した薬や上位魔法書などが雰囲気に反映されないと

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

diff --git a/src/hissatsu.c b/src/hissatsu.c
index 86a73b9..00220c0 100644 (file)
--- a/src/hissatsu.c
+++ b/src/hissatsu.c
@@ -235,7 +235,7 @@ put_str("name              Lv  SP      name              Lv  SP ", y, x + 5);
 
                                        /* Dump the spell --(-- */
                                        strcat(psi_desc, format(" %-18s%2d %3d",
-                                               do_spell(spell_id_from(REALM_HISSATSU, i), SPELL_NAME),
+                                               do_spell(REALM_HISSATSU, i, SPELL_NAME),
                                                spell.slevel, spell.smana));
                                        prt(psi_desc, y + (line%17) + (line >= 17), x+(line/17)*30);
                                        prt("", y + (line%17) + (line >= 17) + 1, x+(line/17)*30);
@@ -293,9 +293,9 @@ put_str("name              Lv  SP      name              Lv  SP ", y, x + 5);
 
                        /* Prompt */
 #ifdef JP
-                       (void) strnfmt(tmp_val, 78, "%s¤ò»È¤¤¤Þ¤¹¤«¡©", do_spell(spell_id_from(REALM_HISSATSU, j), SPELL_NAME));
+                       (void) strnfmt(tmp_val, 78, "%s¤ò»È¤¤¤Þ¤¹¤«¡©", do_spell(REALM_HISSATSU, j, SPELL_NAME));
 #else
-                       (void)strnfmt(tmp_val, 78, "Use %s? ", do_spell(spell_id_from(REALM_HISSATSU, j), SPELL_NAME));
+                       (void)strnfmt(tmp_val, 78, "Use %s? ", do_spell(REALM_HISSATSU, j, SPELL_NAME));
 #endif
 
 
@@ -404,7 +404,7 @@ msg_print("
        sound(SOUND_ZAP);
 
        /* Cast the spell */
-       if (!do_spell(spell_id_from(REALM_HISSATSU, n), SPELL_CAST)) return;
+       if (!do_spell(REALM_HISSATSU, n, SPELL_CAST)) return;
 
        /* Take a turn */
        energy_use = 100;
@@ -519,9 +519,9 @@ s = "
                p_ptr->spell_learned1 |= (1L << i);
                p_ptr->spell_worked1 |= (1L << i);
 #ifdef JP
-               msg_format("%s¤Îµ»¤ò³Ð¤¨¤¿¡£", do_spell(spell_id_from(REALM_HISSATSU, i), SPELL_NAME));
+               msg_format("%s¤Îµ»¤ò³Ð¤¨¤¿¡£", do_spell(REALM_HISSATSU, i, SPELL_NAME));
 #else
-               msg_format("You have learned the special attack of %s.", do_spell(spell_id_from(REALM_HISSATSU, i), SPELL_NAME));
+               msg_format("You have learned the special attack of %s.", do_spell(REALM_HISSATSU, i, SPELL_NAME));
 #endif
                for (j = 0; j < 64; j++)
                {