From: nothere <nothere@0568b783-4c39-0410-ac80-bf13821ea2a2>
Date: Thu, 5 Aug 2004 23:59:39 +0000 (+0000)
Subject: アイテムを拾ったモンスターがカオス的効果やカオス属性等で変身し, 変身
X-Git-Tag: v2.1.2~376
X-Git-Url: http://git.osdn.net/view?p=hengband%2Fhengband.git;a=commitdiff_plain;h=56d92cdb7bca9a842b46ae7b0a7ba3264d50db97

アイテムを拾ったモンスターがカオス的効果やカオス属性等で変身し, 変身
に失敗した場合, 倒すと(なし)を落とすバグを修正. また, これらの変身で
はモンスターはアイテムを失わないように修正.
---

diff --git a/src/spells3.c b/src/spells3.c
index 7a2c935b4..68264b969 100644
--- a/src/spells3.c
+++ b/src/spells3.c
@@ -5492,12 +5492,17 @@ bool polymorph_monster(int y, int x)
 	if (new_r_idx != old_r_idx)
 	{
 		u32b mode = 0L;
+		bool preserve_hold_objects = back_m.hold_o_idx ? TRUE : FALSE;
+		s16b this_o_idx, next_o_idx = 0;
 
 		/* Get the monsters attitude */
 		if (is_friendly(m_ptr)) mode |= PM_FORCE_FRIENDLY;
 		if (is_pet(m_ptr)) mode |= PM_FORCE_PET;
 		if (m_ptr->mflag2 & MFLAG2_NOPET) mode |= PM_NO_PET;
 
+		/* Mega-hack -- ignore held objects */
+		m_ptr->hold_o_idx = 0;
+
 		/* "Kill" the "old" monster */
 		delete_monster_idx(c_ptr->m_idx);
 
@@ -5506,6 +5511,7 @@ bool polymorph_monster(int y, int x)
 		{
 			m_list[hack_m_idx_ii].nickname = back_m.nickname;
 			m_list[hack_m_idx_ii].parent_m_idx = back_m.parent_m_idx;
+			m_list[hack_m_idx_ii].hold_o_idx = back_m.hold_o_idx;
 
 			/* Success */
 			polymorphed = TRUE;
@@ -5520,6 +5526,35 @@ bool polymorph_monster(int y, int x)
 				/* Re-initialize monster process */
 				mproc_init();
 			}
+			else preserve_hold_objects = FALSE;
+		}
+
+		/* Mega-hack -- preserve held objects */
+		if (preserve_hold_objects)
+		{
+			for (this_o_idx = back_m.hold_o_idx; this_o_idx; this_o_idx = next_o_idx)
+			{
+				/* Acquire object */
+				object_type *o_ptr = &o_list[this_o_idx];
+
+				/* Acquire next object */
+				next_o_idx = o_ptr->next_o_idx;
+
+				/* Held by new monster */
+				o_ptr->held_m_idx = hack_m_idx_ii;
+			}
+		}
+		else if (back_m.hold_o_idx) /* Failed (paranoia) */
+		{
+			/* Delete objects */
+			for (this_o_idx = back_m.hold_o_idx; this_o_idx; this_o_idx = next_o_idx)
+			{
+				/* Acquire next object */
+				next_o_idx = o_list[this_o_idx].next_o_idx;
+
+				/* Delete the object */
+				delete_object_idx(this_o_idx);
+			}
 		}
 
 		if (targeted) target_who = hack_m_idx_ii;