diff options
| author | Neil Moore <neil@s-z.org> | 2014-06-09 16:01:53 -0400 |
|---|---|---|
| committer | Neil Moore <neil@s-z.org> | 2014-06-09 16:07:59 -0400 |
| commit | 5b0dc80f637bb344ec847eaeb632018fefccddfb (patch) | |
| tree | efd465c855ec8d111037c7ba5620dc7925fd1fdd /crawl-ref/source/spl-cast.cc | |
| parent | 2d75d1c3f87eaa9771e5d2ad391a8b88e27ebfa7 (diff) | |
| download | crawl-ref-5b0dc80f637bb344ec847eaeb632018fefccddfb.tar.gz crawl-ref-5b0dc80f637bb344ec847eaeb632018fefccddfb.zip | |
Don't cycle through corpses with Apportation (#8622)
But still allow x* to cycle through all object stacks. For now * and +
do the same thing when targetting apportation, but maybe it makes sense
to have * keep the old behaviour.
Note that SPFLAG_TARG_OBJ now uses the new DIR_MOVABLE_OBJECT
targeting_type. If we add a new object-targetting spell that *can*
affect corpses, we'll have to separate SPFLAG_TARG_OBJ into two flags.
Diffstat (limited to 'crawl-ref/source/spl-cast.cc')
| -rw-r--r-- | crawl-ref/source/spl-cast.cc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/crawl-ref/source/spl-cast.cc b/crawl-ref/source/spl-cast.cc index 07bfc4036f..e4546cd348 100644 --- a/crawl-ref/source/spl-cast.cc +++ b/crawl-ref/source/spl-cast.cc @@ -1274,10 +1274,10 @@ spret_type your_spells(spell_type spell, int powc, targ = TARG_HOSTILE_UNDEAD; targeting_type dir = - (testbits(flags, SPFLAG_TARG_OBJ) ? DIR_TARGET_OBJECT : - testbits(flags, SPFLAG_TARGET) ? DIR_TARGET : - testbits(flags, SPFLAG_GRID) ? DIR_TARGET : - testbits(flags, SPFLAG_DIR) ? DIR_DIR : + (testbits(flags, SPFLAG_TARG_OBJ) ? DIR_MOVABLE_OBJECT : + testbits(flags, SPFLAG_TARGET) ? DIR_TARGET : + testbits(flags, SPFLAG_GRID) ? DIR_TARGET : + testbits(flags, SPFLAG_DIR) ? DIR_DIR : DIR_NONE); const char *prompt = get_spell_target_prompt(spell); |