diff options
author | Raphael Langella <raphael.langella@gmail.com> | 2011-07-21 12:44:28 +0000 |
---|---|---|
committer | Raphael Langella <raphael.langella@gmail.com> | 2011-07-21 22:25:43 +0200 |
commit | 17dfbce6f42ff75dfefd63ace016e51d9f493aa5 (patch) | |
tree | 3a2819a7823c305f8410711a984a46410cf4c8a7 /crawl-ref/source/spl-other.h | |
parent | 6056fee300d2862993780b1bbbc1e9476ac70070 (diff) | |
download | crawl-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-other.h')
-rw-r--r-- | crawl-ref/source/spl-other.h | 23 |
1 files changed, 13 insertions, 10 deletions
diff --git a/crawl-ref/source/spl-other.h b/crawl-ref/source/spl-other.h index 02796ef6ce..c6c84a6f37 100644 --- a/crawl-ref/source/spl-other.h +++ b/crawl-ref/source/spl-other.h @@ -1,19 +1,22 @@ #ifndef SPL_OTHER_H #define SPL_OTHER_H -void cast_cure_poison(int pow); +#include "spl-cast.h" -bool cast_sublimation_of_blood(int pow); -bool cast_death_channel(int pow, god_type god = GOD_NO_GOD); +spret_type cast_cure_poison(int pow, bool fail); + +spret_type cast_sublimation_of_blood(int pow, bool fail); +spret_type cast_death_channel(int pow, god_type god, bool fail); +spret_type cast_recall(bool fail); bool recall(int type_recalled); -void cast_phase_shift(int pow); -bool cast_passwall(const coord_def& delta, int pow); -void cast_intoxicate(int pow); -bool cast_fulsome_distillation(int pow, bool check_range = true); +spret_type cast_phase_shift(int pow, bool fail = false); +spret_type cast_passwall(const coord_def& delta, int pow, bool fail); +spret_type cast_intoxicate(int pow, bool fail); +spret_type cast_fulsome_distillation(int pow, bool check_range, bool fail); void remove_condensation_shield(); -bool cast_condensation_shield(int pow); -bool cast_stoneskin(int pow); -bool cast_darkness(int pow); +spret_type cast_condensation_shield(int pow, bool fail); +spret_type cast_stoneskin(int pow, bool fail = false); +spret_type cast_darkness(int pow, bool fail); #endif |