[crawl-ref-commits] master branch updated: 0.12-a0-1445-g680d0ea

[<gi...@cr...>]

       via  680d0ea043ef10e6fd74a799e43437e7ef1cbce7 (commit)
      from  758438fb9570afe569d1fc428d0c6dcbc71ec5f6 (commit)

-----------------------------------------------------------------------
commit 680d0ea043ef10e6fd74a799e43437e7ef1cbce7
Author: Neil Moore <ne...@s-...>
Date:   Sat Dec 29 17:13:34 2012 -0500

    Don't keep force_map forever when crashing after &P
    
    Thanks to HangedMan for finding the problem and how to reproduce it.

-----------------------------------------------------------------------

Summary of changes:
 crawl-ref/source/wiz-dgn.cc |    5 +++++
 1 files changed, 5 insertions(+), 0 deletions(-)

diff --git a/crawl-ref/source/wiz-dgn.cc b/crawl-ref/source/wiz-dgn.cc
index a5e5ff0..7ad2f14 100644
--- a/crawl-ref/source/wiz-dgn.cc
+++ b/crawl-ref/source/wiz-dgn.cc
@@ -630,6 +630,11 @@ static void debug_load_map_by_name(string name, bool primary)
         you.props["force_map"] = toplace->name;
         wizard_recreate_level();
         you.props.erase("force_map");
+
+        // We just saved with you.props["force_map"] set; save again in
+        // case we crash (lest we have the property forever).
+        if (!crawl_state.test)
+            save_game_state();
     }
     else
     {


-- 
Dungeon Crawl Stone Soup