From b0c139df4afd3c9fa78da1e7581fedcd28b6c665 Mon Sep 17 00:00:00 2001
From: Deskull <deskull@users.sourceforge.jp>
Date: Sun, 25 Nov 2018 22:05:10 +0900
Subject: [PATCH] =?utf8?q?#38768=20[Fix]=20Oops=E3=82=82=E3=82=8D=E3=81=A8?=
 =?utf8?q?=E3=82=82=E7=BD=AE=E6=8F=9B=E3=81=A7=E6=B6=88=E3=81=97=E3=81=A6?=
 =?utf8?q?=E3=81=97=E3=81=BE=E3=81=A3=E3=81=9F=E9=87=8D=E8=A6=81=E5=87=A6?=
 =?utf8?q?=E7=90=86=E3=82=92=E5=B7=AE=E3=81=97=E6=88=BB=E3=81=97=E3=80=82?=
 =?utf8?q?=20/=20Remand=20important=20processes=20erasing=20with=20nasty?=
 =?utf8?q?=20"/*=20Oops=20*/".?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

---
 src/load.c     | 4 +++-
 src/monster2.c | 1 +
 src/save.c     | 9 +++++++++
 3 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/src/load.c b/src/load.c
index 11bb61efc..061f2859e 100644
--- a/src/load.c
+++ b/src/load.c
@@ -1750,6 +1750,7 @@ static void rd_extra(void)
 	p_ptr->realm1 = (REALM_IDX)tmp8u;
 	rd_byte(&tmp8u);
 	p_ptr->realm2 = (REALM_IDX)tmp8u;
+	rd_byte(&tmp8u);
 
 	if (z_older_than(10, 4, 4))
 	{
@@ -1774,7 +1775,7 @@ static void rd_extra(void)
 	for (i = 0; i < 6; i++) rd_s16b(&p_ptr->stat_max_max[i]);
 	for (i = 0; i < 6; i++) rd_s16b(&p_ptr->stat_cur[i]);
 
-
+	strip_bytes(24);
 	rd_s32b(&p_ptr->au);
 
 	rd_s32b(&p_ptr->max_exp);
@@ -2207,6 +2208,7 @@ static void rd_extra(void)
 	p_ptr->autopick_autoregister = tmp8u ? TRUE : FALSE;
 
 	rd_byte(&tmp8u);
+	rd_byte(&tmp8u);
 	p_ptr->action = (ACTION_IDX)tmp8u;
 	if (!z_older_than(10, 4, 3))
 	{
diff --git a/src/monster2.c b/src/monster2.c
index faa095b3b..f60cf8f25 100644
--- a/src/monster2.c
+++ b/src/monster2.c
@@ -1976,6 +1976,7 @@ void sanity_blast(monster_type *m_ptr, bool necro)
 			return; /* Cannot see it for some reason */
 
 		if (!(r_ptr->flags2 & RF2_ELDRITCH_HORROR))
+			return;
 
 		if (is_pet(m_ptr))
 			return; /* Pet eldritch horrors are safe most of the time */
diff --git a/src/save.c b/src/save.c
index f5b87bf71..c9de5f78d 100644
--- a/src/save.c
+++ b/src/save.c
@@ -627,6 +627,7 @@ static void wr_extra(void)
 	wr_byte(p_ptr->psex);
 	wr_byte((byte_hack)p_ptr->realm1);
 	wr_byte((byte_hack)p_ptr->realm2);
+	wr_byte(0);
 
 	wr_byte((byte)p_ptr->hitdie);
 	wr_u16b(p_ptr->expfact);
@@ -712,6 +713,10 @@ static void wr_extra(void)
 		wr_s16b((s16b)max_dlv[i]);
 
 	/* More info */
+	wr_s16b(0);
+	wr_s16b(0);
+	wr_s16b(0);
+	wr_s16b(0);
 	wr_s16b(p_ptr->sc);
 	wr_s16b(p_ptr->concent);
 
@@ -790,6 +795,7 @@ static void wr_extra(void)
 	wr_u32b(p_ptr->special_defense);
 	wr_byte(p_ptr->knowledge);
 	wr_byte(p_ptr->autopick_autoregister);
+	wr_byte(0);
 	wr_byte((byte_hack)p_ptr->action);
 	wr_byte(0);
 	wr_byte(preserve_mode);
@@ -799,6 +805,9 @@ static void wr_extra(void)
 	for (i = 0; i < 12; i++) wr_u32b(0L);
 
 	/* Ignore some flags */
+	wr_u32b(0L);
+	wr_u32b(0L);
+	wr_u32b(0L);
 
 
 	/* Write the "object seeds" */
-- 
2.11.0