Revert "Merge branch 'master' of git.osdn.net:/gitroot/hengband/hengband"

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

diff --git a/src/cmd-mane.c b/src/cmd-mane.c
index 7045874..6a7b5dc 100644 (file)
--- a/src/cmd-mane.c
+++ b/src/cmd-mane.c
@@ -11,23 +11,10 @@
  */
 
 #include "angband.h"
-#include "core.h"
-#include "util.h"
-
-#include "floor.h"
-#include "grid.h"
-#include "spells.h"
 #include "spells-summon.h"
 #include "spells-status.h"
-#include "monster-status.h"
-#include "monster-spell.h"
-#include "monster-process.h"
 #include "cmd-spell.h"
 #include "player-status.h"
-#include "player-effects.h"
-#include "cmd-basic.h"
-#include "targeting.h"
-#include "view-mainwindow.h"
 
 static int damage;
 
@@ -645,7 +632,7 @@ static bool use_mane(int spell)
                sleep_monster(dir, plev);
                break;
        case MS_SPEED:
-               (void)set_fast(p_ptr, randint1(20 + plev) + plev, FALSE);
+               (void)set_fast(randint1(20 + plev) + plev, FALSE);
                break;
        case MS_HAND_DOOM:
        {
@@ -657,13 +644,13 @@ static bool use_mane(int spell)
        }
        case MS_HEAL:
                msg_print(_("自分の傷に念を集中した。", "You concentrate on your wounds!"));
-               (void)hp_player(p_ptr, plev*6);
-               (void)set_stun(p_ptr, 0);
+               (void)hp_player(plev*6);
+               (void)set_stun(0);
                (void)set_cut(0);
                break;
        case MS_INVULNER:
                msg_print(_("無傷の球の呪文を唱えた。", "You cast a Globe of Invulnerability."));
-               (void)set_invuln(p_ptr, randint1(7) + 7, FALSE);
+               (void)set_invuln(randint1(7) + 7, FALSE);
                break;
        case MS_BLINK:
                teleport_player(10, 0L);
@@ -764,7 +751,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:
@@ -773,7 +760,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:
@@ -782,7 +769,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));
+                       summon_specific(-1, target_row, target_col, plev, 0, (mode | u_mode), '\0');
                break;
        }
        case MS_S_ANT:
@@ -791,7 +778,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);
+                       summon_specific(-1, target_row, target_col, plev, SUMMON_ANT, mode, '\0');
                break;
        }
        case MS_S_SPIDER:
@@ -800,7 +787,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);
+                       summon_specific(-1, target_row, target_col, plev, SUMMON_SPIDER, mode, '\0');
                break;
        }
        case MS_S_HOUND:
@@ -809,7 +796,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:
@@ -818,7 +805,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:
@@ -827,7 +814,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:
@@ -836,7 +823,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:
@@ -845,7 +832,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:
@@ -854,7 +841,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:
@@ -863,7 +850,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));
+                       summon_specific(-1, target_row, target_col, plev, SUMMON_HI_UNDEAD, (mode | u_mode), '\0');
                break;
        }
        case MS_S_HI_DRAGON:
@@ -872,7 +859,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:
@@ -881,7 +868,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:
@@ -890,9 +877,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: