diff options
author | Darshan Shaligram <dshaligram@users.sourceforge.net> | 2009-12-28 19:01:59 +0530 |
---|---|---|
committer | Darshan Shaligram <dshaligram@users.sourceforge.net> | 2009-12-28 19:01:59 +0530 |
commit | 87f499df5e027c60f0d9f217464dfafd190b0772 (patch) | |
tree | bcef36cf208eb459ac8d88e4ad011d00d816fd5e | |
parent | adcc6b42f200b5a4c7f75d5826884494684a587b (diff) | |
download | crawl-ref-87f499df5e027c60f0d9f217464dfafd190b0772.tar.gz crawl-ref-87f499df5e027c60f0d9f217464dfafd190b0772.zip |
Fix shoals tides being arrested on squares with items that cannot be moved to an adjacent square.
-rw-r--r-- | crawl-ref/source/dgn-shoals.cc | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/crawl-ref/source/dgn-shoals.cc b/crawl-ref/source/dgn-shoals.cc index 0215afd81f..a3a2b12ea9 100644 --- a/crawl-ref/source/dgn-shoals.cc +++ b/crawl-ref/source/dgn-shoals.cc @@ -561,10 +561,11 @@ static bool _shoals_tide_sweep_items_clear(coord_def c) return true; const coord_def target(_shoals_escape_place_from(c, false)); - if (target.origin()) - return false; - - move_item_stack_to_grid(c, target); + // Don't abort tide entry because of items. If we can't sweep the + // item clear here, let dungeon_terrain_changed teleport the item + // to the nearest safe square. + if (!target.origin()) + move_item_stack_to_grid(c, target); return true; } |