Add yet more miscellaneous minor fixes.

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

3 files changed, 5 insertions, 6 deletions

diff --git a/crawl-ref/source/abyss.cc b/crawl-ref/source/abyss.cc
index 14ab8056bd..6c5dc1b637 100644
--- a/crawl-ref/source/abyss.cc
+++ b/crawl-ref/source/abyss.cc
@@ -591,17 +591,17 @@ void abyss_teleport( bool new_area )
 
     // Teleport to a new area of the abyss.
 
-    init_pandemonium();              // Get new monsters
-    dgn_set_colours_from_monsters(); // ...and new colours.
+    // Get new monsters and colours.
+    init_pandemonium();
 
-    for (i = 0; i < MAX_MONSTERS; i++)
+    for (i = 0; i < MAX_MONSTERS; ++i)
     {
         if (menv[i].alive())
             _abyss_lose_monster(menv[i]);
     }
 
     // Orbs and fixed artefacts are marked as "lost in the abyss".
-    for (k = 0; k < MAX_ITEMS; k++)
+    for (k = 0; k < MAX_ITEMS; ++k)
     {
         if (is_valid_item( mitm[k] ))
         {
diff --git a/crawl-ref/source/dungeon.cc b/crawl-ref/source/dungeon.cc
index 4d74b34303..d2541ea9c8 100644
--- a/crawl-ref/source/dungeon.cc
+++ b/crawl-ref/source/dungeon.cc
@@ -1304,9 +1304,7 @@ static void _dgn_set_floor_colours()
     unsigned char old_rock_colour  = env.rock_colour;
 
     if (you.level_type == LEVEL_PANDEMONIUM || you.level_type == LEVEL_ABYSS)
-    {
         dgn_set_colours_from_monsters();
-    }
     else if (you.level_type == LEVEL_DUNGEON)
     {
         // level_type == LEVEL_DUNGEON
diff --git a/crawl-ref/source/misc.cc b/crawl-ref/source/misc.cc
index a7a8002049..52d1d186a6 100644
--- a/crawl-ref/source/misc.cc
+++ b/crawl-ref/source/misc.cc
@@ -2145,6 +2145,7 @@ void down_stairs( int old_level, dungeon_feature_type force_stair,
         if (old_level_type == LEVEL_PANDEMONIUM)
         {
             init_pandemonium();
+
             for (pc = 0; pc < pt; pc++)
                 pandemonium_mons();
         }