diff options
| author | Adam Borowski <kilobyte@angband.pl> | 2012-11-04 04:22:32 +0100 |
|---|---|---|
| committer | Adam Borowski <kilobyte@angband.pl> | 2012-11-04 05:14:46 +0100 |
| commit | 6a5ee951ccc35476cf31d2109204a9eee557ddde (patch) | |
| tree | 0e98f234556072d65e3ee78f2750ddde7abee3ff /crawl-ref/source/arena.cc | |
| parent | f04ddb5670f1e3ff673a3fc13b7f28b388c437eb (diff) | |
| download | crawl-ref-6a5ee951ccc35476cf31d2109204a9eee557ddde.tar.gz crawl-ref-6a5ee951ccc35476cf31d2109204a9eee557ddde.zip | |
Get rid of a crapload of uselessly passed level_number.
Also, get rid of one of three copies of '8'/'9' logic.
Also, fix the depth of place: not being heeded for some purposes.
Technically, there is one actual change: shallow items in Ziggurats had
a fixed level of 27, they now use 27 + depth in Zig. Not noticeable as
most nearby items use level 351 anyway.
Diffstat (limited to 'crawl-ref/source/arena.cc')
| -rw-r--r-- | crawl-ref/source/arena.cc | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/crawl-ref/source/arena.cc b/crawl-ref/source/arena.cc index e5e5ec441d..2432ab42ad 100644 --- a/crawl-ref/source/arena.cc +++ b/crawl-ref/source/arena.cc @@ -196,7 +196,7 @@ namespace arena if (!in_bounds(loc)) break; - const monster* mon = dgn_place_monster(spec, -1, + const monster* mon = dgn_place_monster(spec, loc, false, true, false); if (!mon) { @@ -769,7 +769,7 @@ namespace arena if (fac.friendly) spec.attitude = ATT_FRIENDLY; - monster *mon = dgn_place_monster(spec, -1, pos, false, true); + monster *mon = dgn_place_monster(spec, pos, false, true); if (!mon && fac.active_members == 0 && monster_at(pos)) { @@ -798,7 +798,7 @@ namespace arena monster_teleport(other, true); } - mon = dgn_place_monster(spec, -1, pos, false, true); + mon = dgn_place_monster(spec, pos, false, true); } if (mon) @@ -1050,8 +1050,7 @@ namespace arena // Various arena callbacks -monster_type arena_pick_random_monster(const level_id &place, int power, - int &lev_mons) +monster_type arena_pick_random_monster(const level_id &place) { if (arena::random_uniques) { |