From: Hourier <hourier@users.sourceforge.jp>
Date: Wed, 8 Jan 2020 15:43:08 +0000 (+0900)
Subject: [Refactor] #38997 dimension_door() とmirror_tunnel() に player_type * 引数を追加 / Added... 
X-Git-Tag: vmacos3.0.0-alpha52~2102
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=ceb55c906599b86e8af0cbb1b4af51f780f6ca71;p=hengbandforosx%2Fhengbandosx.git

[Refactor] #38997 dimension_door() とmirror_tunnel() に player_type * 引数を追加 / Added player_type * argument to  dimension_door() and mirror_tunnel()
---

diff --git a/src/cmd/cmd-activate.c b/src/cmd/cmd-activate.c
index e76347d2f..fea231e47 100644
--- a/src/cmd/cmd-activate.c
+++ b/src/cmd/cmd-activate.c
@@ -1530,7 +1530,7 @@ bool activate_artifact(player_type *user_ptr, object_type *o_ptr)
 	case ACT_DIM_DOOR:
 	{
 		msg_print(_("次元の扉が開いた。目的地を選んで下さい。", "You open a dimensional gate. Choose a destination."));
-		if (!dimension_door()) return FALSE;
+		if (!dimension_door(user_ptr)) return FALSE;
 		break;
 	}
 
diff --git a/src/mind.c b/src/mind.c
index 4accd42b1..5ed1b55e1 100644
--- a/src/mind.c
+++ b/src/mind.c
@@ -1432,7 +1432,7 @@ static bool cast_mirror_spell(player_type *caster_ptr, int spell)
 		/* mirror tunnel */
 	case 16:
 		msg_print(_("鏡の世界を通り抜け…  ", "Go through the world of mirror..."));
-		return mirror_tunnel();
+		return mirror_tunnel(caster_ptr);
 
 		/* mirror of recall */
 	case 17:
diff --git a/src/realm-sorcery.c b/src/realm-sorcery.c
index 88fae4d06..f675d153f 100644
--- a/src/realm-sorcery.c
+++ b/src/realm-sorcery.c
@@ -413,7 +413,7 @@ concptr do_sorcery_spell(player_type *caster_ptr, SPELL_IDX spell, BIT_FLAGS mod
 			if (cast)
 			{
 				msg_print(_("次元の扉が開いた。目的地を選んで下さい。", "You open a dimensional gate. Choose a destination."));
-				if (!dimension_door()) return NULL;
+				if (!dimension_door(caster_ptr)) return NULL;
 			}
 		}
 		break;
diff --git a/src/realm-trump.c b/src/realm-trump.c
index 14b41fe00..cafdb5499 100644
--- a/src/realm-trump.c
+++ b/src/realm-trump.c
@@ -290,7 +290,7 @@ concptr do_trump_spell(player_type *caster_ptr, SPELL_IDX spell, BIT_FLAGS mode)
 			if (cast)
 			{
 				msg_print(_("次元の扉が開いた。目的地を選んで下さい。", "You open a dimensional gate. Choose a destination."));
-				if (!dimension_door()) return NULL;
+				if (!dimension_door(caster_ptr)) return NULL;
 			}
 		}
 		break;
diff --git a/src/spells.h b/src/spells.h
index 40b718312..17ae8acc4 100644
--- a/src/spells.h
+++ b/src/spells.h
@@ -317,8 +317,8 @@ extern PERCENTAGE mod_spell_chance_2(player_type *caster_ptr, PERCENTAGE chance)
 extern PERCENTAGE spell_chance(player_type *caster_ptr, SPELL_IDX spell, REALM_IDX realm);
 extern void print_spells(player_type* caster_ptr, SPELL_IDX target_spell, SPELL_IDX *spells, int num, TERM_LEN y, TERM_LEN x, REALM_IDX realm);
 extern bool polymorph_monster(player_type *caster_ptr, POSITION y, POSITION x);
-extern bool dimension_door(void);
-extern bool mirror_tunnel(void);
+extern bool dimension_door(player_type *caster_ptr);
+extern bool mirror_tunnel(player_type *caster_ptr);
 extern void massacre(player_type *caster_ptr);
 extern bool eat_rock(player_type *caster_ptr);
 extern bool shock_power(player_type *caster_ptr);
diff --git a/src/spells3.c b/src/spells3.c
index 20796a6a1..bea48dbe0 100644
--- a/src/spells3.c
+++ b/src/spells3.c
@@ -2841,12 +2841,12 @@ static bool dimension_door_aux(player_type *caster_ptr, POSITION x, POSITION y)
  * Dimension Door
  * @return ターンを消費した場合TRUEを返す
  */
-bool dimension_door(void)
+bool dimension_door(player_type *caster_ptr)
 {
 	DEPTH x = 0, y = 0;
 
-	if (!tgt_pt(p_ptr, &x, &y)) return FALSE;
-	if (dimension_door_aux(p_ptr, x, y)) return TRUE;
+	if (!tgt_pt(caster_ptr, &x, &y)) return FALSE;
+	if (dimension_door_aux(caster_ptr, x, y)) return TRUE;
 
 	msg_print(_("精霊界から物質界に戻る時うまくいかなかった！", "You fail to exit the astral plane correctly!"));
 	return TRUE;
@@ -2859,11 +2859,11 @@ bool dimension_door(void)
  * @param caster_ptr プレーヤーへの参照ポインタ
  * @return ターンを消費した場合TRUEを返す
  */
-bool mirror_tunnel(void)
+bool mirror_tunnel(player_type *caster_ptr)
 {
 	POSITION x = 0, y = 0;
-	if (!tgt_pt(p_ptr, &x, &y)) return FALSE;
-	if (dimension_door_aux(p_ptr, x, y)) return TRUE;
+	if (!tgt_pt(caster_ptr, &x, &y)) return FALSE;
+	if (dimension_door_aux(caster_ptr, x, y)) return TRUE;
 
 	msg_print(_("鏡の世界をうまく通れなかった！", "You fail to pass the mirror plane correctly!"));
 	return TRUE;