diff options
| -rw-r--r-- | crawl-ref/source/beam.cc | 12 | ||||
| -rw-r--r-- | crawl-ref/source/enum.h | 8 | ||||
| -rw-r--r-- | crawl-ref/source/mon-cast.cc | 9 | ||||
| -rw-r--r-- | crawl-ref/source/mon-spll.h | 2 | ||||
| -rw-r--r-- | crawl-ref/source/spl-data.h | 2 | ||||
| -rw-r--r-- | crawl-ref/source/teleport.cc | 2 | ||||
| -rw-r--r-- | crawl-ref/source/teleport.h | 2 |
7 files changed, 19 insertions, 18 deletions
diff --git a/crawl-ref/source/beam.cc b/crawl-ref/source/beam.cc index 47bd79c622..1c54f2914e 100644 --- a/crawl-ref/source/beam.cc +++ b/crawl-ref/source/beam.cc @@ -205,7 +205,7 @@ static void _ench_animation(int flavour, const monsters *mon, bool force) case BEAM_TELEPORT: case BEAM_BANISH: case BEAM_BLINK: - case BEAM_BLINK_CLOSER: + case BEAM_BLINK_CLOSE: elem = ETC_WARP; break; default: @@ -3947,8 +3947,8 @@ void bolt::affect_player_enchantment() obvious_effect = true; break; - case BEAM_BLINK_CLOSER: - blink_closer(&you, source); + case BEAM_BLINK_CLOSE: + blink_other_close(&you, source); obvious_effect = true; break; @@ -5163,10 +5163,10 @@ mon_resist_type bolt::apply_enchantment_to_monster(monsters* mon) monster_blink(mon); return (MON_AFFECTED); - case BEAM_BLINK_CLOSER: + case BEAM_BLINK_CLOSE: if (mon->observable()) obvious_effect = true; - blink_closer(mon, source); + blink_other_close(mon, source); return (MON_AFFECTED); case BEAM_POLYMORPH: @@ -6232,7 +6232,7 @@ std::string beam_type_name(beam_type type) case BEAM_DISINTEGRATION: return ("disintegration"); case BEAM_ENSLAVE_DEMON: return ("enslave demon"); case BEAM_BLINK: return ("blink"); - case BEAM_BLINK_CLOSER: return ("blink closer"); + case BEAM_BLINK_CLOSE: return ("blink close"); case BEAM_PETRIFY: return ("petrify"); case BEAM_CORONA: return ("backlight"); case BEAM_PORKALATOR: return ("porkalator"); diff --git a/crawl-ref/source/enum.h b/crawl-ref/source/enum.h index d22d8fbcd3..c0fa452b32 100644 --- a/crawl-ref/source/enum.h +++ b/crawl-ref/source/enum.h @@ -242,9 +242,9 @@ enum beam_type // beam[].flavour BEAM_DISINTEGRATION, BEAM_ENSLAVE_DEMON, BEAM_BLINK, - BEAM_BLINK_CLOSER, + BEAM_BLINK_CLOSE, BEAM_PETRIFY, - BEAM_CORONA, // 45 + BEAM_CORONA, BEAM_PORKALATOR, BEAM_HIBERNATION, BEAM_BERSERK, @@ -2895,8 +2895,8 @@ enum spell_type SPELL_EARTH_ELEMENTALS, SPELL_AIR_ELEMENTALS, SPELL_SLEEP, - SPELL_BLINK_OTHER_CLOSER, - SPELL_BLINK_CLOSER, + SPELL_BLINK_OTHER_CLOSE, + SPELL_BLINK_CLOSE, SPELL_BLINK_RANGE, SPELL_BLINK_AWAY, diff --git a/crawl-ref/source/mon-cast.cc b/crawl-ref/source/mon-cast.cc index b44fdb765c..7616162696 100644 --- a/crawl-ref/source/mon-cast.cc +++ b/crawl-ref/source/mon-cast.cc @@ -622,8 +622,8 @@ bolt mons_spells( monsters *mons, spell_type spell_cast, int power, beam.is_beam = true; break; - case SPELL_BLINK_OTHER_CLOSER: - beam.flavour = BEAM_BLINK_CLOSER; + case SPELL_BLINK_OTHER_CLOSE: + beam.flavour = BEAM_BLINK_CLOSE; beam.is_beam = true; break; @@ -802,6 +802,7 @@ bool setup_mons_cast(monsters *monster, bolt &pbolt, spell_type spell_cast, case SPELL_CONTROLLED_BLINK: case SPELL_BLINK_RANGE: case SPELL_BLINK_AWAY: + case SPELL_BLINK_CLOSE: case SPELL_TOMB_OF_DOROKLOHE: case SPELL_CHAIN_LIGHTNING: // the only user is reckless case SPELL_SUMMON_EYEBALLS: @@ -2048,11 +2049,11 @@ void mons_cast(monsters *monster, bolt &pbolt, spell_type spell_cast, } break; } - case SPELL_BLINK_OTHER_CLOSER: + case SPELL_BLINK_OTHER_CLOSE: { // Allow the caster to comment on moving the foe. std::string msg = getSpeakString(monster->name(DESC_PLAIN) - + " blink_other_closer"); + + " blink_other_close"); if (!msg.empty() && msg != "__NONE") { mons_speaks_msg(monster, msg, MSGCH_TALK, diff --git a/crawl-ref/source/mon-spll.h b/crawl-ref/source/mon-spll.h index dc2e9a2756..0a17a4a77f 100644 --- a/crawl-ref/source/mon-spll.h +++ b/crawl-ref/source/mon-spll.h @@ -1001,7 +1001,7 @@ { SPELL_LEHUDIBS_CRYSTAL_SPEAR, SPELL_IRON_SHOT, - SPELL_BLINK_OTHER_CLOSER, + SPELL_BLINK_OTHER_CLOSE, SPELL_BOLT_OF_MAGMA, SPELL_ISKENDERUNS_MYSTIC_BLAST, SPELL_STONE_ARROW diff --git a/crawl-ref/source/spl-data.h b/crawl-ref/source/spl-data.h index 48c3d05515..0b5af3f977 100644 --- a/crawl-ref/source/spl-data.h +++ b/crawl-ref/source/spl-data.h @@ -2265,7 +2265,7 @@ }, { - SPELL_BLINK_OTHER_CLOSER, "Blink Other Closer", + SPELL_BLINK_OTHER_CLOSE, "Blink Other Close", SPTYP_TRANSLOCATION, SPFLAG_TARGET | SPFLAG_MONSTER, 2, diff --git a/crawl-ref/source/teleport.cc b/crawl-ref/source/teleport.cc index d1f8aeb077..3a10012c30 100644 --- a/crawl-ref/source/teleport.cc +++ b/crawl-ref/source/teleport.cc @@ -98,7 +98,7 @@ static coord_def random_space_weighted(actor* moved, actor* target, } // Blink the victim closer to the monster at target. -void blink_closer(actor* victim, const coord_def &target) +void blink_other_close(actor* victim, const coord_def &target) { actor* caster = actor_at(target); if (!caster) diff --git a/crawl-ref/source/teleport.h b/crawl-ref/source/teleport.h index a330edc78e..9d87b93301 100644 --- a/crawl-ref/source/teleport.h +++ b/crawl-ref/source/teleport.h @@ -4,7 +4,7 @@ class actor; class monsters; -void blink_closer(actor* victim, const coord_def& target); +void blink_other_close(actor* victim, const coord_def& target); void blink_away(monsters* mon); void blink_range(monsters* mon); |