[Refactor] #39068 summon_kin_type によるグローバル変数渡しを修正．

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

diff --git a/src/cmd-mane.c b/src/cmd-mane.c
index 2befe2f..aabd8e3 100644 (file)
--- a/src/cmd-mane.c
+++ b/src/cmd-mane.c
@@ -11,6 +11,8 @@
  */
 
 #include "angband.h"
+#include "util.h"
+
 #include "floor.h"
 #include "grid.h"
 #include "spells.h"
@@ -759,7 +761,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, '\0');
+                       summon_specific(-1, target_row, target_col, plev, SUMMON_CYBER, mode);
                break;
        }
        case MS_S_MONSTER:
@@ -768,7 +770,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), '\0');
+                       summon_specific(-1, target_row, target_col, plev, 0, (mode | u_mode));
                break;
        }
        case MS_S_MONSTERS:
@@ -777,7 +779,7 @@ static bool use_mane(int spell)
                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), '\0');
+                       summon_specific(-1, target_row, target_col, plev, 0, (mode | u_mode));
                break;
        }
        case MS_S_ANT:
@@ -786,7 +788,7 @@ static bool use_mane(int spell)
                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, '\0');
+                       summon_specific(-1, target_row, target_col, plev, SUMMON_ANT, mode);
                break;
        }
        case MS_S_SPIDER:
@@ -795,7 +797,7 @@ static bool use_mane(int spell)
                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, '\0');
+                       summon_specific(-1, target_row, target_col, plev, SUMMON_SPIDER, mode);
                break;
        }
        case MS_S_HOUND:
@@ -804,7 +806,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, '\0');
+                       summon_specific(-1, target_row, target_col, plev, SUMMON_HOUND, mode);
                break;
        }
        case MS_S_HYDRA:
@@ -813,7 +815,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, '\0');
+                       summon_specific(-1, target_row, target_col, plev, SUMMON_HYDRA, mode);
                break;
        }
        case MS_S_ANGEL:
@@ -822,7 +824,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, '\0');
+                       summon_specific(-1, target_row, target_col, plev, SUMMON_ANGEL, mode);
                break;
        }
        case MS_S_DEMON:
@@ -831,7 +833,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), '\0');
+                       summon_specific(-1, target_row, target_col, plev, SUMMON_DEMON, (mode | u_mode));
                break;
        }
        case MS_S_UNDEAD:
@@ -840,7 +842,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), '\0');
+                       summon_specific(-1, target_row, target_col, plev, SUMMON_UNDEAD, (mode | u_mode));
                break;
        }
        case MS_S_DRAGON:
@@ -849,7 +851,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), '\0');
+                       summon_specific(-1, target_row, target_col, plev, SUMMON_DRAGON, (mode | u_mode));
                break;
        }
        case MS_S_HI_UNDEAD:
@@ -858,7 +860,7 @@ static bool use_mane(int spell)
                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), '\0');
+                       summon_specific(-1, target_row, target_col, plev, SUMMON_HI_UNDEAD, (mode | u_mode));
                break;
        }
        case MS_S_HI_DRAGON:
@@ -867,7 +869,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), '\0');
+                       summon_specific(-1, target_row, target_col, plev, SUMMON_HI_DRAGON, (mode | u_mode));
                break;
        }
        case MS_S_AMBERITE:
@@ -876,7 +878,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), '\0');
+                       summon_specific(-1, target_row, target_col, plev, SUMMON_AMBERITES, (mode | PM_ALLOW_UNIQUE));
                break;
        }
        case MS_S_UNIQUE:
@@ -885,9 +887,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), '\0')) count++;
+                       if (summon_specific(-1, target_row, target_col, plev, SUMMON_UNIQUE, (mode | PM_ALLOW_UNIQUE))) count++;
                for (k = count;k < 4; k++)
-                       summon_specific(-1, target_row, target_col, plev, SUMMON_HI_UNDEAD, (mode | u_mode), '\0');
+                       summon_specific(-1, target_row, target_col, plev, SUMMON_HI_UNDEAD, (mode | u_mode));
                break;
        }
        default: