* Move wall tiles into the dc-dngn/wall folder.

* Flip downstairs tiles to match the upstairs (FR 2479239).


git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@8114 c06c8d41-db1a-0410-9941-cceddc491573

10 files changed, 11 insertions, 9 deletions

diff --git a/crawl-ref/source/decks.cc b/crawl-ref/source/decks.cc
index 57c927ce05..f30c907098 100644
--- a/crawl-ref/source/decks.cc
+++ b/crawl-ref/source/decks.cc
@@ -1889,7 +1889,7 @@ static void _metamorphosis_card(int power, deck_rarity_type rarity)
     }
 
     // Might fail, e.g. because of cursed equipment or potential death by
-    // stat loss. Aren't we being nice?
+    // stat loss. Aren't we being nice? (jpeg)
     if (!transform(random2(power/4), trans, true))
         canned_msg(MSG_NOTHING_HAPPENS);
 }
@@ -3037,7 +3037,7 @@ bool card_effect(card_type which_card, deck_rarity_type rarity,
             set_hunger(12000, true);
         break;
 
-    case NUM_CARDS:
+    default:
         mpr("You have drawn a buggy card!");
         break;
     }
diff --git a/crawl-ref/source/makeitem.cc b/crawl-ref/source/makeitem.cc
index 1e49049735..9f93c38301 100644
--- a/crawl-ref/source/makeitem.cc
+++ b/crawl-ref/source/makeitem.cc
@@ -2048,6 +2048,8 @@ static void _generate_armour_item(item_def& item, bool allow_uniques,
         return;
     }
 
+    // If we get here the item is not an artefact.
+
     if (is_helmet(item) && one_chance_in(3))
         set_helmet_random_desc(item);
 
@@ -2064,7 +2066,7 @@ static void _generate_armour_item(item_def& item, bool allow_uniques,
         set_equip_race(item, _determine_armour_race(item, item_race));
 
     // Dwarven armour is high-quality.
-    if ( get_equip_race(item) == ISFLAG_DWARVEN && coinflip() )
+    if (get_equip_race(item) == ISFLAG_DWARVEN && coinflip())
         item.plus++;
 
     const bool force_good = (item_level == MAKE_GOOD_ITEM);
diff --git a/crawl-ref/source/rltiles/dc-dngn.txt b/crawl-ref/source/rltiles/dc-dngn.txt
index 2136410a22..aaefdab206 100644
--- a/crawl-ref/source/rltiles/dc-dngn.txt
+++ b/crawl-ref/source/rltiles/dc-dngn.txt
@@ -325,11 +325,11 @@ wall/stone2_gray0 DNGN_STONE_WALL
 wall/stone2_gray1
 wall/stone2_gray2
 wall/stone2_gray3
-dngn_metal_wall DNGN_METAL_WALL
-dngn_green_crystal_wall DNGN_GREEN_CRYSTAL_WALL
 
-dngn_wax_wall DNGN_WAX_WALL
-dngn_transparent_wall DNGN_TRANSPARENT_WALL
+wall/dngn_metal_wall DNGN_METAL_WALL
+wall/dngn_green_crystal_wall DNGN_GREEN_CRYSTAL_WALL
+wall/dngn_wax_wall DNGN_WAX_WALL
+wall/dngn_transparent_wall DNGN_TRANSPARENT_WALL
 
 dngn_closed_door DNGN_CLOSED_DOOR
 gate_closed_left DNGN_GATE_CLOSED_LEFT
diff --git a/crawl-ref/source/rltiles/dc-dngn/rock_stairs_down.png b/crawl-ref/source/rltiles/dc-dngn/rock_stairs_down.png
index e294c1b1f6..12cf07512d 100644
--- a/crawl-ref/source/rltiles/dc-dngn/rock_stairs_down.png
+++ b/crawl-ref/source/rltiles/dc-dngn/rock_stairs_down.png
diff --git a/crawl-ref/source/rltiles/dc-dngn/stone_stairs_down.png b/crawl-ref/source/rltiles/dc-dngn/stone_stairs_down.png
index 6753644710..563ff09551 100644
--- a/crawl-ref/source/rltiles/dc-dngn/stone_stairs_down.png
+++ b/crawl-ref/source/rltiles/dc-dngn/stone_stairs_down.png
diff --git a/crawl-ref/source/rltiles/dc-dngn/dngn_green_crystal_wall.png b/crawl-ref/source/rltiles/dc-dngn/wall/dngn_green_crystal_wall.png
index f49bd2e8aa..f49bd2e8aa 100644
--- a/crawl-ref/source/rltiles/dc-dngn/dngn_green_crystal_wall.png
+++ b/crawl-ref/source/rltiles/dc-dngn/wall/dngn_green_crystal_wall.png
diff --git a/crawl-ref/source/rltiles/dc-dngn/dngn_metal_wall.png b/crawl-ref/source/rltiles/dc-dngn/wall/dngn_metal_wall.png
index 37c9a7fa6d..37c9a7fa6d 100644
--- a/crawl-ref/source/rltiles/dc-dngn/dngn_metal_wall.png
+++ b/crawl-ref/source/rltiles/dc-dngn/wall/dngn_metal_wall.png
diff --git a/crawl-ref/source/rltiles/dc-dngn/dngn_transparent_wall.png b/crawl-ref/source/rltiles/dc-dngn/wall/dngn_transparent_wall.png
index cbb6371646..cbb6371646 100644
--- a/crawl-ref/source/rltiles/dc-dngn/dngn_transparent_wall.png
+++ b/crawl-ref/source/rltiles/dc-dngn/wall/dngn_transparent_wall.png
diff --git a/crawl-ref/source/rltiles/dc-dngn/dngn_wax_wall.png b/crawl-ref/source/rltiles/dc-dngn/wall/dngn_wax_wall.png
index 1654470319..1654470319 100644
--- a/crawl-ref/source/rltiles/dc-dngn/dngn_wax_wall.png
+++ b/crawl-ref/source/rltiles/dc-dngn/wall/dngn_wax_wall.png
diff --git a/crawl-ref/source/spl-data.h b/crawl-ref/source/spl-data.h
index 62292a7020..4709251890 100644
--- a/crawl-ref/source/spl-data.h
+++ b/crawl-ref/source/spl-data.h
@@ -252,7 +252,7 @@
      SPFLAG_DIR_OR_TARGET | SPFLAG_NOT_SELF | SPFLAG_BATTLE,
      1,
      25,
-        LOS_RADIUS, LOS_RADIUS,
+     LOS_RADIUS, LOS_RADIUS,
      0,
      NULL,
      true,
@@ -265,7 +265,7 @@
      SPFLAG_DIR_OR_TARGET | SPFLAG_NOT_SELF | SPFLAG_BATTLE,
      3,
      100,
-        LOS_RADIUS, LOS_RADIUS,
+     LOS_RADIUS, LOS_RADIUS,
      0,
      NULL,
      true,