From 405bec660f92f0884459c72375f369b4060ce954 Mon Sep 17 00:00:00 2001
From: Deskull <deskull@users.sourceforge.jp>
Date: Thu, 14 Feb 2019 19:01:56 +0900
Subject: [PATCH] =?utf8?q?[Refactor]=20#37353=20=E3=82=B3=E3=83=A1?=
 =?utf8?q?=E3=83=B3=E3=83=88=E6=95=B4=E7=90=86=E3=80=82=20/=20Refactor=20c?=
 =?utf8?q?omments.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

---
 src/cmd-item.c      |  6 ------
 src/object2.c       | 17 +----------------
 src/player-status.c |  2 --
 3 files changed, 1 insertion(+), 24 deletions(-)

diff --git a/src/cmd-item.c b/src/cmd-item.c
index 3e374754d..dcc19ece8 100644
--- a/src/cmd-item.c
+++ b/src/cmd-item.c
@@ -883,10 +883,7 @@ void do_cmd_uninscribe(void)
 
 	/* Remove the incription */
 	o_ptr->inscription = 0;
-
-	/* Combine the pack */
 	p_ptr->update |= (PU_COMBINE);
-
 	p_ptr->window |= (PW_INVEN | PW_EQUIP);
 
 	/* .や$の関係で, 再計算が必要なはず -- henkma */
@@ -935,10 +932,7 @@ void do_cmd_inscribe(void)
 	{
 		/* Save the inscription */
 		o_ptr->inscription = quark_add(out_val);
-
-		/* Combine the pack */
 		p_ptr->update |= (PU_COMBINE);
-
 		p_ptr->window |= (PW_INVEN | PW_EQUIP);
 
 		/* .や$の関係で, 再計算が必要なはず -- henkma */
diff --git a/src/object2.c b/src/object2.c
index 98f9f1293..720a9cb6e 100644
--- a/src/object2.c
+++ b/src/object2.c
@@ -1503,10 +1503,7 @@ bool can_player_destroy_object(object_type *o_ptr)
 
 		/* We have "felt" it (again) */
 		o_ptr->ident |= (IDENT_SENSE);
-
-		/* Combine the pack */
 		p_ptr->update |= (PU_COMBINE);
-
 		p_ptr->window |= (PW_INVEN | PW_EQUIP);
 
 		return FALSE;
@@ -5343,10 +5340,7 @@ void inven_item_increase(INVENTORY_IDX item, ITEM_NUMBER num)
 
 		/* Recalculate mana XXX */
 		p_ptr->update |= (PU_MANA);
-
-		/* Combine the pack */
 		p_ptr->update |= (PU_COMBINE);
-
 		p_ptr->window |= (PW_INVEN | PW_EQUIP);
 
 		/* Hack -- Clear temporary elemental brands if player takes off weapons */
@@ -7393,10 +7387,7 @@ static void drain_essence(void)
 
 	/* Apply autodestroy/inscription to the drained item */
 	autopick_alter_item(item, TRUE);
-
-	/* Combine the pack */
 	p_ptr->update |= (PU_COMBINE | PU_REORDER);
-
 	p_ptr->window |= (PW_INVEN);
 }
 
@@ -7984,17 +7975,14 @@ static void add_essence(ESSENCE_IDX mode)
 		}
 	}
 
-	take_turn(p_ptr, 100);;
+	take_turn(p_ptr, 100);
 
 #ifdef JP
 	msg_format("%sに%sの能力を付加しました。", o_name, es_ptr->add_name);
 #else
 	msg_format("You have added ability of %s to %s.", es_ptr->add_name, o_name);
 #endif
-
-	/* Combine the pack */
 	p_ptr->update |= (PU_COMBINE | PU_REORDER);
-
 	p_ptr->window |= (PW_INVEN);
 }
 
@@ -8035,10 +8023,7 @@ static void erase_essence(void)
 	object_flags(o_ptr, flgs);
 	if (!(have_pval_flags(flgs))) o_ptr->pval = 0;
 	msg_print(_("エッセンスを取り去った。", "You removed all essence you have added."));
-
-	/* Combine the pack */
 	p_ptr->update |= (PU_COMBINE | PU_REORDER);
-
 	p_ptr->window |= (PW_INVEN);
 }
 
diff --git a/src/player-status.c b/src/player-status.c
index e7cfd7a71..ae97127d0 100644
--- a/src/player-status.c
+++ b/src/player-status.c
@@ -3679,8 +3679,6 @@ void update_creature(player_type *creature_ptr)
 		creature_ptr->update &= ~(PU_AUTODESTROY);
 		autopick_delayed_alter();
 	}
-
-	/* Combine the pack */
 	if (creature_ptr->update & (PU_COMBINE))
 	{
 		creature_ptr->update &= ~(PU_COMBINE);
-- 
2.11.0