[1589849] Enabled ! in targeting mode to aim beams at a specific spot.

Beams aimed at the ground will hit creatures submerged in shallow water,
but enchantments will do nothing, lightning will ground harmlessly, and other
conjurations will do 2/3rd their normal damage.

Made target_unshifted_dirs turn off default_target, and vice versa, since the
options don't go well together.

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

1 files changed, 4 insertions, 0 deletions

diff --git a/crawl-ref/source/initfile.cc b/crawl-ref/source/initfile.cc
index 4e32b2552f..401dfda212 100644
--- a/crawl-ref/source/initfile.cc
+++ b/crawl-ref/source/initfile.cc
@@ -1838,6 +1838,8 @@ void game_options::read_option_line(const std::string &str, bool runscript)
     else if (key == "default_target")
     {
         default_target = read_bool( field, default_target );
+        if (default_target)
+            target_unshifted_dirs = false;
     }
     else if (key == "safe_autopickup")
     {
@@ -2350,6 +2352,8 @@ void game_options::read_option_line(const std::string &str, bool runscript)
     else if (key == "target_unshifted_dirs")
     {
         target_unshifted_dirs = read_bool(field, target_unshifted_dirs);
+        if (target_unshifted_dirs)
+            default_target = false;
     }
     else if (key == "drop_mode")
     {