From 4bd0126a8ef508f5fd93d24a815fa9e22262e54b Mon Sep 17 00:00:00 2001 From: Deskull Date: Sun, 23 Jul 2017 23:43:42 +0900 Subject: [PATCH] =?utf8?q?#37399=20(2.2.0.46)=20ironman=5Fdownward(?= =?utf8?q?=E5=B8=B0=E9=82=84=E7=84=A1=E3=81=97)=E3=81=AE=E6=99=82=E3=80=81?= =?utf8?q?=E5=9C=B0=E4=B8=8A=E3=81=A7=E3=83=AC=E3=83=99=E3=83=AB=E3=83=86?= =?utf8?q?=E3=83=AC=E3=83=9D=E3=82=92=E8=A1=8C=E3=81=A3=E3=81=9F=E5=A0=B4?= =?utf8?q?=E5=90=88=E3=80=81recall=5Fdungeon=E3=81=AE=E5=80=A4=E3=82=92?= =?utf8?q?=E5=95=8F=E3=82=8F=E3=81=9A=E9=89=84=E7=8D=84=E3=81=AB=E9=A3=9B?= =?utf8?q?=E3=81=B6=E3=82=88=E3=81=86=E4=BF=AE=E6=AD=A3=20/=20If=20ironman?= =?utf8?q?=5Fdownward=20is=20true=20and=20when=20player=20invokes=20level?= =?utf8?q?=20teleport,=20player=20go=20to=20Angband=20independently=20of?= =?utf8?q?=20recall=5Fdungeon's=20value.?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- src/birth.c | 6 +++--- src/defines.h | 2 +- src/spells3.c | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/birth.c b/src/birth.c index 7425ba1f9..155990dc3 100644 --- a/src/birth.c +++ b/src/birth.c @@ -3429,15 +3429,15 @@ static void player_wipe_without_name(void) /* Reset virtues*/ for (i = 0; i < 8; i++) p_ptr->virtues[i]=0; + dungeon_type = 0; + /* Set the recall dungeon accordingly */ - if (vanilla_town) + if (vanilla_town || ironman_downward) { - dungeon_type = 0; p_ptr->recall_dungeon = DUNGEON_ANGBAND; } else { - dungeon_type = 0; p_ptr->recall_dungeon = DUNGEON_GALGALS; } diff --git a/src/defines.h b/src/defines.h index 7c541d2b8..6f4eaa23c 100644 --- a/src/defines.h +++ b/src/defines.h @@ -53,7 +53,7 @@ #define FAKE_VER_MAJOR 12 /*!< ゲームのバージョン番号定義(メジャー番号 + 10) */ #define FAKE_VER_MINOR 2 /*!< ゲームのバージョン番号定義(マイナー番号) */ #define FAKE_VER_PATCH 0 /*!< ゲームのバージョン番号定義(パッチ番号) */ -#define FAKE_VER_EXTRA 45 /*!< ゲームのバージョン番号定義(エクストラ番号) */ +#define FAKE_VER_EXTRA 46 /*!< ゲームのバージョン番号定義(エクストラ番号) */ /*! diff --git a/src/spells3.c b/src/spells3.c index 318ac8e36..24aff36ca 100644 --- a/src/spells3.c +++ b/src/spells3.c @@ -712,7 +712,7 @@ void teleport_level(int m_idx) { if (!dun_level) { - dungeon_type = p_ptr->recall_dungeon; + dungeon_type = ironman_downward ? DUNGEON_ANGBAND : p_ptr->recall_dungeon; p_ptr->oldpy = p_ptr->y; p_ptr->oldpx = p_ptr->x; } -- 2.11.0