From a5424dd69954292b712c61f76113caa43c73b370 Mon Sep 17 00:00:00 2001
From: Deskull <desull@users.sourceforge.jp>
Date: Sat, 2 Dec 2017 15:30:04 +0900
Subject: [PATCH] =?utf8?q?#37287=20#37353=20(2.2.0.89)=20EFFECT=5FID?=
 =?utf8?q?=E5=9E=8B=E3=82=92=E5=AE=9A=E7=BE=A9=E3=81=97=E3=80=81=E5=9E=8B?=
 =?utf8?q?=E3=81=AE=E7=BD=AE=E6=8F=9B=E3=82=92=E7=B6=99=E7=B6=9A=E4=B8=AD?=
 =?utf8?q?=E3=80=82=20/=20Define=20EFFECT=5FID=20ongoing=20type=20replacem?=
 =?utf8?q?ent.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

---
 src/cmd2.c    | 2 +-
 src/externs.h | 2 +-
 src/h-type.h  | 2 ++
 src/save.c    | 6 +++---
 src/spells2.c | 2 +-
 5 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/src/cmd2.c b/src/cmd2.c
index bbd673ce9..16d2773b9 100644
--- a/src/cmd2.c
+++ b/src/cmd2.c
@@ -578,7 +578,7 @@ static void chest_death(bool scatter, int y, int x, s16b o_idx)
  * Note that the chest itself is never destroyed.
  * </pre>
  */
-static void chest_trap(int y, int x, s16b o_idx)
+static void chest_trap(POSITION y, POSITION x, KIND_OBJECT_IDX o_idx)
 {
 	int  i, trap;
 
diff --git a/src/externs.h b/src/externs.h
index 7d86332e9..0b53eca82 100644
--- a/src/externs.h
+++ b/src/externs.h
@@ -1148,7 +1148,7 @@ extern bool unlite_area(HIT_POINT dam, int rad);
 extern bool fire_ball(int typ, int dir, HIT_POINT dam, int rad);
 extern bool fire_rocket(int typ, int dir, HIT_POINT dam, int rad);
 extern bool fire_ball_hide(int typ, int dir, HIT_POINT dam, int rad);
-extern bool fire_meteor(int who, int typ, int x, int y, HIT_POINT dam, int rad);
+extern bool fire_meteor(MONSTER_IDX who, EFFECT_ID typ, POSITION x, POSITION y, HIT_POINT dam, POSITION rad);
 extern bool fire_bolt(int typ, int dir, HIT_POINT dam);
 extern bool fire_blast(int typ, int dir, int dd, int ds, int num, int dev);
 extern void call_chaos(void);
diff --git a/src/h-type.h b/src/h-type.h
index dffdd7c83..d9da989da 100644
--- a/src/h-type.h
+++ b/src/h-type.h
@@ -198,6 +198,8 @@ typedef int QUANTITY; /*!< インターフェース上の指定個数 */
 typedef byte BLOW_METHOD; /*!< モンスターの打撃手段ID */
 typedef byte BLOW_EFFECT; /*!< モンスターの打撃効果ID */
 
+typedef int EFFECT_ID; /*!< 効果属性ID */
+
 
 /*** Pointers to all the basic types defined above ***/
 
diff --git a/src/save.c b/src/save.c
index a80ee7383..463226610 100644
--- a/src/save.c
+++ b/src/save.c
@@ -1405,7 +1405,7 @@ static bool wr_savefile_new(void)
 		/* (prevents problems with multi-level quests) */
 		wr_s16b((s16b)q_ptr->level);
 
-		wr_byte(q_ptr->complev);
+		wr_byte((byte_hack)q_ptr->complev);
 		wr_u32b(q_ptr->comptime);
 
 		/* Save quest status if quest is running */
@@ -1416,8 +1416,8 @@ static bool wr_savefile_new(void)
 			wr_s16b(q_ptr->type);
 			wr_s16b(q_ptr->r_idx);
 			wr_s16b(q_ptr->k_idx);
-			wr_byte(q_ptr->flags);
-			wr_byte(q_ptr->dungeon);
+			wr_byte((byte_hack)q_ptr->flags);
+			wr_byte((byte_hack)q_ptr->dungeon);
 		}
 	}
 
diff --git a/src/spells2.c b/src/spells2.c
index 1c7715e99..7a0113779 100644
--- a/src/spells2.c
+++ b/src/spells2.c
@@ -4777,7 +4777,7 @@ bool fire_ball_hide(int typ, int dir, HIT_POINT dam, int rad)
  * Option to hurt the player.
  * </pre>
  */
-bool fire_meteor(int who, int typ, int y, int x, HIT_POINT dam, int rad)
+bool fire_meteor(MONSTER_IDX who, EFFECT_ID typ, POSITION y, POSITION x, HIT_POINT dam, POSITION rad)
 {
 	int flg = PROJECT_STOP | PROJECT_GRID | PROJECT_ITEM | PROJECT_KILL;
 
-- 
2.11.0