From 07c3425eb1fd003f42ab0d0a77f0ea5a2fe80a16 Mon Sep 17 00:00:00 2001
From: Deskull <deskull@users.sourceforge.jp>
Date: Thu, 10 Jan 2019 21:54:54 +0900
Subject: [PATCH] =?utf8?q?[Refactor]=20#38827=20SPEED=E3=81=AE=E5=9E=8B?=
 =?utf8?q?=E5=AE=9A=E7=BE=A9=E3=82=92s16b=E3=81=AB=E6=8B=A1=E5=BC=B5?=
 =?utf8?q?=E3=80=82=20/=20Change=20typedef=20of=20SPEED=20to=20s16b.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

---
 src/defines.h | 2 +-
 src/h-type.h  | 2 +-
 src/load.c    | 8 ++++++--
 src/save.c    | 2 +-
 4 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/src/defines.h b/src/defines.h
index 48064578d..288a52fb9 100644
--- a/src/defines.h
+++ b/src/defines.h
@@ -637,7 +637,7 @@
 #define REALM_DEATH        5
 #define REALM_TRUMP        6
 #define REALM_ARCANE       7
-#define REALM_CRAFT      8
+#define REALM_CRAFT        8
 #define REALM_DAEMON       9
 #define REALM_CRUSADE      10
 #define MAX_MAGIC          10
diff --git a/src/h-type.h b/src/h-type.h
index fa0bfa708..2e06cd252 100644
--- a/src/h-type.h
+++ b/src/h-type.h
@@ -173,7 +173,7 @@ typedef s16b ACTION_ENERGY;		/*!< ゲーム中の行動エネルギー型を定
 typedef s16b ARMOUR_CLASS;		/*!< ゲーム中の行動アーマークラス型を定義 */
 typedef s16b TIME_EFFECT;		/*!< ゲーム中の時限期間の型を定義 */
 typedef byte DISCOUNT_RATE;		/*!< ゲーム中の値引き率の型を定義 */
-typedef byte SPEED;				/*!< ゲーム中の加速値の型定義 */
+typedef s16b SPEED;				/*!< ゲーム中の加速値の型定義 */
 
 /*!
  * @var typedef s16b ENEGRY
diff --git a/src/load.c b/src/load.c
index f9af9ecfc..f4c65950d 100644
--- a/src/load.c
+++ b/src/load.c
@@ -871,7 +871,10 @@ static void rd_monster_old(monster_type *m_ptr)
 	}
 	
 	rd_s16b(&m_ptr->mtimed[MTIMED_CSLEEP]);
-	rd_byte(&m_ptr->mspeed);
+
+	rd_byte(&tmp8u);
+	m_ptr->mspeed = tmp8u;
+
 	if (z_older_than(10, 4, 2))
 	{
 		rd_byte(&tmp8u);
@@ -1025,7 +1028,8 @@ static void rd_monster(monster_type *m_ptr)
 	if (flags & SAVE_MON_CSLEEP) rd_s16b(&m_ptr->mtimed[MTIMED_CSLEEP]);
 	else m_ptr->mtimed[MTIMED_CSLEEP] = 0;
 
-	rd_byte(&m_ptr->mspeed);
+	rd_byte(&tmp8u);
+	m_ptr->mspeed = tmp8u;
 
 	rd_s16b(&m_ptr->energy_need);
 
diff --git a/src/save.c b/src/save.c
index bf1b59c90..35d5dac04 100644
--- a/src/save.c
+++ b/src/save.c
@@ -259,7 +259,7 @@ static void wr_monster(monster_type *m_ptr)
 	if (flags & SAVE_MON_SUB_ALIGN) wr_byte(m_ptr->sub_align);
 	if (flags & SAVE_MON_CSLEEP) wr_s16b(m_ptr->mtimed[MTIMED_CSLEEP]);
 
-	wr_byte(m_ptr->mspeed);
+	wr_byte((byte)m_ptr->mspeed);
 	wr_s16b(m_ptr->energy_need);
 
 	if (flags & SAVE_MON_FAST)
-- 
2.11.0