From a298a872647d9beb0d30d71472a0e08e83df1440 Mon Sep 17 00:00:00 2001 From: haranp Date: Tue, 17 Feb 2009 10:26:02 +0000 Subject: Change elemental type colour enum to use ETC_ prefix instead of EC_ prefix, which was conflicting with the Abyssal entry cause enum. Fixes [2605869]. git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@9110 c06c8d41-db1a-0410-9941-cceddc491573 --- crawl-ref/source/beam.cc | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'crawl-ref/source/beam.cc') diff --git a/crawl-ref/source/beam.cc b/crawl-ref/source/beam.cc index c8238fbe86..ce90cc914e 100644 --- a/crawl-ref/source/beam.cc +++ b/crawl-ref/source/beam.cc @@ -152,7 +152,7 @@ void zap_animation(int colour, const monsters *mon, bool force) { // Default to whatever colour magic is today. if (colour == -1) - colour = EC_MAGIC; + colour = ETC_MAGIC; #ifdef USE_TILE tiles.add_overlay(p, tileidx_zap(colour)); @@ -170,16 +170,16 @@ void zap_animation(int colour, const monsters *mon, bool force) // Special front function for zap_animation to interpret enchantment flavours. static void _ench_animation( int flavour, const monsters *mon, bool force ) { - const int elem = (flavour == BEAM_HEALING) ? EC_HEAL : - (flavour == BEAM_PAIN) ? EC_UNHOLY : - (flavour == BEAM_DISPEL_UNDEAD) ? EC_HOLY : - (flavour == BEAM_POLYMORPH) ? EC_MUTAGENIC : + const int elem = (flavour == BEAM_HEALING) ? ETC_HEAL : + (flavour == BEAM_PAIN) ? ETC_UNHOLY : + (flavour == BEAM_DISPEL_UNDEAD) ? ETC_HOLY : + (flavour == BEAM_POLYMORPH) ? ETC_MUTAGENIC : (flavour == BEAM_CHAOS - || flavour == BEAM_RANDOM) ? EC_RANDOM : + || flavour == BEAM_RANDOM) ? ETC_RANDOM : (flavour == BEAM_TELEPORT || flavour == BEAM_BANISH - || flavour == BEAM_BLINK) ? EC_WARP - : EC_ENCHANT; + || flavour == BEAM_BLINK) ? ETC_WARP + : ETC_ENCHANT; zap_animation(element_colour(elem), mon, force); } -- cgit v1.2.3-54-g00ecf