Move all tiles for stairs, gates and portals into a new subfolder

dc-dngn/gateways/.
Also prompt for randomly rolled unnamed characters.


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

26 files changed, 26 insertions, 23 deletions

diff --git a/crawl-ref/source/misc.cc b/crawl-ref/source/misc.cc
index d55807f0ea..5c98c97a4e 100644
--- a/crawl-ref/source/misc.cc
+++ b/crawl-ref/source/misc.cc
@@ -1687,7 +1687,7 @@ static bool _stair_moves_pre(dungeon_feature_type stair)
 
 static bool _check_carrying_orb()
 {
-    // We never picked up the Orb, all's okay.
+    // We never picked up the Orb, no problem.
     if (you.char_direction != GDT_ASCENDING)
         return (true);
 
diff --git a/crawl-ref/source/newgame.cc b/crawl-ref/source/newgame.cc
index 34c122a86a..2c3b334527 100644
--- a/crawl-ref/source/newgame.cc
+++ b/crawl-ref/source/newgame.cc
@@ -1219,6 +1219,28 @@ game_start:
 
     strcpy( you.class_name, get_class_name(you.char_class) );
 
+    if (Options.random_pick)
+    {
+        // For completely random combinations (!, #, or Options.random_pick)
+        // reroll characters until the player accepts one of them or quits.
+        clrscr();
+
+        std::string specs = species_name(you.species, you.experience_level);
+        if (specs.length() > 79)
+            specs = specs.substr(0, 79);
+
+        cprintf( "You are a%s %s %s." EOL,
+                 (is_vowel( specs[0] )) ? "n" : "", specs.c_str(),
+                 you.class_name );
+
+        cprintf(EOL "Do you want to play this combination? (ynq) [y]");
+        char c = getch();
+        if (c == ESCAPE || tolower(c) == 'q')
+            end(0);
+        if (tolower(c) == 'n')
+            goto game_start;
+    }
+
     // New: pick name _after_ race and class choices.
     if (you.your_name[0] == 0)
     {
@@ -1250,27 +1272,6 @@ game_start:
             }
         }
     }
-    else if (Options.random_pick)
-    {
-        // For completely random combinations (!, #, or Options.random_pick)
-        // reroll characters until the player accepts one of them or quits.
-        clrscr();
-
-        std::string specs = species_name(you.species, you.experience_level);
-        if (specs.length() > 79)
-            specs = specs.substr(0, 79);
-
-        cprintf( "You are a%s %s %s." EOL,
-                 (is_vowel( specs[0] )) ? "n" : "", specs.c_str(),
-                 you.class_name );
-
-        cprintf(EOL "Do you want to play this combination? (ynq) [y]");
-        char c = getch();
-        if (c == ESCAPE || tolower(c) == 'q')
-            end(0);
-        if (tolower(c) == 'n')
-            goto game_start;
-    }
 
 
 // ************ Round-out character statistics and such. ************
diff --git a/crawl-ref/source/rltiles/dc-dngn.txt b/crawl-ref/source/rltiles/dc-dngn.txt
index 2ca3801855..0d95b38b37 100644
--- a/crawl-ref/source/rltiles/dc-dngn.txt
+++ b/crawl-ref/source/rltiles/dc-dngn.txt
@@ -351,6 +351,7 @@ dngn_trap_teleport DNGN_TRAP_TELEPORT
 dngn_trap_zot DNGN_TRAP_ZOT
 
 ## stairs
+%sdir dc-dngn/gateways
 stone_stairs_down DNGN_STONE_STAIRS_DOWN
 stone_stairs_up DNGN_STONE_STAIRS_UP
 escape_hatch_down DNGN_ESCAPE_HATCH_DOWN
@@ -409,12 +410,12 @@ dngn_shallow_water_murky2
 dngn_shallow_water_murky_disturbance DNGN_SHALLOW_WATER_MURKY_DISTURBANCE
 dngn_shallow_water_murky_disturbance2
 
+%sdir dc-dngn/gateways
 %rim 1
 dngn_enter_hell DNGN_ENTER_HELL
 dngn_enter_zot_closed DNGN_ENTER_ZOT_CLOSED
 dngn_enter_zot_open DNGN_ENTER_ZOT_OPEN
 %rim 0
-dngn_enter_labyrinth DNGN_ENTER_LABYRINTH
 dngn_enter_dis DNGN_ENTER_DIS
 dngn_enter_gehenna DNGN_ENTER_GEHENNA
 dngn_enter_cocytus DNGN_ENTER_COCYTUS
@@ -425,6 +426,7 @@ dngn_exit DNGN_EXIT_ABYSS
 dngn_exit_flickering
 
 dngn_stone_arch DNGN_STONE_ARCH
+dngn_enter_labyrinth DNGN_ENTER_LABYRINTH
 dngn_enter_pandemonium DNGN_ENTER_PANDEMONIUM
 dngn_portal DNGN_PORTAL
 dngn_portal_rotated
diff --git a/crawl-ref/source/rltiles/dc-dngn/dngn_enter.png b/crawl-ref/source/rltiles/dc-dngn/gateways/dngn_enter.png
index 27821aff65..27821aff65 100644
--- a/crawl-ref/source/rltiles/dc-dngn/dngn_enter.png
+++ b/crawl-ref/source/rltiles/dc-dngn/gateways/dngn_enter.png
diff --git a/crawl-ref/source/rltiles/dc-dngn/dngn_enter_abyss.png b/crawl-ref/source/rltiles/dc-dngn/gateways/dngn_enter_abyss.png
index 17397e043a..17397e043a 100644
--- a/crawl-ref/source/rltiles/dc-dngn/dngn_enter_abyss.png
+++ b/crawl-ref/source/rltiles/dc-dngn/gateways/dngn_enter_abyss.png
diff --git a/crawl-ref/source/rltiles/dc-dngn/dngn_enter_cocytus.png b/crawl-ref/source/rltiles/dc-dngn/gateways/dngn_enter_cocytus.png
index 9d5f28c84c..9d5f28c84c 100644
--- a/crawl-ref/source/rltiles/dc-dngn/dngn_enter_cocytus.png
+++ b/crawl-ref/source/rltiles/dc-dngn/gateways/dngn_enter_cocytus.png
diff --git a/crawl-ref/source/rltiles/dc-dngn/dngn_enter_dis.png b/crawl-ref/source/rltiles/dc-dngn/gateways/dngn_enter_dis.png
index 8b0461df87..8b0461df87 100644
--- a/crawl-ref/source/rltiles/dc-dngn/dngn_enter_dis.png
+++ b/crawl-ref/source/rltiles/dc-dngn/gateways/dngn_enter_dis.png
diff --git a/crawl-ref/source/rltiles/dc-dngn/dngn_enter_gehenna.png b/crawl-ref/source/rltiles/dc-dngn/gateways/dngn_enter_gehenna.png
index 8180dab466..8180dab466 100644
--- a/crawl-ref/source/rltiles/dc-dngn/dngn_enter_gehenna.png
+++ b/crawl-ref/source/rltiles/dc-dngn/gateways/dngn_enter_gehenna.png
diff --git a/crawl-ref/source/rltiles/dc-dngn/dngn_enter_hell.png b/crawl-ref/source/rltiles/dc-dngn/gateways/dngn_enter_hell.png
index b1c2c4b481..b1c2c4b481 100644
--- a/crawl-ref/source/rltiles/dc-dngn/dngn_enter_hell.png
+++ b/crawl-ref/source/rltiles/dc-dngn/gateways/dngn_enter_hell.png
diff --git a/crawl-ref/source/rltiles/dc-dngn/dngn_enter_labyrinth.png b/crawl-ref/source/rltiles/dc-dngn/gateways/dngn_enter_labyrinth.png
index 6cd270b185..6cd270b185 100644
--- a/crawl-ref/source/rltiles/dc-dngn/dngn_enter_labyrinth.png
+++ b/crawl-ref/source/rltiles/dc-dngn/gateways/dngn_enter_labyrinth.png
diff --git a/crawl-ref/source/rltiles/dc-dngn/dngn_enter_pandemonium.png b/crawl-ref/source/rltiles/dc-dngn/gateways/dngn_enter_pandemonium.png
index 2d72ffad65..2d72ffad65 100644
--- a/crawl-ref/source/rltiles/dc-dngn/dngn_enter_pandemonium.png
+++ b/crawl-ref/source/rltiles/dc-dngn/gateways/dngn_enter_pandemonium.png
diff --git a/crawl-ref/source/rltiles/dc-dngn/dngn_enter_tartarus.png b/crawl-ref/source/rltiles/dc-dngn/gateways/dngn_enter_tartarus.png
index c15dadc4e2..c15dadc4e2 100644
--- a/crawl-ref/source/rltiles/dc-dngn/dngn_enter_tartarus.png
+++ b/crawl-ref/source/rltiles/dc-dngn/gateways/dngn_enter_tartarus.png
diff --git a/crawl-ref/source/rltiles/dc-dngn/dngn_enter_zot_closed.png b/crawl-ref/source/rltiles/dc-dngn/gateways/dngn_enter_zot_closed.png
index 3d163d39d5..3d163d39d5 100644
--- a/crawl-ref/source/rltiles/dc-dngn/dngn_enter_zot_closed.png
+++ b/crawl-ref/source/rltiles/dc-dngn/gateways/dngn_enter_zot_closed.png
diff --git a/crawl-ref/source/rltiles/dc-dngn/dngn_enter_zot_open.png b/crawl-ref/source/rltiles/dc-dngn/gateways/dngn_enter_zot_open.png
index f50faa176d..f50faa176d 100644
--- a/crawl-ref/source/rltiles/dc-dngn/dngn_enter_zot_open.png
+++ b/crawl-ref/source/rltiles/dc-dngn/gateways/dngn_enter_zot_open.png
diff --git a/crawl-ref/source/rltiles/dc-dngn/dngn_entrance.png b/crawl-ref/source/rltiles/dc-dngn/gateways/dngn_entrance.png
index d1489a7a15..d1489a7a15 100644
--- a/crawl-ref/source/rltiles/dc-dngn/dngn_entrance.png
+++ b/crawl-ref/source/rltiles/dc-dngn/gateways/dngn_entrance.png
diff --git a/crawl-ref/source/rltiles/dc-dngn/dngn_exit.png b/crawl-ref/source/rltiles/dc-dngn/gateways/dngn_exit.png
index d5dbaf7740..d5dbaf7740 100644
--- a/crawl-ref/source/rltiles/dc-dngn/dngn_exit.png
+++ b/crawl-ref/source/rltiles/dc-dngn/gateways/dngn_exit.png
diff --git a/crawl-ref/source/rltiles/dc-dngn/dngn_exit_flickering.png b/crawl-ref/source/rltiles/dc-dngn/gateways/dngn_exit_flickering.png
index 32d6781a67..32d6781a67 100644
--- a/crawl-ref/source/rltiles/dc-dngn/dngn_exit_flickering.png
+++ b/crawl-ref/source/rltiles/dc-dngn/gateways/dngn_exit_flickering.png
diff --git a/crawl-ref/source/rltiles/dc-dngn/dngn_portal.png b/crawl-ref/source/rltiles/dc-dngn/gateways/dngn_portal.png
index af364d12ed..af364d12ed 100644
--- a/crawl-ref/source/rltiles/dc-dngn/dngn_portal.png
+++ b/crawl-ref/source/rltiles/dc-dngn/gateways/dngn_portal.png
diff --git a/crawl-ref/source/rltiles/dc-dngn/dngn_portal_rotated.png b/crawl-ref/source/rltiles/dc-dngn/gateways/dngn_portal_rotated.png
index 3dd824c48a..3dd824c48a 100644
--- a/crawl-ref/source/rltiles/dc-dngn/dngn_portal_rotated.png
+++ b/crawl-ref/source/rltiles/dc-dngn/gateways/dngn_portal_rotated.png
diff --git a/crawl-ref/source/rltiles/dc-dngn/dngn_return.png b/crawl-ref/source/rltiles/dc-dngn/gateways/dngn_return.png
index 3f71739824..3f71739824 100644
--- a/crawl-ref/source/rltiles/dc-dngn/dngn_return.png
+++ b/crawl-ref/source/rltiles/dc-dngn/gateways/dngn_return.png
diff --git a/crawl-ref/source/rltiles/dc-dngn/dngn_stone_arch.png b/crawl-ref/source/rltiles/dc-dngn/gateways/dngn_stone_arch.png
index 6b3cacf015..6b3cacf015 100644
--- a/crawl-ref/source/rltiles/dc-dngn/dngn_stone_arch.png
+++ b/crawl-ref/source/rltiles/dc-dngn/gateways/dngn_stone_arch.png
diff --git a/crawl-ref/source/rltiles/dc-dngn/dngn_transit_pandemonium.png b/crawl-ref/source/rltiles/dc-dngn/gateways/dngn_transit_pandemonium.png
index f0a06d0764..f0a06d0764 100644
--- a/crawl-ref/source/rltiles/dc-dngn/dngn_transit_pandemonium.png
+++ b/crawl-ref/source/rltiles/dc-dngn/gateways/dngn_transit_pandemonium.png
diff --git a/crawl-ref/source/rltiles/dc-dngn/escape_hatch_down.png b/crawl-ref/source/rltiles/dc-dngn/gateways/escape_hatch_down.png
index 6a2e4f222e..6a2e4f222e 100644
--- a/crawl-ref/source/rltiles/dc-dngn/escape_hatch_down.png
+++ b/crawl-ref/source/rltiles/dc-dngn/gateways/escape_hatch_down.png
diff --git a/crawl-ref/source/rltiles/dc-dngn/escape_hatch_up.png b/crawl-ref/source/rltiles/dc-dngn/gateways/escape_hatch_up.png
index 99095652b1..99095652b1 100644
--- a/crawl-ref/source/rltiles/dc-dngn/escape_hatch_up.png
+++ b/crawl-ref/source/rltiles/dc-dngn/gateways/escape_hatch_up.png
diff --git a/crawl-ref/source/rltiles/dc-dngn/stone_stairs_down.png b/crawl-ref/source/rltiles/dc-dngn/gateways/stone_stairs_down.png
index 563ff09551..563ff09551 100644
--- a/crawl-ref/source/rltiles/dc-dngn/stone_stairs_down.png
+++ b/crawl-ref/source/rltiles/dc-dngn/gateways/stone_stairs_down.png
diff --git a/crawl-ref/source/rltiles/dc-dngn/stone_stairs_up.png b/crawl-ref/source/rltiles/dc-dngn/gateways/stone_stairs_up.png
index b899ed425c..b899ed425c 100644
--- a/crawl-ref/source/rltiles/dc-dngn/stone_stairs_up.png
+++ b/crawl-ref/source/rltiles/dc-dngn/gateways/stone_stairs_up.png