X-Git-Url: http://git.osdn.net/view?a=blobdiff_plain;f=src%2Fmelee1.c;h=dc707fc972db683b1cee5fe751f5b8377e3c3c65;hb=73cc25b91b1598b5f2a7ba0279bba383333ab81d;hp=45d271a7d3e8c425d7d9c617ec68a0ff3157a05e;hpb=24a2f02eca5e4b45296589db0f5408eb4eaa5967;p=hengbandforosx%2Fhengbandosx.git

diff --git a/src/melee1.c b/src/melee1.c
index 45d271a7d..dc707fc97 100644
--- a/src/melee1.c
+++ b/src/melee1.c
@@ -436,7 +436,7 @@ static void py_attack_aux(POSITION y, POSITION x, bool *fear, bool *mdeath, s16b
 	int num = 0, bonus, chance, vir;
 	HIT_POINT k;
 
-	grid_type       *g_ptr = &current_floor->grid_array[y][x];
+	grid_type       *g_ptr = &current_floor_ptr->grid_array[y][x];
 
 	monster_type    *m_ptr = &m_list[g_ptr->m_idx];
 	monster_race    *r_ptr = &r_info[m_ptr->r_idx];
@@ -1307,7 +1307,7 @@ static void py_attack_aux(POSITION y, POSITION x, bool *fear, bool *mdeath, s16b
 	if (do_quake)
 	{
 		earthquake(p_ptr->y, p_ptr->x, 10);
-		if (!current_floor->grid_array[y][x].m_idx) *mdeath = TRUE;
+		if (!current_floor_ptr->grid_array[y][x].m_idx) *mdeath = TRUE;
 	}
 }
 
@@ -1326,7 +1326,7 @@ bool py_attack(POSITION y, POSITION x, BIT_FLAGS mode)
 	bool            mdeath = FALSE;
 	bool            stormbringer = FALSE;
 
-	grid_type       *g_ptr = &current_floor->grid_array[y][x];
+	grid_type       *g_ptr = &current_floor_ptr->grid_array[y][x];
 	monster_type    *m_ptr = &m_list[g_ptr->m_idx];
 	monster_race    *r_ptr = &r_info[m_ptr->r_idx];
 	GAME_TEXT m_name[MAX_NLEN];
@@ -3004,7 +3004,7 @@ bool make_attack_normal(MONSTER_IDX m_idx)
 							r_ptr->r_flagsr |= (r_ptr->flagsr & RFR_EFF_RES_SHAR_MASK);
 					}
 
-					if (is_mirror_grid(&current_floor->grid_array[p_ptr->y][p_ptr->x]))
+					if (is_mirror_grid(&current_floor_ptr->grid_array[p_ptr->y][p_ptr->x]))
 					{
 						teleport_player(10, 0L);
 					}