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/abyss.cc | 4 +-- crawl-ref/source/beam.cc | 16 ++++----- crawl-ref/source/initfile.cc | 4 +-- crawl-ref/source/item_use.cc | 2 +- crawl-ref/source/makeitem.cc | 38 ++++++++++---------- crawl-ref/source/mon-data.h | 8 ++--- crawl-ref/source/religion.cc | 2 +- crawl-ref/source/stuff.cc | 86 ++++++++++++++++++++++---------------------- crawl-ref/source/view.cc | 46 ++++++++++++------------ crawl-ref/source/view.h | 80 ++++++++++++++++++++--------------------- 10 files changed, 143 insertions(+), 143 deletions(-) diff --git a/crawl-ref/source/abyss.cc b/crawl-ref/source/abyss.cc index 9c51074f42..81628ab889 100644 --- a/crawl-ref/source/abyss.cc +++ b/crawl-ref/source/abyss.cc @@ -936,7 +936,7 @@ bool lugonu_corrupt_level(int power) mprf(MSGCH_GOD, "Lugonu's Hand of Corruption reaches out!"); - you.flash_colour = EC_MUTAGENIC; + you.flash_colour = ETC_MUTAGENIC; viewwindow(true, false); _initialise_level_corrupt_seeds(power); @@ -957,7 +957,7 @@ bool lugonu_corrupt_level(int power) _corrupt_level_features(*abyssal); run_corruption_effects(300); - you.flash_colour = EC_MUTAGENIC; + you.flash_colour = ETC_MUTAGENIC; viewwindow(true, false); // Allow extra time for the flash to linger. delay(1000); 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); } diff --git a/crawl-ref/source/initfile.cc b/crawl-ref/source/initfile.cc index 0ce6da8a26..a65b50e635 100644 --- a/crawl-ref/source/initfile.cc +++ b/crawl-ref/source/initfile.cc @@ -139,7 +139,7 @@ int str_to_colour( const std::string &str, int default_colour, "iron", "bone", "random" }; - ASSERT(ARRAYSZ(element_cols) == (EC_RANDOM - EC_FIRE) + 1); + ASSERT(ARRAYSZ(element_cols) == (ETC_RANDOM - ETC_FIRE) + 1); for (ret = 0; ret < 16; ++ret) { @@ -165,7 +165,7 @@ int str_to_colour( const std::string &str, int default_colour, if (str == element_cols[i]) { // Ugh. - ret = element_type(EC_FIRE + i); + ret = element_type(ETC_FIRE + i); break; } } diff --git a/crawl-ref/source/item_use.cc b/crawl-ref/source/item_use.cc index 8e3e804e98..c2d8273be1 100644 --- a/crawl-ref/source/item_use.cc +++ b/crawl-ref/source/item_use.cc @@ -2033,7 +2033,7 @@ void setup_missile_beam(const actor *agent, bolt &beam, item_def &item, beam.flavour = BEAM_CHAOS; beam.name = "chaos"; - beam.colour = EC_RANDOM; + beam.colour = ETC_RANDOM; ammo.special = SPMSL_CHAOS; } diff --git a/crawl-ref/source/makeitem.cc b/crawl-ref/source/makeitem.cc index 213a380388..90ac8de89c 100644 --- a/crawl-ref/source/makeitem.cc +++ b/crawl-ref/source/makeitem.cc @@ -675,7 +675,7 @@ void item_colour( item_def &item ) break; case OBJ_ORBS: - item.colour = EC_MUTAGENIC; + item.colour = ETC_MUTAGENIC; break; case OBJ_MISCELLANY: @@ -711,43 +711,43 @@ void item_colour( item_def &item ) switch (item.plus) { case RUNE_DIS: // iron - item.colour = EC_IRON; + item.colour = ETC_IRON; break; case RUNE_COCYTUS: // icy - item.colour = EC_ICE; + item.colour = ETC_ICE; break; case RUNE_TARTARUS: // bone - item.colour = EC_BONE; + item.colour = ETC_BONE; break; case RUNE_SLIME_PITS: // slimy - item.colour = EC_SLIME; + item.colour = ETC_SLIME; break; case RUNE_SNAKE_PIT: // serpentine - item.colour = EC_POISON; + item.colour = ETC_POISON; break; case RUNE_ELVEN_HALLS: // elven - item.colour = EC_ELVEN; + item.colour = ETC_ELVEN; break; case RUNE_VAULTS: // silver - item.colour = EC_SILVER; + item.colour = ETC_SILVER; break; case RUNE_TOMB: // golden - item.colour = EC_GOLD; + item.colour = ETC_GOLD; break; case RUNE_SWAMP: // decaying - item.colour = EC_DECAY; + item.colour = ETC_DECAY; break; case RUNE_SHOALS: // barnacled - item.colour = EC_WATER; + item.colour = ETC_WATER; break; // This one is hardly unique, but colour isn't used for @@ -755,34 +755,34 @@ void item_colour( item_def &item ) case RUNE_DEMONIC: // random pandemonium demonlords { element_type types[] = - {EC_EARTH, EC_ELECTRICITY, EC_ENCHANT, EC_HEAL, - EC_BLOOD, EC_DEATH, EC_UNHOLY, EC_VEHUMET, EC_BEOGH, - EC_CRYSTAL, EC_SMOKE, EC_DWARVEN, EC_ORCISH, EC_GILA}; + {ETC_EARTH, ETC_ELECTRICITY, ETC_ENCHANT, ETC_HEAL, + ETC_BLOOD, ETC_DEATH, ETC_UNHOLY, ETC_VEHUMET, ETC_BEOGH, + ETC_CRYSTAL, ETC_SMOKE, ETC_DWARVEN, ETC_ORCISH, ETC_GILA}; item.colour = RANDOM_ELEMENT(types); break; } case RUNE_ABYSSAL: // random in abyss - item.colour = EC_RANDOM; + item.colour = ETC_RANDOM; break; case RUNE_MNOLEG: // glowing - item.colour = EC_MUTAGENIC; + item.colour = ETC_MUTAGENIC; break; case RUNE_LOM_LOBON: // magical - item.colour = EC_MAGIC; + item.colour = ETC_MAGIC; break; case RUNE_CEREBOV: // fiery - item.colour = EC_FIRE; + item.colour = ETC_FIRE; break; case RUNE_GEHENNA: // obsidian case RUNE_GLOORX_VLOQ: // dark default: - item.colour = EC_DARK; + item.colour = ETC_DARK; break; } break; diff --git a/crawl-ref/source/mon-data.h b/crawl-ref/source/mon-data.h index b9799ac515..aadc8b2944 100644 --- a/crawl-ref/source/mon-data.h +++ b/crawl-ref/source/mon-data.h @@ -1603,7 +1603,7 @@ static monsterentry mondata[] = { }, { - MONS_SIMULACRUM_SMALL, 'z', EC_ICE, "small simulacrum", + MONS_SIMULACRUM_SMALL, 'z', ETC_ICE, "small simulacrum", M_EVIL | M_NO_REGEN, MR_RES_POISON | MR_VUL_FIRE | mrd(MR_RES_COLD, 3), 0, 6, MONS_SIMULACRUM_SMALL, MONS_SIMULACRUM_SMALL, MH_UNDEAD, -1, @@ -2917,7 +2917,7 @@ static monsterentry mondata[] = { }, { - MONS_SIMULACRUM_LARGE, 'Z', EC_ICE, "large simulacrum", + MONS_SIMULACRUM_LARGE, 'Z', ETC_ICE, "large simulacrum", M_EVIL | M_NO_REGEN, MR_RES_POISON | MR_VUL_FIRE | mrd(MR_RES_COLD, 3), 0, 6, MONS_SIMULACRUM_SMALL, MONS_SIMULACRUM_LARGE, MH_UNDEAD, -1, @@ -3363,7 +3363,7 @@ static monsterentry mondata[] = { // middle demons ('3') { - MONS_HELLION, '3', EC_FIRE, "hellion", + MONS_HELLION, '3', ETC_FIRE, "hellion", M_SPELLCASTER | M_EVIL | M_GLOWS, MR_RES_POISON | MR_RES_HELLFIRE | MR_VUL_COLD, 0, 11, MONS_HELLION, MONS_HELLION, MH_DEMONIC, -7, @@ -3474,7 +3474,7 @@ static monsterentry mondata[] = { }, { - MONS_CHAOS_SPAWN, '3', EC_RANDOM, "chaos spawn", + MONS_CHAOS_SPAWN, '3', ETC_RANDOM, "chaos spawn", M_SEE_INVIS | M_EVIL | M_INSUBSTANTIAL, MR_RES_STICKY_FLAME, 0, 12, MONS_CHAOS_SPAWN, MONS_CHAOS_SPAWN, MH_DEMONIC, -7, diff --git a/crawl-ref/source/religion.cc b/crawl-ref/source/religion.cc index a907542e8b..f3bc4bd600 100644 --- a/crawl-ref/source/religion.cc +++ b/crawl-ref/source/religion.cc @@ -5702,7 +5702,7 @@ void yred_make_enslaved_soul(monsters *mon, bool force_hostile, // Recreate the monster as an abomination or spectral thing. define_monster(*mon); - mon->colour = EC_UNHOLY; + mon->colour = ETC_UNHOLY; mon->flags |= MF_ENSLAVED_SOUL; mon->flags |= MF_CREATED_FRIENDLY; diff --git a/crawl-ref/source/stuff.cc b/crawl-ref/source/stuff.cc index 97a910bed6..02c4b2ff57 100644 --- a/crawl-ref/source/stuff.cc +++ b/crawl-ref/source/stuff.cc @@ -1315,17 +1315,17 @@ unsigned char random_uncommon_colour() // returns if a colour is one of the special element colours (ie not regular) bool is_element_colour( int col ) { - // striping any COLFLAGS (just in case) - return ((col & 0x007f) >= EC_FIRE); + // stripping any COLFLAGS (just in case) + return ((col & 0x007f) >= ETC_FIRE); } int element_colour( int element, bool no_random ) { // Doing this so that we don't have to do recursion here at all // (these were the only cases which had possible double evaluation): - if (element == EC_FLOOR) + if (element == ETC_FLOOR) element = env.floor_colour; - else if (element == EC_ROCK) + else if (element == ETC_ROCK) element = env.rock_colour; // pass regular colours through for safety. @@ -1341,112 +1341,112 @@ int element_colour( int element, bool no_random ) switch (element & 0x007f) // strip COLFLAGs just in case { - case EC_FIRE: + case ETC_FIRE: ret = (tmp_rand < 40) ? RED : (tmp_rand < 80) ? YELLOW : LIGHTRED; break; - case EC_ICE: + case ETC_ICE: ret = (tmp_rand < 40) ? LIGHTBLUE : (tmp_rand < 80) ? BLUE : WHITE; break; - case EC_EARTH: + case ETC_EARTH: ret = (tmp_rand < 60) ? BROWN : LIGHTRED; break; - case EC_AIR: + case ETC_AIR: ret = (tmp_rand < 60) ? LIGHTGREY : WHITE; break; - case EC_ELECTRICITY: + case ETC_ELECTRICITY: ret = (tmp_rand < 40) ? LIGHTCYAN : (tmp_rand < 80) ? LIGHTBLUE : CYAN; break; - case EC_POISON: + case ETC_POISON: ret = (tmp_rand < 60) ? LIGHTGREEN : GREEN; break; - case EC_WATER: + case ETC_WATER: ret = (tmp_rand < 60) ? BLUE : CYAN; break; - case EC_MAGIC: + case ETC_MAGIC: ret = (tmp_rand < 30) ? LIGHTMAGENTA : (tmp_rand < 60) ? LIGHTBLUE : (tmp_rand < 90) ? MAGENTA : BLUE; break; - case EC_MUTAGENIC: - case EC_WARP: + case ETC_MUTAGENIC: + case ETC_WARP: ret = (tmp_rand < 60) ? LIGHTMAGENTA : MAGENTA; break; - case EC_ENCHANT: + case ETC_ENCHANT: ret = (tmp_rand < 60) ? LIGHTBLUE : BLUE; break; - case EC_HEAL: + case ETC_HEAL: ret = (tmp_rand < 60) ? LIGHTBLUE : YELLOW; break; - case EC_BLOOD: + case ETC_BLOOD: ret = (tmp_rand < 60) ? RED : DARKGREY; break; - case EC_DEATH: // assassin - case EC_NECRO: // necromancer + case ETC_DEATH: // assassin + case ETC_NECRO: // necromancer ret = (tmp_rand < 80) ? DARKGREY : MAGENTA; break; - case EC_UNHOLY: // ie demonology + case ETC_UNHOLY: // ie demonology ret = (tmp_rand < 80) ? DARKGREY : RED; break; - case EC_DARK: + case ETC_DARK: ret = (tmp_rand < 80) ? DARKGREY : LIGHTGREY; break; - case EC_HOLY: + case ETC_HOLY: ret = (tmp_rand < 60) ? YELLOW : WHITE; break; - case EC_VEHUMET: + case ETC_VEHUMET: ret = (tmp_rand < 40) ? LIGHTRED : (tmp_rand < 80) ? LIGHTMAGENTA : LIGHTBLUE; break; - case EC_BEOGH: + case ETC_BEOGH: ret = (tmp_rand < 60) ? LIGHTRED // plain Orc colour : BROWN; // Orcish mines wall/idol colour break; - case EC_CRYSTAL: + case ETC_CRYSTAL: ret = (tmp_rand < 40) ? LIGHTGREY : (tmp_rand < 80) ? GREEN : LIGHTRED; break; - case EC_SLIME: + case ETC_SLIME: ret = (tmp_rand < 40) ? GREEN : (tmp_rand < 80) ? BROWN : LIGHTGREEN; break; - case EC_SMOKE: + case ETC_SMOKE: ret = (tmp_rand < 30) ? LIGHTGREY : (tmp_rand < 60) ? DARKGREY : (tmp_rand < 90) ? LIGHTBLUE : MAGENTA; break; - case EC_JEWEL: + case ETC_JEWEL: ret = (tmp_rand < 12) ? WHITE : (tmp_rand < 24) ? YELLOW : (tmp_rand < 36) ? LIGHTMAGENTA : @@ -1459,28 +1459,28 @@ int element_colour( int element, bool no_random ) : BLUE; break; - case EC_ELVEN: + case ETC_ELVEN: ret = (tmp_rand < 40) ? LIGHTGREEN : (tmp_rand < 80) ? GREEN : (tmp_rand < 100) ? LIGHTBLUE : BLUE; break; - case EC_DWARVEN: + case ETC_DWARVEN: ret = (tmp_rand < 40) ? BROWN : (tmp_rand < 80) ? LIGHTRED : (tmp_rand < 100) ? LIGHTGREY : CYAN; break; - case EC_ORCISH: + case ETC_ORCISH: ret = (tmp_rand < 40) ? DARKGREY : (tmp_rand < 80) ? RED : (tmp_rand < 100) ? BROWN : MAGENTA; break; - case EC_GILA: + case ETC_GILA: ret = (tmp_rand < 30) ? LIGHTMAGENTA : (tmp_rand < 60) ? MAGENTA : (tmp_rand < 90) ? YELLOW : @@ -1488,49 +1488,49 @@ int element_colour( int element, bool no_random ) : RED; break; - case EC_STONE: + case ETC_STONE: if (player_in_branch( BRANCH_HALL_OF_ZOT )) ret = env.rock_colour; else ret = LIGHTGREY; break; - case EC_MIST: + case ETC_MIST: ret = tmp_rand < 100? CYAN : BLUE; break; - case EC_SHIMMER_BLUE: + case ETC_SHIMMER_BLUE: ret = random_choose_weighted(80, BLUE, 20, LIGHTBLUE, 5, CYAN, 0); break; - case EC_DECAY: + case ETC_DECAY: ret = (tmp_rand < 60) ? BROWN : GREEN; break; - case EC_SILVER: + case ETC_SILVER: ret = (tmp_rand < 90) ? LIGHTGREY : WHITE; break; - case EC_GOLD: + case ETC_GOLD: ret = (tmp_rand < 60) ? YELLOW : BROWN; break; - case EC_IRON: + case ETC_IRON: ret = (tmp_rand < 40) ? CYAN : (tmp_rand < 80) ? LIGHTGREY : DARKGREY; break; - case EC_BONE: + case ETC_BONE: ret = (tmp_rand < 90) ? WHITE : LIGHTGREY; break; - case EC_RANDOM: + case ETC_RANDOM: ret = 1 + random2(15); // always random break; - case EC_FLOOR: // should already be handled - case EC_ROCK: // should already be handled + case ETC_FLOOR: // should already be handled + case ETC_ROCK: // should already be handled default: break; } diff --git a/crawl-ref/source/view.cc b/crawl-ref/source/view.cc index b9d40322d1..5bda2008f4 100644 --- a/crawl-ref/source/view.cc +++ b/crawl-ref/source/view.cc @@ -1569,11 +1569,11 @@ inline static void _update_cloud_grid(int cloudno) break; case CLOUD_MIST: - which_colour = EC_MIST; + which_colour = ETC_MIST; break; case CLOUD_CHAOS: - which_colour = EC_RANDOM; + which_colour = ETC_RANDOM; break; default: @@ -4160,14 +4160,14 @@ void init_feature_table( void ) case DNGN_ROCK_WALL: case DNGN_PERMAROCK_WALL: Feature[i].dchar = DCHAR_WALL; - Feature[i].colour = EC_ROCK; + Feature[i].colour = ETC_ROCK; Feature[i].magic_symbol = Options.char_table[ DCHAR_WALL_MAGIC ]; Feature[i].minimap = MF_WALL; break; case DNGN_STONE_WALL: Feature[i].dchar = DCHAR_WALL; - Feature[i].colour = EC_STONE; + Feature[i].colour = ETC_STONE; Feature[i].magic_symbol = Options.char_table[ DCHAR_WALL_MAGIC ]; Feature[i].minimap = MF_WALL; break; @@ -4204,7 +4204,7 @@ void init_feature_table( void ) case DNGN_SECRET_DOOR: // Note: get_secret_door_appearance means this probably isn't used. Feature[i].dchar = DCHAR_WALL; - Feature[i].colour = EC_ROCK; + Feature[i].colour = ETC_ROCK; Feature[i].magic_symbol = Options.char_table[ DCHAR_WALL_MAGIC ]; Feature[i].minimap = MF_WALL; break; @@ -4255,7 +4255,7 @@ void init_feature_table( void ) case DNGN_FLOOR: Feature[i].dchar = DCHAR_FLOOR; - Feature[i].colour = EC_FLOOR; + Feature[i].colour = ETC_FLOOR; Feature[i].magic_symbol = Options.char_table[ DCHAR_FLOOR_MAGIC ]; Feature[i].minimap = MF_FLOOR; break; @@ -4307,7 +4307,7 @@ void init_feature_table( void ) case DNGN_UNDISCOVERED_TRAP: Feature[i].dchar = DCHAR_FLOOR; - Feature[i].colour = EC_FLOOR; + Feature[i].colour = ETC_FLOOR; Feature[i].magic_symbol = Options.char_table[ DCHAR_FLOOR_MAGIC ]; Feature[i].minimap = MF_FLOOR; break; @@ -4343,9 +4343,9 @@ void init_feature_table( void ) case DNGN_EXIT_PORTAL_VAULT: Feature[i].dchar = DCHAR_ARCH; - Feature[i].colour = EC_SHIMMER_BLUE; + Feature[i].colour = ETC_SHIMMER_BLUE; Feature[i].map_colour = LIGHTGREY; - Feature[i].seen_colour = EC_SHIMMER_BLUE; + Feature[i].seen_colour = ETC_SHIMMER_BLUE; Feature[i].minimap = MF_STAIR_BRANCH; break; @@ -4422,18 +4422,18 @@ void init_feature_table( void ) break; case DNGN_ENTER_ABYSS: - Feature[i].colour = EC_RANDOM; + Feature[i].colour = ETC_RANDOM; Feature[i].dchar = DCHAR_ARCH; Feature[i].flags |= FFT_NOTABLE; Feature[i].map_colour = LIGHTGREY; - Feature[i].seen_colour = EC_RANDOM; + Feature[i].seen_colour = ETC_RANDOM; Feature[i].minimap = MF_STAIR_BRANCH; break; case DNGN_EXIT_ABYSS: - Feature[i].colour = EC_RANDOM; + Feature[i].colour = ETC_RANDOM; Feature[i].dchar = DCHAR_ARCH; - Feature[i].map_colour = EC_RANDOM; + Feature[i].map_colour = ETC_RANDOM; Feature[i].minimap = MF_STAIR_BRANCH; break; @@ -4562,29 +4562,29 @@ void init_feature_table( void ) break; case DNGN_ALTAR_YREDELEMNUL: - Feature[i].colour = EC_UNHOLY; + Feature[i].colour = ETC_UNHOLY; Feature[i].dchar = DCHAR_ALTAR; Feature[i].flags |= FFT_NOTABLE; Feature[i].map_colour = DARKGREY; - Feature[i].seen_colour = EC_UNHOLY; + Feature[i].seen_colour = ETC_UNHOLY; Feature[i].minimap = MF_FEATURE; break; case DNGN_ALTAR_XOM: - Feature[i].colour = EC_RANDOM; + Feature[i].colour = ETC_RANDOM; Feature[i].dchar = DCHAR_ALTAR; Feature[i].flags |= FFT_NOTABLE; Feature[i].map_colour = DARKGREY; - Feature[i].seen_colour = EC_RANDOM; + Feature[i].seen_colour = ETC_RANDOM; Feature[i].minimap = MF_FEATURE; break; case DNGN_ALTAR_VEHUMET: - Feature[i].colour = EC_VEHUMET; + Feature[i].colour = ETC_VEHUMET; Feature[i].dchar = DCHAR_ALTAR; Feature[i].flags |= FFT_NOTABLE; Feature[i].map_colour = DARKGREY; - Feature[i].seen_colour = EC_VEHUMET; + Feature[i].seen_colour = ETC_VEHUMET; Feature[i].minimap = MF_FEATURE; break; @@ -4598,11 +4598,11 @@ void init_feature_table( void ) break; case DNGN_ALTAR_MAKHLEB: - Feature[i].colour = EC_FIRE; + Feature[i].colour = ETC_FIRE; Feature[i].dchar = DCHAR_ALTAR; Feature[i].flags |= FFT_NOTABLE; Feature[i].map_colour = DARKGREY; - Feature[i].seen_colour = EC_FIRE; + Feature[i].seen_colour = ETC_FIRE; Feature[i].minimap = MF_FEATURE; break; @@ -4652,11 +4652,11 @@ void init_feature_table( void ) break; case DNGN_ALTAR_BEOGH: - Feature[i].colour = EC_BEOGH; + Feature[i].colour = ETC_BEOGH; Feature[i].dchar = DCHAR_ALTAR; Feature[i].flags |= FFT_NOTABLE; Feature[i].map_colour = DARKGREY; - Feature[i].seen_colour = EC_BEOGH; + Feature[i].seen_colour = ETC_BEOGH; Feature[i].minimap = MF_FEATURE; break; diff --git a/crawl-ref/source/view.h b/crawl-ref/source/view.h index ed18a4536c..4f6f78d4f5 100644 --- a/crawl-ref/source/view.h +++ b/crawl-ref/source/view.h @@ -18,45 +18,45 @@ // initfile.cc (str_to_colour)! enum element_type { - EC_FIRE = 32, // fiery colours (must be first and > highest colour) - EC_ICE, // icy colours - EC_EARTH, // earthy colours - EC_ELECTRICITY, // electrical side of air - EC_AIR, // non-electric and general air magic - EC_POISON, // used only for venom mage and stalker stuff - EC_WATER, // used only for the elemental - EC_MAGIC, // general magical effect - EC_MUTAGENIC, // transmute, poly, radiation effects - EC_WARP, // teleportation and anything similar - EC_ENCHANT, // magical enhancements - EC_HEAL, // holy healing (not necromantic stuff) - EC_HOLY, // general "good" god effects - EC_DARK, // darkness - EC_DEATH, // currently only assassin (and equal to EC_NECRO) - EC_NECRO, // necromancy stuff - EC_UNHOLY, // demonology stuff - EC_VEHUMET, // vehumet's odd-ball colours - EC_BEOGH, // Beogh altar colours - EC_CRYSTAL, // colours of crystal - EC_BLOOD, // colours of blood - EC_SMOKE, // colours of smoke - EC_SLIME, // colours of slime - EC_JEWEL, // colourful - EC_ELVEN, // used for colouring elf fabric items - EC_DWARVEN, // used for colouring dwarf fabric items - EC_ORCISH, // used for colouring orc fabric items - EC_GILA, // gila monster colours - EC_FLOOR, // colour of the area's floor - EC_ROCK, // colour of the area's rock - EC_STONE, // colour of the area's stone - EC_MIST, // colour of mist - EC_SHIMMER_BLUE, // shimmering colours of blue. - EC_DECAY, // colour of decay/swamp - EC_SILVER, // colour of silver - EC_GOLD, // colour of gold - EC_IRON, // colour of iron - EC_BONE, // colour of bone - EC_RANDOM // any colour (except BLACK) + ETC_FIRE = 32, // fiery colours (must be first and > highest colour) + ETC_ICE, // icy colours + ETC_EARTH, // earthy colours + ETC_ELECTRICITY, // electrical side of air + ETC_AIR, // non-electric and general air magic + ETC_POISON, // used only for venom mage and stalker stuff + ETC_WATER, // used only for the elemental + ETC_MAGIC, // general magical effect + ETC_MUTAGENIC, // transmute, poly, radiation effects + ETC_WARP, // teleportation and anything similar + ETC_ENCHANT, // magical enhancements + ETC_HEAL, // holy healing (not necromantic stuff) + ETC_HOLY, // general "good" god effects + ETC_DARK, // darkness + ETC_DEATH, // currently only assassin (and equal to ETC_NECRO) + ETC_NECRO, // necromancy stuff + ETC_UNHOLY, // demonology stuff + ETC_VEHUMET, // vehumet's oddball colours + ETC_BEOGH, // Beogh altar colours + ETC_CRYSTAL, // colours of crystal + ETC_BLOOD, // colours of blood + ETC_SMOKE, // colours of smoke + ETC_SLIME, // colours of slime + ETC_JEWEL, // colourful + ETC_ELVEN, // used for colouring elf fabric items + ETC_DWARVEN, // used for colouring dwarf fabric items + ETC_ORCISH, // used for colouring orc fabric items + ETC_GILA, // gila monster colours + ETC_FLOOR, // colour of the area's floor + ETC_ROCK, // colour of the area's rock + ETC_STONE, // colour of the area's stone + ETC_MIST, // colour of mist + ETC_SHIMMER_BLUE, // shimmering colours of blue. + ETC_DECAY, // colour of decay/swamp + ETC_SILVER, // colour of silver + ETC_GOLD, // colour of gold + ETC_IRON, // colour of iron + ETC_BONE, // colour of bone + ETC_RANDOM // any colour (except BLACK) }; void init_char_table(char_set_type set); @@ -101,7 +101,7 @@ int multibyte_strlen(const std::string &s); void get_item_symbol(unsigned int object, unsigned *ch, unsigned short *colour); -// Applies EC_ colour substitutions and brands. +// Applies ETC_ colour substitutions and brands. unsigned real_colour(unsigned raw_colour); int get_mons_colour(const monsters *mons); -- cgit v1.2.3-54-g00ecf