diff options
| author | Stefan O'Rear <stefanor@cox.net> | 2009-11-15 00:04:52 -0800 |
|---|---|---|
| committer | Stefan O'Rear <stefanor@cox.net> | 2009-11-15 00:04:52 -0800 |
| commit | 05010f1d267b268e68821223680f34545c443f5c (patch) | |
| tree | 967466e274aa990271509d232af4a6c1fd0ad1a5 /crawl-ref/source/spl-cast.cc | |
| parent | dd56050f2d05db6ed7ff5bc99acd1032707c27fd (diff) | |
| parent | 5bba7e89fd395a2cde9cbf596208785508e22331 (diff) | |
| download | crawl-ref-05010f1d267b268e68821223680f34545c443f5c.tar.gz crawl-ref-05010f1d267b268e68821223680f34545c443f5c.zip | |
Merge Johnny Shelley's arcane marksman patch
Diffstat (limited to 'crawl-ref/source/spl-cast.cc')
| -rw-r--r-- | crawl-ref/source/spl-cast.cc | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/crawl-ref/source/spl-cast.cc b/crawl-ref/source/spl-cast.cc index 171bbe08d7..968f1c85b1 100644 --- a/crawl-ref/source/spl-cast.cc +++ b/crawl-ref/source/spl-cast.cc @@ -56,10 +56,6 @@ #include "view.h" #include "shout.h" -#ifdef TARGET_OS_DOS -#include <conio.h> -#endif - static int _calc_spell_range(spell_type spell, int power = 0, bool real_cast = false); @@ -816,7 +812,7 @@ bool cast_a_spell(bool check_range, spell_type spell) static bool _spell_is_utility_spell(spell_type spell_id) { return (spell_typematch(spell_id, - SPTYP_ENCHANTMENT | SPTYP_TRANSLOCATION | SPTYP_DIVINATION)); + SPTYP_ENCHANTMENT | SPTYP_TRANSLOCATION)); } bool maybe_identify_staff(item_def &item, spell_type spell) |