[Refactor] #37353 「死を欺く処理」を dungeon.c から cheat_death() に分離。 / Separate cheat_death...

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

diff --git a/src/mane.c b/src/mane.c
index 52a4c06..6db37e0 100644 (file)
--- a/src/mane.c
+++ b/src/mane.c
@@ -11,6 +11,7 @@
  */
 
 #include "angband.h"
+#include "spells-summon.h"
 
 static int damage;
 
@@ -135,8 +136,6 @@ static int get_mane_power(int *sn, bool baigaesi)
 
                                /* Show list */
                                redraw = TRUE;
-
-                               /* Save the screen */
                                screen_save();
 
                                /* Display a list of spells */
@@ -195,8 +194,6 @@ static int get_mane_power(int *sn, bool baigaesi)
                        {
                                /* Hide list */
                                redraw = FALSE;
-
-                               /* Restore the screen */
                                screen_load();
                        }
 
@@ -238,15 +235,10 @@ static int get_mane_power(int *sn, bool baigaesi)
                /* Stop the loop */
                flag = TRUE;
        }
-
-       /* Restore the screen */
        if (redraw) screen_load();
 
-       /* Show choices */
        p_ptr->window |= (PW_SPELL);
-
-       /* Window stuff */
-       window_stuff();
+       handle_stuff();
 
        /* Abort if needed */
        if (!flag) return (FALSE);
@@ -684,13 +676,9 @@ static bool use_mane(int spell)
                /* Hack */
                p_ptr->energy_need -= 1000 + (100 + randint1(200)+200)*TURNS_PER_TICK/10;
 
-               /* Redraw map */
                p_ptr->redraw |= (PR_MAP);
-
-               /* Update monsters */
                p_ptr->update |= (PU_MONSTERS);
 
-               /* Window stuff */
                p_ptr->window |= (PW_OVERHEAD | PW_DUNGEON);
 
                handle_stuff();
@@ -701,7 +689,7 @@ static bool use_mane(int spell)
        {
                monster_type *m_ptr;
                monster_race *r_ptr;
-               char m_name[80];
+               GAME_TEXT m_name[MAX_NLEN];
 
                if (!target_set(TARGET_KILL)) return FALSE;
                if (!cave[target_row][target_col].m_idx) break;
@@ -742,7 +730,7 @@ static bool use_mane(int spell)
                IDX target_m_idx;
                monster_type *m_ptr;
                monster_race *r_ptr;
-               char m_name[80];
+               GAME_TEXT m_name[MAX_NLEN];
 
                if (!target_set(TARGET_KILL)) return FALSE;
                target_m_idx = cave[target_row][target_col].m_idx;
@@ -806,7 +794,7 @@ static bool use_mane(int spell)
                msg_print(_("サイバーデーモンを召喚した！", "You summon Cyberdemons!"));
                if (max_cyber > 4) max_cyber = 4;
                for (k = 0;k < max_cyber; k++)
-                       summon_specific(-1, target_row, target_col, plev, SUMMON_CYBER, mode);
+                       summon_specific(-1, target_row, target_col, plev, SUMMON_CYBER, mode, '\0');
                break;
        }
        case MS_S_MONSTER:
@@ -815,7 +803,7 @@ static bool use_mane(int spell)
                if (!target_set(TARGET_KILL)) return FALSE;
                msg_print(_("仲間を召喚した。", "You summon help."));
                for (k = 0;k < 1; k++)
-                       summon_specific(-1, target_row, target_col, plev, 0, (mode | u_mode));
+                       summon_specific(-1, target_row, target_col, plev, 0, (mode | u_mode), '\0');
                break;
        }
        case MS_S_MONSTERS:
@@ -823,8 +811,8 @@ static bool use_mane(int spell)
                int k;
                if (!target_set(TARGET_KILL)) return FALSE;
                msg_print(_("モンスターを召喚した！", "You summon monsters!"));
-               for (k = 0;k < 6; k++)
-                       summon_specific(-1, target_row, target_col, plev, 0, (mode | u_mode));
+               for (k = 0;k < A_MAX; k++)
+                       summon_specific(-1, target_row, target_col, plev, 0, (mode | u_mode), '\0');
                break;
        }
        case MS_S_ANT:
@@ -832,8 +820,8 @@ static bool use_mane(int spell)
                int k;
                if (!target_set(TARGET_KILL)) return FALSE;
                msg_print(_("アリを召喚した。", "You summon ants."));
-               for (k = 0;k < 6; k++)
-                       summon_specific(-1, target_row, target_col, plev, SUMMON_ANT, mode);
+               for (k = 0;k < A_MAX; k++)
+                       summon_specific(-1, target_row, target_col, plev, SUMMON_ANT, mode, '\0');
                break;
        }
        case MS_S_SPIDER:
@@ -841,8 +829,8 @@ static bool use_mane(int spell)
                int k;
                if (!target_set(TARGET_KILL)) return FALSE;
                msg_print(_("蜘蛛を召喚した。", "You summon spiders."));
-               for (k = 0;k < 6; k++)
-                       summon_specific(-1, target_row, target_col, plev, SUMMON_SPIDER, mode);
+               for (k = 0;k < A_MAX; k++)
+                       summon_specific(-1, target_row, target_col, plev, SUMMON_SPIDER, mode, '\0');
                break;
        }
        case MS_S_HOUND:
@@ -851,7 +839,7 @@ static bool use_mane(int spell)
                if (!target_set(TARGET_KILL)) return FALSE;
                msg_print(_("ハウンドを召喚した。", "You summon hounds."));
                for (k = 0;k < 4; k++)
-                       summon_specific(-1, target_row, target_col, plev, SUMMON_HOUND, mode);
+                       summon_specific(-1, target_row, target_col, plev, SUMMON_HOUND, mode, '\0');
                break;
        }
        case MS_S_HYDRA:
@@ -860,7 +848,7 @@ static bool use_mane(int spell)
                if (!target_set(TARGET_KILL)) return FALSE;
                msg_print(_("ヒドラを召喚した。", "You summon hydras."));
                for (k = 0;k < 4; k++)
-                       summon_specific(-1, target_row, target_col, plev, SUMMON_HYDRA, mode);
+                       summon_specific(-1, target_row, target_col, plev, SUMMON_HYDRA, mode, '\0');
                break;
        }
        case MS_S_ANGEL:
@@ -869,7 +857,7 @@ static bool use_mane(int spell)
                if (!target_set(TARGET_KILL)) return FALSE;
                msg_print(_("天使を召喚した！", "You summon angel!"));
                for (k = 0;k < 1; k++)
-                       summon_specific(-1, target_row, target_col, plev, SUMMON_ANGEL, mode);
+                       summon_specific(-1, target_row, target_col, plev, SUMMON_ANGEL, mode, '\0');
                break;
        }
        case MS_S_DEMON:
@@ -878,7 +866,7 @@ static bool use_mane(int spell)
                if (!target_set(TARGET_KILL)) return FALSE;
                msg_print(_("混沌の宮廷から悪魔を召喚した！", "You summon a demon from the Courts of Chaos!"));
                for (k = 0;k < 1; k++)
-                       summon_specific(-1, target_row, target_col, plev, SUMMON_DEMON, (mode | u_mode));
+                       summon_specific(-1, target_row, target_col, plev, SUMMON_DEMON, (mode | u_mode), '\0');
                break;
        }
        case MS_S_UNDEAD:
@@ -887,7 +875,7 @@ static bool use_mane(int spell)
                if (!target_set(TARGET_KILL)) return FALSE;
                msg_print(_("アンデッドの強敵を召喚した！", "You summon an undead adversary!"));
                for (k = 0;k < 1; k++)
-                       summon_specific(-1, target_row, target_col, plev, SUMMON_UNDEAD, (mode | u_mode));
+                       summon_specific(-1, target_row, target_col, plev, SUMMON_UNDEAD, (mode | u_mode), '\0');
                break;
        }
        case MS_S_DRAGON:
@@ -896,7 +884,7 @@ static bool use_mane(int spell)
                if (!target_set(TARGET_KILL)) return FALSE;
                msg_print(_("ドラゴンを召喚した！", "You summon dragon!"));
                for (k = 0;k < 1; k++)
-                       summon_specific(-1, target_row, target_col, plev, SUMMON_DRAGON, (mode | u_mode));
+                       summon_specific(-1, target_row, target_col, plev, SUMMON_DRAGON, (mode | u_mode), '\0');
                break;
        }
        case MS_S_HI_UNDEAD:
@@ -904,8 +892,8 @@ static bool use_mane(int spell)
                int k;
                if (!target_set(TARGET_KILL)) return FALSE;
                msg_print(_("強力なアンデッドを召喚した！", "You summon greater undead!"));
-               for (k = 0;k < 6; k++)
-                       summon_specific(-1, target_row, target_col, plev, SUMMON_HI_UNDEAD, (mode | u_mode));
+               for (k = 0;k < A_MAX; k++)
+                       summon_specific(-1, target_row, target_col, plev, SUMMON_HI_UNDEAD, (mode | u_mode), '\0');
                break;
        }
        case MS_S_HI_DRAGON:
@@ -914,7 +902,7 @@ static bool use_mane(int spell)
                if (!target_set(TARGET_KILL)) return FALSE;
                msg_print(_("古代ドラゴンを召喚した！", "You summon ancient dragons!"));
                for (k = 0;k < 4; k++)
-                       summon_specific(-1, target_row, target_col, plev, SUMMON_HI_DRAGON, (mode | u_mode));
+                       summon_specific(-1, target_row, target_col, plev, SUMMON_HI_DRAGON, (mode | u_mode), '\0');
                break;
        }
        case MS_S_AMBERITE:
@@ -923,7 +911,7 @@ static bool use_mane(int spell)
                if (!target_set(TARGET_KILL)) return FALSE;
                msg_print(_("アンバーの王族を召喚した！", "You summon Lords of Amber!"));
                for (k = 0;k < 4; k++)
-                       summon_specific(-1, target_row, target_col, plev, SUMMON_AMBERITES, (mode | PM_ALLOW_UNIQUE));
+                       summon_specific(-1, target_row, target_col, plev, SUMMON_AMBERITES, (mode | PM_ALLOW_UNIQUE), '\0');
                break;
        }
        case MS_S_UNIQUE:
@@ -932,9 +920,9 @@ static bool use_mane(int spell)
                if (!target_set(TARGET_KILL)) return FALSE;
                msg_print(_("特別な強敵を召喚した！", "You summon special opponents!"));
                for (k = 0;k < 4; k++)
-                       if (summon_specific(-1, target_row, target_col, plev, SUMMON_UNIQUE, (mode | PM_ALLOW_UNIQUE))) count++;
+                       if (summon_specific(-1, target_row, target_col, plev, SUMMON_UNIQUE, (mode | PM_ALLOW_UNIQUE), '\0')) count++;
                for (k = count;k < 4; k++)
-                       summon_specific(-1, target_row, target_col, plev, SUMMON_HI_UNDEAD, (mode | u_mode));
+                       summon_specific(-1, target_row, target_col, plev, SUMMON_HI_UNDEAD, (mode | u_mode), '\0');
                break;
        }
        default:
@@ -1042,7 +1030,6 @@ bool do_cmd_mane(bool baigaesi)
 
        p_ptr->energy_use = 100;
 
-       /* Window stuff */
        p_ptr->redraw |= (PR_IMITATION);
        p_ptr->window |= (PW_PLAYER);
        p_ptr->window |= (PW_SPELL);