Added spears to fire order, & as an alias for X in autopickup option, removed

travel_exclude_radius2, corrected feature names in level-design.txt. (David).

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

1 files changed, 2 insertions, 10 deletions

diff --git a/crawl-ref/source/initfile.cc b/crawl-ref/source/initfile.cc
index 60ba59ea53..34437eb81b 100644
--- a/crawl-ref/source/initfile.cc
+++ b/crawl-ref/source/initfile.cc
@@ -617,7 +617,6 @@ void game_options::reset_options()
     travel_colour          = true;
     travel_delay           = 20;
     travel_stair_cost      = 500;
-    travel_exclude_radius2 =  68;
 
     // Sort only pickup menus by default.
     sort_menus.clear();
@@ -693,7 +692,7 @@ void game_options::reset_options()
     fire_items_start       = 0;           // start at slot 'a'
 
     // Clear fire_order and set up the defaults.
-    set_fire_order("launcher, javelin / dart / stone");
+    set_fire_order("launcher, javelin / dart / stone / spear");
 
     item_stack_summary_minimum = 5;
 
@@ -1555,6 +1554,7 @@ void game_options::read_option_line(const std::string &str, bool runscript)
                 type = '+';
                 break;
 
+            case '&':
             case 'x':
                 // also corpses
                 type = 'X';
@@ -2288,14 +2288,6 @@ void game_options::read_option_line(const std::string &str, bool runscript)
     {
         macro_meta_entry = read_bool(field, macro_meta_entry);
     }
-    else if (key == "travel_exclude_radius2")
-    {
-        travel_exclude_radius2 = atoi( field.c_str() );
-        if (travel_exclude_radius2 < 0)
-            travel_exclude_radius2 = 0;
-        else if (travel_exclude_radius2 > 400)
-            travel_exclude_radius2 = 400;
-    }
     else if (key == "stop_travel" || key == "travel_stop_message")
     {
         std::vector<std::string> fragments = split_string(",", field);