Fix 2014303: Vampire hunger properties

Fix 2014275: Sif Muna giving manuals
Fix 2013914: Draconians merging incorrectly

Also, at the start of a tutorial game change all secret doors within a
radius of 10 into closed doors, to avoid players encountering a dead-end
really close to the entry. (And yes, I've had that happen.)

Change display of forbidden choices in the character selection menus. It
should now be clearer what's going on.


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

1 files changed, 4 insertions, 6 deletions

diff --git a/crawl-ref/source/files.cc b/crawl-ref/source/files.cc
index f00a8cf58a..4e9a019817 100644
--- a/crawl-ref/source/files.cc
+++ b/crawl-ref/source/files.cc
@@ -1367,7 +1367,7 @@ void save_game(bool leave_game, const char *farewellmsg)
     /* lua */
     std::string luaFile = get_savedir_filename( you.your_name, "", "lua" );
     clua.save(luaFile.c_str());
-    // note that luaFile may not exist
+    // Note that luaFile may not exist.
     DO_CHMOD_PRIVATE(luaFile.c_str());
 #endif
 
@@ -1405,7 +1405,6 @@ void save_game(bool leave_game, const char *farewellmsg)
     }
 
     /* tutorial */
-
     std::string tutorFile = get_savedir_filename(you.your_name, "", "tut");
     FILE *tutorf = fopen(tutorFile.c_str(), "wb");
     if (tutorf)
@@ -1503,7 +1502,7 @@ void _load_ghost(void)
     ghosts.clear();
     _restore_ghost_version(gfile, majorVersion, minorVersion);
 
-    // sanity check - EOF
+    // Sanity check - EOF.
     if (!feof(gfile))
     {
         fclose(gfile);
@@ -1521,10 +1520,10 @@ void _load_ghost(void)
         mpr( "Loaded ghost.", MSGCH_DIAGNOSTICS );
 #endif
 
-    // remove bones file - ghosts are hardly permanent.
+    // Remove bones file - ghosts are hardly permanent.
     unlink(cha_fil.c_str());
 
-    // translate ghost to monster and place.
+    // Translate ghost to monster and place.
     for (int imn = 0; imn < MAX_MONSTERS - 10 && !ghosts.empty(); imn++)
     {
         if (menv[imn].type != -1)
@@ -1601,7 +1600,6 @@ void restore_game(void)
     }
 
     /* tutorial */
-
     std::string tutorFile = get_savedir_filename(you.your_name, "", "tut");
     FILE *tutorf = fopen(tutorFile.c_str(), "rb");
     if (tutorf)