[Refactor] #38997 teleport_player() に player_type * 引数を追加． / Add player_type * argume...

diff --git a/src/cmd/cmd-activate.c b/src/cmd/cmd-activate.c
index 28ba51f..ede9277 100644 (file)
--- a/src/cmd/cmd-activate.c
+++ b/src/cmd/cmd-activate.c
@@ -1535,7 +1535,7 @@ bool activate_artifact(player_type *user_ptr, object_type *o_ptr)
        case ACT_TELEPORT:
        {
                msg_print(_("周りの空間が歪んでいる...", "It twists space around you..."));
-               teleport_player(100, 0L);
+               teleport_player(user_ptr, 100, 0L);
                break;
        }
 
@@ -1605,10 +1605,10 @@ bool activate_artifact(player_type *user_ptr, object_type *o_ptr)
                switch (randint1(13))
                {
                case 1: case 2: case 3: case 4: case 5:
-                       teleport_player(10, 0L);
+                       teleport_player(user_ptr, 10, 0L);
                        break;
                case 6: case 7: case 8: case 9: case 10:
-                       teleport_player(222, 0L);
+                       teleport_player(user_ptr, 222, 0L);
                        break;
                case 11: case 12:
                        (void)stair_creation(user_ptr);
@@ -1661,7 +1661,7 @@ bool activate_artifact(player_type *user_ptr, object_type *o_ptr)
 
        case ACT_PHASE_DOOR:
        {
-               teleport_player(10, 0L);
+               teleport_player(user_ptr, 10, 0L);
                break;
        }
 

diff --git a/src/cmd/cmd-basic.c b/src/cmd/cmd-basic.c
index 2f3ad12..88d5c8f 100644 (file)
--- a/src/cmd/cmd-basic.c
+++ b/src/cmd/cmd-basic.c
@@ -2302,7 +2302,7 @@ void do_cmd_fire(player_type *creature_ptr, SPELL_IDX snipe_type)
        /* Sniper actions after some shootings */
        if (snipe_type == SP_AWAY)
        {
-               teleport_player(10 + (creature_ptr->concent * 2), 0L);
+               teleport_player(creature_ptr, 10 + (creature_ptr->concent * 2), 0L);
        }
        if (snipe_type == SP_FINAL)
        {

diff --git a/src/cmd/cmd-mane.c b/src/cmd/cmd-mane.c
index 54c471f..d146da4 100644 (file)
--- a/src/cmd/cmd-mane.c
+++ b/src/cmd/cmd-mane.c
@@ -663,10 +663,10 @@ static bool use_mane(player_type *caster_ptr, int spell)
                (void)set_invuln(caster_ptr, randint1(7) + 7, FALSE);
                break;
        case MS_BLINK:
-               teleport_player(10, 0L);
+               teleport_player(caster_ptr, 10, 0L);
                break;
        case MS_TELEPORT:
-               teleport_player(plev * 5, 0L);
+               teleport_player(caster_ptr, plev * 5, 0L);
                break;
        case MS_WORLD:
                (void)time_walk(caster_ptr);

diff --git a/src/cmd/cmd-read.c b/src/cmd/cmd-read.c
index 6b79e74..45ad833 100644 (file)
--- a/src/cmd/cmd-read.c
+++ b/src/cmd/cmd-read.c
@@ -167,14 +167,14 @@ void exe_read(player_type *creature_ptr, INVENTORY_IDX item, bool known)
 
                case SV_SCROLL_PHASE_DOOR:
                {
-                       teleport_player(10, 0L);
+                       teleport_player(creature_ptr, 10, 0L);
                        ident = TRUE;
                        break;
                }
 
                case SV_SCROLL_TELEPORT:
                {
-                       teleport_player(100, 0L);
+                       teleport_player(creature_ptr, 100, 0L);
                        ident = TRUE;
                        break;
                }

diff --git a/src/cmd/cmd-usestaff.c b/src/cmd/cmd-usestaff.c
index 00846a9..4e2df73 100644 (file)
--- a/src/cmd/cmd-usestaff.c
+++ b/src/cmd/cmd-usestaff.c
@@ -75,7 +75,7 @@ int staff_effect(player_type *creature_ptr, OBJECT_SUBTYPE_VALUE sval, bool *use
 
                case SV_STAFF_TELEPORTATION:
                {
-                       teleport_player((powerful ? 150 : 100), 0L);
+                       teleport_player(creature_ptr, (powerful ? 150 : 100), 0L);
                        ident = TRUE;
                        break;
                }

diff --git a/src/combat/melee1.c b/src/combat/melee1.c
index 95ed830..d52cb1e 100644 (file)
--- a/src/combat/melee1.c
+++ b/src/combat/melee1.c
@@ -3837,7 +3837,7 @@ bool make_attack_normal(player_type *target_ptr, MONSTER_IDX m_idx)
 
                                        if (is_mirror_grid(&p_ptr->current_floor_ptr->grid_array[target_ptr->y][target_ptr->x]))
                                        {
-                                               teleport_player(10, 0L);
+                                               teleport_player(target_ptr, 10, 0L);
                                        }
                                }
 

diff --git a/src/core.c b/src/core.c
index bb9cae6..dac4acd 100644 (file)
--- a/src/core.c
+++ b/src/core.c
@@ -652,7 +652,7 @@ static void pattern_teleport(player_type *creature_ptr)
        }
        else if (get_check(_("通常テレポート？", "Normal teleport? ")))
        {
-               teleport_player(200, 0L);
+               teleport_player(creature_ptr, 200, 0L);
                return;
        }
        else
@@ -2181,7 +2181,7 @@ static void process_world_aux_mutation(player_type *creature_ptr)
                        disturb(creature_ptr, FALSE, TRUE);
                        msg_print(_("あなたの位置は突然ひじょうに不確定になった...", "Your position suddenly seems very uncertain..."));
                        msg_print(NULL);
-                       teleport_player(40, TELEPORT_PASSIVE);
+                       teleport_player(creature_ptr, 40, TELEPORT_PASSIVE);
                }
        }
 
@@ -2632,7 +2632,7 @@ static void process_world_aux_curse(player_type *creature_ptr)
                        if (get_check_strict(_("テレポートしますか？", "Teleport? "), CHECK_OKAY_CANCEL))
                        {
                                disturb(creature_ptr, FALSE, TRUE);
-                               teleport_player(50, 0L);
+                               teleport_player(creature_ptr, 50, 0L);
                        }
                        else
                        {
@@ -2774,7 +2774,7 @@ static void process_world_aux_curse(player_type *creature_ptr)
                        disturb(creature_ptr, FALSE, TRUE);
 
                        /* Teleport player */
-                       teleport_player(40, TELEPORT_PASSIVE);
+                       teleport_player(creature_ptr, 40, TELEPORT_PASSIVE);
                }
                /* Handle HP draining */
                if ((creature_ptr->cursed & TRC_DRAIN_HP) && one_in_(666))

diff --git a/src/mind.c b/src/mind.c
index b640838..6d8cc03 100644 (file)
--- a/src/mind.c
+++ b/src/mind.c
@@ -1075,11 +1075,11 @@ static bool cast_mindcrafter_spell(player_type *caster_ptr, int spell)
                break;
        case 2:
                /* Minor displace */
-               teleport_player(10, 0L);
+               teleport_player(caster_ptr, 10, 0L);
                break;
        case 3:
                /* Major displace */
-               teleport_player(plev * 5, 0L);
+               teleport_player(caster_ptr, plev * 5, 0L);
                break;
        case 4:
                /* Domination */
@@ -1353,7 +1353,7 @@ static bool cast_mirror_spell(player_type *caster_ptr, int spell)
                break;
                /* warped mirror */
        case 3:
-               teleport_player(10, 0L);
+               teleport_player(caster_ptr, 10, 0L);
                break;
                /* mirror of light */
        case 4:
@@ -1361,7 +1361,7 @@ static bool cast_mirror_spell(player_type *caster_ptr, int spell)
                break;
                /* mirror of wandering */
        case 5:
-               teleport_player(plev * 5, 0L);
+               teleport_player(caster_ptr, plev * 5, 0L);
                break;
                /* robe of dust */
        case 6:
@@ -1566,7 +1566,7 @@ static bool cast_ninja_spell(player_type *caster_ptr, int spell)
                break;
        case 2:
        {
-               teleport_player(10, 0L);
+               teleport_player(caster_ptr, 10, 0L);
                break;
        }
        case 3:
@@ -1581,7 +1581,7 @@ static bool cast_ninja_spell(player_type *caster_ptr, int spell)
        }
        case 4:
        {
-               teleport_player(caster_ptr->lev * 5, 0L);
+               teleport_player(caster_ptr, caster_ptr->lev * 5, 0L);
                break;
        }
        case 5:
@@ -1602,7 +1602,7 @@ static bool cast_ninja_spell(player_type *caster_ptr, int spell)
                break;
        case 9:
                fire_ball(GF_FIRE, 0, 50+plev, plev/10+2);
-               teleport_player(30, 0L);
+               teleport_player(caster_ptr, 30, 0L);
                set_oppose_fire(caster_ptr, (TIME_EFFECT)plev, FALSE);
                break;
        case 10:
@@ -1722,7 +1722,7 @@ static bool cast_ninja_spell(player_type *caster_ptr, int spell)
                fire_ball(GF_POIS, 0, 75+plev*2/3, plev/5+2);
                fire_ball(GF_HYPODYNAMIA, 0, 75+plev*2/3, plev/5+2);
                fire_ball(GF_CONFUSION, 0, 75+plev*2/3, plev/5+2);
-               teleport_player(30, 0L);
+               teleport_player(caster_ptr, 30, 0L);
                break;
        case 18:
        {
@@ -1936,7 +1936,7 @@ void do_cmd_mind(void)
                                else if (b < 81)
                                {
                                        msg_print(_("鏡の世界の干渉を受けた！", "Weird visions seem to dance before your eyes..."));
-                                       teleport_player(10, TELEPORT_PASSIVE);
+                                       teleport_player(p_ptr, 10, TELEPORT_PASSIVE);
                                }
                                else if (b < 96)
                                {

diff --git a/src/mspells3.c b/src/mspells3.c
index 3b74cf5..af82726 100644 (file)
--- a/src/mspells3.c
+++ b/src/mspells3.c
@@ -1286,10 +1286,10 @@ static bool cast_learned_spell(int spell, bool success)
                (void)set_invuln(p_ptr, randint1(4) + 4, FALSE);
                break;
        case MS_BLINK:
-               teleport_player(10, 0L);
+               teleport_player(p_ptr, 10, 0L);
                break;
        case MS_TELEPORT:
-               teleport_player(plev * 5, 0L);
+               teleport_player(p_ptr, plev * 5, 0L);
                break;
        case MS_WORLD:
                (void)time_walk(p_ptr);

diff --git a/src/mutation.c b/src/mutation.c
index a03a1c2..b8a1b7d 100644 (file)
--- a/src/mutation.c
+++ b/src/mutation.c
@@ -2121,7 +2121,7 @@ bool exe_mutation_power(player_type *creature_ptr, int power)
 
                case MUT1_VTELEPORT:
                        msg_print(_("集中している...", "You concentrate..."));
-                       teleport_player(10 + 4 * lvl, 0L);
+                       teleport_player(creature_ptr, 10 + 4 * lvl, 0L);
                        break;
 
                case MUT1_MIND_BLST:
@@ -2150,7 +2150,7 @@ bool exe_mutation_power(player_type *creature_ptr, int power)
                        break;
 
                case MUT1_BLINK:
-                       teleport_player(10, 0L);
+                       teleport_player(creature_ptr, 10, 0L);
                        break;
 
                case MUT1_EAT_ROCK:

diff --git a/src/racial.c b/src/racial.c
index 9cb6af2..25cf247 100644 (file)
--- a/src/racial.c
+++ b/src/racial.c
@@ -660,7 +660,7 @@ static bool exe_racial_power(player_type *creature_ptr, s32b command)
 
                case RACE_GNOME:
                        msg_print(_("パッ！", "Blink!"));
-                       teleport_player(10, 0L);
+                       teleport_player(creature_ptr, 10, 0L);
                        break;
 
                case RACE_HALF_ORC:

diff --git a/src/realm-arcane.c b/src/realm-arcane.c
index 4b501d6..9e0bd49 100644 (file)
--- a/src/realm-arcane.c
+++ b/src/realm-arcane.c
@@ -107,7 +107,7 @@ concptr do_arcane_spell(player_type *caster_ptr, SPELL_IDX spell, BIT_FLAGS mode
 
                        if (cast)
                        {
-                               teleport_player(range, 0L);
+                               teleport_player(caster_ptr, range, 0L);
                        }
                }
                break;
@@ -339,7 +339,7 @@ concptr do_arcane_spell(player_type *caster_ptr, SPELL_IDX spell, BIT_FLAGS mode
 
                        if (cast)
                        {
-                               teleport_player(range, 0L);
+                               teleport_player(caster_ptr, range, 0L);
                        }
                }
                break;

diff --git a/src/realm-chaos.c b/src/realm-chaos.c
index 71ef000..362c82d 100644 (file)
--- a/src/realm-chaos.c
+++ b/src/realm-chaos.c
@@ -182,7 +182,7 @@ concptr do_chaos_spell(player_type *caster_ptr, SPELL_IDX spell, BIT_FLAGS mode)
 
                        if (cast)
                        {
-                               teleport_player(range, 0L);
+                               teleport_player(caster_ptr, range, 0L);
                        }
                }
                break;

diff --git a/src/realm-crusade.c b/src/realm-crusade.c
index 2f3af2c..9fce28d 100644 (file)
--- a/src/realm-crusade.c
+++ b/src/realm-crusade.c
@@ -101,7 +101,7 @@ concptr do_crusade_spell(player_type *caster_ptr, SPELL_IDX spell, BIT_FLAGS mod
                {
                        POSITION range = 25 + plev / 2;
                        if (info) return info_range(range);
-                       if (cast) teleport_player(range, 0L);
+                       if (cast) teleport_player(caster_ptr, range, 0L);
                }
                break;
 

diff --git a/src/realm-hex.c b/src/realm-hex.c
index c5b200c..2cf63c5 100644 (file)
--- a/src/realm-hex.c
+++ b/src/realm-hex.c
@@ -1042,7 +1042,7 @@ concptr do_hex_spell(player_type *caster_ptr, SPELL_IDX spell, BIT_FLAGS mode)
                        else
                        {
                                msg_print(_("おっと！", "Oops!"));
-                               teleport_player(30, 0L);
+                               teleport_player(caster_ptr, 30, 0L);
                        }
 
                        add = FALSE;

diff --git a/src/realm-sorcery.c b/src/realm-sorcery.c
index 57b2165..6ff0fe6 100644 (file)
--- a/src/realm-sorcery.c
+++ b/src/realm-sorcery.c
@@ -56,7 +56,7 @@ concptr do_sorcery_spell(player_type *caster_ptr, SPELL_IDX spell, BIT_FLAGS mod
 
                        if (cast)
                        {
-                               teleport_player(range, 0L);
+                               teleport_player(caster_ptr, range, 0L);
                        }
                }
                break;
@@ -126,7 +126,7 @@ concptr do_sorcery_spell(player_type *caster_ptr, SPELL_IDX spell, BIT_FLAGS mod
 
                        if (cast)
                        {
-                               teleport_player(range, 0L);
+                               teleport_player(caster_ptr, range, 0L);
                        }
                }
                break;

diff --git a/src/realm-trump.c b/src/realm-trump.c
index b873087..c41dcc0 100644 (file)
--- a/src/realm-trump.c
+++ b/src/realm-trump.c
@@ -42,7 +42,7 @@ concptr do_trump_spell(player_type *caster_ptr, SPELL_IDX spell, BIT_FLAGS mode)
 
                        if (cast)
                        {
-                               teleport_player(range, 0L);
+                               teleport_player(caster_ptr, range, 0L);
                        }
                }
                break;
@@ -103,7 +103,7 @@ concptr do_trump_spell(player_type *caster_ptr, SPELL_IDX spell, BIT_FLAGS mode)
 
                        if (cast)
                        {
-                               teleport_player(range, 0L);
+                               teleport_player(caster_ptr, range, 0L);
                        }
                }
                break;

diff --git a/src/spells-status.c b/src/spells-status.c
index 12e5ea8..3476552 100644 (file)
--- a/src/spells-status.c
+++ b/src/spells-status.c
@@ -488,7 +488,7 @@ void apply_nexus(monster_type *m_ptr, player_type *target_ptr)
        {
        case 1: case 2: case 3:
        {
-               teleport_player(200, TELEPORT_PASSIVE);
+               teleport_player(target_ptr, 200, TELEPORT_PASSIVE);
                break;
        }
 

diff --git a/src/spells.h b/src/spells.h
index b93b109..082d92d 100644 (file)
--- a/src/spells.h
+++ b/src/spells.h
@@ -285,7 +285,7 @@ extern bool concentration(player_type *creature_ptr);
 extern bool teleport_away(player_type *caster_ptr, MONSTER_IDX m_idx, POSITION dis, BIT_FLAGS mode);
 extern void teleport_monster_to(MONSTER_IDX m_idx, POSITION ty, POSITION tx, int power, BIT_FLAGS mode);
 extern bool teleport_player_aux(player_type *creature_ptr, POSITION dis, BIT_FLAGS mode);
-extern void teleport_player(POSITION dis, BIT_FLAGS mode);
+extern void teleport_player(player_type *creature_ptr, POSITION dis, BIT_FLAGS mode);
 extern void teleport_player_away(MONSTER_IDX m_idx, POSITION dis);
 extern void teleport_player_to(player_type *creature_ptr, POSITION ny, POSITION nx, BIT_FLAGS mode);
 extern void teleport_away_followable(MONSTER_IDX m_idx);

diff --git a/src/spells1.c b/src/spells1.c
index 7c2b746..72beebc 100644 (file)
--- a/src/spells1.c
+++ b/src/spells1.c
@@ -4630,7 +4630,7 @@ static bool project_p(MONSTER_IDX who, player_type *target_ptr, concptr who_name
 
                if (!CHECK_MULTISHADOW(target_ptr))
                {
-                       teleport_player(5, TELEPORT_PASSIVE);
+                       teleport_player(target_ptr, 5, TELEPORT_PASSIVE);
                        if (!target_ptr->levitation)
                                (void)set_slow(target_ptr, target_ptr->slow + randint0(4) + 4, FALSE);
                        if (!(target_ptr->resist_sound || target_ptr->levitation))

diff --git a/src/spells2.c b/src/spells2.c
index 9481e62..fb49b60 100644 (file)
--- a/src/spells2.c
+++ b/src/spells2.c
@@ -2574,7 +2574,7 @@ bool activate_ty_curse(bool stop_ty, int *count)
                        if (!(*count))
                        {
                                msg_print(_("周囲の空間が歪んだ！", "Space warps about you!"));
-                               teleport_player(damroll(10, 10), TELEPORT_PASSIVE);
+                               teleport_player(p_ptr, damroll(10, 10), TELEPORT_PASSIVE);
                                if (randint0(13)) (*count) += activate_hi_summon(p_ptr->y, p_ptr->x, FALSE);
                                if (!one_in_(6)) break;
                        }
@@ -2970,7 +2970,7 @@ bool kawarimi(bool success)
        y = p_ptr->y;
        x = p_ptr->x;
 
-       teleport_player(10 + randint1(90), 0L);
+       teleport_player(p_ptr, 10 + randint1(90), 0L);
        object_wipe(q_ptr);
        object_prep(q_ptr, lookup_kind(TV_STATUE, SV_WOODEN_STATUE));
 
@@ -3203,16 +3203,16 @@ void wild_magic(int spell)
        case 1:
        case 2:
        case 3:
-               teleport_player(10, TELEPORT_PASSIVE);
+               teleport_player(p_ptr, 10, TELEPORT_PASSIVE);
                break;
        case 4:
        case 5:
        case 6:
-               teleport_player(100, TELEPORT_PASSIVE);
+               teleport_player(p_ptr, 100, TELEPORT_PASSIVE);
                break;
        case 7:
        case 8:
-               teleport_player(200, TELEPORT_PASSIVE);
+               teleport_player(p_ptr, 200, TELEPORT_PASSIVE);
                break;
        case 9:
        case 10:
@@ -3747,7 +3747,7 @@ void cast_shuffle(player_type *caster_ptr)
        else if (die < 40)
        {
                msg_print(_("テレポート・カードだ。", "It's a teleport trump card."));
-               teleport_player(10, TELEPORT_PASSIVE);
+               teleport_player(p_ptr, 10, TELEPORT_PASSIVE);
        }
        else if (die < 42)
        {
@@ -3757,12 +3757,12 @@ void cast_shuffle(player_type *caster_ptr)
        else if (die < 47)
        {
                msg_print(_("テレポート・カードだ。", "It's a teleport trump card."));
-               teleport_player(100, TELEPORT_PASSIVE);
+               teleport_player(p_ptr, 100, TELEPORT_PASSIVE);
        }
        else if (die < 52)
        {
                msg_print(_("テレポート・カードだ。", "It's a teleport trump card."));
-               teleport_player(200, TELEPORT_PASSIVE);
+               teleport_player(p_ptr, 200, TELEPORT_PASSIVE);
        }
        else if (die < 60)
        {
@@ -3915,7 +3915,7 @@ bool panic_hit(void)
                if (randint0(p_ptr->skill_dis) < 7)
                        msg_print(_("うまく逃げられなかった。", "You failed to run away."));
                else
-                       teleport_player(30, 0L);
+                       teleport_player(p_ptr, 30, 0L);
                return TRUE;
        }
        else

diff --git a/src/spells3.c b/src/spells3.c
index 41619d6..cab7594 100644 (file)
--- a/src/spells3.c
+++ b/src/spells3.c
@@ -400,25 +400,25 @@ bool teleport_player_aux(player_type *creature_ptr, POSITION dis, BIT_FLAGS mode
  * @param mode オプション
  * @return なし
  */
-void teleport_player(POSITION dis, BIT_FLAGS mode)
+void teleport_player(player_type *creature_ptr, POSITION dis, BIT_FLAGS mode)
 {
        POSITION yy, xx;
-       POSITION oy = p_ptr->y;
-       POSITION ox = p_ptr->x;
+       POSITION oy = creature_ptr->y;
+       POSITION ox = creature_ptr->x;
 
-       if (!teleport_player_aux(p_ptr, dis, mode)) return;
+       if (!teleport_player_aux(creature_ptr, dis, mode)) return;
 
        /* Monsters with teleport ability may follow the player */
        for (xx = -1; xx < 2; xx++)
        {
                for (yy = -1; yy < 2; yy++)
                {
-                       MONSTER_IDX tmp_m_idx = p_ptr->current_floor_ptr->grid_array[oy+yy][ox+xx].m_idx;
+                       MONSTER_IDX tmp_m_idx = creature_ptr->current_floor_ptr->grid_array[oy+yy][ox+xx].m_idx;
 
                        /* A monster except your mount may follow */
-                       if (tmp_m_idx && (p_ptr->riding != tmp_m_idx))
+                       if (tmp_m_idx && (creature_ptr->riding != tmp_m_idx))
                        {
-                               monster_type *m_ptr = &p_ptr->current_floor_ptr->m_list[tmp_m_idx];
+                               monster_type *m_ptr = &creature_ptr->current_floor_ptr->m_list[tmp_m_idx];
                                monster_race *r_ptr = &r_info[m_ptr->r_idx];
 
                                /*
@@ -428,7 +428,7 @@ void teleport_player(POSITION dis, BIT_FLAGS mode)
                                if ((r_ptr->a_ability_flags2 & RF6_TPORT) &&
                                    !(r_ptr->flagsr & RFR_RES_TELE))
                                {
-                                       if (!MON_CSLEEP(m_ptr)) teleport_monster_to(tmp_m_idx, p_ptr->y, p_ptr->x, r_ptr->level, 0L);
+                                       if (!MON_CSLEEP(m_ptr)) teleport_monster_to(tmp_m_idx, creature_ptr->y, creature_ptr->x, r_ptr->level, 0L);
                                }
                        }
                }
@@ -574,7 +574,7 @@ void teleport_away_followable(MONSTER_IDX m_idx)
                        {
                                if (one_in_(3))
                                {
-                                       teleport_player(200, TELEPORT_PASSIVE);
+                                       teleport_player(p_ptr, 200, TELEPORT_PASSIVE);
                                        msg_print(_("失敗！", "Failed!"));
                                }
                                else teleport_player_to(p_ptr, m_ptr->fy, m_ptr->fx, 0L);
@@ -2963,7 +2963,7 @@ static bool dimension_door_aux(DEPTH x, DEPTH y)
            (!randint0(plev / 10 + 10)))
        {
                p_ptr->energy_need += (s16b)((s32b)(60 - plev) * ENERGY_NEED() / 100L);
-               teleport_player((plev + 2) * 2, TELEPORT_PASSIVE);
+               teleport_player(p_ptr, (plev + 2) * 2, TELEPORT_PASSIVE);
 
                /* Failed */
                return FALSE;

diff --git a/src/trap.c b/src/trap.c
index 63d5d27..485bc53 100644 (file)
--- a/src/trap.c
+++ b/src/trap.c
@@ -483,7 +483,7 @@ void hit_trap(player_type *trapped_ptr, bool break_trap)
        case TRAP_TELEPORT:
        {
                msg_print(_("テレポート・トラップにひっかかった！", "You hit a teleport trap!"));
-               teleport_player(100, TELEPORT_PASSIVE);
+               teleport_player(trapped_ptr, 100, TELEPORT_PASSIVE);
                break;
        }
 

diff --git a/src/wizard2.c b/src/wizard2.c
index 076aac7..93af6d7 100644 (file)
--- a/src/wizard2.c
+++ b/src/wizard2.c
@@ -1918,7 +1918,7 @@ void do_cmd_debug(player_type *creature_ptr)
 
        /* Phase Door */
        case 'p':
-               teleport_player(10, 0L);
+               teleport_player(creature_ptr, 10, 0L);
                break;
 
        /* Take a Quests */
@@ -1986,7 +1986,7 @@ void do_cmd_debug(player_type *creature_ptr)
 
        /* Teleport */
        case 't':
-               teleport_player(100, 0L);
+               teleport_player(creature_ptr, 100, 0L);
                break;
 
        /* Game Time Setting */