diff options
| author | dshaligram <dshaligram@c06c8d41-db1a-0410-9941-cceddc491573> | 2009-01-02 20:37:59 +0000 |
|---|---|---|
| committer | dshaligram <dshaligram@c06c8d41-db1a-0410-9941-cceddc491573> | 2009-01-02 20:37:59 +0000 |
| commit | 5e61cb2529210393d8dbb30ab3152a11459a212f (patch) | |
| tree | ef8b42d2f29f134def92196ef87e2ad979a54787 /crawl-ref/source/arena.cc | |
| parent | 78edf358eefc57dbe3f7bcd257cbf6b9d319149a (diff) | |
| download | crawl-ref-5e61cb2529210393d8dbb30ab3152a11459a212f.tar.gz crawl-ref-5e61cb2529210393d8dbb30ab3152a11459a212f.zip | |
Fix arena not placing water monsters correctly, remove monster habitat special-casing for "generation" time. Also fix arena "friendlies" not picking up items.
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@8130 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref/source/arena.cc')
| -rw-r--r-- | crawl-ref/source/arena.cc | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/crawl-ref/source/arena.cc b/crawl-ref/source/arena.cc index aefd29729d..db02ef669e 100644 --- a/crawl-ref/source/arena.cc +++ b/crawl-ref/source/arena.cc @@ -167,16 +167,15 @@ namespace arena for (int q = 0; q < spec.quantity; ++q) { - const coord_def loc = - find_newmons_square_contiguous(MONS_GIANT_BAT, pos, 6); + const coord_def loc = pos; if (!in_bounds(loc)) break; const int imon = dgn_place_monster(spec, you.your_level, loc, false, true, false); if (imon == -1) - end(1, false, "Failed to create monster at (%d,%d)", - loc.x, loc.y); + end(1, false, "Failed to create monster at (%d,%d) grd: %s", + loc.x, loc.y, dungeon_feature_name(grd(loc))); list_eq(imon); } } @@ -223,7 +222,8 @@ namespace arena ASSERT(map); bool success = dgn_place_map(map, true, true); if (!success) - throw make_stringf("Failed to create arena named \"%s\"", arena_type.c_str()); + throw make_stringf("Failed to create arena named \"%s\"", + arena_type.c_str()); link_items(); if (!env.rock_colour) |