From: Deskull Date: Wed, 3 Oct 2018 13:11:50 +0000 (+0900) Subject: [Refactor] #37287 #37353 型の置換。 / Type replacement. X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=638658ed148f3b39fd50322752afd677812be403;p=hengband%2Fhengband.git [Refactor] #37287 #37353 型の置換。 / Type replacement. --- diff --git a/src/externs.h b/src/externs.h index e28f0b652..75d22c5e9 100644 --- a/src/externs.h +++ b/src/externs.h @@ -1094,9 +1094,9 @@ extern bool dispel_living(HIT_POINT dam); extern bool dispel_demons(HIT_POINT dam); extern bool crusade(void); extern bool turn_undead(void); -extern bool destroy_area(int y1, int x1, int r, bool in_generate); -extern bool earthquake_aux(int cy, int cx, int r, MONSTER_IDX m_idx); -extern bool earthquake(int cy, int cx, int r); +extern bool destroy_area(POSITION y1, POSITION x1, POSITION r, bool in_generate); +extern bool earthquake_aux(POSITION cy, POSITION cx, POSITION r, MONSTER_IDX m_idx); +extern bool earthquake(POSITION cy, POSITION cx, POSITION r); extern void lite_room(int y1, int x1); extern void unlite_room(int y1, int x1); extern bool lite_area(HIT_POINT dam, int rad); diff --git a/src/spells2.c b/src/spells2.c index b4a628d85..113235a6a 100644 --- a/src/spells2.c +++ b/src/spells2.c @@ -1538,9 +1538,10 @@ bool probing(void) * "earthquake" by using the "full" to select "destruction". * */ -bool destroy_area(int y1, int x1, int r, bool in_generate) +bool destroy_area(POSITION y1, POSITION x1, POSITION r, bool in_generate) { - int y, x, k, t; + POSITION y, x; + int k, t; cave_type *c_ptr; bool flag = FALSE; @@ -1834,9 +1835,10 @@ bool destroy_area(int y1, int x1, int r, bool in_generate) * This has allowed massive simplification of the "monster" code. * */ -bool earthquake_aux(int cy, int cx, int r, MONSTER_IDX m_idx) +bool earthquake_aux(POSITION cy, POSITION cx, POSITION r, MONSTER_IDX m_idx) { - int i, t, y, x, yy, xx, dy, dx; + int i, t; + POSITION y, x, yy, xx, dy, dx; int damage = 0; int sn = 0; POSITION sy = 0, sx = 0; @@ -2298,7 +2300,7 @@ bool earthquake_aux(int cy, int cx, int r, MONSTER_IDX m_idx) * @param cx 中心X座標 * @param r 効果半径 */ -bool earthquake(int cy, int cx, int r) +bool earthquake(POSITION cy, POSITION cx, POSITION r) { return earthquake_aux(cy, cx, r, 0); }