From 2f8c4a80ee42295363173626ba5d5bffef4c8e4d Mon Sep 17 00:00:00 2001
From: Deskull <desull@users.sourceforge.jp>
Date: Wed, 11 Oct 2017 23:59:21 +0900
Subject: [PATCH] =?utf8?q?#37287=20#37353=20(2.2.0.89)=20FEED=20=E5=9E=8B?=
 =?utf8?q?=E3=82=92=E5=AE=9A=E7=BE=A9=E3=81=97=E3=80=81=E5=9E=8B=E3=81=AE?=
 =?utf8?q?=E7=BD=AE=E6=8F=9B=E3=82=92=E7=B6=99=E7=B6=9A=E4=B8=AD=E3=80=82?=
 =?utf8?q?=20/=20Define=20FEED,=20ongoing=20type=20replacement.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

---
 src/h-type.h  | 1 +
 src/spells3.c | 2 +-
 src/types.h   | 8 ++++----
 3 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/src/h-type.h b/src/h-type.h
index 3dae1c4b9..64aa4a14a 100644
--- a/src/h-type.h
+++ b/src/h-type.h
@@ -143,6 +143,7 @@ typedef s16b WEIGHT;               /*!< ゲーム中の重量の型定義(ポン
 typedef int DICE_NUMBER; /*!< ゲーム中のダイス数の型定義 */
 typedef int DICE_SID;    /*!< ゲーム中のダイス面の型定義 */
 typedef s32b PRICE;      /*!< ゲーム中の金額価値の型定義 */
+typedef s16b FEED;       /*!< ゲーム中の滋養度の型定義 */
 
 typedef u32b STR_OFFSET;      /*!< テキストオフセットの型定義 */
 
diff --git a/src/spells3.c b/src/spells3.c
index 4c15ea7be..d9ab543bf 100644
--- a/src/spells3.c
+++ b/src/spells3.c
@@ -5363,7 +5363,7 @@ bool dimension_door(void)
  */
 bool mirror_tunnel(void)
 {
-	int x = 0, y = 0;
+	POSITION x = 0, y = 0;
 
 	/* Rerutn FALSE if cancelled */
 	if (!tgt_pt(&x, &y)) return FALSE;
diff --git a/src/types.h b/src/types.h
index 23468d533..31d15ea4f 100644
--- a/src/types.h
+++ b/src/types.h
@@ -1081,14 +1081,14 @@ struct player_type
 	s16b virtues[8];
 	s16b vir_types[8];
 
-	s16b word_recall;	  /* Word of recall counter */
-	s16b alter_reality;	  /* Alter reality counter */
-	IDX recall_dungeon;      /* Dungeon set to be recalled */
+	TIME_EFFECT word_recall;	  /* Word of recall counter */
+	TIME_EFFECT alter_reality;	  /* Alter reality counter */
+	DUNGEON_IDX recall_dungeon;      /* Dungeon set to be recalled */
 
 	ENERGY energy_need;	  /* Energy needed for next move */
 	ENERGY enchant_energy_need;	  /* Energy needed for next upkeep effect	 */
 
-	s16b food;		  /* Current nutrition */
+	FEED food;		  /* Current nutrition */
 
 	BIT_FLAGS special_attack;	  /* Special attack capacity -LM- */
 	BIT_FLAGS special_defense;	  /* Special block capacity -LM- */
-- 
2.11.0