From: Deskull <deskull@users.sourceforge.jp>
Date: Wed, 21 Nov 2018 13:35:19 +0000 (+0900)
Subject: [Refactor] #37353 コメント整理 / Refactor comments.
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=fa04e1963f8146023efa8bd35dc57412a338648a;hp=3dbc8ab121c9da6a8abbef112887408a145f725f;p=hengband%2Fhengband.git

[Refactor] #37353 コメント整理 / Refactor comments.
---

diff --git a/src/artifact.c b/src/artifact.c
index 8720d832b..7575fc29f 100644
--- a/src/artifact.c
+++ b/src/artifact.c
@@ -2070,7 +2070,6 @@ bool create_artifact(object_type *o_ptr, bool a_scroll)
 	msg_format_wizard(CHEAT_OBJECT, _("パワー %d で 価値%ld のランダムアーティファクト生成 バイアスは「%s」",
 		"Random artifact generated - Power:%d Value:%d Bias:%s."), max_powers, total_flags, artifact_bias_name[o_ptr->artifact_bias]);
 
-	/* Window stuff */
 	p_ptr->window |= (PW_INVEN | PW_EQUIP);
 
 	return TRUE;
diff --git a/src/bldg.c b/src/bldg.c
index 34a0ac7c7..f9a6ada52 100644
--- a/src/bldg.c
+++ b/src/bldg.c
@@ -3709,7 +3709,6 @@ if (get_check(format("そのロッドを＄%d で再充填しますか？",
 	/* Combine / Reorder the pack (later) */
 	p_ptr->notice |= (PN_COMBINE | PN_REORDER);
 
-	/* Window stuff */
 	p_ptr->window |= (PW_INVEN);
 
 	/* Pay the price */
@@ -3855,7 +3854,6 @@ static void building_recharge_all(void)
 	/* Combine / Reorder the pack (later) */
 	p_ptr->notice |= (PN_COMBINE | PN_REORDER);
 
-	/* Window stuff */
 	p_ptr->window |= (PW_INVEN);
 
 	/* Pay the price */
@@ -4636,7 +4634,6 @@ void do_cmd_bldg(void)
 	/* Redraw entire screen */
 	p_ptr->redraw |= (PR_BASIC | PR_EXTRA | PR_EQUIPPY | PR_MAP);
 
-	/* Window stuff */
 	p_ptr->window |= (PW_OVERHEAD | PW_DUNGEON);
 }
 
diff --git a/src/cave.c b/src/cave.c
index 9432d404b..5dafdbae4 100644
--- a/src/cave.c
+++ b/src/cave.c
@@ -4351,7 +4351,6 @@ void map_area(POSITION range)
 	/* Redraw map */
 	p_ptr->redraw |= (PR_MAP);
 
-	/* Window stuff */
 	p_ptr->window |= (PW_OVERHEAD | PW_DUNGEON);
 }
 
@@ -4459,7 +4458,6 @@ void wiz_lite(bool ninja)
 	/* Redraw map */
 	p_ptr->redraw |= (PR_MAP);
 
-	/* Window stuff */
 	p_ptr->window |= (PW_OVERHEAD | PW_DUNGEON);
 
 	if (p_ptr->special_defense & NINJA_S_STEALTH)
@@ -4534,7 +4532,6 @@ void wiz_dark(void)
 	/* Redraw map */
 	p_ptr->redraw |= (PR_MAP);
 
-	/* Window stuff */
 	p_ptr->window |= (PW_OVERHEAD | PW_DUNGEON);
 }
 
@@ -4989,7 +4986,6 @@ void monster_race_track(MONRACE_IDX r_idx)
 	/* Save this monster ID */
 	p_ptr->monster_race_idx = r_idx;
 
-	/* Window stuff */
 	p_ptr->window |= (PW_MONSTER);
 }
 
@@ -5003,7 +4999,6 @@ void object_kind_track(KIND_OBJECT_IDX k_idx)
 	/* Save this monster ID */
 	p_ptr->object_kind_idx = k_idx;
 
-	/* Window stuff */
 	p_ptr->window |= (PW_OBJECT);
 }
 
diff --git a/src/cmd-activate.c b/src/cmd-activate.c
index c9b80303b..d1046bf1b 100644
--- a/src/cmd-activate.c
+++ b/src/cmd-activate.c
@@ -168,7 +168,6 @@ void do_cmd_activate_aux(INVENTORY_IDX item)
 	{
 		(void)activate_artifact(o_ptr);
 
-		/* Window stuff */
 		p_ptr->window |= (PW_INVEN | PW_EQUIP);
 
 		/* Success */
diff --git a/src/cmd-eat.c b/src/cmd-eat.c
index 8a9a0bf2b..c29c320e4 100644
--- a/src/cmd-eat.c
+++ b/src/cmd-eat.c
@@ -317,7 +317,6 @@ void do_cmd_eat_food_aux(INVENTORY_IDX item)
 		gain_exp((lev + (p_ptr->lev >> 1)) / p_ptr->lev);
 	}
 
-	/* Window stuff */
 	p_ptr->window |= (PW_INVEN | PW_EQUIP | PW_PLAYER);
 
 
@@ -408,7 +407,6 @@ void do_cmd_eat_food_aux(INVENTORY_IDX item)
 			floor_item_charges(0 - item);
 		}
 
-		/* Window stuff */
 		p_ptr->window |= (PW_INVEN | PW_EQUIP);
 
 		/* Don't eat a staff/wand itself */
diff --git a/src/cmd-item.c b/src/cmd-item.c
index 653af3dbb..65725d496 100644
--- a/src/cmd-item.c
+++ b/src/cmd-item.c
@@ -523,7 +523,6 @@ void do_cmd_wield(void)
 
 	p_ptr->redraw |= (PR_EQUIPPY);
 
-	/* Window stuff */
 	p_ptr->window |= (PW_INVEN | PW_EQUIP | PW_PLAYER);
 
 	calc_android_exp();
@@ -652,7 +651,6 @@ void do_cmd_takeoff(void)
 			/* Recalculate the bonuses */
 			p_ptr->update |= (PU_BONUS);
 
-			/* Window stuff */
 			p_ptr->window |= (PW_EQUIP);
 
 			msg_print(_("呪いを打ち破った。", "You break the curse."));
@@ -1088,7 +1086,6 @@ void do_cmd_uninscribe(void)
 	/* Combine the pack */
 	p_ptr->notice |= (PN_COMBINE);
 
-	/* Window stuff */
 	p_ptr->window |= (PW_INVEN | PW_EQUIP);
 
 	/* .や$の関係で, 再計算が必要なはず -- henkma */
@@ -1154,7 +1151,6 @@ void do_cmd_inscribe(void)
 		/* Combine the pack */
 		p_ptr->notice |= (PN_COMBINE);
 
-		/* Window stuff */
 		p_ptr->window |= (PW_INVEN | PW_EQUIP);
 
 		/* .や$の関係で, 再計算が必要なはず -- henkma */
@@ -1569,7 +1565,6 @@ void do_cmd_locate(void)
 	/* Redraw map */
 	p_ptr->redraw |= (PR_MAP);
 
-	/* Window stuff */
 	p_ptr->window |= (PW_OVERHEAD | PW_DUNGEON);
 
 	/* Handle stuff */
diff --git a/src/cmd-pet.c b/src/cmd-pet.c
index 908bae5ba..a3c67facd 100644
--- a/src/cmd-pet.c
+++ b/src/cmd-pet.c
@@ -1135,13 +1135,8 @@ bool rakuba(HIT_POINT dam, bool force)
 		if (!sn)
 		{
 			monster_desc(m_name, m_ptr, 0);
-#ifdef JP
-			msg_format("%sから振り落とされそうになって、壁にぶつかった。", m_name);
-			take_hit(DAMAGE_NOESCAPE, r_ptr->level + 3, "壁への衝突", -1);
-#else
-			msg_format("You have nearly fallen from %s, but bumped into wall.", m_name);
-			take_hit(DAMAGE_NOESCAPE, r_ptr->level + 3, "bumping into wall", -1);
-#endif
+			msg_format(_("%sから振り落とされそうになって、壁にぶつかった。", "You have nearly fallen from %s, but bumped into wall."), m_name);
+			take_hit(DAMAGE_NOESCAPE, r_ptr->level + 3, _("壁への衝突", "bumping into wall"), -1);
 			return FALSE;
 		}
 
@@ -1171,7 +1166,6 @@ bool rakuba(HIT_POINT dam, bool force)
 
 	p_ptr->update |= (PU_VIEW | PU_LITE | PU_FLOW | PU_MON_LITE | PU_MONSTERS);
 
-	/* Window stuff */
 	p_ptr->window |= (PW_OVERHEAD | PW_DUNGEON);
 
 	p_ptr->redraw |= (PR_EXTRA);
diff --git a/src/cmd-quaff.c b/src/cmd-quaff.c
index 8c62657b6..9d9b4d72f 100644
--- a/src/cmd-quaff.c
+++ b/src/cmd-quaff.c
@@ -555,7 +555,6 @@ void do_cmd_quaff_potion_aux(INVENTORY_IDX item)
 		gain_exp((lev + (p_ptr->lev >> 1)) / p_ptr->lev);
 	}
 
-	/* Window stuff */
 	p_ptr->window |= (PW_INVEN | PW_EQUIP | PW_PLAYER);
 
 	/* Potions can feed the player */
diff --git a/src/cmd-read.c b/src/cmd-read.c
index 36ab68e46..e08593bde 100644
--- a/src/cmd-read.c
+++ b/src/cmd-read.c
@@ -576,7 +576,6 @@ void do_cmd_read_scroll_aux(INVENTORY_IDX item, bool known)
 		gain_exp((lev + (p_ptr->lev >> 1)) / p_ptr->lev);
 	}
 
-	/* Window stuff */
 	p_ptr->window |= (PW_INVEN | PW_EQUIP | PW_PLAYER);
 
 
diff --git a/src/cmd-usestaff.c b/src/cmd-usestaff.c
index 82e633099..de2a1c529 100644
--- a/src/cmd-usestaff.c
+++ b/src/cmd-usestaff.c
@@ -417,7 +417,6 @@ void do_cmd_use_staff_aux(INVENTORY_IDX item)
 		gain_exp((lev + (p_ptr->lev >> 1)) / p_ptr->lev);
 	}
 
-	/* Window stuff */
 	p_ptr->window |= (PW_INVEN | PW_EQUIP | PW_PLAYER);
 
 
diff --git a/src/cmd-zaprod.c b/src/cmd-zaprod.c
index fde4e3118..e6120de5e 100644
--- a/src/cmd-zaprod.c
+++ b/src/cmd-zaprod.c
@@ -385,7 +385,6 @@ void do_cmd_zap_rod_aux(INVENTORY_IDX item)
 		gain_exp((lev + (p_ptr->lev >> 1)) / p_ptr->lev);
 	}
 
-	/* Window stuff */
 	p_ptr->window |= (PW_INVEN | PW_EQUIP | PW_PLAYER);
 }
 
diff --git a/src/cmd-zapwand.c b/src/cmd-zapwand.c
index 8371aac36..3e7e3a00d 100644
--- a/src/cmd-zapwand.c
+++ b/src/cmd-zapwand.c
@@ -426,7 +426,6 @@ void do_cmd_aim_wand_aux(INVENTORY_IDX item)
 		gain_exp((lev + (p_ptr->lev >> 1)) / p_ptr->lev);
 	}
 
-	/* Window stuff */
 	p_ptr->window |= (PW_INVEN | PW_EQUIP | PW_PLAYER);
 
 
diff --git a/src/cmd1.c b/src/cmd1.c
index a799de9f2..65c9f1dde 100644
--- a/src/cmd1.c
+++ b/src/cmd1.c
@@ -565,7 +565,6 @@ void carry(bool pickup)
 	/* Redraw map */
 	p_ptr->redraw |= (PR_MAP);
 
-	/* Window stuff */
 	p_ptr->window |= (PW_OVERHEAD);
 
 	/* Handle stuff */
@@ -632,7 +631,6 @@ void carry(bool pickup)
 			/* Redraw gold */
 			p_ptr->redraw |= (PR_GOLD);
 
-			/* Window stuff */
 			p_ptr->window |= (PW_PLAYER);
 		}
 
@@ -910,7 +908,6 @@ bool move_player_effect(POSITION ny, POSITION nx, BIT_FLAGS mpe_mode)
 
 		p_ptr->update |= (PU_VIEW | PU_LITE | PU_FLOW | PU_MON_LITE | PU_DISTANCE);
 
-		/* Window stuff */
 		p_ptr->window |= (PW_OVERHEAD | PW_DUNGEON);
 
 		/* Remove "unsafe" flag */
diff --git a/src/cmd2.c b/src/cmd2.c
index 7b063162b..7baf96657 100644
--- a/src/cmd2.c
+++ b/src/cmd2.c
@@ -3948,7 +3948,6 @@ bool do_cmd_throw(int mult, bool boomerang, OBJECT_IDX shuriken)
 			/* Recalculate mana XXX */
 			p_ptr->update |= (PU_MANA);
 
-			/* Window stuff */
 			p_ptr->window |= (PW_EQUIP);
 		}
 		else
diff --git a/src/cmd4.c b/src/cmd4.c
index 63ce72910..e1ab4a924 100644
--- a/src/cmd4.c
+++ b/src/cmd4.c
@@ -997,10 +997,8 @@ void do_cmd_redraw(void)
 	/* Redraw everything */
 	p_ptr->redraw |= (PR_WIPE | PR_BASIC | PR_EXTRA | PR_MAP | PR_EQUIPPY);
 
-	/* Window stuff */
 	p_ptr->window |= (PW_INVEN | PW_EQUIP | PW_SPELL | PW_PLAYER);
 
-	/* Window stuff */
 	p_ptr->window |= (PW_MESSAGE | PW_OVERHEAD | PW_DUNGEON | PW_MONSTER | PW_OBJECT);
 
 	update_playtime();
diff --git a/src/cmd5.c b/src/cmd5.c
index 7f131e899..7b0a4ab2c 100644
--- a/src/cmd5.c
+++ b/src/cmd5.c
@@ -132,7 +132,6 @@ static int get_spell(SPELL_IDX *sn, cptr prompt, OBJECT_SUBTYPE_VALUE sval, bool
 	/* Show choices */
 	p_ptr->window |= (PW_SPELL);
 
-	/* Window stuff */
 	window_stuff();
 
 	/* Build a prompt (accept all spells) */
@@ -317,7 +316,6 @@ static int get_spell(SPELL_IDX *sn, cptr prompt, OBJECT_SUBTYPE_VALUE sval, bool
 	/* Show choices */
 	p_ptr->window |= (PW_SPELL);
 
-	/* Window stuff */
 	window_stuff();
 
 
@@ -1370,7 +1368,6 @@ void do_cmd_cast(void)
 		}
 	}
 
-	/* Window stuff */
 	p_ptr->window |= (PW_PLAYER);
 	p_ptr->window |= (PW_SPELL);
 }
diff --git a/src/dungeon.c b/src/dungeon.c
index eaa7f1de0..1b2581efb 100644
--- a/src/dungeon.c
+++ b/src/dungeon.c
@@ -148,7 +148,6 @@ static void sense_inventory_aux(INVENTORY_IDX slot, bool heavy)
 	/* Combine / Reorder the pack (later) */
 	p_ptr->notice |= (PN_COMBINE | PN_REORDER);
 
-	/* Window stuff */
 	p_ptr->window |= (PW_INVEN | PW_EQUIP);
 }
 
@@ -740,7 +739,6 @@ static void regenhp(int percent)
 		/* Redraw */
 		p_ptr->redraw |= (PR_HP);
 
-		/* Window stuff */
 		p_ptr->window |= (PW_PLAYER);
 
 		wild_regen = 20;
@@ -833,7 +831,6 @@ static void regenmana(int upkeep_factor, int regen_amount)
 		/* Redraw */
 		p_ptr->redraw |= (PR_MANA);
 
-		/* Window stuff */
 		p_ptr->window |= (PW_PLAYER);
 		p_ptr->window |= (PW_SPELL);
 
@@ -982,7 +979,6 @@ static void regen_captured_monsters(void)
 		/* Combine pack */
 		p_ptr->notice |= (PN_COMBINE);
 
-		/* Window stuff */
 		p_ptr->window |= (PW_INVEN);
 		p_ptr->window |= (PW_EQUIP);
 		wild_regen = 20;
@@ -999,7 +995,6 @@ static void notice_lite_change(object_type *o_ptr)
 	/* Hack -- notice interesting fuel steps */
 	if ((o_ptr->xtra4 < 100) || (!(o_ptr->xtra4 % 100)))
 	{
-		/* Window stuff */
 		p_ptr->window |= (PW_EQUIP);
 	}
 
@@ -1221,7 +1216,6 @@ static void check_music(void)
 			/* Update monsters */
 			p_ptr->update |= (PU_MONSTERS);
 
-			/* Window stuff */
 			p_ptr->window |= (PW_OVERHEAD | PW_DUNGEON);
 		}
 	}
@@ -2768,7 +2762,6 @@ static void process_world_aux_recharge(void)
 	/* Notice changes */
 	if (changed)
 	{
-		/* Window stuff */
 		p_ptr->window |= (PW_EQUIP);
 		wild_regen = 20;
 	}
@@ -2817,7 +2810,6 @@ static void process_world_aux_recharge(void)
 	/* Notice changes */
 	if (changed)
 	{
-		/* Window stuff */
 		p_ptr->window |= (PW_INVEN);
 		wild_regen = 20;
 	}
@@ -5242,7 +5234,6 @@ static void process_player(void)
 				/* Update monsters */
 				p_ptr->update |= (PU_MONSTERS);
 
-				/* Window stuff */
 				p_ptr->window |= (PW_OVERHEAD | PW_DUNGEON);
 
 				msg_print(_("「時は動きだす…」", "You feel time flowing around you once more."));
@@ -5369,7 +5360,6 @@ static void dungeon(bool load_game)
 	/* Enter "xtra" mode */
 	character_xtra = TRUE;
 
-	/* Window stuff */
 	p_ptr->window |= (PW_INVEN | PW_EQUIP | PW_SPELL | PW_PLAYER | PW_MONSTER | PW_OVERHEAD | PW_DUNGEON);
 
 	/* Redraw dungeon */
@@ -6136,13 +6126,10 @@ void play_game(bool new_game)
 	/* React to changes */
 	Term_xtra(TERM_XTRA_REACT, 0);
 
-	/* Window stuff */
 	p_ptr->window |= (PW_INVEN | PW_EQUIP | PW_SPELL | PW_PLAYER);
 
-	/* Window stuff */
 	p_ptr->window |= (PW_MESSAGE | PW_OVERHEAD | PW_DUNGEON | PW_MONSTER | PW_OBJECT);
 
-	/* Window stuff */
 	window_stuff();
 
 
diff --git a/src/effects.c b/src/effects.c
index 262dd796c..d02f99034 100644
--- a/src/effects.c
+++ b/src/effects.c
@@ -281,7 +281,6 @@ void dispel_player(void)
 		/* Update monsters */
 		p_ptr->update |= (PU_MONSTERS);
 
-		/* Window stuff */
 		p_ptr->window |= (PW_OVERHEAD | PW_DUNGEON);
 
 		p_ptr->energy_need += ENERGY_NEED();
@@ -429,7 +428,6 @@ bool set_blind(TIME_EFFECT v)
 	/* Redraw map */
 	p_ptr->redraw |= (PR_MAP);
 
-	/* Window stuff */
 	p_ptr->window |= (PW_OVERHEAD | PW_DUNGEON);
 
 	/* Handle stuff */
@@ -778,7 +776,6 @@ bool set_image(TIME_EFFECT v)
 	/* Update monsters */
 	p_ptr->update |= (PU_MONSTERS);
 
-	/* Window stuff */
 	p_ptr->window |= (PW_OVERHEAD | PW_DUNGEON);
 
 	/* Handle stuff */
@@ -1440,7 +1437,6 @@ bool set_wraith_form(TIME_EFFECT v, bool do_dec)
 			/* Update monsters */
 			p_ptr->update |= (PU_MONSTERS);
 
-			/* Window stuff */
 			p_ptr->window |= (PW_OVERHEAD | PW_DUNGEON);
 		}
 	}
@@ -1459,7 +1455,6 @@ bool set_wraith_form(TIME_EFFECT v, bool do_dec)
 			/* Update monsters */
 			p_ptr->update |= (PU_MONSTERS);
 
-			/* Window stuff */
 			p_ptr->window |= (PW_OVERHEAD | PW_DUNGEON);
 		}
 	}
@@ -1525,7 +1520,6 @@ bool set_invuln(TIME_EFFECT v, bool do_dec)
 			/* Update monsters */
 			p_ptr->update |= (PU_MONSTERS);
 
-			/* Window stuff */
 			p_ptr->window |= (PW_OVERHEAD | PW_DUNGEON);
 		}
 	}
@@ -1544,7 +1538,6 @@ bool set_invuln(TIME_EFFECT v, bool do_dec)
 			/* Update monsters */
 			p_ptr->update |= (PU_MONSTERS);
 
-			/* Window stuff */
 			p_ptr->window |= (PW_OVERHEAD | PW_DUNGEON);
 
 			p_ptr->energy_need += ENERGY_NEED();
@@ -3900,7 +3893,6 @@ bool hp_player(int num)
 		/* Redraw */
 		p_ptr->redraw |= (PR_HP);
 
-		/* Window stuff */
 		p_ptr->window |= (PW_PLAYER);
 
 		/* Heal 0-4 */
@@ -4135,7 +4127,6 @@ bool lose_all_info(void)
 	/* Combine / Reorder the pack (later) */
 	p_ptr->notice |= (PN_COMBINE | PN_REORDER);
 
-	/* Window stuff */
 	p_ptr->window |= (PW_INVEN | PW_EQUIP | PW_PLAYER);
 
 	/* Mega-Hack -- Forget the map */
@@ -4473,7 +4464,6 @@ int take_hit(int damage_type, HIT_POINT damage, cptr hit_from, int monspell)
 	/* Display the hitpoints */
 	p_ptr->redraw |= (PR_HP);
 
-	/* Window stuff */
 	p_ptr->window |= (PW_PLAYER);
 
 	if (damage_type != DAMAGE_GENO && p_ptr->chp == 0)
diff --git a/src/floor-events.c b/src/floor-events.c
index 75bb835da..2f0cc7388 100644
--- a/src/floor-events.c
+++ b/src/floor-events.c
@@ -33,7 +33,6 @@ void day_break()
 	/* Redraw map */
 	p_ptr->redraw |= (PR_MAP);
 
-	/* Window stuff */
 	p_ptr->window |= (PW_OVERHEAD | PW_DUNGEON);
 
 	if (p_ptr->special_defense & NINJA_S_STEALTH)
@@ -89,7 +88,6 @@ void night_falls(void)
 	/* Redraw map */
 	p_ptr->redraw |= (PR_MAP);
 
-	/* Window stuff */
 	p_ptr->window |= (PW_OVERHEAD | PW_DUNGEON);
 
 	if (p_ptr->special_defense & NINJA_S_STEALTH)
diff --git a/src/hissatsu.c b/src/hissatsu.c
index 976f2d8a1..b3a2477bf 100644
--- a/src/hissatsu.c
+++ b/src/hissatsu.c
@@ -299,7 +299,6 @@ static int get_hissatsu_power(SPELL_IDX *sn)
 	/* Show choices */
 	p_ptr->window |= (PW_SPELL);
 
-	/* Window stuff */
 	window_stuff();
 
 
@@ -383,7 +382,6 @@ void do_cmd_hissatsu(void)
 	/* Redraw mana */
 	p_ptr->redraw |= (PR_MANA);
 
-	/* Window stuff */
 	p_ptr->window |= (PW_PLAYER);
 	p_ptr->window |= (PW_SPELL);
 }
diff --git a/src/mane.c b/src/mane.c
index 52a4c0608..68f2e3804 100644
--- a/src/mane.c
+++ b/src/mane.c
@@ -245,7 +245,6 @@ static int get_mane_power(int *sn, bool baigaesi)
 	/* Show choices */
 	p_ptr->window |= (PW_SPELL);
 
-	/* Window stuff */
 	window_stuff();
 
 	/* Abort if needed */
@@ -690,7 +689,6 @@ static bool use_mane(int spell)
 		/* Update monsters */
 		p_ptr->update |= (PU_MONSTERS);
 
-		/* Window stuff */
 		p_ptr->window |= (PW_OVERHEAD | PW_DUNGEON);
 
 		handle_stuff();
@@ -1042,7 +1040,6 @@ bool do_cmd_mane(bool baigaesi)
 
 	p_ptr->energy_use = 100;
 
-	/* Window stuff */
 	p_ptr->redraw |= (PR_IMITATION);
 	p_ptr->window |= (PW_PLAYER);
 	p_ptr->window |= (PW_SPELL);
diff --git a/src/melee1.c b/src/melee1.c
index 23ca9ace0..596a8b817 100644
--- a/src/melee1.c
+++ b/src/melee1.c
@@ -2097,7 +2097,6 @@ bool make_attack_normal(MONSTER_IDX m_idx)
 							/* Combine / Reorder the pack */
 							p_ptr->notice |= (PN_COMBINE | PN_REORDER);
 
-							/* Window stuff */
 							p_ptr->window |= (PW_INVEN);
 
 							break;
@@ -2160,7 +2159,6 @@ bool make_attack_normal(MONSTER_IDX m_idx)
 						/* Redraw gold */
 						p_ptr->redraw |= (PR_GOLD);
 
-						/* Window stuff */
 						p_ptr->window |= (PW_PLAYER);
 
 						/* Blink away */
@@ -2359,7 +2357,6 @@ bool make_attack_normal(MONSTER_IDX m_idx)
 							obvious = TRUE;
 						}
 
-						/* Window stuff */
 						p_ptr->window |= (PW_EQUIP);
 					}
 
diff --git a/src/mind.c b/src/mind.c
index 9585fa714..c8a2dce88 100644
--- a/src/mind.c
+++ b/src/mind.c
@@ -1007,7 +1007,6 @@ static bool_hack get_mind_power(SPELL_IDX *sn, bool only_browse)
 	/* Show choices */
 	p_ptr->window |= (PW_SPELL);
 
-	/* Window stuff */
 	window_stuff();
 
 	/* Abort if needed */
@@ -1196,7 +1195,6 @@ static bool cast_mindcrafter_spell(int spell)
 		/* Update monsters */
 		p_ptr->update |= (PU_MONSTERS);
 
-		/* Window stuff */
 		p_ptr->window |= (PW_OVERHEAD | PW_DUNGEON);
 
 		handle_stuff();
@@ -2101,7 +2099,6 @@ void do_cmd_mind(void)
 	/* Redraw mana */
 	p_ptr->redraw |= (PR_MANA);
 
-	/* Window stuff */
 	p_ptr->window |= (PW_PLAYER);
 	p_ptr->window |= (PW_SPELL);
 }
diff --git a/src/monster-process.c b/src/monster-process.c
index 0a43f3706..57b6a1e15 100644
--- a/src/monster-process.c
+++ b/src/monster-process.c
@@ -3284,7 +3284,6 @@ void process_monster(MONSTER_IDX m_idx)
 		/* Update some things */
 		p_ptr->update |= (PU_FLOW);
 
-		/* Window stuff */
 		p_ptr->window |= (PW_OVERHEAD | PW_DUNGEON);
 	}
 
@@ -3584,7 +3583,6 @@ void process_monsters(void)
 			(old_r_blows3 != r_ptr->r_blows[3]) ||
 			(old_r_cast_spell != r_ptr->r_cast_spell))
 		{
-			/* Window stuff */
 			p_ptr->window |= (PW_MONSTER);
 		}
 	}
diff --git a/src/monster-status.c b/src/monster-status.c
index e63a7f758..5b6b1442f 100644
--- a/src/monster-status.c
+++ b/src/monster-status.c
@@ -731,7 +731,6 @@ bool process_the_world(int num, MONSTER_IDX who, bool vs_player)
 	/* Update monsters */
 	p_ptr->update |= (PU_MONSTERS);
 
-	/* Window stuff */
 	p_ptr->window |= (PW_OVERHEAD | PW_DUNGEON);
 
 	world_monster = 0;
diff --git a/src/monster2.c b/src/monster2.c
index f008b301b..a5d1df5bb 100644
--- a/src/monster2.c
+++ b/src/monster2.c
@@ -1891,7 +1891,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);
 	}
 
@@ -1937,7 +1936,6 @@ void lore_treasure(MONSTER_IDX m_idx, ITEM_NUMBER num_item, ITEM_NUMBER num_gold
 	/* Update monster recall window */
 	if (p_ptr->monster_race_idx == m_ptr->r_idx)
 	{
-		/* Window stuff */
 		p_ptr->window |= (PW_MONSTER);
 	}
 }
diff --git a/src/mspells3.c b/src/mspells3.c
index 450b5cd90..92bb2c1e2 100644
--- a/src/mspells3.c
+++ b/src/mspells3.c
@@ -578,7 +578,6 @@ static int get_learned_power(SPELL_IDX *sn)
 	/* Show choices */
 	p_ptr->window |= (PW_SPELL);
 
-	/* Window stuff */
 	window_stuff();
 
 	/* Abort if needed */
@@ -1086,7 +1085,6 @@ static bool cast_learned_spell(int spell, bool success)
 		/* Update monsters */
 		p_ptr->update |= (PU_MONSTERS);
 
-		/* Window stuff */
 		p_ptr->window |= (PW_OVERHEAD | PW_DUNGEON);
 
 		handle_stuff();
@@ -1590,7 +1588,6 @@ bool do_cmd_cast_learned(void)
 
 	p_ptr->energy_use = 100;
 
-	/* Window stuff */
 	p_ptr->redraw |= (PR_MANA);
 	p_ptr->window |= (PW_PLAYER);
 	p_ptr->window |= (PW_SPELL);
diff --git a/src/object1.c b/src/object1.c
index 0a1133421..aeeee1d7b 100644
--- a/src/object1.c
+++ b/src/object1.c
@@ -2514,7 +2514,6 @@ void toggle_inven_equip(void)
 			window_flag[j] &= ~(PW_INVEN);
 			window_flag[j] |= (PW_EQUIP);
 
-			/* Window stuff */
 			p_ptr->window |= (PW_EQUIP);
 		}
 
@@ -2525,7 +2524,6 @@ void toggle_inven_equip(void)
 			window_flag[j] &= ~(PW_EQUIP);
 			window_flag[j] |= (PW_INVEN);
 
-			/* Window stuff */
 			p_ptr->window |= (PW_INVEN);
 		}
 	}
@@ -3533,7 +3531,6 @@ bool get_item(OBJECT_IDX *cp, cptr pmt, cptr str, BIT_FLAGS mode)
 	/* Update */
 	p_ptr->window |= (PW_INVEN | PW_EQUIP);
 
-	/* Window stuff */
 	window_stuff();
 
 
@@ -4959,7 +4956,6 @@ bool get_item_floor(COMMAND_CODE *cp, cptr pmt, cptr str, BIT_FLAGS mode)
 	/* Update */
 	p_ptr->window |= (PW_INVEN | PW_EQUIP);
 
-	/* Window stuff */
 	window_stuff();
 
 
@@ -5068,7 +5064,6 @@ void py_pickup_floor(bool pickup)
 			/* Redraw gold */
 			p_ptr->redraw |= (PR_GOLD);
 
-			/* Window stuff */
 			p_ptr->window |= (PW_PLAYER);
 
 			/* Delete the gold */
diff --git a/src/object2.c b/src/object2.c
index 691284dc5..3dc5f4cf0 100644
--- a/src/object2.c
+++ b/src/object2.c
@@ -376,7 +376,6 @@ void compact_objects(int size)
 		/* Redraw map */
 		p_ptr->redraw |= (PR_MAP);
 
-		/* Window stuff */
 		p_ptr->window |= (PW_OVERHEAD | PW_DUNGEON);
 	}
 
@@ -1543,7 +1542,6 @@ bool can_player_destroy_object(object_type *o_ptr)
 		/* Combine the pack */
 		p_ptr->notice |= (PN_COMBINE);
 
-		/* Window stuff */
 		p_ptr->window |= (PW_INVEN | PW_EQUIP);
 
 		return FALSE;
@@ -5743,7 +5741,6 @@ void inven_item_increase(INVENTORY_IDX item, int num)
 		/* Combine the pack */
 		p_ptr->notice |= (PN_COMBINE);
 
-		/* Window stuff */
 		p_ptr->window |= (PW_INVEN | PW_EQUIP);
 
 		/* Hack -- Clear temporary elemental brands if player takes off weapons */
@@ -5795,7 +5792,6 @@ void inven_item_optimize(INVENTORY_IDX item)
 		/* Erase the "final" slot */
 		object_wipe(&inventory[i]);
 
-		/* Window stuff */
 		p_ptr->window |= (PW_INVEN);
 	}
 
@@ -5817,11 +5813,9 @@ void inven_item_optimize(INVENTORY_IDX item)
 		/* Recalculate mana XXX */
 		p_ptr->update |= (PU_MANA);
 
-		/* Window stuff */
 		p_ptr->window |= (PW_EQUIP);
 	}
 
-	/* Window stuff */
 	p_ptr->window |= (PW_SPELL);
 }
 
@@ -6116,7 +6110,6 @@ s16b inven_carry(object_type *o_ptr)
 			/* Recalculate bonuses */
 			p_ptr->update |= (PU_BONUS);
 
-			/* Window stuff */
 			p_ptr->window |= (PW_INVEN);
 
 			/* Success */
@@ -6198,7 +6191,6 @@ s16b inven_carry(object_type *o_ptr)
 	/* Combine and Reorder pack */
 	p_ptr->notice |= (PN_COMBINE | PN_REORDER);
 
-	/* Window stuff */
 	p_ptr->window |= (PW_INVEN);
 
 	/* Return the slot */
@@ -6457,7 +6449,6 @@ void combine_pack(void)
 						}
 					}
 
-					/* Window stuff */
 					p_ptr->window |= (PW_INVEN);
 
 					/* Take note */
@@ -6533,7 +6524,6 @@ void reorder_pack(void)
 		/* Insert the moving item */
 		object_copy(&inventory[j], q_ptr);
 
-		/* Window stuff */
 		p_ptr->window |= (PW_INVEN);
 	}
 
@@ -7850,7 +7840,6 @@ static void drain_essence(void)
 	/* Combine the pack */
 	p_ptr->notice |= (PN_COMBINE | PN_REORDER);
 
-	/* Window stuff */
 	p_ptr->window |= (PW_INVEN);
 }
 
@@ -8479,7 +8468,6 @@ static void add_essence(ESSENCE_IDX mode)
 	/* Combine the pack */
 	p_ptr->notice |= (PN_COMBINE | PN_REORDER);
 
-	/* Window stuff */
 	p_ptr->window |= (PW_INVEN);
 }
 
@@ -8536,7 +8524,6 @@ static void erase_essence(void)
 	/* Combine the pack */
 	p_ptr->notice |= (PN_COMBINE | PN_REORDER);
 
-	/* Window stuff */
 	p_ptr->window |= (PW_INVEN);
 }
 
diff --git a/src/racial.c b/src/racial.c
index 7fa4e8c87..fa0f70635 100644
--- a/src/racial.c
+++ b/src/racial.c
@@ -2795,7 +2795,6 @@ if (!repeat_pull(&i) || i<0 || i>=num) {
 			/* Redraw mana and hp */
 			p_ptr->redraw |= (PR_HP | PR_MANA);
 
-			/* Window stuff */
 			p_ptr->window |= (PW_PLAYER | PW_SPELL);
 		}
 	}
diff --git a/src/realm-hex.c b/src/realm-hex.c
index f30c90d1d..7b157c3df 100644
--- a/src/realm-hex.c
+++ b/src/realm-hex.c
@@ -212,7 +212,6 @@ void check_hex(void)
 			/* Update monsters */
 			p_ptr->update |= (PU_MONSTERS);
 
-			/* Window stuff */
 			p_ptr->window |= (PW_OVERHEAD | PW_DUNGEON);
 		}
 	}
diff --git a/src/realm-song.c b/src/realm-song.c
index ace0d8f88..18b915904 100644
--- a/src/realm-song.c
+++ b/src/realm-song.c
@@ -945,7 +945,6 @@ cptr do_music_spell(SPELL_IDX spell, BIT_FLAGS mode)
 			/* Update monsters */
 			p_ptr->update |= (PU_MONSTERS);
 
-			/* Window stuff */
 			p_ptr->window |= (PW_OVERHEAD | PW_DUNGEON);
 
 			start_singing(spell, MUSIC_INVULN);
@@ -962,7 +961,6 @@ cptr do_music_spell(SPELL_IDX spell, BIT_FLAGS mode)
 				/* Update monsters */
 				p_ptr->update |= (PU_MONSTERS);
 
-				/* Window stuff */
 				p_ptr->window |= (PW_OVERHEAD | PW_DUNGEON);
 			}
 		}
diff --git a/src/snipe.c b/src/snipe.c
index 3d2645a76..04ba9abe9 100644
--- a/src/snipe.c
+++ b/src/snipe.c
@@ -394,7 +394,6 @@ static int get_snipe_power(COMMAND_CODE *sn, bool only_browse)
 	/* Show choices */
 	p_ptr->window |= (PW_SPELL);
 
-	/* Window stuff */
 	window_stuff();
 
 	/* Abort if needed */
@@ -607,7 +606,6 @@ void do_cmd_snipe(void)
 	/* Redraw mana */
 	p_ptr->redraw |= (PR_HP | PR_MANA);
 
-	/* Window stuff */
 	p_ptr->window |= (PW_PLAYER);
 	p_ptr->window |= (PW_SPELL);
 }
diff --git a/src/spells1.c b/src/spells1.c
index 9dd3f4c5e..dfaba158c 100644
--- a/src/spells1.c
+++ b/src/spells1.c
@@ -5060,7 +5060,6 @@ static bool project_m(MONSTER_IDX who, POSITION r, POSITION y, POSITION x, HIT_P
 	/* Update monster recall window */
 	if ((p_ptr->monster_race_idx == m_ptr->r_idx) && (seen || !m_ptr->r_idx))
 	{
-		/* Window stuff */
 		p_ptr->window |= (PW_MONSTER);
 	}
 
@@ -5693,7 +5692,6 @@ static bool project_p(MONSTER_IDX who, cptr who_name, int r, POSITION y, POSITIO
 				p_ptr->redraw |= PR_MAP;
 				/* Update monsters */
 				p_ptr->update |= (PU_MONSTERS);
-				/* Window stuff */
 				p_ptr->window |= (PW_OVERHEAD | PW_DUNGEON);
 
 				/* Redraw status bar */
@@ -5996,7 +5994,6 @@ static bool project_p(MONSTER_IDX who, cptr who_name, int r, POSITION y, POSITIO
 				/* Redraw mana */
 				p_ptr->redraw |= (PR_MANA);
 
-				/* Window stuff */
 				p_ptr->window |= (PW_PLAYER);
 				p_ptr->window |= (PW_SPELL);
 
diff --git a/src/spells2.c b/src/spells2.c
index 2e88b34c3..a4264ce5d 100644
--- a/src/spells2.c
+++ b/src/spells2.c
@@ -480,7 +480,6 @@ bool detect_monsters_invis(POSITION range)
 			/* Update monster recall window */
 			if (p_ptr->monster_race_idx == m_ptr->r_idx)
 			{
-				/* Window stuff */
 				p_ptr->window |= (PW_MONSTER);
 			}
 
@@ -550,7 +549,6 @@ bool detect_monsters_evil(POSITION range)
 				/* Update monster recall window */
 				if (p_ptr->monster_race_idx == m_ptr->r_idx)
 				{
-					/* Window stuff */
 					p_ptr->window |= (PW_MONSTER);
 				}
 			}
@@ -614,7 +612,6 @@ bool detect_monsters_nonliving(POSITION range)
 			/* Update monster recall window */
 			if (p_ptr->monster_race_idx == m_ptr->r_idx)
 			{
-				/* Window stuff */
 				p_ptr->window |= (PW_MONSTER);
 			}
 
@@ -677,7 +674,6 @@ bool detect_monsters_mind(POSITION range)
 			/* Update monster recall window */
 			if (p_ptr->monster_race_idx == m_ptr->r_idx)
 			{
-				/* Window stuff */
 				p_ptr->window |= (PW_MONSTER);
 			}
 
@@ -742,7 +738,6 @@ bool detect_monsters_string(POSITION range, cptr Match)
 			/* Update monster recall window */
 			if (p_ptr->monster_race_idx == m_ptr->r_idx)
 			{
-				/* Window stuff */
 				p_ptr->window |= (PW_MONSTER);
 			}
 
@@ -814,7 +809,6 @@ bool detect_monsters_xxx(POSITION range, u32b match_flag)
 				/* Update monster recall window */
 				if (p_ptr->monster_race_idx == m_ptr->r_idx)
 				{
-					/* Window stuff */
 					p_ptr->window |= (PW_MONSTER);
 				}
 			}
@@ -1192,7 +1186,6 @@ bool genocide_aux(MONSTER_IDX m_idx, int power, bool player_cast, int dam_side,
 	/* Redraw */
 	p_ptr->redraw |= (PR_HP);
 
-	/* Window stuff */
 	p_ptr->window |= (PW_PLAYER);
 
 	/* Handle */
@@ -1750,7 +1743,6 @@ bool destroy_area(POSITION y1, POSITION x1, POSITION r, bool in_generate)
 		/* Redraw map */
 		p_ptr->redraw |= (PR_MAP);
 
-		/* Window stuff */
 		p_ptr->window |= (PW_OVERHEAD | PW_DUNGEON);
 
 		if (p_ptr->special_defense & NINJA_S_STEALTH)
@@ -2235,7 +2227,6 @@ bool earthquake_aux(POSITION cy, POSITION cx, POSITION r, MONSTER_IDX m_idx)
 	/* Redraw map */
 	p_ptr->redraw |= (PR_MAP);
 
-	/* Window stuff */
 	p_ptr->window |= (PW_OVERHEAD | PW_DUNGEON);
 
 	if (p_ptr->special_defense & NINJA_S_STEALTH)
@@ -5237,7 +5228,6 @@ bool psychometry(void)
 	/* Combine / Reorder the pack (later) */
 	p_ptr->notice |= (PN_COMBINE | PN_REORDER);
 
-	/* Window stuff */
 	p_ptr->window |= (PW_INVEN | PW_EQUIP | PW_PLAYER);
 
 	/* Valid "tval" codes */
diff --git a/src/spells3.c b/src/spells3.c
index 6a015e5c4..8ac4a0cbe 100644
--- a/src/spells3.c
+++ b/src/spells3.c
@@ -1053,7 +1053,6 @@ msg_format("%s(%c)は劣化を跳ね返した！",o_name, index_to_label(t) );
 		/* Recalculate bonuses */
 		p_ptr->update |= (PU_BONUS);
 
-		/* Window stuff */
 		p_ptr->window |= (PW_EQUIP | PW_PLAYER);
 
 		calc_android_exp();
@@ -1492,7 +1491,6 @@ static bool vanish_dungeon(void)
 	/* Redraw map */
 	p_ptr->redraw |= (PR_MAP);
 
-	/* Window stuff */
 	p_ptr->window |= (PW_OVERHEAD | PW_DUNGEON);
 
 	return TRUE;
@@ -1896,7 +1894,6 @@ static int remove_curse_aux(int all)
 		/* Recalculate the bonuses */
 		p_ptr->update |= (PU_BONUS);
 
-		/* Window stuff */
 		p_ptr->window |= (PW_EQUIP);
 
 		/* Count the uncursings */
@@ -2029,7 +2026,6 @@ bool alchemy(void)
 		/* Redraw gold */
 		p_ptr->redraw |= (PR_GOLD);
 
-		/* Window stuff */
 		p_ptr->window |= (PW_PLAYER);
 
 	}
@@ -2184,7 +2180,6 @@ bool enchant(object_type *o_ptr, int n, int eflag)
 	/* Combine / Reorder the pack (later) */
 	p_ptr->notice |= (PN_COMBINE | PN_REORDER);
 
-	/* Window stuff */
 	p_ptr->window |= (PW_INVEN | PW_EQUIP | PW_PLAYER);
 
 	calc_android_exp();
@@ -2453,7 +2448,6 @@ bool identify_item(object_type *o_ptr)
 	/* Combine / Reorder the pack (later) */
 	p_ptr->notice |= (PN_COMBINE | PN_REORDER);
 
-	/* Window stuff */
 	p_ptr->window |= (PW_INVEN | PW_EQUIP | PW_PLAYER);
 
 	strcpy(record_o_name, o_name);
@@ -3010,7 +3004,6 @@ bool recharge(int power)
 	/* Combine / Reorder the pack (later) */
 	p_ptr->notice |= (PN_COMBINE | PN_REORDER);
 
-	/* Window stuff */
 	p_ptr->window |= (PW_INVEN);
 
 	/* Something was done */
@@ -3101,7 +3094,6 @@ msg_format("%s から邪悪なオーラが消えた。",
 		/* Recalculate the bonuses */
 		p_ptr->update |= (PU_BONUS);
 
-		/* Window stuff */
 		p_ptr->window |= (PW_EQUIP);
 	}
 
@@ -3193,7 +3185,6 @@ msg_format("%s は劣化した！",
 	/* Recalculate bonuses */
 	p_ptr->update |= (PU_BONUS);
 
-	/* Window stuff */
 	p_ptr->window |= (PW_EQUIP | PW_PLAYER);
 
 	calc_android_exp();
@@ -4486,7 +4477,6 @@ static int minus_ac(void)
 	/* Calculate bonuses */
 	p_ptr->update |= (PU_BONUS);
 
-	/* Window stuff */
 	p_ptr->window |= (PW_EQUIP | PW_PLAYER);
 
 	calc_android_exp();
@@ -4827,7 +4817,6 @@ msg_format("%sが%sを包み込もうとしたが、%sはそれを跳ね返し
 		/* Recalculate mana */
 		p_ptr->update |= (PU_MANA);
 
-		/* Window stuff */
 		p_ptr->window |= (PW_INVEN | PW_EQUIP | PW_PLAYER);
 	}
 
@@ -4897,7 +4886,6 @@ bool curse_weapon_object(bool force, object_type *o_ptr)
 		/* Recalculate mana */
 		p_ptr->update |= (PU_MANA);
 
-		/* Window stuff */
 		p_ptr->window |= (PW_INVEN | PW_EQUIP | PW_PLAYER);
 	}
 
diff --git a/src/store.c b/src/store.c
index 084d2aeaa..1b40d48f7 100644
--- a/src/store.c
+++ b/src/store.c
@@ -5257,7 +5257,6 @@ void do_cmd_store(void)
 	/* Redraw map */
 	p_ptr->redraw |= (PR_MAP);
 
-	/* Window stuff */
 	p_ptr->window |= (PW_OVERHEAD | PW_DUNGEON);
 }
 
diff --git a/src/util.c b/src/util.c
index def117aad..338a289d8 100644
--- a/src/util.c
+++ b/src/util.c
@@ -2952,7 +2952,6 @@ void msg_print(cptr msg)
 	/* Memorize the tail */
 	/* if (character_generated) message_add(t); */
 
-	/* Window stuff */
 	p_ptr->window |= (PW_MESSAGE);
 	window_stuff();
 
diff --git a/src/wizard2.c b/src/wizard2.c
index f54b8b7f4..e726e3682 100644
--- a/src/wizard2.c
+++ b/src/wizard2.c
@@ -73,7 +73,6 @@ void do_cmd_rerate(bool display)
 	p_ptr->update |= (PU_HP);
 	p_ptr->redraw |= (PR_HP);
 
-	/* Window stuff */
 	p_ptr->window |= (PW_PLAYER);
 
 	/* Handle stuff */
@@ -1009,7 +1008,6 @@ static void wiz_reroll_item(object_type *o_ptr)
 		/* Combine / Reorder the pack (later) */
 		p_ptr->notice |= (PN_COMBINE | PN_REORDER);
 
-		/* Window stuff */
 		p_ptr->window |= (PW_INVEN | PW_EQUIP | PW_SPELL | PW_PLAYER);
 	}
 }
@@ -1386,7 +1384,6 @@ static void do_cmd_wiz_play(void)
 		/* Combine / Reorder the pack (later) */
 		p_ptr->notice |= (PN_COMBINE | PN_REORDER);
 
-		/* Window stuff */
 		p_ptr->window |= (PW_INVEN | PW_EQUIP | PW_SPELL | PW_PLAYER);
 	}
 
diff --git a/src/xtra1.c b/src/xtra1.c
index a7cfd39d5..482c98091 100644
--- a/src/xtra1.c
+++ b/src/xtra1.c
@@ -2808,7 +2808,6 @@ static void calc_mana(void)
 		/* Display mana later */
 		p_ptr->redraw |= (PR_MANA);
 
-		/* Window stuff */
 		p_ptr->window |= (PW_PLAYER);
 		p_ptr->window |= (PW_SPELL);
 	}
@@ -2931,7 +2930,6 @@ static void calc_hitpoints(void)
 		/* Display hitpoints (later) */
 		p_ptr->redraw |= (PR_HP);
 
-		/* Window stuff */
 		p_ptr->window |= (PW_PLAYER);
 	}
 }
@@ -4547,7 +4545,6 @@ void calc_bonuses(void)
 			/* Redisplay the stats later */
 			p_ptr->redraw |= (PR_STATS);
 
-			/* Window stuff */
 			p_ptr->window |= (PW_PLAYER);
 		}
 
@@ -4573,7 +4570,6 @@ void calc_bonuses(void)
 			/* Redisplay the stats later */
 			p_ptr->redraw |= (PR_STATS);
 
-			/* Window stuff */
 			p_ptr->window |= (PW_PLAYER);
 		}
 
@@ -4626,7 +4622,6 @@ void calc_bonuses(void)
 				}
 			}
 
-			/* Window stuff */
 			p_ptr->window |= (PW_PLAYER);
 		}
 	}
@@ -5476,7 +5471,6 @@ void calc_bonuses(void)
 		/* Redraw */
 		p_ptr->redraw |= (PR_ARMOR);
 
-		/* Window stuff */
 		p_ptr->window |= (PW_PLAYER);
 	}
 
@@ -6250,7 +6244,6 @@ void handle_stuff(void)
 	/* Redraw stuff */
 	if (p_ptr->redraw) redraw_stuff();
 
-	/* Window stuff */
 	if (p_ptr->window) window_stuff();
 }
 
diff --git a/src/xtra2.c b/src/xtra2.c
index 6da1d6552..3f25c6bb4 100644
--- a/src/xtra2.c
+++ b/src/xtra2.c
@@ -67,7 +67,6 @@ void check_experience(void)
 		/* Redraw some stuff */
 		p_ptr->redraw |= (PR_LEV | PR_TITLE);
 
-		/* Window stuff */
 		p_ptr->window |= (PW_PLAYER);
 
 		/* Handle stuff */
@@ -111,7 +110,6 @@ void check_experience(void)
 		/* Redraw some stuff */
 		p_ptr->redraw |= (PR_LEV | PR_TITLE | PR_EXP);
 
-		/* Window stuff */
 		p_ptr->window |= (PW_PLAYER | PW_SPELL | PW_INVEN);
 
 		/* HPとMPの上昇量を表示 */
@@ -204,7 +202,6 @@ void check_experience(void)
 		/* Redraw some stuff */
 		p_ptr->redraw |= (PR_LEV | PR_TITLE);
 
-		/* Window stuff */
 		p_ptr->window |= (PW_PLAYER | PW_SPELL);
 
 		/* Handle stuff */
@@ -2110,10 +2107,8 @@ void redraw_window(void)
 	/* Only if the dungeon exists */
 	if (!character_dungeon) return;
 
-	/* Window stuff */
 	p_ptr->window |= (PW_INVEN | PW_EQUIP | PW_SPELL | PW_PLAYER);
 
-	/* Window stuff */
 	p_ptr->window |= (PW_MESSAGE | PW_OVERHEAD | PW_DUNGEON | PW_MONSTER | PW_OBJECT);
 
 	/* Hack -- update */
@@ -2315,7 +2310,6 @@ void verify_panel(void)
 	/* Redraw map */
 	p_ptr->redraw |= (PR_MAP);
 
-	/* Window stuff */
 	p_ptr->window |= (PW_OVERHEAD | PW_DUNGEON);
 }
 
@@ -3718,7 +3712,6 @@ bool target_set(BIT_FLAGS mode)
 					/* Redraw map */
 					p_ptr->redraw |= (PR_MAP);
 
-					/* Window stuff */
 					p_ptr->window |= (PW_OVERHEAD);
 
 					/* Handle stuff */
@@ -3810,7 +3803,6 @@ bool target_set(BIT_FLAGS mode)
 						/* Redraw map */
 						p_ptr->redraw |= (PR_MAP);
 
-						/* Window stuff */
 						p_ptr->window |= (PW_OVERHEAD);
 
 						/* Handle stuff */
@@ -3930,7 +3922,6 @@ bool target_set(BIT_FLAGS mode)
 					/* Redraw map */
 					p_ptr->redraw |= (PR_MAP);
 
-					/* Window stuff */
 					p_ptr->window |= (PW_OVERHEAD);
 
 					/* Handle stuff */
@@ -4056,7 +4047,6 @@ bool target_set(BIT_FLAGS mode)
 	/* Redraw map */
 	p_ptr->redraw |= (PR_MAP);
 
-	/* Window stuff */
 	p_ptr->window |= (PW_OVERHEAD);
 
 	/* Handle stuff */
@@ -5184,7 +5174,6 @@ bool tgt_pt(POSITION *x_ptr, POSITION *y_ptr)
 					/* Redraw map */
 					p_ptr->redraw |= (PR_MAP);
 
-					/* Window stuff */
 					p_ptr->window |= (PW_OVERHEAD);
 
 					/* Handle stuff */
@@ -5274,7 +5263,6 @@ bool tgt_pt(POSITION *x_ptr, POSITION *y_ptr)
 	/* Redraw map */
 	p_ptr->redraw |= (PR_MAP);
 
-	/* Window stuff */
 	p_ptr->window |= (PW_OVERHEAD);
 
 	/* Handle stuff */