Shaft traps (trap doors) [1792195] and level annotation [1769009]

added, with the shaft traps changed as per comments on SF; shafts
aren't randomly generated yet, so this doesn't change gameplay.
Changed DNGN_TRAP_III to DNGN_TRAP_NATURAL, of which trap type the
shaft traps are the only current member.


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

1 files changed, 15 insertions, 0 deletions

diff --git a/crawl-ref/source/files.cc b/crawl-ref/source/files.cc
index d3848d7c3f..1c1af9c8d0 100644
--- a/crawl-ref/source/files.cc
+++ b/crawl-ref/source/files.cc
@@ -78,6 +78,7 @@
 #include "mtransit.h"
 #include "notes.h"
 #include "output.h"
+#include "overmap.h"
 #include "place.h"
 #include "player.h"
 #include "randart.h"
@@ -902,6 +903,7 @@ bool load( dungeon_feature_type stair_taken, int load_mode,
     // GENERATE new level when the file can't be opened:
     if (levelFile == NULL)
     {
+        env.turns_on_level = -1;
         builder( you.your_level, you.level_type );
         just_created_level = true;
 
@@ -1029,6 +1031,19 @@ bool load( dungeon_feature_type stair_taken, int load_mode,
 
     setup_environment_effects();
 
+    // Inform user of level's annotation.
+    if (get_level_annotation().length() > 0
+        && !crawl_state.level_annotation_shown)
+    {
+        char buf[200];
+
+        sprintf(buf, "Level annotation: %s\n",
+                get_level_annotation().c_str() );
+        mpr(buf, MSGCH_PLAIN, YELLOW);
+    }
+
+    crawl_state.level_annotation_shown = false;
+
     if (load_mode != LOAD_RESTART_GAME)
     {
         // Update PlaceInfo entries