diff options
author | dshaligram <dshaligram@c06c8d41-db1a-0410-9941-cceddc491573> | 2008-11-25 00:01:38 +0000 |
---|---|---|
committer | dshaligram <dshaligram@c06c8d41-db1a-0410-9941-cceddc491573> | 2008-11-25 00:01:38 +0000 |
commit | 97f93f7d2dd30fee884ee4eeb8a16dcb51cf4a7c (patch) | |
tree | ef959b41c9373a02d6424717be5cbcbd1c72782f /crawl-ref/source/player.cc | |
parent | be49ad27a08b4d5a5e347e6d8a2e6852f81c4a8b (diff) | |
download | crawl-ref-97f93f7d2dd30fee884ee4eeb8a16dcb51cf4a7c.tar.gz crawl-ref-97f93f7d2dd30fee884ee4eeb8a16dcb51cf4a7c.zip |
Allow ziggurats placed in Pandemonium to return to the same Pan level when the player leaves the ziggurat. Breaks saves.
Cleaned up up_stairs() and down_stairs() to remove spurious depth changes when changing you.level_type - depth (you.your_level) now changes only for stairs with both ends in LEVEL_DUNGEON.
All levels are now saved on exit, including non LEVEL_DUNGEON levels. Re-entering non-dungeon levels from down_stairs will still delete the old level. Re-entering non-dungeon levels from up_stairs (i.e. returning to a non-dungeon level from some other place, like a ziggurat) will reload the old level.
Fixed bogus marker trashing when player attempts to use a Zot entrance with insufficient runes.
Delete .msg files when game ends.
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@7598 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref/source/player.cc')
-rw-r--r-- | crawl-ref/source/player.cc | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/crawl-ref/source/player.cc b/crawl-ref/source/player.cc index 7fcace5605..b386f0f4cb 100644 --- a/crawl-ref/source/player.cc +++ b/crawl-ref/source/player.cc @@ -6957,7 +6957,10 @@ void PlaceInfo::assert_validity() const if (level_type == LEVEL_LABYRINTH || level_type == LEVEL_ABYSS) ASSERT(num_visits == levels_seen); else if (level_type == LEVEL_PANDEMONIUM) - ASSERT(num_visits <= levels_seen); + // Ziggurats can allow a player to return to the same + // Pandemonium level. + // ASSERT(num_visits <= levels_seen); + ; else if (level_type == LEVEL_DUNGEON && branches[branch].depth > 0) ASSERT(levels_seen <= (unsigned long) branches[branch].depth); |