From 744271a78568822e914a3fe1faf3c153b1ba9954 Mon Sep 17 00:00:00 2001
From: Deskull <deskull@users.sourceforge.jp>
Date: Thu, 24 Jan 2019 23:38:27 +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/bldg.c         | 4 ----
 src/cmd-eat.c      | 4 ----
 src/cmd-quaff.c    | 2 --
 src/cmd-read.c     | 2 --
 src/cmd-usestaff.c | 4 ----
 src/cmd-zaprod.c   | 2 --
 src/cmd-zapwand.c  | 4 ----
 src/dungeon.c      | 2 --
 src/effects.c      | 2 --
 src/spells2.c      | 2 --
 src/spells3.c      | 4 ----
 src/wizard2.c      | 4 ----
 12 files changed, 36 deletions(-)

diff --git a/src/bldg.c b/src/bldg.c
index 5dab533b7..557f9b2f9 100644
--- a/src/bldg.c
+++ b/src/bldg.c
@@ -3484,8 +3484,6 @@ static void building_recharge(void)
 #else
 	msg_format("%^s %s recharged for %d gold.", tmp_str, ((o_ptr->number > 1) ? "were" : "was"), price);
 #endif
-
-	/* Combine / Reorder the pack (later) */
 	p_ptr->update |= (PU_COMBINE | PU_REORDER);
 
 	p_ptr->window |= (PW_INVEN);
@@ -3628,8 +3626,6 @@ static void building_recharge_all(void)
 	/* Give feedback */
 	msg_format(_("＄%d で再充填しました。", "You pay %d gold."), total_cost);
 	msg_print(NULL);
-
-	/* Combine / Reorder the pack (later) */
 	p_ptr->update |= (PU_COMBINE | PU_REORDER);
 
 	p_ptr->window |= (PW_INVEN);
diff --git a/src/cmd-eat.c b/src/cmd-eat.c
index c874ec653..a7298740a 100644
--- a/src/cmd-eat.c
+++ b/src/cmd-eat.c
@@ -297,8 +297,6 @@ void do_cmd_eat_food_aux(INVENTORY_IDX item)
 
 		}
 	}
-
-	/* Combine / Reorder the pack (later) */
 	p_ptr->update |= (PU_COMBINE | PU_REORDER);
 
 	if (!(object_is_aware(o_ptr)))
@@ -354,8 +352,6 @@ void do_cmd_eat_food_aux(INVENTORY_IDX item)
 		{
 			msg_format(_("この%sにはもう魔力が残っていない。", "The %s has no charges left."), staff);
 			o_ptr->ident |= (IDENT_EMPTY);
-
-			/* Combine / Reorder the pack (later) */
 			p_ptr->update |= (PU_COMBINE | PU_REORDER);
 			p_ptr->window |= (PW_INVEN);
 
diff --git a/src/cmd-quaff.c b/src/cmd-quaff.c
index 6bc704ef6..7cc5cf369 100644
--- a/src/cmd-quaff.c
+++ b/src/cmd-quaff.c
@@ -500,8 +500,6 @@ void do_cmd_quaff_potion_aux(INVENTORY_IDX item)
 		msg_print(_("液体の一部はあなたのアゴを素通りして落ちた！", "Some of the fluid falls through your jaws!"));
 		(void)potion_smash_effect(0, p_ptr->y, p_ptr->x, q_ptr->k_idx);
 	}
-
-	/* Combine / Reorder the pack (later) */
 	p_ptr->update |= (PU_COMBINE | PU_REORDER);
 
 	if (!(object_is_aware(q_ptr)))
diff --git a/src/cmd-read.c b/src/cmd-read.c
index 911fbd6fd..5648e0780 100644
--- a/src/cmd-read.c
+++ b/src/cmd-read.c
@@ -555,8 +555,6 @@ void do_cmd_read_scroll_aux(INVENTORY_IDX item, bool known)
 		used_up=FALSE;
 	}
 
-
-	/* Combine / Reorder the pack (later) */
 	p_ptr->update |= (PU_COMBINE | PU_REORDER);
 
 	if (!(object_is_aware(o_ptr)))
diff --git a/src/cmd-usestaff.c b/src/cmd-usestaff.c
index 61bce4dfe..68a0ea07d 100644
--- a/src/cmd-usestaff.c
+++ b/src/cmd-usestaff.c
@@ -342,8 +342,6 @@ void do_cmd_use_staff_aux(INVENTORY_IDX item)
 		if (flush_failure) flush();
 		msg_print(_("この杖にはもう魔力が残っていない。", "The staff has no charges left."));
 		o_ptr->ident |= (IDENT_EMPTY);
-
-		/* Combine / Reorder the pack (later) */
 		p_ptr->update |= (PU_COMBINE | PU_REORDER);
 		p_ptr->window |= (PW_INVEN);
 
@@ -361,8 +359,6 @@ void do_cmd_use_staff_aux(INVENTORY_IDX item)
 		chg_virtue(V_CHANCE, 1);
 		chg_virtue(V_KNOWLEDGE, -1);
 	}
-
-	/* Combine / Reorder the pack (later) */
 	p_ptr->update |= (PU_COMBINE | PU_REORDER);
 
 	/* Tried the item */
diff --git a/src/cmd-zaprod.c b/src/cmd-zaprod.c
index 2972d5535..dd1272734 100644
--- a/src/cmd-zaprod.c
+++ b/src/cmd-zaprod.c
@@ -366,8 +366,6 @@ void do_cmd_zap_rod_aux(INVENTORY_IDX item)
 
 	/* Increase the timeout by the rod kind's pval. -LM- */
 	if (use_charge) o_ptr->timeout += k_ptr->pval;
-
-	/* Combine / Reorder the pack (later) */
 	p_ptr->update |= (PU_COMBINE | PU_REORDER);
 
 	if (!(object_is_aware(o_ptr)))
diff --git a/src/cmd-zapwand.c b/src/cmd-zapwand.c
index df07b3ba3..844ae977f 100644
--- a/src/cmd-zapwand.c
+++ b/src/cmd-zapwand.c
@@ -398,8 +398,6 @@ void do_cmd_aim_wand_aux(INVENTORY_IDX item)
 		if (flush_failure) flush();
 		msg_print(_("この魔法棒にはもう魔力が残っていない。", "The wand has no charges left."));
 		o_ptr->ident |= (IDENT_EMPTY);
-
-		/* Combine / Reorder the pack (later) */
 		p_ptr->update |= (PU_COMBINE | PU_REORDER);
 		p_ptr->window |= (PW_INVEN);
 
@@ -409,8 +407,6 @@ void do_cmd_aim_wand_aux(INVENTORY_IDX item)
 	sound(SOUND_ZAP);
 
 	ident = wand_effect(o_ptr->sval, dir, FALSE, FALSE);
-
-	/* Combine / Reorder the pack (later) */
 	p_ptr->update |= (PU_COMBINE | PU_REORDER);
 
 	if (!(object_is_aware(o_ptr)))
diff --git a/src/dungeon.c b/src/dungeon.c
index 8e343ea38..b70e1a962 100644
--- a/src/dungeon.c
+++ b/src/dungeon.c
@@ -155,8 +155,6 @@ static void sense_inventory_aux(INVENTORY_IDX slot, bool heavy)
 
 	/* Auto-inscription/destroy */
 	autopick_alter_item(slot, destroy_feeling);
-
-	/* Combine / Reorder the pack (later) */
 	p_ptr->update |= (PU_COMBINE | PU_REORDER);
 
 	p_ptr->window |= (PW_INVEN | PW_EQUIP);
diff --git a/src/effects.c b/src/effects.c
index 23ac4f40c..cc4025ddc 100644
--- a/src/effects.c
+++ b/src/effects.c
@@ -3796,8 +3796,6 @@ bool lose_all_info(void)
 		o_ptr->ident &= ~(IDENT_SENSE);
 	}
 	p_ptr->update |= (PU_BONUS);
-
-	/* Combine / Reorder the pack (later) */
 	p_ptr->update |= (PU_COMBINE | PU_REORDER);
 
 	p_ptr->window |= (PW_INVEN | PW_EQUIP | PW_PLAYER);
diff --git a/src/spells2.c b/src/spells2.c
index 172b86eb9..bff061b39 100644
--- a/src/spells2.c
+++ b/src/spells2.c
@@ -4942,8 +4942,6 @@ bool psychometry(void)
 
 	/* Player touches it */
 	o_ptr->marked |= OM_TOUCHED;
-
-	/* Combine / Reorder the pack (later) */
 	p_ptr->update |= (PU_COMBINE | PU_REORDER);
 
 	p_ptr->window |= (PW_INVEN | PW_EQUIP | PW_PLAYER);
diff --git a/src/spells3.c b/src/spells3.c
index 15bcf003f..dc86d6982 100644
--- a/src/spells3.c
+++ b/src/spells3.c
@@ -2123,8 +2123,6 @@ bool enchant(object_type *o_ptr, int n, int eflag)
 
 	/* Failure */
 	if (!res) return (FALSE);
-
-	/* Combine / Reorder the pack (later) */
 	p_ptr->update |= (PU_BONUS | PU_COMBINE | PU_REORDER);
 	p_ptr->window |= (PW_INVEN | PW_EQUIP | PW_PLAYER);
 
@@ -2821,8 +2819,6 @@ bool recharge(int power)
 			}
 		}
 	}
-
-	/* Combine / Reorder the pack (later) */
 	p_ptr->update |= (PU_COMBINE | PU_REORDER);
 	p_ptr->window |= (PW_INVEN);
 
diff --git a/src/wizard2.c b/src/wizard2.c
index 2e6296665..0d7831770 100644
--- a/src/wizard2.c
+++ b/src/wizard2.c
@@ -980,8 +980,6 @@ static void wiz_reroll_item(object_type *o_ptr)
 		/* Apply changes */
 		object_copy(o_ptr, q_ptr);
 		p_ptr->update |= (PU_BONUS);
-
-		/* Combine / Reorder the pack (later) */
 		p_ptr->update |= (PU_COMBINE | PU_REORDER);
 
 		p_ptr->window |= (PW_INVEN | PW_EQUIP | PW_SPELL | PW_PLAYER);
@@ -1320,8 +1318,6 @@ static void do_cmd_wiz_play(void)
 		object_copy(o_ptr, q_ptr);
 
 		p_ptr->update |= (PU_BONUS);
-
-		/* Combine / Reorder the pack (later) */
 		p_ptr->update |= (PU_COMBINE | PU_REORDER);
 
 		p_ptr->window |= (PW_INVEN | PW_EQUIP | PW_SPELL | PW_PLAYER);
-- 
2.11.0