diff options
| author | j-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573> | 2009-03-29 19:42:25 +0000 |
|---|---|---|
| committer | j-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573> | 2009-03-29 19:42:25 +0000 |
| commit | ce8b57822e05def892bca46e7e724bc6625d73ba (patch) | |
| tree | 033beef59721cd41a6900e874d10ea78d8a4fb1e /crawl-ref/source/files.cc | |
| parent | 996361d167065bc29bef5da248e3d18bd0d9cbab (diff) | |
| download | crawl-ref-ce8b57822e05def892bca46e7e724bc6625d73ba.tar.gz crawl-ref-ce8b57822e05def892bca46e7e724bc6625d73ba.zip | |
* Merfolk may wear heavy armour while swimming, though their armour
penalty is doubled in deep water.
* Change "zombified ally" -> "mindless thrall" (and only count friendly
monsters).
* Call trackers_init_new_level() earlier, in load(), so that TileNewLevel()
can use the correct travel information when drawing exclusions on the
minimap.
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@9566 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref/source/files.cc')
| -rw-r--r-- | crawl-ref/source/files.cc | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/crawl-ref/source/files.cc b/crawl-ref/source/files.cc index b4332c5e73..098b1cd471 100644 --- a/crawl-ref/source/files.cc +++ b/crawl-ref/source/files.cc @@ -968,7 +968,7 @@ static void _grab_followers() if (fmenv == NULL) continue; - if (!mons_can_use_stairs(fmenv)) + if (mons_wont_attack(fmenv) && !mons_can_use_stairs(fmenv)) non_stair_using_allies++; if (fmenv->type == MONS_PLAYER_GHOST @@ -985,9 +985,9 @@ static void _grab_followers() { // XXX: This assumes that the only monsters that are // incapable of using stairs are zombified. - mprf("Your zombified all%s stay%s behind.", - non_stair_using_allies > 1 ? "ies" : "y", - non_stair_using_allies > 1 ? "" : "s"); + mprf("Your mindless thrall%s stay%s behind.", + non_stair_using_allies > 1 ? "s" : "", + non_stair_using_allies > 1 ? "" : "s"); } memset(travel_point_distance, 0, sizeof(travel_distance_grid_t)); @@ -1249,10 +1249,15 @@ bool load( dungeon_feature_type stair_taken, load_mode_type load_mode, place_transiting_items(); } -#ifdef USE_TILE + // Tell stash-tracker and travel that we've changed levels. if (load_mode != LOAD_VISITOR) + { + // Tell stash-tracker and travel that we've changed levels. + trackers_init_new_level(true); +#ifdef USE_TILE TileNewLevel(just_created_level); #endif + } _redraw_all(); |