summaryrefslogtreecommitdiffstats
path: root/crawl-ref/source
diff options
context:
space:
mode:
authordshaligram <dshaligram@c06c8d41-db1a-0410-9941-cceddc491573>2007-02-08 05:23:10 +0000
committerdshaligram <dshaligram@c06c8d41-db1a-0410-9941-cceddc491573>2007-02-08 05:23:10 +0000
commitbf1085165e25a72de45edd793a6b9f17752a4a38 (patch)
tree2283d3d1a064ec11b2955a9b60c24370d60571e7 /crawl-ref/source
parent9cad3dbf079256bba6661cd9cecb37e317470570 (diff)
downloadcrawl-ref-bf1085165e25a72de45edd793a6b9f17752a4a38.tar.gz
crawl-ref-bf1085165e25a72de45edd793a6b9f17752a4a38.zip
Disallow ghosts in labyrinths. Abyss/Pandemonium ghosts can otherwise be
loaded in labyrinths and can be devastatingly OOD. git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@935 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref/source')
-rw-r--r--crawl-ref/source/files.cc6
1 files changed, 4 insertions, 2 deletions
diff --git a/crawl-ref/source/files.cc b/crawl-ref/source/files.cc
index 7ea4991c0d..bedfa97b1f 100644
--- a/crawl-ref/source/files.cc
+++ b/crawl-ref/source/files.cc
@@ -741,8 +741,10 @@ void load( unsigned char stair_taken, int load_mode, bool was_a_labyrinth,
if (you.level_type == LEVEL_PANDEMONIUM)
generate_random_demon();
- else if (you.your_level > 1 && one_chance_in(3))
- load_ghost(); // no ghosts in Pan
+ else if (you.your_level > 1
+ && one_chance_in(3)
+ && you.level_type != LEVEL_LABYRINTH)
+ load_ghost(); // no ghosts in Pan or Labyrinth
}
else
{