summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--crawl-ref/source/misc.cc2
-rw-r--r--crawl-ref/source/traps.cc3
2 files changed, 3 insertions, 2 deletions
diff --git a/crawl-ref/source/misc.cc b/crawl-ref/source/misc.cc
index 8351616c1c..385946cd44 100644
--- a/crawl-ref/source/misc.cc
+++ b/crawl-ref/source/misc.cc
@@ -1057,7 +1057,7 @@ void down_stairs( int old_level, dungeon_feature_type force_stair,
dungeon_feature_type stair_taken = stair_find;
- if (you.level_type == LEVEL_LABYRINTH || you.level_type == LEVEL_ABYSS)
+ if (you.level_type == LEVEL_ABYSS)
stair_taken = DNGN_FLOOR;
if (you.level_type == LEVEL_PANDEMONIUM)
diff --git a/crawl-ref/source/traps.cc b/crawl-ref/source/traps.cc
index 2773566b34..ce38b939d5 100644
--- a/crawl-ref/source/traps.cc
+++ b/crawl-ref/source/traps.cc
@@ -817,7 +817,8 @@ bool trap_item(object_class_type base_type, char sub_type,
// don't want to go overboard here. Will only generate up to three
// separate trap items, or less if there are other items present.
if (mitm[ igrd[beam_x][beam_y] ].link != NON_ITEM
- && (item.base_type != OBJ_MISSILES || item.sub_type != MI_THROWING_NET))
+ && (item.base_type != OBJ_MISSILES
+ || item.sub_type != MI_THROWING_NET))
{
if (mitm[ mitm[ igrd[beam_x][beam_y] ].link ].link != NON_ITEM)
return (false);