X-Git-Url: http://git.osdn.net/view?a=blobdiff_plain;f=src%2Fmonster1.c;h=913332af148880843e4e88b37e6d6ef7321c53b2;hb=ef5fc5bd6d0b59af4087c2b1f741e8f24860604d;hp=ae5a39af1d35570f9b4254852ee70eab6a1c5edb;hpb=bd23dab5010eee32b843ffabf83d10cbdbc9fe9d;p=hengband%2Fhengband.git

diff --git a/src/monster1.c b/src/monster1.c
index ae5a39af1..913332af1 100644
--- a/src/monster1.c
+++ b/src/monster1.c
@@ -220,7 +220,7 @@ static void roff_aux(MONRACE_IDX r_idx, BIT_FLAGS mode)
 	int             msex = 0;
 
 	bool nightmare = ironman_nightmare && !(mode & 0x02);
-	int speed = nightmare ? r_ptr->speed + 5 : r_ptr->speed;
+	SPEED speed = nightmare ? r_ptr->speed + 5 : r_ptr->speed;
 
 	bool            breath = FALSE;
 	bool            magic = FALSE;
@@ -583,8 +583,6 @@ static void roff_aux(MONRACE_IDX r_idx, BIT_FLAGS mode)
 			hooked_roff(format(_("%^sは", "%^s "), wd_he[msex]));
 			old = TRUE;
 		}
-
-		/* Describe */
 		hooked_roff(_("侵入者を追跡しない", "does not deign to chase intruders"));
 	}
 
@@ -2451,48 +2449,3 @@ bool monster_has_hostile_align(monster_type *m_ptr, int pa_good, int pa_evil, mo
 	/* Non-hostile alignment */
 	return FALSE;
 }
-
-
-/*!
- * @brief モンスターが生命体かどうかを返す
- * Is the monster "alive"?
- * @param r_ptr 判定するモンスターの種族情報構造体参照ポインタ
- * @return 生命体ならばTRUEを返す
- * @details
- * Used to determine the message to print for a killed monster.
- * ("dies", "destroyed")
- */
-bool monster_living(monster_race *r_ptr)
-{
-	/* Non-living, undead, or demon */
-	if (r_ptr->flags3 & (RF3_DEMON | RF3_UNDEAD | RF3_NONLIVING))
-		return FALSE;
-	else
-		return TRUE;
-}
-
-
-/*!
- * @brief モンスターが特殊能力上、賞金首から排除する必要があるかどうかを返す。
- * Is the monster "alive"? / Is this monster declined to be questor or bounty?
- * @param r_idx モンスターの種族ID
- * @return 賞金首に加えられないならばTRUEを返す
- * @details
- * 実質バーノール＝ルパート用。
- */
-bool no_questor_or_bounty_uniques(MONRACE_IDX r_idx)
-{
-	switch (r_idx)
-	{
-	/*
-	 * Decline them to be questor or bounty because they use
-	 * special motion "split and combine"
-	 */
-	case MON_BANORLUPART:
-	case MON_BANOR:
-	case MON_LUPART:
-		return TRUE;
-	default:
-		return FALSE;
-	}
-}