X-Git-Url: http://git.osdn.net/view?a=blobdiff_plain;f=src%2Fcmd2.c;h=cd434a8a014a554e9b92cefeb1b1c1ca5358b00f;hb=f5d7e7a38b4256114811b63e44dd04509f011dbd;hp=d6aa0135435a081f5d6848baf5675cfa938df888;hpb=2427a4790e784a1e988eb52106b19da5bec1a6f1;p=hengband%2Fhengband.git

diff --git a/src/cmd2.c b/src/cmd2.c
index d6aa01354..cd434a8a0 100644
--- a/src/cmd2.c
+++ b/src/cmd2.c
@@ -12,8 +12,10 @@
 
 #include "angband.h"
 #include "chest.h"
+#include "floor.h"
 #include "melee.h"
 #include "object-hook.h"
+#include "projection.h"
 
 /*!
  * @brief フロア脱出時に出戻りが不可能だった場合に警告を加える処理
@@ -1014,7 +1016,7 @@ static bool do_cmd_tunnel_aux(POSITION y, POSITION x)
 	cave_type *c_ptr;
 	feature_type *f_ptr, *mimic_f_ptr;
 	int power;
-	cptr name;
+	concptr name;
 	bool more = FALSE;
 
 	/* Verify legality */
@@ -1406,7 +1408,7 @@ bool do_cmd_disarm_aux(POSITION y, POSITION x, DIRECTION dir)
 	feature_type *f_ptr = &f_info[c_ptr->feat];
 
 	/* Access trap name */
-	cptr name = (f_name + f_ptr->name);
+	concptr name = (f_name + f_ptr->name);
 
 	/* Extract trap "power" */
 	int power = f_ptr->power;
@@ -1597,7 +1599,7 @@ static bool do_cmd_bash_aux(POSITION y, POSITION x, DIRECTION dir)
 
 	bool		more = FALSE;
 
-	cptr name = f_name + f_info[get_feat_mimic(c_ptr)].name;
+	concptr name = f_name + f_info[get_feat_mimic(c_ptr)].name;
 
 	p_ptr->energy_use = 100;
 
@@ -2117,7 +2119,7 @@ void do_cmd_rest(void)
 	/* Prompt for time if needed */
 	if (command_arg <= 0)
 	{
-		cptr p = _("休憩 (0-9999, '*' で HP/MP全快, '&' で必要なだけ): ", 
+		concptr p = _("休憩 (0-9999, '*' で HP/MP全快, '&' で必要なだけ): ", 
 				   "Rest (0-9999, '*' for HP/SP, '&' as needed): ");
 
 
@@ -2917,10 +2919,7 @@ void do_cmd_fire_aux(INVENTORY_IDX item, object_type *j_ptr)
 
 					if (m_ptr->ml)
 					{
-						/* Hack -- Track this monster race */
 						if (!p_ptr->image) monster_race_track(m_ptr->ap_r_idx);
-
-						/* Hack -- Track this monster */
 						health_track(c_mon_ptr->m_idx);
 					}
 				}
@@ -3135,7 +3134,7 @@ void do_cmd_fire(void)
 {
 	OBJECT_IDX item;
 	object_type *j_ptr, *ammo_ptr;
-	cptr q, s;
+	concptr q, s;
 
 	if(p_ptr->wild_mode) return;
 
@@ -3247,7 +3246,7 @@ bool do_cmd_throw(int mult, bool boomerang, OBJECT_IDX shuriken)
 	int msec = delay_factor * delay_factor * delay_factor;
 
 	BIT_FLAGS flgs[TR_FLAG_SIZE];
-	cptr q, s;
+	concptr q, s;
 	bool come_back = FALSE;
 	bool do_drop = TRUE;
 
@@ -3513,10 +3512,7 @@ bool do_cmd_throw(int mult, bool boomerang, OBJECT_IDX shuriken)
 
 					if (m_ptr->ml)
 					{
-						/* Hack -- Track this monster race */
 						if (!p_ptr->image) monster_race_track(m_ptr->ap_r_idx);
-
-						/* Hack -- Track this monster */
 						health_track(c_ptr->m_idx);
 					}
 				}