Changed '!' in targeting from target-select to target-select-ignoring-range.

Added '@', which is to '!' as '.' is to the old '5'.
Fixed 2146628: cancelling targeting was incorrectly checking range.
The behaviour of allow_self_target is now slightly different (see forthcoming
mail on crawl-ref-discuss.)


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

1 files changed, 1 insertions, 1 deletions

diff --git a/crawl-ref/source/initfile.cc b/crawl-ref/source/initfile.cc
index 12b3f47370..4dfaf1ac3e 100644
--- a/crawl-ref/source/initfile.cc
+++ b/crawl-ref/source/initfile.cc
@@ -2036,7 +2036,6 @@ void game_options::read_option_line(const std::string &str, bool runscript)
         else if (field == "safe")
             easy_confirm = CONFIRM_SAFE_EASY;
     }
-    else BOOL_OPTION(easy_quit_item_prompts);
     else if (key == "allow_self_target")
     {
         if (field == "yes")
@@ -2046,6 +2045,7 @@ void game_options::read_option_line(const std::string &str, bool runscript)
         else if (field == "prompt")
             allow_self_target = CONFIRM_PROMPT;
     }
+    else BOOL_OPTION(easy_quit_item_prompts);
     else BOOL_OPTION_NAMED("easy_quit_item_lists", easy_quit_item_prompts);
     else BOOL_OPTION(easy_open);
     else BOOL_OPTION(easy_unequip);