Fixed bad grammar on shield block messages in melee.

Split up Abyss/Pan/Labyrinth save files. The only practical use right now is to
be able to correctly place Abyss and Pan ghosts.

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

1 files changed, 4 insertions, 4 deletions

diff --git a/crawl-ref/source/files.h b/crawl-ref/source/files.h
index ff0af7c108..814c25b1eb 100644
--- a/crawl-ref/source/files.h
+++ b/crawl-ref/source/files.h
@@ -43,8 +43,8 @@ std::string get_savedir_filename(const std::string &pre,
 
 std::string get_prefs_filename();
 
-void load( unsigned char stair_taken, int load_mode, bool was_a_labyrinth, 
-           char old_level, char where_were_you2 );
+void load( int stair_taken, int load_mode, bool was_a_labyrinth, 
+           int old_level, branch_type where_were_you2 );
 
 // last updated 12may2000 {dlb}
 /* ***********************************************************************
@@ -72,8 +72,8 @@ void save_ghost( bool force = false );
 /* ***********************************************************************
  * called from: files hiscores
  * *********************************************************************** */
-std::string make_filename( const char *prefix, int level, int where,
-                           bool isLabyrinth, bool isGhost );
+std::string make_filename( const char *prefix, int level, int branch,
+                           level_area_type lt, bool isGhost );
 
 void writeShort(FILE *file, short s);