From c2c8211441b487f8eeb9b5b29bc47585fb9cd87f Mon Sep 17 00:00:00 2001
From: deskull <deskull@users.sourceforge.jp>
Date: Wed, 26 Jun 2019 00:12:03 +0900
Subject: [PATCH] =?utf8?q?[Refactor]=20#38997=20set=5Ffood()=20=E3=81=AB?=
 =?utf8?q?=20player=5Ftype=20*=20=E5=BC=95=E6=95=B0=E3=82=92=E8=BF=BD?=
 =?utf8?q?=E5=8A=A0=EF=BC=8E?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

---
 src/bldg.c           |  2 +-
 src/cmd-activate.c   |  2 +-
 src/cmd-eat.c        | 14 +++++++-------
 src/cmd-quaff.c      | 20 ++++++++++----------
 src/cmd-read.c       |  2 +-
 src/core.c           |  6 +++---
 src/player-effects.c | 20 ++++++++++----------
 src/player-effects.h |  2 +-
 src/player-status.c  |  2 +-
 src/realm-arcane.c   |  2 +-
 src/realm-craft.c    |  2 +-
 src/realm-death.c    |  2 +-
 src/realm-life.c     |  2 +-
 src/spells2.c        |  2 +-
 src/spells3.c        |  6 +++---
 src/wizard2.c        |  2 +-
 16 files changed, 44 insertions(+), 44 deletions(-)

diff --git a/src/bldg.c b/src/bldg.c
index 9e7b2af49..f3bdc7c84 100644
--- a/src/bldg.c
+++ b/src/bldg.c
@@ -2016,7 +2016,7 @@ static bool inn_comm(int cmd)
 				return FALSE;
 			}
 			msg_print(_("バーテンはいくらかの食べ物とビールをくれた。", "The barkeep gives you some gruel and a beer."));
-			(void)set_food(PY_FOOD_MAX - 1);
+			(void)set_food(p_ptr, PY_FOOD_MAX - 1);
 			break;
 
 		case BACT_REST: /* Rest for the night */
diff --git a/src/cmd-activate.c b/src/cmd-activate.c
index b246ce990..76228f5ec 100644
--- a/src/cmd-activate.c
+++ b/src/cmd-activate.c
@@ -1500,7 +1500,7 @@ bool activate_artifact(object_type *o_ptr)
 
 	case ACT_SATIATE:
 	{
-		(void)set_food(PY_FOOD_MAX - 1);
+		(void)set_food(p_ptr, PY_FOOD_MAX - 1);
 		break;
 	}
 
diff --git a/src/cmd-eat.c b/src/cmd-eat.c
index 0572e16e2..0a8c53e19 100644
--- a/src/cmd-eat.c
+++ b/src/cmd-eat.c
@@ -338,7 +338,7 @@ void exe_eat_food(INVENTORY_IDX item)
 	if (PRACE_IS_(p_ptr, RACE_VAMPIRE) || (p_ptr->mimic_form == MIMIC_VAMPIRE))
 	{
 		/* Reduced nutritional benefit */
-		(void)set_food(p_ptr->food + (o_ptr->pval / 10));
+		(void)set_food(p_ptr, p_ptr->food + (o_ptr->pval / 10));
 		msg_print(_("あなたのような者にとって食糧など僅かな栄養にしかならない。",
 			"Mere victuals hold scant sustenance for a being such as yourself."));
 
@@ -378,7 +378,7 @@ void exe_eat_food(INVENTORY_IDX item)
 		o_ptr->pval--;
 
 		/* Eat a charge */
-		set_food(p_ptr->food + 5000);
+		set_food(p_ptr, p_ptr->food + 5000);
 
 		/* XXX Hack -- unstack if necessary */
 		if (o_ptr->tval == TV_STAFF &&
@@ -429,7 +429,7 @@ void exe_eat_food(INVENTORY_IDX item)
 		GAME_TEXT o_name[MAX_NLEN];
 		object_desc(o_name, o_ptr, (OD_OMIT_PREFIX | OD_NAME_ONLY));
 		msg_format(_("%sは燃え上り灰になった。精力を吸収した気がする。", "%^s is burnt to ashes.  You absorb its vitality!"), o_name);
-		(void)set_food(PY_FOOD_MAX - 1);
+		(void)set_food(p_ptr, PY_FOOD_MAX - 1);
 	}
 	else if (PRACE_IS_(p_ptr, RACE_SKELETON))
 	{
@@ -438,7 +438,7 @@ void exe_eat_food(INVENTORY_IDX item)
 			(o_ptr->tval == TV_CORPSE && o_ptr->sval == SV_SKELETON))
 		{
 			msg_print(_("あなたは骨で自分の体を補った。", "Your body absorbs the bone."));
-			set_food(p_ptr->food + 5000);
+			set_food(p_ptr, p_ptr->food + 5000);
 		}
 		else
 #endif
@@ -469,17 +469,17 @@ void exe_eat_food(INVENTORY_IDX item)
 		(mimic_info[p_ptr->mimic_form].MIMIC_FLAGS & MIMIC_IS_NONLIVING))
 	{
 		msg_print(_("生者の食物はあなたにとってほとんど栄養にならない。", "The food of mortals is poor sustenance for you."));
-		set_food(p_ptr->food + ((o_ptr->pval) / 20));
+		set_food(p_ptr, p_ptr->food + ((o_ptr->pval) / 20));
 	}
 	else if (o_ptr->tval == TV_FOOD && o_ptr->sval == SV_FOOD_WAYBREAD)
 	{
 		/* Waybread is always fully satisfying. */
-		set_food(MAX(p_ptr->food, PY_FOOD_MAX - 1));
+		set_food(p_ptr, MAX(p_ptr->food, PY_FOOD_MAX - 1));
 	}
 	else
 	{
 		/* Food can feed the player */
-		(void)set_food(p_ptr->food + o_ptr->pval);
+		(void)set_food(p_ptr, p_ptr->food + o_ptr->pval);
 	}
 
 	/* Destroy a food in the pack */
diff --git a/src/cmd-quaff.c b/src/cmd-quaff.c
index cd39e63ef..264553305 100644
--- a/src/cmd-quaff.c
+++ b/src/cmd-quaff.c
@@ -142,7 +142,7 @@ void exe_quaff_potion(INVENTORY_IDX item)
 			      (mimic_info[p_ptr->mimic_form].MIMIC_FLAGS & MIMIC_IS_NONLIVING)))
 			{
 				/* Only living creatures get thirsty */
-				(void)set_food(PY_FOOD_STARVE - 1);
+				(void)set_food(p_ptr, PY_FOOD_STARVE - 1);
 			}
 
 			(void)set_poisoned(p_ptr, 0);
@@ -545,7 +545,7 @@ void exe_quaff_potion(INVENTORY_IDX item)
 		switch (p_ptr->prace)
 		{
 			case RACE_VAMPIRE:
-				(void)set_food(p_ptr->food + (q_ptr->pval / 10));
+				(void)set_food(p_ptr, p_ptr->food + (q_ptr->pval / 10));
 				break;
 			case RACE_SKELETON:
 				/* Do nothing */
@@ -554,37 +554,37 @@ void exe_quaff_potion(INVENTORY_IDX item)
 			case RACE_ZOMBIE:
 			case RACE_DEMON:
 			case RACE_SPECTRE:
-				set_food(p_ptr->food + ((q_ptr->pval) / 20));
+				set_food(p_ptr, p_ptr->food + ((q_ptr->pval) / 20));
 				break;
 			case RACE_ANDROID:
 				if (q_ptr->tval == TV_FLASK)
 				{
 					msg_print(_("オイルを補給した。", "You replenish yourself with the oil."));
-					set_food(p_ptr->food + 5000);
+					set_food(p_ptr, p_ptr->food + 5000);
 				}
 				else
 				{
-					set_food(p_ptr->food + ((q_ptr->pval) / 20));
+					set_food(p_ptr, p_ptr->food + ((q_ptr->pval) / 20));
 				}
 				break;
 			case RACE_ENT:
 				msg_print(_("水分を取り込んだ。", "You are moistened."));
-				set_food(MIN(p_ptr->food + q_ptr->pval + MAX(0, q_ptr->pval * 10) + 2000, PY_FOOD_MAX - 1));
+				set_food(p_ptr, MIN(p_ptr->food + q_ptr->pval + MAX(0, q_ptr->pval * 10) + 2000, PY_FOOD_MAX - 1));
 				break;
 			default:
-				(void)set_food(p_ptr->food + q_ptr->pval);
+				(void)set_food(p_ptr, p_ptr->food + q_ptr->pval);
 				break;
 		}
 		break;
 	case MIMIC_DEMON:
 	case MIMIC_DEMON_LORD:
-		set_food(p_ptr->food + ((q_ptr->pval) / 20));
+		set_food(p_ptr, p_ptr->food + ((q_ptr->pval) / 20));
 		break;
 	case MIMIC_VAMPIRE:
-		(void)set_food(p_ptr->food + (q_ptr->pval / 10));
+		(void)set_food(p_ptr, p_ptr->food + (q_ptr->pval / 10));
 		break;
 	default:
-		(void)set_food(p_ptr->food + q_ptr->pval);
+		(void)set_food(p_ptr, p_ptr->food + q_ptr->pval);
 		break;
 	}
 }
diff --git a/src/cmd-read.c b/src/cmd-read.c
index c205f1bfd..69483391e 100644
--- a/src/cmd-read.c
+++ b/src/cmd-read.c
@@ -333,7 +333,7 @@ void exe_read(INVENTORY_IDX item, bool known)
 
 		case SV_SCROLL_SATISFY_HUNGER:
 		{
-			if (set_food(PY_FOOD_MAX - 1)) ident = TRUE;
+			if (set_food(p_ptr, PY_FOOD_MAX - 1)) ident = TRUE;
 			break;
 		}
 
diff --git a/src/core.c b/src/core.c
index 6046f6b07..4b74996d4 100644
--- a/src/core.c
+++ b/src/core.c
@@ -1272,7 +1272,7 @@ static void process_world_aux_digestion(void)
 		if (p_ptr->food >= PY_FOOD_MAX)
 		{
 			/* Digest a lot of food */
-			(void)set_food(p_ptr->food - 100);
+			(void)set_food(p_ptr, p_ptr->food - 100);
 		}
 
 		/* Digest normally -- Every 50 game turns */
@@ -1299,7 +1299,7 @@ static void process_world_aux_digestion(void)
 			if (digestion > 100) digestion = 100;
 
 			/* Digest some food */
-			(void)set_food(p_ptr->food - digestion);
+			(void)set_food(p_ptr, p_ptr->food - digestion);
 		}
 
 
@@ -2473,7 +2473,7 @@ static void process_world_aux_mutation(void)
 		disturb(FALSE, TRUE);
 		msg_print(_("胃が痙攣し、食事を失った！", "Your stomach roils, and you lose your lunch!"));
 		msg_print(NULL);
-		set_food(PY_FOOD_WEAK);
+		set_food(p_ptr, PY_FOOD_WEAK);
 		if (music_singing_any()) stop_singing(p_ptr);
 		if (hex_spelling_any()) stop_hex_spell_all();
 	}
diff --git a/src/player-effects.c b/src/player-effects.c
index def1d9def..3bca880ee 100644
--- a/src/player-effects.c
+++ b/src/player-effects.c
@@ -3038,7 +3038,7 @@ bool set_cut(player_type *creature_ptr, TIME_EFFECT v)
  * game turns, or 500/(100/5) = 25 player turns (if nothing else is
  * affecting the player speed).\n
  */
-bool set_food(TIME_EFFECT v)
+bool set_food(player_type *creature_ptr, TIME_EFFECT v)
 {
 	int old_aux, new_aux;
 
@@ -3046,31 +3046,31 @@ bool set_food(TIME_EFFECT v)
 	v = (v > 20000) ? 20000 : (v < 0) ? 0 : v;
 
 	/* Fainting / Starving */
-	if (p_ptr->food < PY_FOOD_FAINT)
+	if (creature_ptr->food < PY_FOOD_FAINT)
 	{
 		old_aux = 0;
 	}
 
 	/* Weak */
-	else if (p_ptr->food < PY_FOOD_WEAK)
+	else if (creature_ptr->food < PY_FOOD_WEAK)
 	{
 		old_aux = 1;
 	}
 
 	/* Hungry */
-	else if (p_ptr->food < PY_FOOD_ALERT)
+	else if (creature_ptr->food < PY_FOOD_ALERT)
 	{
 		old_aux = 2;
 	}
 
 	/* Normal */
-	else if (p_ptr->food < PY_FOOD_FULL)
+	else if (creature_ptr->food < PY_FOOD_FULL)
 	{
 		old_aux = 3;
 	}
 
 	/* Full */
-	else if (p_ptr->food < PY_FOOD_MAX)
+	else if (creature_ptr->food < PY_FOOD_MAX)
 	{
 		old_aux = 4;
 	}
@@ -3180,7 +3180,7 @@ bool set_food(TIME_EFFECT v)
 			case 4: msg_print(_("やっとお腹がきつくなくなった。", "You are no longer gorged.")); break;
 		}
 
-		if (p_ptr->wild_mode && (new_aux < 2))
+		if (creature_ptr->wild_mode && (new_aux < 2))
 		{
 			change_wild_mode(FALSE);
 		}
@@ -3190,16 +3190,16 @@ bool set_food(TIME_EFFECT v)
 	}
 
 	/* Use the value */
-	p_ptr->food = v;
+	creature_ptr->food = v;
 
 	/* Nothing to notice */
 	if (!notice) return (FALSE);
 
 	if (disturb_state) disturb(FALSE, FALSE);
-	p_ptr->update |= (PU_BONUS);
+	creature_ptr->update |= (PU_BONUS);
 
 	/* Redraw hunger */
-	p_ptr->redraw |= (PR_HUNGER);
+	creature_ptr->redraw |= (PR_HUNGER);
 	handle_stuff();
 	return (TRUE);
 }
diff --git a/src/player-effects.h b/src/player-effects.h
index 9fb5d9379..22c500915 100644
--- a/src/player-effects.h
+++ b/src/player-effects.h
@@ -56,7 +56,7 @@ extern bool set_oppose_cold(player_type *creature_ptr, TIME_EFFECT v, bool do_de
 extern bool set_oppose_pois(player_type *creature_ptr, TIME_EFFECT v, bool do_dec);
 extern bool set_stun(player_type *creature_ptr, TIME_EFFECT v);
 extern bool set_cut(player_type *creature_ptr, TIME_EFFECT v);
-extern bool set_food(TIME_EFFECT v);
+extern bool set_food(player_type *creature_ptr, TIME_EFFECT v);
 extern bool inc_stat(player_type *creature_ptr, int stat);
 extern bool dec_stat(player_type *creature_ptr, int stat, int amount, int permanent);
 extern bool res_stat(player_type *creature_ptr, int stat);
diff --git a/src/player-status.c b/src/player-status.c
index ad0194520..07819973b 100644
--- a/src/player-status.c
+++ b/src/player-status.c
@@ -5843,7 +5843,7 @@ void cheat_death(player_type *creature_ptr)
 	creature_ptr->is_dead = FALSE;
 
 	/* Hack -- Prevent starvation */
-	(void)set_food(PY_FOOD_MAX - 1);
+	(void)set_food(p_ptr, PY_FOOD_MAX - 1);
 
 	current_floor_ptr->dun_level = 0;
 	creature_ptr->inside_arena = FALSE;
diff --git a/src/realm-arcane.c b/src/realm-arcane.c
index a0731bb67..57c527bc1 100644
--- a/src/realm-arcane.c
+++ b/src/realm-arcane.c
@@ -403,7 +403,7 @@ concptr do_arcane_spell(SPELL_IDX spell, BIT_FLAGS mode)
 		{
 			if (cast)
 			{
-				set_food(PY_FOOD_MAX - 1);
+				set_food(p_ptr, PY_FOOD_MAX - 1);
 			}
 		}
 		break;
diff --git a/src/realm-craft.c b/src/realm-craft.c
index 9bbec41fc..782ac903b 100644
--- a/src/realm-craft.c
+++ b/src/realm-craft.c
@@ -69,7 +69,7 @@ concptr do_craft_spell(SPELL_IDX spell, BIT_FLAGS mode)
 		{
 			if (cast)
 			{
-				set_food(PY_FOOD_MAX - 1);
+				set_food(p_ptr, PY_FOOD_MAX - 1);
 			}
 		}
 		break;
diff --git a/src/realm-death.c b/src/realm-death.c
index 007b0a0b3..11444e062 100644
--- a/src/realm-death.c
+++ b/src/realm-death.c
@@ -330,7 +330,7 @@ concptr do_death_spell(SPELL_IDX spell, BIT_FLAGS mode)
 
 					/* Not gorged already */
 					if (p_ptr->food < PY_FOOD_MAX)
-						set_food(dam >= PY_FOOD_MAX ? PY_FOOD_MAX - 1 : dam);
+						set_food(p_ptr, dam >= PY_FOOD_MAX ? PY_FOOD_MAX - 1 : dam);
 				}
 			}
 		}
diff --git a/src/realm-life.c b/src/realm-life.c
index b4899e3c0..638941f4b 100644
--- a/src/realm-life.c
+++ b/src/realm-life.c
@@ -132,7 +132,7 @@ concptr do_life_spell(SPELL_IDX spell, BIT_FLAGS mode)
 		{
 			if (cast)
 			{
-				set_food(PY_FOOD_MAX - 1);
+				set_food(p_ptr, PY_FOOD_MAX - 1);
 			}
 		}
 		break;
diff --git a/src/spells2.c b/src/spells2.c
index a76fe527f..29dfa60c2 100644
--- a/src/spells2.c
+++ b/src/spells2.c
@@ -3893,7 +3893,7 @@ bool_hack vampirism(void)
 		/* But if we ARE Gorged,  it won't cure us */
 		dummy = p_ptr->food + MIN(5000, 100 * dummy);
 		if (p_ptr->food < PY_FOOD_MAX)   /* Not gorged already */
-			(void)set_food(dummy >= PY_FOOD_MAX ? PY_FOOD_MAX - 1 : dummy);
+			(void)set_food(p_ptr, dummy >= PY_FOOD_MAX ? PY_FOOD_MAX - 1 : dummy);
 	}
 	else
 		msg_print(_("げぇ！ひどい味だ。", "Yechh. That tastes foul."));
diff --git a/src/spells3.c b/src/spells3.c
index 0da8cd1d3..897b91928 100644
--- a/src/spells3.c
+++ b/src/spells3.c
@@ -3342,16 +3342,16 @@ bool eat_lock(void)
 	}
 	else if (have_flag(f_ptr->flags, FF_DOOR) || have_flag(f_ptr->flags, FF_CAN_DIG))
 	{
-		(void)set_food(p_ptr->food + 3000);
+		(void)set_food(p_ptr, p_ptr->food + 3000);
 	}
 	else if (have_flag(f_ptr->flags, FF_MAY_HAVE_GOLD) || have_flag(f_ptr->flags, FF_HAS_GOLD))
 	{
-		(void)set_food(p_ptr->food + 5000);
+		(void)set_food(p_ptr, p_ptr->food + 5000);
 	}
 	else
 	{
 		msg_format(_("この%sはとてもおいしい！", "This %s is very filling!"), f_name + mimic_f_ptr->name);
-		(void)set_food(p_ptr->food + 10000);
+		(void)set_food(p_ptr, p_ptr->food + 10000);
 	}
 
 	/* Destroy the wall */
diff --git a/src/wizard2.c b/src/wizard2.c
index 1fe80f25e..3b03cf73c 100644
--- a/src/wizard2.c
+++ b/src/wizard2.c
@@ -1293,7 +1293,7 @@ static void do_cmd_wiz_cure_all(void)
 {
 	(void)life_stream(FALSE, FALSE);
 	(void)restore_mana(TRUE);
-	(void)set_food(PY_FOOD_MAX - 1);
+	(void)set_food(p_ptr, PY_FOOD_MAX - 1);
 }
 
 
-- 
2.11.0