summaryrefslogtreecommitdiffstats
path: root/crawl-ref/source/spl-wpnench.h
diff options
context:
space:
mode:
authorRaphael Langella <raphael.langella@gmail.com>2011-07-21 12:44:28 +0000
committerRaphael Langella <raphael.langella@gmail.com>2011-07-21 22:25:43 +0200
commit17dfbce6f42ff75dfefd63ace016e51d9f493aa5 (patch)
tree3a2819a7823c305f8410711a984a46410cf4c8a7 /crawl-ref/source/spl-wpnench.h
parent6056fee300d2862993780b1bbbc1e9476ac70070 (diff)
downloadcrawl-ref-17dfbce6f42ff75dfefd63ace016e51d9f493aa5.tar.gz
crawl-ref-17dfbce6f42ff75dfefd63ace016e51d9f493aa5.zip
Don't miscast when the spell can still be aborted (#4281).
This is a significant refactoring. All the spells now return a spret_type and take a boolean which tells if the spell has actually failed. Also some code clean up in _do_cast(). All spells have their own function now. Also fix the following bugs: * Properly abort fire storm if forced casting on a wall with '!'. Also put a message for forced out of range casting (like cloud spells). * Casting summon elemental on an invisible monster aborted with no cost. * if a summoning spell aborts because create_monster fails, you don't lose a turn. You still get a chance of miscast in this rare case. * s2s, tukima and branding spells abort properly instead of consuming turn and MP when player is not wielding appropriate object. * s2s abort message when wielding a non-snakable.
Diffstat (limited to 'crawl-ref/source/spl-wpnench.h')
-rw-r--r--crawl-ref/source/spl-wpnench.h7
1 files changed, 4 insertions, 3 deletions
diff --git a/crawl-ref/source/spl-wpnench.h b/crawl-ref/source/spl-wpnench.h
index 4f6072fdd1..92440be6aa 100644
--- a/crawl-ref/source/spl-wpnench.h
+++ b/crawl-ref/source/spl-wpnench.h
@@ -2,11 +2,12 @@
#define SPL_WPNENCH_H
#include "itemprop-enum.h"
+#include "spl-cast.h"
class dist;
-bool brand_weapon(brand_type which_brand, int power);
-void cast_confusing_touch(int power);
-bool cast_sure_blade(int power);
+spret_type brand_weapon(brand_type which_brand, int power, bool fail = false);
+spret_type cast_confusing_touch(int power, bool fail);
+spret_type cast_sure_blade(int power, bool fail = false);
#endif