From f4d5feed726e9c70f0dc2a4aa7cce3849492a701 Mon Sep 17 00:00:00 2001 From: deskull Date: Thu, 9 May 2019 18:30:28 +0900 Subject: [PATCH] =?utf8?q?[Refactor]=20#37353=20generate=5Fencounter=20?= =?utf8?q?=E3=82=92=E3=80=80wild.c=20=E5=86=85=E5=A4=89=E6=95=B0=E3=81=AB?= =?utf8?q?=E6=95=B4=E7=90=86=EF=BC=8E=E5=8A=A0=E3=81=88=E3=81=A6=E6=82=AA?= =?utf8?q?=E5=A4=A2=E3=83=A2=E3=83=BC=E3=83=89=E3=81=AE=E7=9C=9F=E5=A4=9C?= =?utf8?q?=E4=B8=AD=E6=99=82=E3=81=AF=E8=A5=B2=E6=92=83=E3=81=A8=E5=90=8C?= =?utf8?q?=E3=81=98=E7=94=9F=E6=88=90=E3=81=8C=E7=99=BA=E7=94=9F=E3=81=99?= =?utf8?q?=E3=82=8B=E3=82=88=E3=81=86=E4=BB=95=E6=A7=98=E5=A4=89=E6=9B=B4?= =?utf8?q?=EF=BC=8E?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- src/cmd-basic.c | 4 +--- src/core.c | 8 +++----- src/externs.h | 1 - src/player-effects.c | 4 ++-- src/variable.c | 2 -- src/wild.c | 6 +++++- src/wild.h | 2 +- 7 files changed, 12 insertions(+), 15 deletions(-) diff --git a/src/cmd-basic.c b/src/cmd-basic.c index 3e05f3ffa..80b332a82 100644 --- a/src/cmd-basic.c +++ b/src/cmd-basic.c @@ -2094,13 +2094,11 @@ void do_cmd_walk(bool pickup) /* Go into large wilderness view */ p_ptr->oldpy = randint1(MAX_HGT-2); p_ptr->oldpx = randint1(MAX_WID-2); - change_wild_mode(); + change_wild_mode(TRUE); /* Give first move to monsters */ take_turn(p_ptr, 100); - /* HACk -- set the encouter flag for the wilderness generation */ - generate_encounter = TRUE; } } diff --git a/src/core.c b/src/core.c index 9325382cd..ae97d8113 100644 --- a/src/core.c +++ b/src/core.c @@ -3323,13 +3323,11 @@ static void process_world(void) /* Go into large wilderness view */ p_ptr->oldpy = randint1(MAX_HGT - 2); p_ptr->oldpx = randint1(MAX_WID - 2); - change_wild_mode(); + change_wild_mode(TRUE); /* Give first move to monsters */ take_turn(p_ptr, 100); - /* HACk -- set the encouter flag for the wilderness generation */ - generate_encounter = TRUE; } p_ptr->invoking_midnight_curse = TRUE; @@ -3769,7 +3767,7 @@ static void process_command(void) break; } - change_wild_mode(); + change_wild_mode(FALSE); } else do_cmd_go_up(); @@ -3780,7 +3778,7 @@ static void process_command(void) case '>': { if (p_ptr->wild_mode) - change_wild_mode(); + change_wild_mode(FALSE); else do_cmd_go_down(); break; diff --git a/src/externs.h b/src/externs.h index b9b282248..5849a8e55 100644 --- a/src/externs.h +++ b/src/externs.h @@ -171,7 +171,6 @@ extern bool write_level; extern u32b start_time; extern bool sukekaku; extern bool new_mane; -extern bool generate_encounter; extern concptr screen_dump; extern DEPTH *max_dlv; diff --git a/src/player-effects.c b/src/player-effects.c index 6a6aebd44..4196a6697 100644 --- a/src/player-effects.c +++ b/src/player-effects.c @@ -3175,7 +3175,7 @@ bool set_food(TIME_EFFECT v) if (p_ptr->wild_mode && (new_aux < 2)) { - change_wild_mode(); + change_wild_mode(FALSE); } /* Change */ @@ -4242,7 +4242,7 @@ int take_hit(int damage_type, HIT_POINT damage, concptr hit_from, int monspell) } if (p_ptr->wild_mode && !p_ptr->leaving && (p_ptr->chp < MAX(warning, p_ptr->mhp/5))) { - change_wild_mode(); + change_wild_mode(FALSE); } return damage; } diff --git a/src/variable.c b/src/variable.c index 5e0065ddf..fb6157041 100644 --- a/src/variable.c +++ b/src/variable.c @@ -392,8 +392,6 @@ u32b start_time; bool sukekaku; bool new_mane; -bool generate_encounter; - concptr screen_dump = NULL; diff --git a/src/wild.c b/src/wild.c index 65e61adaf..b49505253 100644 --- a/src/wild.c +++ b/src/wild.c @@ -34,6 +34,8 @@ */ wilderness_type **wilderness; +bool generate_encounter; + /*! * @brief 地形生成確率を決める要素100の配列を確率テーブルから作成する @@ -1108,12 +1110,14 @@ void init_wilderness_terrains(void) /*! * @brief 荒野から広域マップへの切り替え処理 / * Initialize arrays for wilderness terrains + * @param encount 襲撃時TRUE * @return 切り替えが行われた場合はTRUEを返す。 */ -bool change_wild_mode(void) +bool change_wild_mode(bool encount) { int i; bool have_pet = FALSE; + generate_encounter = encount; /* It is in the middle of changing map */ if (p_ptr->leaving) return FALSE; diff --git a/src/wild.h b/src/wild.h index e6633704d..4467abc24 100644 --- a/src/wild.h +++ b/src/wild.h @@ -8,7 +8,7 @@ extern errr init_wilderness(void); extern void init_wilderness_terrains(void); extern void seed_wilderness(void); extern errr parse_line_wilderness(char *buf, int ymin, int xmin, int ymax, int xmax, int *y, int *x); -extern bool change_wild_mode(void); +extern bool change_wild_mode(bool encount); /* Border */ typedef struct border_type border_type; -- 2.11.0