summaryrefslogtreecommitdiffstats
path: root/crawl-ref/source/traps.cc
diff options
context:
space:
mode:
authordshaligram <dshaligram@c06c8d41-db1a-0410-9941-cceddc491573>2008-11-23 18:58:31 +0000
committerdshaligram <dshaligram@c06c8d41-db1a-0410-9941-cceddc491573>2008-11-23 18:58:31 +0000
commitbe8748fa444e6813e09ef959f5ee4b88b67dd68e (patch)
tree0ed8640d1756cbfbd02091d0c74d7b47a7b0eec8 /crawl-ref/source/traps.cc
parent1392155c0cb7acb6224a39611102e46460a06e5b (diff)
downloadcrawl-ref-be8748fa444e6813e09ef959f5ee4b88b67dd68e.tar.gz
crawl-ref-be8748fa444e6813e09ef959f5ee4b88b67dd68e.zip
More steps toward ziggurats.
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@7553 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref/source/traps.cc')
-rw-r--r--crawl-ref/source/traps.cc34
1 files changed, 2 insertions, 32 deletions
diff --git a/crawl-ref/source/traps.cc b/crawl-ref/source/traps.cc
index 796b3f61f7..89f35f7a6c 100644
--- a/crawl-ref/source/traps.cc
+++ b/crawl-ref/source/traps.cc
@@ -1388,22 +1388,7 @@ static int num_traps_default(int level_number, const level_id &place)
int num_traps_for_place(int level_number, const level_id &place)
{
if (level_number == -1)
- {
- switch(place.level_type)
- {
- case LEVEL_DUNGEON:
- level_number = absdungeon_depth(place.branch, place.depth);
- break;
- case LEVEL_ABYSS:
- level_number = 51;
- break;
- case LEVEL_PANDEMONIUM:
- level_number = 52;
- break;
- default:
- level_number = you.your_level;
- }
- }
+ level_number = place.absdepth();
switch (place.level_type)
{
@@ -1473,22 +1458,7 @@ static trap_type random_trap_default(int level_number, const level_id &place)
trap_type random_trap_for_place(int level_number, const level_id &place)
{
if (level_number == -1)
- {
- switch (place.level_type)
- {
- case LEVEL_DUNGEON:
- level_number = absdungeon_depth(place.branch, place.depth);
- break;
- case LEVEL_ABYSS:
- level_number = 51;
- break;
- case LEVEL_PANDEMONIUM:
- level_number = 52;
- break;
- default:
- level_number = you.your_level;
- }
- }
+ level_number = place.absdepth();
switch (place.level_type)
{