diff options
Diffstat (limited to 'src')
-rw-r--r-- | src/cave.c | 6 | ||||
-rw-r--r-- | src/cmd1.c | 2 | ||||
-rw-r--r-- | src/cmd7.c | 2 | ||||
-rw-r--r-- | src/dungeon.c | 2 | ||||
-rw-r--r-- | src/externs.h | 2 | ||||
-rw-r--r-- | src/generate.c | 2 | ||||
-rw-r--r-- | src/lua_bind.c | 2 | ||||
-rw-r--r-- | src/monster2.c | 8 | ||||
-rw-r--r-- | src/powers.c | 2 | ||||
-rw-r--r-- | src/q_rand.c | 2 | ||||
-rw-r--r-- | src/spells1.c | 2 | ||||
-rw-r--r-- | src/spells2.c | 4 | ||||
-rw-r--r-- | src/wizard2.c | 6 | ||||
-rw-r--r-- | src/xtra2.c | 12 |
14 files changed, 25 insertions, 29 deletions
@@ -4846,15 +4846,11 @@ bool_ projectable(int y1, int x1, int y2, int x2) * * Currently the "m" parameter is unused. */ -void scatter(int *yp, int *xp, int y, int x, int d, int m) +void scatter(int *yp, int *xp, int y, int x, int d) { int nx, ny; int attempts_left = 5000; - /* Unused */ - m = m; - - /* Pick a location */ while (--attempts_left) { @@ -4953,7 +4953,7 @@ bool_ execute_inscription(byte i, byte y, byte x) { int yy = y, xx = x; - scatter(&yy, &xx, y, x, 3, 0); + scatter(&yy, &xx, y, x, 3); place_monster_one(yy, xx, test_monster_name("Dwarven Warrior"), 0, FALSE, MSTATUS_FRIEND); @@ -7365,7 +7365,7 @@ void do_cmd_symbiotic(void) d = 2; while (d < 100) { - scatter(&y, &x, p_ptr->py, p_ptr->px, d, 0); + scatter(&y, &x, p_ptr->py, p_ptr->px, d); if (cave_floor_bold(y, x) && (!cave[y][x].m_idx)) break; diff --git a/src/dungeon.c b/src/dungeon.c index 8a54329e..6d732f00 100644 --- a/src/dungeon.c +++ b/src/dungeon.c @@ -1273,7 +1273,7 @@ static void process_world(void) /* Summon */ while (1) { - scatter(&yy, &xx, p_ptr->py, p_ptr->px, 6, 0); + scatter(&yy, &xx, p_ptr->py, p_ptr->px, 6); /* Accept an empty grid within the boundary */ if (in_bounds(yy, xx) && cave_floor_bold(yy, xx)) break; diff --git a/src/externs.h b/src/externs.h index 3af59a14..a463831a 100644 --- a/src/externs.h +++ b/src/externs.h @@ -657,7 +657,7 @@ extern void place_floor_convert_glass(int y, int x); extern void place_filler(int y, int x); extern void mmove2(int *y, int *x, int y1, int x1, int y2, int x2); extern bool_ projectable(int y1, int x1, int y2, int x2); -extern void scatter(int *yp, int *xp, int y, int x, int d, int m); +extern void scatter(int *yp, int *xp, int y, int x, int d); extern void health_track(int m_idx); extern void monster_race_track(int r_idx, int ego); extern void object_track(object_type *o_ptr); diff --git a/src/generate.c b/src/generate.c index 3c0fd9fd..0e8cfa59 100644 --- a/src/generate.c +++ b/src/generate.c @@ -1943,7 +1943,7 @@ static void vault_monsters(int y1, int x1, int num) int d = 1; /* Pick a nearby location */ - scatter(&y, &x, y1, x1, d, 0); + scatter(&y, &x, y1, x1, d); /* Require "empty" floor grids */ if (!cave_empty_bold(y, x)) continue; diff --git a/src/lua_bind.c b/src/lua_bind.c index 3a901a7c..693c7e72 100644 --- a/src/lua_bind.c +++ b/src/lua_bind.c @@ -148,7 +148,7 @@ void find_position(int y, int x, int *yy, int *xx) do { - scatter(yy, xx, y, x, 6, 0); + scatter(yy, xx, y, x, 6); } while (!(in_bounds(*yy, *xx) && cave_floor_bold(*yy, *xx)) && --attempts); } diff --git a/src/monster2.c b/src/monster2.c index c633d5cf..b0753244 100644 --- a/src/monster2.c +++ b/src/monster2.c @@ -2853,7 +2853,7 @@ bool_ place_monster_aux(int y, int x, int r_idx, bool_ slp, bool_ grp, int statu int nx, ny, z, d = 3; /* Pick a location */ - scatter(&ny, &nx, y, x, d, 0); + scatter(&ny, &nx, y, x, d); /* Require empty grids */ if (!cave_empty_bold(ny, nx)) continue; @@ -3399,7 +3399,7 @@ bool_ summon_specific(int y1, int x1, int lev, int type) int d = (i / 15) + 1; /* Pick a location */ - scatter(&y, &x, y1, x1, d, 0); + scatter(&y, &x, y1, x1, d); /* Require "empty" floor grid */ if (!cave_empty_bold(y, x)) continue; @@ -3487,7 +3487,7 @@ bool_ summon_specific_friendly(int y1, int x1, int lev, int type, bool_ Group_ok int d = (i / 15) + 1; /* Pick a location */ - scatter(&y, &x, y1, x1, d, 0); + scatter(&y, &x, y1, x1, d); /* Require "empty" floor grid */ if (!cave_empty_bold(y, x)) continue; @@ -3701,7 +3701,7 @@ bool_ multiply_monster(int m_idx, bool_ charm, bool_ clone) /* Pick a location */ - scatter(&y, &x, m_ptr->fy, m_ptr->fx, d, 0); + scatter(&y, &x, m_ptr->fy, m_ptr->fx, d); /* Require an "empty" floor grid */ if (!cave_empty_bold(y, x)) continue; diff --git a/src/powers.c b/src/powers.c index afaf7431..12b2c2c0 100644 --- a/src/powers.c +++ b/src/powers.c @@ -773,7 +773,7 @@ static void power_activate(int power) d = 2; while (d < 100) { - scatter(&y, &x, p_ptr->py, p_ptr->px, d, 0); + scatter(&y, &x, p_ptr->py, p_ptr->px, d); if (cave_floor_bold(y, x) && (!cave[y][x].m_idx)) break; diff --git a/src/q_rand.c b/src/q_rand.c index 2c0898c4..84f7d3d3 100644 --- a/src/q_rand.c +++ b/src/q_rand.c @@ -167,7 +167,7 @@ void hero_death(s32b m_idx, s32b r_idx) int d = (i / 15) + 1; /* Pick a location */ - scatter(&y, &x, p_ptr->py, p_ptr->px, d, 0); + scatter(&y, &x, p_ptr->py, p_ptr->px, d); /* Require "empty" floor grid */ if (!cave_empty_bold(y, x)) continue; diff --git a/src/spells1.c b/src/spells1.c index 0893c7f5..9bfc6fe2 100644 --- a/src/spells1.c +++ b/src/spells1.c @@ -3033,7 +3033,7 @@ static bool_ project_f(int who, int r, int y, int x, int dam, int typ) { y2 = y1 = randint(cur_hgt) - 1; x2 = x1 = randint(cur_wid) - 1; - scatter(&y2, &x2, y1, x1, 20, 0); + scatter(&y2, &x2, y1, x1, 20); tries --; } diff --git a/src/spells2.c b/src/spells2.c index d9b53e56..5467499c 100644 --- a/src/spells2.c +++ b/src/spells2.c @@ -5098,7 +5098,7 @@ bool_ genocide_aux(bool_ player_cast, char typ) do { - scatter(&wy, &wx, m_ptr->fy, m_ptr->fx, 10, 0); + scatter(&wy, &wx, m_ptr->fy, m_ptr->fx, 10); } while (!(in_bounds(wy, wx) && cave_floor_bold(wy, wx)) && --attempts); @@ -5223,7 +5223,7 @@ bool_ mass_genocide(bool_ player_cast) do { - scatter(&wy, &wx, m_ptr->fy, m_ptr->fx, 10, 0); + scatter(&wy, &wx, m_ptr->fy, m_ptr->fx, 10); } while (!(in_bounds(wy, wx) && cave_floor_bold(wy, wx)) && --attempts); diff --git a/src/wizard2.c b/src/wizard2.c index e8a13b45..a19b72e0 100644 --- a/src/wizard2.c +++ b/src/wizard2.c @@ -231,7 +231,7 @@ static void do_cmd_summon_horde() while (--attempts) { - scatter(&wy, &wx, p_ptr->py, p_ptr->px, 3, 0); + scatter(&wy, &wx, p_ptr->py, p_ptr->px, 3); if (cave_naked_bold(wy, wx)) break; } @@ -1521,7 +1521,7 @@ static void do_cmd_wiz_named(int r_idx, bool_ slp) int d = 1; /* Pick a location */ - scatter(&y, &x, p_ptr->py, p_ptr->px, d, 0); + scatter(&y, &x, p_ptr->py, p_ptr->px, d); /* Require empty grids */ if (!cave_empty_bold(y, x)) continue; @@ -1556,7 +1556,7 @@ void do_cmd_wiz_named_friendly(int r_idx, bool_ slp) int d = 1; /* Pick a location */ - scatter(&y, &x, p_ptr->py, p_ptr->px, d, 0); + scatter(&y, &x, p_ptr->py, p_ptr->px, d); /* Require empty grids */ if (!cave_empty_bold(y, x)) continue; diff --git a/src/xtra2.c b/src/xtra2.c index 4c52ad4a..70978e47 100644 --- a/src/xtra2.c +++ b/src/xtra2.c @@ -87,7 +87,7 @@ bool_ set_parasite(int v, int r) do { - scatter(&wy, &wx, p_ptr->py, p_ptr->px, 10, 0); + scatter(&wy, &wx, p_ptr->py, p_ptr->px, 10); } while (!(in_bounds(wy, wx) && cave_floor_bold(wy, wx)) && --attempts); @@ -2504,7 +2504,7 @@ void monster_death(int m_idx) do { - scatter(&wy, &wx, p_ptr->py, p_ptr->px, 20, 0); + scatter(&wy, &wx, p_ptr->py, p_ptr->px, 20); } while (!(in_bounds(wy, wx) && cave_floor_bold(wy, wx)) && --attempts); @@ -2546,7 +2546,7 @@ void monster_death(int m_idx) do { - scatter(&wy, &wx, p_ptr->py, p_ptr->px, 3, 0); + scatter(&wy, &wx, p_ptr->py, p_ptr->px, 3); } while (!(in_bounds(wy, wx) && cave_floor_bold(wy, wx)) && --attempts); @@ -2750,7 +2750,7 @@ void monster_death(int m_idx) do { - scatter(&yy, &xx, y, x, 6, 0); + scatter(&yy, &xx, y, x, 6); } while (!(in_bounds(yy, xx) && cave_floor_bold(yy, xx)) && --attempts); @@ -2904,7 +2904,7 @@ void monster_death(int m_idx) int d = 1; /* Pick a location */ - scatter(&ny, &nx, y, x, d, 0); + scatter(&ny, &nx, y, x, d); /* Stagger */ y = ny; @@ -6032,7 +6032,7 @@ void make_wish(void) do { - scatter(&wy, &wx, p_ptr->py, p_ptr->px, 5, 0); + scatter(&wy, &wx, p_ptr->py, p_ptr->px, 5); } while (!(in_bounds(wy, wx) && cave_floor_bold(wy, wx)) && --attempts); |