X-Git-Url: http://git.osdn.net/view?a=blobdiff_plain;f=src%2Fmonster2.c;h=8ce1b4cf79a9bdd2114881e0da3a0dad605697fd;hb=fc28a8a29bc4f185493861d134ec31d60603e22d;hp=65d7f2f4b53994a4051b7d420d22c0483097c3c4;hpb=9d4b877c27a36774ae5256db6237264298837607;p=hengband%2Fhengband.git

diff --git a/src/monster2.c b/src/monster2.c
index 65d7f2f4b..8ce1b4cf7 100644
--- a/src/monster2.c
+++ b/src/monster2.c
@@ -11,6 +11,9 @@
  */
 
 #include "angband.h"
+#include "cmd-pet.h"
+#include "monster-hook.h"
+#include "monster-status.h"
 
 #define HORDE_NOGOOD 0x01 /*!< (未実装フラグ)HORDE生成でGOODなモンスターの生成を禁止する？ */
 #define HORDE_NOEVIL 0x02 /*!< (未実装フラグ)HORDE生成でEVILなモンスターの生成を禁止する？ */
@@ -169,7 +172,7 @@ cptr funny_comments[MAX_SAN_COMMENT] =
  * @param x 目標x座標
  * @return なし
  */
-void set_target(monster_type *m_ptr, int y, int x)
+void set_target(monster_type *m_ptr, POSITION y, POSITION x)
 {
 	m_ptr->target_y = y;
 	m_ptr->target_x = x;
@@ -221,20 +224,15 @@ monster_race *real_r_ptr(monster_type *m_ptr)
  */
 void delete_monster_idx(MONSTER_IDX i)
 {
-	int x, y;
-
+	POSITION x, y;
 	monster_type *m_ptr = &m_list[i];
-
 	monster_race *r_ptr = &r_info[m_ptr->r_idx];
-
-	s16b this_o_idx, next_o_idx = 0;
-
+	OBJECT_IDX this_o_idx, next_o_idx = 0;
 
 	/* Get location */
 	y = m_ptr->fy;
 	x = m_ptr->fx;
 
-
 	/* Hack -- Reduce the racial counter */
 	real_r_ptr(m_ptr)->cur_num--;
 
@@ -268,8 +266,6 @@ void delete_monster_idx(MONSTER_IDX i)
 	for (this_o_idx = m_ptr->hold_o_idx; this_o_idx; this_o_idx = next_o_idx)
 	{
 		object_type *o_ptr;
-
-		/* Acquire object */
 		o_ptr = &o_list[this_o_idx];
 
 		/* Acquire next object */
@@ -280,7 +276,6 @@ void delete_monster_idx(MONSTER_IDX i)
 		 * to prevent calling lite_spot()
 		 */
 
-		/* Delete the object */
 		delete_object_idx(this_o_idx);
 	}
 
@@ -332,23 +327,18 @@ void delete_monster(POSITION y, POSITION x)
  */
 static void compact_monsters_aux(IDX i1, IDX i2)
 {
-	int y, x, i;
-
+	POSITION y, x;
+	int i;
 	cave_type *c_ptr;
-
 	monster_type *m_ptr;
-
-	s16b this_o_idx, next_o_idx = 0;
-
+	OBJECT_IDX this_o_idx, next_o_idx = 0;
 
 	/* Do nothing */
 	if (i1 == i2) return;
 
-
 	/* Old monster */
 	m_ptr = &m_list[i1];
 
-	/* Location */
 	y = m_ptr->fy;
 	x = m_ptr->fx;
 
@@ -362,8 +352,6 @@ static void compact_monsters_aux(IDX i1, IDX i2)
 	for (this_o_idx = m_ptr->hold_o_idx; this_o_idx; this_o_idx = next_o_idx)
 	{
 		object_type *o_ptr;
-
-		/* Acquire object */
 		o_ptr = &o_list[this_o_idx];
 
 		/* Acquire next object */
@@ -478,12 +466,10 @@ void compact_monsters(int size)
 			if (record_named_pet && is_pet(m_ptr) && m_ptr->nickname)
 			{
 				char m_name[80];
-
 				monster_desc(m_name, m_ptr, MD_INDEF_VISIBLE);
 				do_cmd_write_nikki(NIKKI_NAMED_PET, RECORD_NAMED_PET_COMPACT, m_name);
 			}
 
-			/* Delete the monster */
 			delete_monster_idx(i);
 
 			/* Count the monster */
@@ -597,7 +583,6 @@ MONSTER_IDX m_pop(void)
 {
 	MONSTER_IDX i;
 
-
 	/* Normal allocation */
 	if (m_max < max_m_idx)
 	{
@@ -614,7 +599,6 @@ MONSTER_IDX m_pop(void)
 		return (i);
 	}
 
-
 	/* Recycle dead monsters */
 	for (i = 1; i < m_max; i++)
 	{
@@ -633,7 +617,6 @@ MONSTER_IDX m_pop(void)
 		return (i);
 	}
 
-
 	/* Warn the player (except during dungeon creation) */
 	if (character_dungeon) msg_print(_("モンスターが多すぎる！", "Too many monsters!"));
 
@@ -961,8 +944,6 @@ static bool summon_specific_aux(MONRACE_IDX r_idx)
 			break;
 		}
 	}
-
-	/* Result */
 	/* Since okay is int, "return (okay);" is not correct. */
 	return (bool)(okay ? TRUE : FALSE);
 }
@@ -1454,8 +1435,6 @@ MONRACE_IDX get_mon_num(DEPTH level)
 		/* Keep the "best" one */
 		if (table[i].level < table[j].level) i = j;
 	}
-
-	/* Result */
 	return (table[i].index);
 }
 
@@ -1513,7 +1492,7 @@ MONRACE_IDX get_mon_num(DEPTH level)
  *  MD_PRON_VISIBLE | MD_POSSESSIVE | MD_OBJECTIVE
  *    --> Reflexive, genderized if visable ("himself") or "itself"
  */
-void monster_desc(char *desc, monster_type *m_ptr, int mode)
+void monster_desc(char *desc, monster_type *m_ptr, BIT_FLAGS mode)
 {
 	cptr            res;
 	monster_race    *r_ptr;
@@ -1898,7 +1877,6 @@ int lore_do_probe(MONRACE_IDX r_idx)
 	/* Update monster recall window */
 	if (p_ptr->monster_race_idx == r_idx)
 	{
-		/* Window stuff */
 		p_ptr->window |= (PW_MONSTER);
 	}
 
@@ -1924,7 +1902,7 @@ int lore_do_probe(MONRACE_IDX r_idx)
  * gold and items are dropped, and remembers that information to be
  * described later by the monster recall code.
  */
-void lore_treasure(MONSTER_IDX m_idx, int num_item, int num_gold)
+void lore_treasure(MONSTER_IDX m_idx, ITEM_NUMBER num_item, ITEM_NUMBER num_gold)
 {
 	monster_type *m_ptr = &m_list[m_idx];
 
@@ -1944,7 +1922,6 @@ void lore_treasure(MONSTER_IDX m_idx, int num_item, int num_gold)
 	/* Update monster recall window */
 	if (p_ptr->monster_race_idx == m_ptr->r_idx)
 	{
-		/* Window stuff */
 		p_ptr->window |= (PW_MONSTER);
 	}
 }
@@ -1958,7 +1935,6 @@ void lore_treasure(MONSTER_IDX m_idx, int num_item, int num_gold)
  */
 void sanity_blast(monster_type *m_ptr, bool necro)
 {
-	bool happened = FALSE;
 	int power = 100;
 
 	if (p_ptr->inside_battle || !character_dungeon) return;
@@ -1979,14 +1955,14 @@ void sanity_blast(monster_type *m_ptr, bool necro)
 		}
 		else power *= 2;
 
-		if (!hack_mind)
+		if (!is_loading_now)
 			return; /* No effect yet, just loaded... */
 
 		if (!m_ptr->ml)
 			return; /* Cannot see it for some reason */
 
 		if (!(r_ptr->flags2 & RF2_ELDRITCH_HORROR))
-			return; /* oops */
+			return;
 
 		if (is_pet(m_ptr))
 			return; /* Pet eldritch horrors are safe most of the time */
@@ -2135,28 +2111,83 @@ void sanity_blast(monster_type *m_ptr, bool necro)
 		msg_print(_("ネクロノミコンを読んで正気を失った！", "Your sanity is shaken by reading the Necronomicon!"));
 	}
 
-	if (!saving_throw(p_ptr->skill_sav - power)) /* Mind blast */
+	if (saving_throw(p_ptr->skill_sav - power))
 	{
-		if (!p_ptr->resist_conf)
-		{
-			(void)set_confused(p_ptr->confused + randint0(4) + 4);
-		}
-		if (!p_ptr->resist_chaos && one_in_(3))
-		{
-			(void)set_image(p_ptr->image + randint0(250) + 150);
-		}
 		return;
 	}
 
-	if (!saving_throw(p_ptr->skill_sav - power)) /* Lose int & wis */
-	{
-		do_dec_stat(A_INT);
-		do_dec_stat(A_WIS);
-		return;
-	}
+	do {
+		(void)do_dec_stat(A_INT);
+	} while (randint0(100) > p_ptr->skill_sav && one_in_(2));
+
+	do {
+		(void)do_dec_stat(A_WIS);
+	} while (randint0(100) > p_ptr->skill_sav && one_in_(2));
 
-	if (!saving_throw(p_ptr->skill_sav - power)) /* Brain smash */
+	switch (randint1(21))
 	{
+	case 1:
+		if (!(p_ptr->muta3 & MUT3_MORONIC) && one_in_(5))
+		{
+			if ((p_ptr->stat_use[A_INT] < 4) && (p_ptr->stat_use[A_WIS] < 4))
+			{
+				msg_print(_("あなたは完璧な馬鹿になったような気がした。しかしそれは元々だった。", "You turn into an utter moron!"));
+			}
+			else
+			{
+				msg_print(_("あなたは完璧な馬鹿になった！", "You turn into an utter moron!"));
+			}
+
+			if (p_ptr->muta3 & MUT3_HYPER_INT)
+			{
+				msg_print(_("あなたの脳は生体コンピュータではなくなった。", "Your brain is no longer a living computer."));
+				p_ptr->muta3 &= ~(MUT3_HYPER_INT);
+			}
+			p_ptr->muta3 |= MUT3_MORONIC;
+		}
+		break;
+	case 2:
+	case 3:
+	case 4:
+		if (!(p_ptr->muta2 & MUT2_COWARDICE) && !p_ptr->resist_fear)
+		{
+			msg_print(_("あなたはパラノイアになった！", "You become paranoid!"));
+
+			/* Duh, the following should never happen, but anyway... */
+			if (p_ptr->muta3 & MUT3_FEARLESS)
+			{
+				msg_print(_("あなたはもう恐れ知らずではなくなった。", "You are no longer fearless."));
+				p_ptr->muta3 &= ~(MUT3_FEARLESS);
+			}
+
+			p_ptr->muta2 |= MUT2_COWARDICE;
+		}
+		break;
+	case 5:
+	case 6:
+	case 7:
+		if (!(p_ptr->muta2 & MUT2_HALLU) && !p_ptr->resist_chaos)
+		{
+			msg_print(_("幻覚をひき起こす精神錯乱に陥った！", "You are afflicted by a hallucinatory insanity!"));
+			p_ptr->muta2 |= MUT2_HALLU;
+		}
+		break;
+	case 8:
+	case 9:
+	case 10:
+		if (!(p_ptr->muta2 & MUT2_BERS_RAGE))
+		{
+			msg_print(_("激烈な感情の発作におそわれるようになった！", "You become subject to fits of berserk rage!"));
+			p_ptr->muta2 |= MUT2_BERS_RAGE;
+		}
+		break;
+	case 11:
+	case 12:
+	case 13:
+	case 14:
+	case 15:
+	case 16:
+		/* Brain smash */
 		if (!p_ptr->resist_conf)
 		{
 			(void)set_confused(p_ptr->confused + randint0(4) + 4);
@@ -2165,116 +2196,20 @@ void sanity_blast(monster_type *m_ptr, bool necro)
 		{
 			(void)set_paralyzed(p_ptr->paralyzed + randint0(4) + 4);
 		}
-		while (randint0(100) > p_ptr->skill_sav)
-			(void)do_dec_stat(A_INT);
-		while (randint0(100) > p_ptr->skill_sav)
-			(void)do_dec_stat(A_WIS);
 		if (!p_ptr->resist_chaos)
 		{
 			(void)set_image(p_ptr->image + randint0(250) + 150);
 		}
-		return;
-	}
-
-	if (!saving_throw(p_ptr->skill_sav - power)) /* Amnesia */
-	{
-
+		break;
+	case 17:
+	case 18:
+	case 19:
+	case 20:
+	case 21:
+		/* Amnesia */
 		if (lose_all_info())
 			msg_print(_("あまりの恐怖に全てのことを忘れてしまった！", "You forget everything in your utmost terror!"));
-
-		return;
-	}
-
-	if (saving_throw(p_ptr->skill_sav - power))
-	{
-		return;
-	}
-
-	/* Else gain permanent insanity */
-	if ((p_ptr->muta3 & MUT3_MORONIC) && /*(p_ptr->muta2 & MUT2_BERS_RAGE) &&*/
-		((p_ptr->muta2 & MUT2_COWARDICE) || (p_ptr->resist_fear)) &&
-		((p_ptr->muta2 & MUT2_HALLU) || (p_ptr->resist_chaos)))
-	{
-		/* The poor bastard already has all possible insanities! */
-		return;
-	}
-
-	while (!happened)
-	{
-		switch (randint1(21))
-		{
-			case 1:
-				if (!(p_ptr->muta3 & MUT3_MORONIC) && one_in_(5))
-				{
-					if ((p_ptr->stat_use[A_INT] < 4) && (p_ptr->stat_use[A_WIS] < 4))
-					{
-						msg_print(_("あなたは完璧な馬鹿になったような気がした。しかしそれは元々だった。", "You turn into an utter moron!"));
-					}
-					else
-					{
-						msg_print(_("あなたは完璧な馬鹿になった！", "You turn into an utter moron!"));
-					}
-
-					if (p_ptr->muta3 & MUT3_HYPER_INT)
-					{
-						msg_print(_("あなたの脳は生体コンピュータではなくなった。", "Your brain is no longer a living computer."));
-						p_ptr->muta3 &= ~(MUT3_HYPER_INT);
-					}
-					p_ptr->muta3 |= MUT3_MORONIC;
-					happened = TRUE;
-				}
-				break;
-			case 2:
-			case 3:
-			case 4:
-			case 5:
-			case 6:
-			case 7:
-			case 8:
-			case 9:
-			case 10:
-			case 11:
-				if (!(p_ptr->muta2 & MUT2_COWARDICE) && !p_ptr->resist_fear)
-				{
-					msg_print(_("あなたはパラノイアになった！", "You become paranoid!"));
-
-					/* Duh, the following should never happen, but anyway... */
-					if (p_ptr->muta3 & MUT3_FEARLESS)
-					{
-						msg_print(_("あなたはもう恐れ知らずではなくなった。", "You are no longer fearless."));
-						p_ptr->muta3 &= ~(MUT3_FEARLESS);
-					}
-
-					p_ptr->muta2 |= MUT2_COWARDICE;
-					happened = TRUE;
-				}
-				break;
-			case 12:
-			case 13:
-			case 14:
-			case 15:
-			case 16:
-			case 17:
-			case 18:
-			case 19:
-			case 20:
-			case 21:
-				if (!(p_ptr->muta2 & MUT2_HALLU) && !p_ptr->resist_chaos)
-				{
-					msg_print(_("幻覚をひき起こす精神錯乱に陥った！", "You are afflicted by a hallucinatory insanity!"));
-					p_ptr->muta2 |= MUT2_HALLU;
-					happened = TRUE;
-				}
-				break;
-			default:
-				if (!(p_ptr->muta2 & MUT2_BERS_RAGE))
-				{
-					msg_print(_("激烈な感情の発作におそわれるようになった！", "You become subject to fits of berserk rage!"));
-					p_ptr->muta2 |= MUT2_BERS_RAGE;
-					happened = TRUE;
-				}
-				break;
-		}
+		break;
 	}
 
 	p_ptr->update |= PU_BONUS;
@@ -2343,7 +2278,7 @@ void sanity_blast(monster_type *m_ptr, bool necro)
  * "disturb_near" (monster which is "easily" viewable moves in some
  * way).  Note that "moves" includes "appears" and "disappears".
  */
-void update_mon(MONSTER_IDX m_idx, bool full)
+void update_monster(MONSTER_IDX m_idx, bool full)
 {
 	monster_type *m_ptr = &m_list[m_idx];
 
@@ -2662,7 +2597,7 @@ void update_mon(MONSTER_IDX m_idx, bool full)
 			if (disturb_near && (projectable(m_ptr->fy, m_ptr->fx, p_ptr->y, p_ptr->x) && projectable(p_ptr->y, p_ptr->x, m_ptr->fy, m_ptr->fx)))
 			{
 				if (disturb_pets || is_hostile(m_ptr))
-					disturb(1, 1);
+					disturb(TRUE, TRUE);
 			}
 		}
 	}
@@ -2687,7 +2622,7 @@ void update_mon(MONSTER_IDX m_idx, bool full)
 			if (do_disturb)
 			{
 				if (disturb_pets || is_hostile(m_ptr))
-					disturb(1, 1);
+					disturb(TRUE, TRUE);
 			}
 		}
 	}
@@ -2706,7 +2641,7 @@ void update_mon(MONSTER_IDX m_idx, bool full)
 			if (do_disturb)
 			{
 				if (disturb_pets || is_hostile(m_ptr))
-					disturb(1, 1);
+					disturb(TRUE, TRUE);
 			}
 		}
 	}
@@ -2724,7 +2659,7 @@ void update_mon(MONSTER_IDX m_idx, bool full)
 			if (do_disturb)
 			{
 				if (disturb_pets || is_hostile(m_ptr))
-					disturb(1, 1);
+					disturb(TRUE, TRUE);
 			}
 		}
 	}
@@ -2747,9 +2682,7 @@ void update_monsters(bool full)
 
 		/* Skip dead monsters */
 		if (!m_ptr->r_idx) continue;
-
-		/* Update the monster */
-		update_mon(i, full);
+		update_monster(i, full);
 	}
 }
 
@@ -2852,7 +2785,7 @@ void choose_new_monster(MONSTER_IDX m_idx, bool born, MONRACE_IDX r_idx)
 
 	if (!r_idx)
 	{
-		int level;
+		DEPTH level;
 
 		chameleon_change_m_idx = m_idx;
 		if (old_unique)
@@ -2882,7 +2815,7 @@ void choose_new_monster(MONSTER_IDX m_idx, bool born, MONRACE_IDX r_idx)
 
 	m_ptr->r_idx = r_idx;
 	m_ptr->ap_r_idx = r_idx;
-	update_mon(m_idx, FALSE);
+	update_monster(m_idx, FALSE);
 	lite_spot(m_ptr->fy, m_ptr->fx);
 
 	if ((r_info[old_r_idx].flags7 & (RF7_LITE_MASK | RF7_DARK_MASK)) ||
@@ -3030,10 +2963,10 @@ byte get_mspeed(monster_race *r_ptr)
  *
  * This routine refuses to place out-of-depth "FORCE_DEPTH" monsters.
  *
- * XXX XXX XXX Use special "here" and "dead" flags for unique monsters,
+ * Use special "here" and "dead" flags for unique monsters,
  * remove old "cur_num" and "max_num" fields.
  *
- * XXX XXX XXX Actually, do something similar for artifacts, to simplify
+ * Actually, do something similar for artifacts, to simplify
  * the "preserve" mode, and to make the "what artifacts" flag more useful.
  *
  * This is the only function which may place a monster in the dungeon,
@@ -3141,7 +3074,6 @@ static bool place_monster_one(MONSTER_IDX who, POSITION y, POSITION x, MONRACE_I
 			c_ptr->info &= ~(CAVE_OBJECT);
 			c_ptr->mimic = 0;
 
-			/* Notice */
 			note_spot(y, x);
 		}
 		else return FALSE;
@@ -3329,9 +3261,7 @@ static bool place_monster_one(MONSTER_IDX who, POSITION y, POSITION x, MONRACE_I
 		p_ptr->update |= (PU_MON_LITE);
 	else if ((r_ptr->flags7 & RF7_HAS_LD_MASK) && !MON_CSLEEP(m_ptr))
 		p_ptr->update |= (PU_MON_LITE);
-
-	/* Update the monster */
-	update_mon(c_ptr->m_idx, TRUE);
+	update_monster(c_ptr->m_idx, TRUE);
 
 
 	/* Count the monsters on the level */
@@ -3505,8 +3435,6 @@ static bool mon_scatter(MONRACE_IDX r_idx, POSITION *yp, POSITION *xp, POSITION
 	return TRUE;
 }
 
-#define GROUP_MAX 32 /*!< place_monster_group() 関数によるモンスターのGROUP生成時の配置最大数 / Maximum size of a group of monsters */
-
 /*!
  * @brief モンスターを目標地点に集団生成する / Attempt to place a "group" of monsters around the given location
  * @param who 召喚主のモンスター情報ID
@@ -3516,7 +3444,7 @@ static bool mon_scatter(MONRACE_IDX r_idx, POSITION *yp, POSITION *xp, POSITION
  * @param mode 生成オプション
  * @return 成功したらtrue
  */
-static bool place_monster_group(IDX who, POSITION y, POSITION x, MONRACE_IDX r_idx, u32b mode)
+static bool place_monster_group(MONSTER_IDX who, POSITION y, POSITION x, MONRACE_IDX r_idx, BIT_FLAGS mode)
 {
 	monster_race *r_ptr = &r_info[r_idx];
 
@@ -3602,14 +3530,14 @@ static bool place_monster_group(IDX who, POSITION y, POSITION x, MONRACE_IDX r_i
  * @brief 護衛対象となるモンスター種族IDを渡すグローバル変数 / Hack -- help pick an escort type
  * @todo 関数ポインタの都合を配慮しながら、グローバル変数place_monster_idxを除去し、関数引数化する
  */
-static IDX place_monster_idx = 0;
+static MONSTER_IDX place_monster_idx = 0;
 
 /*!
  * @var place_monster_m_idx
  * @brief 護衛対象となるモンスターIDを渡すグローバル変数 / Hack -- help pick an escort type
  * @todo 関数ポインタの都合を配慮しながら、グローバル変数place_monster_m_idxを除去し、関数引数化する
  */
-static IDX place_monster_m_idx = 0;
+static MONSTER_IDX place_monster_m_idx = 0;
 
 /*!
  * @brief モンスター種族が召喚主の護衛となれるかどうかをチェックする / Hack -- help pick an escort type
@@ -3649,7 +3577,6 @@ static bool place_monster_can_escort(MONRACE_IDX r_idx)
 	if ((r_ptr->flags7 & RF7_CHAMELEON) && !(z_ptr->flags7 & RF7_CHAMELEON))
 		return FALSE;
 
-	/* Okay */
 	return (TRUE);
 }
 
@@ -3781,13 +3708,9 @@ bool place_monster(POSITION y, POSITION x, BIT_FLAGS mode)
 	/* Attempt to place the monster */
 	if (place_monster_aux(0, y, x, r_idx, mode)) return (TRUE);
 
-	/* Oops */
 	return (FALSE);
 }
 
-
-#ifdef MONSTER_HORDES
-
 /*!
  * @brief 指定地点に1種類のモンスター種族による群れを生成する
  * @param y 生成地点y座標
@@ -3851,9 +3774,6 @@ bool alloc_horde(POSITION y, POSITION x)
 	return TRUE;
 }
 
-#endif /* MONSTER_HORDES */
-
-
 /*!
  * @brief ダンジョンの主生成を試みる / Put the Guardian
  * @param def_val 現在の主の生成状態
@@ -3861,7 +3781,7 @@ bool alloc_horde(POSITION y, POSITION x)
  */
 bool alloc_guardian(bool def_val)
 {
-	int guardian = d_info[dungeon_type].final_guardian;
+	MONRACE_IDX guardian = d_info[dungeon_type].final_guardian;
 
 	if (guardian && (d_info[dungeon_type].maxdepth == dun_level) && (r_info[guardian].cur_num < r_info[guardian].max_num))
 	{
@@ -3904,10 +3824,10 @@ bool alloc_guardian(bool def_val)
  * Use "slp" to choose the initial "sleep" status
  * Use "monster_level" for the monster level
  */
-bool alloc_monster(int dis, u32b mode)
+bool alloc_monster(POSITION dis, BIT_FLAGS mode)
 {
-	int			y = 0, x = 0;
-	int         attempts_left = 10000;
+	int y = 0, x = 0;
+	int attempts_left = 10000;
 
 	/* Put the Guardian */
 	if (alloc_guardian(FALSE)) return TRUE;
@@ -3944,7 +3864,6 @@ bool alloc_monster(int dis, u32b mode)
 	}
 
 
-#ifdef MONSTER_HORDES
 	if (randint1(5000) <= dun_level)
 	{
 		if (alloc_horde(y, x))
@@ -3955,16 +3874,10 @@ bool alloc_monster(int dis, u32b mode)
 	}
 	else
 	{
-#endif /* MONSTER_HORDES */
-
 		/* Attempt to place the monster, allow groups */
 		if (place_monster(y, x, (mode | PM_ALLOW_GROUP))) return (TRUE);
-
-#ifdef MONSTER_HORDES
 	}
-#endif /* MONSTER_HORDES */
 
-	/* Nope */
 	return (FALSE);
 }
 
@@ -4001,11 +3914,11 @@ static bool summon_specific_okay(MONRACE_IDX r_idx)
 		}
 	}
 
+	if (!summon_unique_okay && ((r_ptr->flags1 & RF1_UNIQUE) || (r_ptr->flags7 & RF7_NAZGUL))) return FALSE;
+
 	/* Hack -- no specific type specified */
 	if (!summon_specific_type) return (TRUE);
 
-	if (!summon_unique_okay && ((r_ptr->flags1 & RF1_UNIQUE) || (r_ptr->flags7 & RF7_NAZGUL))) return FALSE;
-
 	if ((summon_specific_who < 0) &&
 	    ((r_ptr->flags1 & RF1_UNIQUE) || (r_ptr->flags7 & RF7_NAZGUL)) &&
 	    monster_has_hostile_align(NULL, 10, -10, r_ptr))
@@ -4089,6 +4002,7 @@ bool summon_specific(MONSTER_IDX who, POSITION y1, POSITION x1, DEPTH lev, int t
 
 	summon_specific_type = 0;
 	/* Success */
+	sound(SOUND_SUMMON);
 	return (TRUE);
 }
 
@@ -4130,7 +4044,7 @@ bool summon_named_creature (MONSTER_IDX who, POSITION oy, POSITION ox, MONRACE_I
  * @details
  * Note that "reproduction" REQUIRES empty space.
  */
-bool multiply_monster(MONSTER_IDX m_idx, bool clone, u32b mode)
+bool multiply_monster(MONSTER_IDX m_idx, bool clone, BIT_FLAGS mode)
 {
 	monster_type	*m_ptr = &m_list[m_idx];
 
@@ -4510,7 +4424,6 @@ void update_smart_learn(MONSTER_IDX m_idx, int what)
 	if (!(r_ptr->flags2 & (RF2_SMART)) && (randint0(100) < 50)) return;
 
 
-	/* XXX XXX XXX */
 
 	/* Analyze the knowledge */
 	switch (what)
@@ -4631,7 +4544,7 @@ bool player_place(POSITION y, POSITION x)
  */
 void monster_drop_carried_objects(monster_type *m_ptr)
 {
-	s16b this_o_idx, next_o_idx = 0;
+	OBJECT_IDX this_o_idx, next_o_idx = 0;
 	object_type forge;
 	object_type *o_ptr;
 	object_type *q_ptr;
@@ -4640,13 +4553,10 @@ void monster_drop_carried_objects(monster_type *m_ptr)
 	/* Drop objects being carried */
 	for (this_o_idx = m_ptr->hold_o_idx; this_o_idx; this_o_idx = next_o_idx)
 	{
-		/* Acquire object */
 		o_ptr = &o_list[this_o_idx];
 
 		/* Acquire next object */
 		next_o_idx = o_ptr->next_o_idx;
-
-		/* Get local object */
 		q_ptr = &forge;
 
 		/* Copy the object */
@@ -4655,7 +4565,6 @@ void monster_drop_carried_objects(monster_type *m_ptr)
 		/* Forget monster */
 		q_ptr->held_m_idx = 0;
 
-		/* Delete the object */
 		delete_object_idx(this_o_idx);
 
 		/* Drop it */