Fix a bug with swap_when_safe, and experimentally default

  chunks_autopickup, swap_when_safe, and show_beam to true.



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

1 files changed, 12 insertions, 12 deletions

diff --git a/crawl-ref/source/initfile.cc b/crawl-ref/source/initfile.cc
index 6665a7a096..5b414e5158 100644
--- a/crawl-ref/source/initfile.cc
+++ b/crawl-ref/source/initfile.cc
@@ -630,23 +630,23 @@ void game_options::reset_options()
     show_more_prompt = true;
 
     show_gold_turns = false;
-    show_beam       = false;
+    show_beam       = true;
 
     use_old_selection_order = false;
-    prev_race   = 0;
-    prev_cls    = 0;
-    prev_ck     = GOD_NO_GOD;
-    prev_dk     = DK_NO_SELECTION;
-    prev_pr     = GOD_NO_GOD;
-    prev_weapon = WPN_UNKNOWN;
-    prev_book   = SBT_NO_SELECTION;
+    prev_race     = 0;
+    prev_cls      = 0;
+    prev_ck       = GOD_NO_GOD;
+    prev_dk       = DK_NO_SELECTION;
+    prev_pr       = GOD_NO_GOD;
+    prev_weapon   = WPN_UNKNOWN;
+    prev_book     = SBT_NO_SELECTION;
     prev_randpick = false;
     remember_name = true;
 
 #ifdef USE_ASCII_CHARACTERS
-    char_set               = CSET_ASCII;
+    char_set      = CSET_ASCII;
 #else
-    char_set               = CSET_IBM;
+    char_set      = CSET_IBM;
 #endif
 
     // set it to the .crawlrc default
@@ -668,8 +668,8 @@ void game_options::reset_options()
     easy_unequip           = true;
     easy_butcher           = true;
     always_confirm_butcher = false;
-    chunks_autopickup      = false;
-    swap_when_safe         = false;
+    chunks_autopickup      = true;
+    swap_when_safe         = true;
     list_rotten            = true;
     easy_confirm           = CONFIRM_SAFE_EASY;
     easy_quit_item_prompts = true;