From 348414ac059e769c8765a4e591387f228c8f610f Mon Sep 17 00:00:00 2001 From: deskull Date: Wed, 11 Dec 2019 19:02:01 +0900 Subject: [PATCH] =?utf8?q?[Refactor]=20#38997=20map=5Farea()=20=E3=81=AB?= =?utf8?q?=20player=5Ftype=20*=20=E5=BC=95=E6=95=B0=E3=82=92=E8=BF=BD?= =?utf8?q?=E5=8A=A0=EF=BC=8E=20/=20Add=20player=5Ftype=20*=20argument=20to?= =?utf8?q?=20map=5Farea().?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- src/cmd/cmd-activate.c | 2 +- src/cmd/cmd-read.c | 2 +- src/cmd/cmd-usestaff.c | 2 +- src/cmd/cmd-zaprod.c | 2 +- src/mind.c | 4 ++-- src/realm-daemon.c | 2 +- src/realm-life.c | 2 +- src/realm-nature.c | 2 +- src/realm-song.c | 2 +- src/realm-sorcery.c | 2 +- src/spells-floor.c | 18 +++++++++--------- src/spells-floor.h | 2 +- src/wizard2.c | 2 +- 13 files changed, 22 insertions(+), 22 deletions(-) diff --git a/src/cmd/cmd-activate.c b/src/cmd/cmd-activate.c index ede9277c0..09f204122 100644 --- a/src/cmd/cmd-activate.c +++ b/src/cmd/cmd-activate.c @@ -1441,7 +1441,7 @@ bool activate_artifact(player_type *user_ptr, object_type *o_ptr) case ACT_MAP_LIGHT: { msg_print(_("眩しく輝いた...", "It shines brightly...")); - map_area(DETECT_RAD_MAP); + map_area(user_ptr, DETECT_RAD_MAP); lite_area(damroll(2, 15), 3); break; } diff --git a/src/cmd/cmd-read.c b/src/cmd/cmd-read.c index 45ad83300..e871e56fe 100644 --- a/src/cmd/cmd-read.c +++ b/src/cmd/cmd-read.c @@ -282,7 +282,7 @@ void exe_read(player_type *creature_ptr, INVENTORY_IDX item, bool known) case SV_SCROLL_MAPPING: { - map_area(DETECT_RAD_MAP); + map_area(creature_ptr, DETECT_RAD_MAP); ident = TRUE; break; } diff --git a/src/cmd/cmd-usestaff.c b/src/cmd/cmd-usestaff.c index 4e2df7333..b764b9e1b 100644 --- a/src/cmd/cmd-usestaff.c +++ b/src/cmd/cmd-usestaff.c @@ -114,7 +114,7 @@ int staff_effect(player_type *creature_ptr, OBJECT_SUBTYPE_VALUE sval, bool *use case SV_STAFF_MAPPING: { - map_area(powerful ? DETECT_RAD_MAP * 3 / 2 : DETECT_RAD_MAP); + map_area(creature_ptr, powerful ? DETECT_RAD_MAP * 3 / 2 : DETECT_RAD_MAP); ident = TRUE; break; } diff --git a/src/cmd/cmd-zaprod.c b/src/cmd/cmd-zaprod.c index c9d2a07a9..c22c5ee82 100644 --- a/src/cmd/cmd-zaprod.c +++ b/src/cmd/cmd-zaprod.c @@ -78,7 +78,7 @@ int rod_effect(player_type *creature_ptr, OBJECT_SUBTYPE_VALUE sval, DIRECTION d case SV_ROD_MAPPING: { - map_area(powerful ? DETECT_RAD_MAP * 3 / 2 : DETECT_RAD_MAP); + map_area(creature_ptr, powerful ? DETECT_RAD_MAP * 3 / 2 : DETECT_RAD_MAP); ident = TRUE; break; } diff --git a/src/mind.c b/src/mind.c index 8a3b03284..f772097da 100644 --- a/src/mind.c +++ b/src/mind.c @@ -1042,7 +1042,7 @@ static bool cast_mindcrafter_spell(player_type *caster_ptr, int spell) wiz_lite(caster_ptr, FALSE); } else if (plev > 19) - map_area(DETECT_RAD_MAP); + map_area(caster_ptr, DETECT_RAD_MAP); if (plev < 30) { @@ -1328,7 +1328,7 @@ static bool cast_mirror_spell(player_type *caster_ptr, int spell) if (plev + tmp > 4)detect_monsters_normal(DETECT_RAD_DEFAULT); if (plev + tmp > 18)detect_monsters_invis(DETECT_RAD_DEFAULT); if (plev + tmp > 28)set_tim_esp(caster_ptr, (TIME_EFFECT)plev, FALSE); - if (plev + tmp > 38)map_area(DETECT_RAD_MAP); + if (plev + tmp > 38)map_area(caster_ptr, DETECT_RAD_MAP); if (tmp == 0 && plev < 5) { msg_print(_("鏡がなくて集中できなかった！", "You need a mirror to concentrate!")); } diff --git a/src/realm-daemon.c b/src/realm-daemon.c index a76265df1..3c2d909ed 100644 --- a/src/realm-daemon.c +++ b/src/realm-daemon.c @@ -210,7 +210,7 @@ concptr do_daemon_spell(player_type *caster_ptr, SPELL_IDX spell, BIT_FLAGS mode if (cast) { - map_area(rad); + map_area(caster_ptr, rad); } } break; diff --git a/src/realm-life.c b/src/realm-life.c index 8af9d9f21..84a12baf8 100644 --- a/src/realm-life.c +++ b/src/realm-life.c @@ -203,7 +203,7 @@ concptr do_life_spell(player_type *caster_ptr, SPELL_IDX spell, BIT_FLAGS mode) if (cast) { - map_area(rad); + map_area(caster_ptr, rad); } } break; diff --git a/src/realm-nature.c b/src/realm-nature.c index 068a839c1..58080ff13 100644 --- a/src/realm-nature.c +++ b/src/realm-nature.c @@ -238,7 +238,7 @@ concptr do_nature_spell(player_type *caster_ptr, SPELL_IDX spell, BIT_FLAGS mode if (cast) { - map_area(rad1); + map_area(caster_ptr, rad1); detect_traps(rad2, TRUE); detect_doors(rad2); detect_stairs(rad2); diff --git a/src/realm-song.c b/src/realm-song.c index 7ffda8590..e43e25d96 100644 --- a/src/realm-song.c +++ b/src/realm-song.c @@ -286,7 +286,7 @@ concptr do_music_spell(player_type *caster_ptr, SPELL_IDX spell, BIT_FLAGS mode) if (count >= 19) wiz_lite(p_ptr, FALSE); if (count >= 11) { - map_area(rad); + map_area(caster_ptr, rad); if (plev > 39 && count < 19) SINGING_COUNT(caster_ptr) = count + 1; } diff --git a/src/realm-sorcery.c b/src/realm-sorcery.c index 6ff0fe6b1..5ebe5d31a 100644 --- a/src/realm-sorcery.c +++ b/src/realm-sorcery.c @@ -176,7 +176,7 @@ concptr do_sorcery_spell(player_type *caster_ptr, SPELL_IDX spell, BIT_FLAGS mod if (cast) { - map_area(rad); + map_area(caster_ptr, rad); } } break; diff --git a/src/spells-floor.c b/src/spells-floor.c index 186afbdeb..9156ef436 100644 --- a/src/spells-floor.c +++ b/src/spells-floor.c @@ -387,7 +387,7 @@ void stair_creation(player_type *caster_ptr) /* * Hack -- map the current panel (plus some) ala "magic mapping" */ -void map_area(POSITION range) +void map_area(player_type *caster_ptr, POSITION range) { int i; POSITION x, y; @@ -395,16 +395,16 @@ void map_area(POSITION range) FEAT_IDX feat; feature_type *f_ptr; - if (d_info[p_ptr->dungeon_idx].flags1 & DF1_DARKNESS) range /= 3; + if (d_info[caster_ptr->dungeon_idx].flags1 & DF1_DARKNESS) range /= 3; /* Scan that area */ - for (y = 1; y < p_ptr->current_floor_ptr->height - 1; y++) + for (y = 1; y < caster_ptr->current_floor_ptr->height - 1; y++) { - for (x = 1; x < p_ptr->current_floor_ptr->width - 1; x++) + for (x = 1; x < caster_ptr->current_floor_ptr->width - 1; x++) { - if (distance(p_ptr->y, p_ptr->x, y, x) > range) continue; + if (distance(caster_ptr->y, caster_ptr->x, y, x) > range) continue; - g_ptr = &p_ptr->current_floor_ptr->grid_array[y][x]; + g_ptr = &caster_ptr->current_floor_ptr->grid_array[y][x]; /* Memorize terrain of the grid */ g_ptr->info |= (CAVE_KNOWN); @@ -426,7 +426,7 @@ void map_area(POSITION range) /* Memorize known walls */ for (i = 0; i < 8; i++) { - g_ptr = &p_ptr->current_floor_ptr->grid_array[y + ddy_ddd[i]][x + ddx_ddd[i]]; + g_ptr = &caster_ptr->current_floor_ptr->grid_array[y + ddy_ddd[i]][x + ddx_ddd[i]]; /* Feature code (applying "mimic" field) */ feat = get_feat_mimic(g_ptr); @@ -443,8 +443,8 @@ void map_area(POSITION range) } } - p_ptr->redraw |= (PR_MAP); - p_ptr->window |= (PW_OVERHEAD | PW_DUNGEON); + caster_ptr->redraw |= (PR_MAP); + caster_ptr->window |= (PW_OVERHEAD | PW_DUNGEON); } diff --git a/src/spells-floor.h b/src/spells-floor.h index 3c5744e5c..6baae4065 100644 --- a/src/spells-floor.h +++ b/src/spells-floor.h @@ -6,6 +6,6 @@ extern bool warding_glyph(player_type *caster_ptr); extern bool explosive_rune(floor_type *floor_ptr, POSITION y, POSITION x); extern bool place_mirror(player_type *caster_ptr); extern void stair_creation(player_type *caster_ptr); -extern void map_area(POSITION range); +extern void map_area(player_type *caster_ptr, POSITION range); extern bool destroy_area(floor_type *floor_ptr, POSITION y1, POSITION x1, POSITION r, bool in_generate); extern bool earthquake(player_type *caster_ptr, POSITION cy, POSITION cx, POSITION r, MONSTER_IDX m_idx); diff --git a/src/wizard2.c b/src/wizard2.c index 93af6d71a..4c3b089d2 100644 --- a/src/wizard2.c +++ b/src/wizard2.c @@ -1878,7 +1878,7 @@ void do_cmd_debug(player_type *creature_ptr) /* Magic Mapping */ case 'm': - map_area(DETECT_RAD_ALL * 3); + map_area(creature_ptr, DETECT_RAD_ALL * 3); break; /* Mutation */ -- 2.11.0