Added support for a validation hook for maps to check if they're A-Ok.

Tweaked savefile format (breaks saves) to allow the game to perform emergency
saves if level-generation fails (followers are lost, needs to be fixed).

[1743698] Re-refixed SP_ELF stub (Eino).

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

1 files changed, 5 insertions, 5 deletions

diff --git a/crawl-ref/source/misc.cc b/crawl-ref/source/misc.cc
index 1fc91fe7f7..e526b1d43f 100644
--- a/crawl-ref/source/misc.cc
+++ b/crawl-ref/source/misc.cc
@@ -533,7 +533,7 @@ void merfolk_start_swimming(void)
 
 void up_stairs(void)
 {
-    int stair_find = grd[you.x_pos][you.y_pos];
+    dungeon_feature_type stair_find = grd[you.x_pos][you.y_pos];
     const branch_type old_where = you.where_are_you;
     const bool was_a_labyrinth = you.level_type != LEVEL_DUNGEON;
 
@@ -653,7 +653,7 @@ void up_stairs(void)
         }
     }
 
-    const unsigned char stair_taken = stair_find;
+    const dungeon_feature_type stair_taken = stair_find;
 
     if (player_is_levitating())
     {
@@ -739,12 +739,12 @@ void up_stairs(void)
     }
 }                               // end up_stairs()
 
-void down_stairs( int old_level, int force_stair )
+void down_stairs( int old_level, dungeon_feature_type force_stair )
 {
     int i;
     char old_level_type = you.level_type;
     const bool was_a_labyrinth = you.level_type != LEVEL_DUNGEON;
-    const int stair_find =
+    const dungeon_feature_type stair_find =
         force_stair? force_stair : grd[you.x_pos][you.y_pos];
 
     bool leave_abyss_pan = false;
@@ -955,7 +955,7 @@ void down_stairs( int old_level, int force_stair )
     if (you.level_type == LEVEL_DUNGEON)
         you.your_level++;
 
-    int stair_taken = stair_find;
+    dungeon_feature_type stair_taken = stair_find;
 
     if (you.level_type == LEVEL_LABYRINTH || you.level_type == LEVEL_ABYSS)
         stair_taken = DNGN_FLOOR;