From 1ece860245ae4e8808359db5049a9d6785202f41 Mon Sep 17 00:00:00 2001 From: nothere Date: Wed, 13 Aug 2003 08:37:46 +0000 Subject: [PATCH] =?utf8?q?=E4=BF=9D=E5=AD=98=E9=9A=8E=E3=81=AB=E3=81=84?= =?utf8?q?=E3=82=8B=E3=82=A2=E3=82=A4=E3=83=86=E3=83=A0=E3=82=92=E6=8B=BE?= =?utf8?q?=E3=81=A3=E3=81=9F=E3=83=A6=E3=83=8B=E3=83=BC=E3=82=AF=E3=83=A2?= =?utf8?q?=E3=83=B3=E3=82=B9=E3=82=BF=E3=83=BC=E3=81=8C=E5=88=A5=E3=81=AE?= =?utf8?q?=E9=9A=8E=E3=81=AB=E7=8F=BE=E3=82=8C=E3=81=A6=E3=81=8B=E3=82=89?= =?utf8?q?=E4=BF=9D=20=E5=AD=98=E9=9A=8E=E3=81=AB=E6=88=BB=E3=81=A3?= =?utf8?q?=E3=81=9F=E5=A0=B4=E5=90=88,=20lite=5Fspot()=E3=81=8C=E5=91=BC?= =?utf8?q?=E3=81=B0=E3=82=8C=E3=81=9F=E9=9A=9B=E3=81=AB=E9=85=8D=E5=88=97?= =?utf8?q?=E5=A4=96=E3=82=A2=E3=82=AF=E3=82=BB=E3=82=B9=E3=82=92=E8=B5=B7?= =?utf8?q?=E3=81=93=E3=81=97=E3=81=A6=E5=BC=B7=20=E5=88=B6=E7=B5=82?= =?utf8?q?=E4=BA=86=E3=81=99=E3=82=8B=E5=A0=B4=E5=90=88=E3=81=8C=E3=81=82?= =?utf8?q?=E3=82=8B=E3=83=90=E3=82=B0=E3=82=92=E4=BF=AE=E6=AD=A3.=20?= =?utf8?q?=E3=81=BE=E3=81=9F,=20monster=5Fdrop=5Fcarried=5Fobjects()=20?= =?utf8?q?=E5=86=85=E3=81=A7=E3=81=AEo=5Fptr->held=5Fm=5Fidx=E3=81=AE?= =?utf8?q?=E6=89=B1=E3=81=84=E3=81=8C=E3=81=8A=E3=81=8B=E3=81=97=E3=81=8F,?= =?utf8?q?=20=E3=83=A2=E3=83=B3=E3=82=B9=E3=82=BF=E3=83=BC=E3=81=8C?= =?utf8?q?=E3=82=A2=E3=82=A4=E3=83=86=E3=83=A0=E3=82=92=E8=90=BD=E3=81=A8?= =?utf8?q?=E3=81=99=20=E5=BA=A6=E3=81=AB=E5=BA=A7=E6=A8=99(0,0)=E3=81=8C?= =?utf8?q?=E5=86=8D=E6=8F=8F=E7=94=BB=E3=81=95=E3=82=8C=E3=81=A6=E3=81=84?= =?utf8?q?=E3=81=9F=E3=83=90=E3=82=B0=E3=82=82=E4=BF=AE=E6=AD=A3.?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- src/monster2.c | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/src/monster2.c b/src/monster2.c index ae7d45b4a..6b0fb5a36 100644 --- a/src/monster2.c +++ b/src/monster2.c @@ -245,8 +245,10 @@ void delete_monster_idx(int i) /* Acquire next object */ next_o_idx = o_ptr->next_o_idx; - /* Hack -- efficiency */ - o_ptr->held_m_idx = 0; + /* + * o_ptr->held_m_idx is needed in delete_object_idx() + * to prevent calling lite_spot() + */ /* Delete the object */ delete_object_idx(this_o_idx); @@ -4962,15 +4964,15 @@ void monster_drop_carried_objects(monster_type *m_ptr) /* Acquire next object */ next_o_idx = o_ptr->next_o_idx; - /* Paranoia */ - o_ptr->held_m_idx = 0; - /* Get local object */ q_ptr = &forge; /* Copy the object */ object_copy(q_ptr, o_ptr); + /* Forget monster */ + q_ptr->held_m_idx = 0; + /* Delete the object */ delete_object_idx(this_o_idx); -- 2.11.0