fiddlerwoaroof/crawl - Change BR6HF3PWCXUG24OBIWTCZ64DDVBA2G6BQBDJ5V5WMARRQBG2CLGQC

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

Created by haranp on February 17, 2009

BR6HF3PWCXUG24OBIWTCZ64DDVBA2G6BQBDJ5V5WMARRQBG2CLGQC

Dependencies

In channels

main

Change contents

Replacement in crawl-ref/source/view.h at line 21 [7.13254]

B:BD[6.209] → [6.209:1423]

B:BD[6.1423] → [8.7:44]

∅:D[8.44] → [6.1461:1958]

B:BD[6.1461] → [6.1461:1958]

B:BD[6.1958] → [9.6:225]

∅:D[9.225] → [6.1958:2011]

B:BD[6.1958] → [6.1958:2011]

    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)

[6.209]

[6.2011]

    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)

Replacement in crawl-ref/source/view.h at line 104 [7.13254]
B:BD[10.225] → [11.5:53]
```
// Applies EC_ colour substitutions and brands.
```
[10.225]
[11.53]
```
// Applies ETC_ colour substitutions and brands.
```
Replacement in crawl-ref/source/view.cc at line 1572 [7.16817]
B:BD[12.3715] → [12.3715:3747]
```
        which_colour = EC_MIST;
```
[12.3715]
[13.254]
```
        which_colour = ETC_MIST;
```
Replacement in crawl-ref/source/view.cc at line 1576 [7.16817]
B:BD[13.292] → [13.292:326]
```
        which_colour = EC_RANDOM;
```
[13.292]
[12.3747]
```
        which_colour = ETC_RANDOM;
```

Replacement in crawl-ref/source/view.cc at line 4163 [7.16817]

B:BD[14.948] → [14.948:995]

            Feature[i].colour       = EC_ROCK;

[14.948]

[15.46082]

            Feature[i].colour       = ETC_ROCK;

Replacement in crawl-ref/source/view.cc at line 4170 [7.16817]

B:BD[14.1046] → [14.1046:1094]

            Feature[i].colour       = EC_STONE;

[14.1046]

[15.46318]

            Feature[i].colour       = ETC_STONE;

Replacement in crawl-ref/source/view.cc at line 4207 [7.16817]

B:BD[14.1523] → [14.1523:1570]

            Feature[i].colour       = EC_ROCK;

[14.1523]

[15.47195]

            Feature[i].colour       = ETC_ROCK;

Replacement in crawl-ref/source/view.cc at line 4258 [7.16817]

B:BD[14.2106] → [14.2106:2154]

            Feature[i].colour       = EC_FLOOR;

[14.2106]

[16.6]

            Feature[i].colour       = ETC_FLOOR;

Replacement in crawl-ref/source/view.cc at line 4310 [7.16817]

B:BD[14.2921] → [14.2921:2969]

            Feature[i].colour       = EC_FLOOR;

[14.2921]

[15.50566]

            Feature[i].colour       = ETC_FLOOR;

Replacement in crawl-ref/source/view.cc at line 4346 [7.16817]
∅:D[17.1350] → [18.589:643]
B:BD[18.589] → [18.589:643]
```
            Feature[i].colour      = EC_SHIMMER_BLUE;
```
[17.1350]
[18.643]
```
            Feature[i].colour      = ETC_SHIMMER_BLUE;
```
Replacement in crawl-ref/source/view.cc at line 4348 [7.16817]
∅:D[18.691] → [19.488:542]
B:BD[19.488] → [19.488:542]
```
            Feature[i].seen_colour = EC_SHIMMER_BLUE;
```
[18.691]
[20.1826]
```
            Feature[i].seen_colour = ETC_SHIMMER_BLUE;
```

Replacement in crawl-ref/source/view.cc at line 4425 [7.16817]

B:BD[15.53290] → [14.4478:4526]

            Feature[i].colour      = EC_RANDOM;

[15.53290]

[14.4526]

            Feature[i].colour      = ETC_RANDOM;

Replacement in crawl-ref/source/view.cc at line 4429 [7.16817]
∅:D[14.4673] → [15.53485:53533]
B:BD[15.53485] → [15.53485:53533]
```
            Feature[i].seen_colour = EC_RANDOM;
```
[14.4673]
[20.2313]
```
            Feature[i].seen_colour = ETC_RANDOM;
```

Replacement in crawl-ref/source/view.cc at line 4434 [7.16817]

B:BD[15.53583] → [14.4674:4721]

            Feature[i].colour     = EC_RANDOM;

[15.53583]

[14.4721]

            Feature[i].colour     = ETC_RANDOM;

Replacement in crawl-ref/source/view.cc at line 4436 [7.16817]
∅:D[17.1823] → [15.53692:53739]
∅:D[14.4769] → [15.53692:53739]
B:BD[15.53692] → [15.53692:53739]
```
            Feature[i].map_colour = EC_RANDOM;
```
[14.4769]
[20.2368]
```
            Feature[i].map_colour = ETC_RANDOM;
```

Replacement in crawl-ref/source/view.cc at line 4565 [7.16817]

B:BD[15.57967] → [14.6638:6686]

            Feature[i].colour      = EC_UNHOLY;

[15.57967]

[14.6686]

            Feature[i].colour      = ETC_UNHOLY;

Replacement in crawl-ref/source/view.cc at line 4569 [7.16817]
∅:D[14.6833] → [15.58162:58210]
B:BD[15.58162] → [15.58162:58210]
```
            Feature[i].seen_colour = EC_UNHOLY;
```
[14.6833]
[20.3004]
```
            Feature[i].seen_colour = ETC_UNHOLY;
```

Replacement in crawl-ref/source/view.cc at line 4574 [7.16817]

B:BD[15.58259] → [14.6834:6882]

            Feature[i].colour      = EC_RANDOM;

[15.58259]

[14.6882]

            Feature[i].colour      = ETC_RANDOM;

Replacement in crawl-ref/source/view.cc at line 4578 [7.16817]
∅:D[14.7029] → [15.58454:58502]
B:BD[15.58454] → [15.58454:58502]
```
            Feature[i].seen_colour = EC_RANDOM;
```
[14.7029]
[20.3054]
```
            Feature[i].seen_colour = ETC_RANDOM;
```

Replacement in crawl-ref/source/view.cc at line 4583 [7.16817]

B:BD[15.58555] → [14.7030:7079]

            Feature[i].colour      = EC_VEHUMET;

[15.58555]

[14.7079]

            Feature[i].colour      = ETC_VEHUMET;

Replacement in crawl-ref/source/view.cc at line 4587 [7.16817]
∅:D[14.7226] → [15.58751:58800]
B:BD[15.58751] → [15.58751:58800]
```
            Feature[i].seen_colour = EC_VEHUMET;
```
[14.7226]
[20.3104]
```
            Feature[i].seen_colour = ETC_VEHUMET;
```

Replacement in crawl-ref/source/view.cc at line 4601 [7.16817]

B:BD[15.59139] → [14.7418:7464]

            Feature[i].colour      = EC_FIRE;

[15.59139]

[14.7464]

            Feature[i].colour      = ETC_FIRE;

Replacement in crawl-ref/source/view.cc at line 4605 [7.16817]
∅:D[14.7611] → [15.59332:59378]
B:BD[15.59332] → [15.59332:59378]
```
            Feature[i].seen_colour = EC_FIRE;
```
[14.7611]
[20.3204]
```
            Feature[i].seen_colour = ETC_FIRE;
```

Replacement in crawl-ref/source/view.cc at line 4655 [7.16817]

B:BD[21.4681] → [14.8580:8627]

            Feature[i].colour      = EC_BEOGH;

[21.4681]

[14.8627]

            Feature[i].colour      = ETC_BEOGH;

Replacement in crawl-ref/source/view.cc at line 4659 [7.16817]
∅:D[14.8774] → [22.49:96]
B:BD[21.4876] → [22.49:96]
```
            Feature[i].seen_colour = EC_BEOGH;
```
[14.8774]
[20.3504]
```
            Feature[i].seen_colour = ETC_BEOGH;
```

Replacement in crawl-ref/source/stuff.cc at line 1318 [7.224557]

B:BD[15.110125] → [15.110125:110209]

    // striping any COLFLAGS (just in case)
    return ((col & 0x007f) >= EC_FIRE);

[15.110125]

[15.110209]

    // stripping any COLFLAGS (just in case)
    return ((col & 0x007f) >= ETC_FIRE);

Replacement in crawl-ref/source/stuff.cc at line 1326 [7.224557]
B:BD[15.110406] → [15.110406:110435]
```
    if (element == EC_FLOOR)
```
[15.110406]
[15.110435]
```
    if (element == ETC_FLOOR)
```
Replacement in crawl-ref/source/stuff.cc at line 1328 [7.224557]
B:BD[15.110471] → [15.110471:110504]
```
    else if (element == EC_ROCK)
```
[15.110471]
[15.110504]
```
    else if (element == ETC_ROCK)
```
Replacement in crawl-ref/source/stuff.cc at line 1344 [7.224557]
B:BD[15.110984] → [15.110984:111002]
```
    case EC_FIRE:
```
[15.110984]
[15.111002]
```
    case ETC_FIRE:
```
Replacement in crawl-ref/source/stuff.cc at line 1350 [7.224557]
B:BD[15.111138] → [15.111138:111155]
```
    case EC_ICE:
```
[15.111138]
[15.111155]
```
    case ETC_ICE:
```
Replacement in crawl-ref/source/stuff.cc at line 1356 [7.224557]
B:BD[15.111292] → [15.111292:111311]
```
    case EC_EARTH:
```
[15.111292]
[15.111311]
```
    case ETC_EARTH:
```
Replacement in crawl-ref/source/stuff.cc at line 1360 [7.224557]
B:BD[15.111377] → [15.111377:111394]
```
    case EC_AIR:
```
[15.111377]
[15.111394]
```
    case ETC_AIR:
```
Replacement in crawl-ref/source/stuff.cc at line 1364 [7.224557]
B:BD[15.111461] → [15.111461:111486]
```
    case EC_ELECTRICITY:
```
[15.111461]
[15.111486]
```
    case ETC_ELECTRICITY:
```
Replacement in crawl-ref/source/stuff.cc at line 1370 [7.224557]
B:BD[15.111627] → [15.111627:111647]
```
    case EC_POISON:
```
[15.111627]
[15.111647]
```
    case ETC_POISON:
```
Replacement in crawl-ref/source/stuff.cc at line 1374 [7.224557]
B:BD[15.111715] → [15.111715:111734]
```
    case EC_WATER:
```
[15.111715]
[15.111734]
```
    case ETC_WATER:
```
Replacement in crawl-ref/source/stuff.cc at line 1378 [7.224557]
B:BD[15.111795] → [15.111795:111814]
```
    case EC_MAGIC:
```
[15.111795]
[15.111814]
```
    case ETC_MAGIC:
```
Replacement in crawl-ref/source/stuff.cc at line 1385 [7.224557]
B:BD[15.112000] → [15.112000:112041]
```
    case EC_MUTAGENIC:
    case EC_WARP:
```
[15.112000]
[15.112041]
```
    case ETC_MUTAGENIC:
    case ETC_WARP:
```
Replacement in crawl-ref/source/stuff.cc at line 1390 [7.224557]
B:BD[15.112113] → [15.112113:112134]
```
    case EC_ENCHANT:
```
[15.112113]
[15.112134]
```
    case ETC_ENCHANT:
```
Replacement in crawl-ref/source/stuff.cc at line 1394 [7.224557]
B:BD[15.112200] → [15.112200:112218]
```
    case EC_HEAL:
```
[15.112200]
[15.112218]
```
    case ETC_HEAL:
```
Replacement in crawl-ref/source/stuff.cc at line 1398 [7.224557]
B:BD[15.112286] → [15.112286:112305]
```
    case EC_BLOOD:
```
[15.112286]
[15.112305]
```
    case ETC_BLOOD:
```

Replacement in crawl-ref/source/stuff.cc at line 1402 [7.224557]

B:BD[15.112369] → [15.112369:112444]

    case EC_DEATH:      // assassin
    case EC_NECRO:      // necromancer

[15.112369]

[15.112444]

    case ETC_DEATH:      // assassin
    case ETC_NECRO:      // necromancer

Replacement in crawl-ref/source/stuff.cc at line 1407 [7.224557]
B:BD[15.112512] → [15.112512:112553]
```
    case EC_UNHOLY:     // ie demonology
```
[15.112512]
[15.112553]
```
    case ETC_UNHOLY:     // ie demonology
```
Replacement in crawl-ref/source/stuff.cc at line 1411 [7.224557]
B:BD[15.112617] → [15.112617:112635]
```
    case EC_DARK:
```
[15.112617]
[9.361]
```
    case ETC_DARK:
```
Replacement in crawl-ref/source/stuff.cc at line 1415 [7.224557]
B:BD[15.112675] → [15.112675:112693]
```
    case EC_HOLY:
```
[15.112675]
[15.112693]
```
    case ETC_HOLY:
```
Replacement in crawl-ref/source/stuff.cc at line 1419 [7.224557]
B:BD[15.112757] → [15.112757:112778]
```
    case EC_VEHUMET:
```
[15.112757]
[15.112778]
```
    case ETC_VEHUMET:
```
Replacement in crawl-ref/source/stuff.cc at line 1425 [7.224557]
B:BD[22.244] → [22.244:263]
```
    case EC_BEOGH:
```
[22.244]
[2.253]
```
    case ETC_BEOGH:
```
Replacement in crawl-ref/source/stuff.cc at line 1430 [7.224557]
B:BD[15.112926] → [15.112926:112947]
```
    case EC_CRYSTAL:
```
[15.112926]
[15.112947]
```
    case ETC_CRYSTAL:
```
Replacement in crawl-ref/source/stuff.cc at line 1436 [7.224557]
B:BD[15.113088] → [15.113088:113107]
```
    case EC_SLIME:
```
[15.113088]
[15.113107]
```
    case ETC_SLIME:
```
Replacement in crawl-ref/source/stuff.cc at line 1442 [7.224557]
B:BD[15.113246] → [15.113246:113265]
```
    case EC_SMOKE:
```
[15.113246]
[15.113265]
```
    case ETC_SMOKE:
```
Replacement in crawl-ref/source/stuff.cc at line 1449 [7.224557]
B:BD[15.113452] → [15.113452:113471]
```
    case EC_JEWEL:
```
[15.113452]
[15.113471]
```
    case ETC_JEWEL:
```
Replacement in crawl-ref/source/stuff.cc at line 1462 [7.224557]
B:BD[15.113914] → [15.113914:113933]
```
    case EC_ELVEN:
```
[15.113914]
[15.113933]
```
    case ETC_ELVEN:
```
Replacement in crawl-ref/source/stuff.cc at line 1469 [7.224557]
B:BD[15.114119] → [15.114119:114140]
```
    case EC_DWARVEN:
```
[15.114119]
[15.114140]
```
    case ETC_DWARVEN:
```
Replacement in crawl-ref/source/stuff.cc at line 1476 [7.224557]
B:BD[15.114324] → [15.114324:114344]
```
    case EC_ORCISH:
```
[15.114324]
[15.114344]
```
    case ETC_ORCISH:
```
Replacement in crawl-ref/source/stuff.cc at line 1483 [7.224557]
B:BD[15.114525] → [15.114525:114543]
```
    case EC_GILA:
```
[15.114525]
[15.114543]
```
    case ETC_GILA:
```
Replacement in crawl-ref/source/stuff.cc at line 1491 [7.224557]
B:BD[15.114774] → [15.114774:114793]
```
    case EC_STONE:
```
[15.114774]
[15.114793]
```
    case ETC_STONE:
```
Replacement in crawl-ref/source/stuff.cc at line 1498 [7.224557]
B:BD[23.224] → [23.224:242]
```
    case EC_MIST:
```
[23.224]
[23.242]
```
    case ETC_MIST:
```
Replacement in crawl-ref/source/stuff.cc at line 1502 [7.224557]
B:BD[19.1950] → [19.1950:1976]
```
    case EC_SHIMMER_BLUE:
```
[19.1950]
[19.1976]
```
    case ETC_SHIMMER_BLUE:
```
Replacement in crawl-ref/source/stuff.cc at line 1506 [7.224557]
B:BD[9.432] → [9.432:451]
```
    case EC_DECAY:
```
[9.432]
[9.451]
```
    case ETC_DECAY:
```
Replacement in crawl-ref/source/stuff.cc at line 1510 [7.224557]
B:BD[9.514] → [9.514:534]
```
    case EC_SILVER:
```
[9.514]
[9.534]
```
    case ETC_SILVER:
```
Replacement in crawl-ref/source/stuff.cc at line 1514 [7.224557]
B:BD[9.601] → [9.601:619]
```
    case EC_GOLD:
```
[9.601]
[9.619]
```
    case ETC_GOLD:
```
Replacement in crawl-ref/source/stuff.cc at line 1518 [7.224557]
B:BD[9.683] → [9.683:701]
```
    case EC_IRON:
```
[9.683]
[9.701]
```
    case ETC_IRON:
```
Replacement in crawl-ref/source/stuff.cc at line 1524 [7.224557]
B:BD[9.842] → [9.842:860]
```
    case EC_BONE:
```
[9.842]
[9.860]
```
    case ETC_BONE:
```
Replacement in crawl-ref/source/stuff.cc at line 1528 [7.224557]
B:BD[15.114938] → [15.114938:114958]
```
    case EC_RANDOM:
```
[15.114938]
[15.114958]
```
    case ETC_RANDOM:
```

Replacement in crawl-ref/source/stuff.cc at line 1532 [7.224557]

B:BD[15.115035] → [24.438:534]

    case EC_FLOOR: // should already be handled
    case EC_ROCK:  // should already be handled

[15.115035]

[15.115131]

    case ETC_FLOOR: // should already be handled
    case ETC_ROCK:  // should already be handled

Replacement in crawl-ref/source/religion.cc at line 5705 [7.804403]
B:BD[4.4636] → [4.4636:4665]
```
    mon->colour = EC_UNHOLY;
```
[4.4636]
[4.4665]
```
    mon->colour = ETC_UNHOLY;
```

Replacement in crawl-ref/source/mon-data.h at line 1606 [7.1826214]

B:BD[25.45686] → [26.2541:2601]

    MONS_SIMULACRUM_SMALL, 'z', EC_ICE, "small simulacrum",

[25.45686]

[3.2783]

    MONS_SIMULACRUM_SMALL, 'z', ETC_ICE, "small simulacrum",

Replacement in crawl-ref/source/mon-data.h at line 2920 [7.1826214]

B:BD[7.1873503] → [26.2602:2662]

    MONS_SIMULACRUM_LARGE, 'Z', EC_ICE, "large simulacrum",

[7.1873503]

[3.2861]

    MONS_SIMULACRUM_LARGE, 'Z', ETC_ICE, "large simulacrum",

Replacement in crawl-ref/source/mon-data.h at line 3366 [7.1826214]
B:BD[25.103027] → [25.103027:103070]
```
    MONS_HELLION, '3', EC_FIRE, "hellion",
```
[25.103027]
[27.3481]
```
    MONS_HELLION, '3', ETC_FIRE, "hellion",
```
Replacement in crawl-ref/source/mon-data.h at line 3477 [7.1826214]
B:BD[28.2773] → [28.2773:2826]
```
    MONS_CHAOS_SPAWN, '3', EC_RANDOM, "chaos spawn",
```
[28.2773]
[29.15474]
```
    MONS_CHAOS_SPAWN, '3', ETC_RANDOM, "chaos spawn",
```
Replacement in crawl-ref/source/makeitem.cc at line 678 [30.927]
B:BD[30.19571] → [9.1021:1057]
```
        item.colour = EC_MUTAGENIC;
```
[30.19571]
[30.19607]
```
        item.colour = ETC_MUTAGENIC;
```
Replacement in crawl-ref/source/makeitem.cc at line 714 [30.927]
B:BD[30.20456] → [9.1058:1097]
```
                item.colour = EC_IRON;
```
[30.20456]
[30.20492]
```
                item.colour = ETC_IRON;
```
Replacement in crawl-ref/source/makeitem.cc at line 718 [30.927]
B:BD[30.20571] → [9.1098:1136]
```
                item.colour = EC_ICE;
```
[30.20571]
[30.20612]
```
                item.colour = ETC_ICE;
```
Replacement in crawl-ref/source/makeitem.cc at line 722 [30.927]
B:BD[30.20692] → [9.1137:1176]
```
                item.colour = EC_BONE;
```
[30.20692]
[30.20729]
```
                item.colour = ETC_BONE;
```
Replacement in crawl-ref/source/makeitem.cc at line 726 [30.927]
B:BD[30.20810] → [9.1177:1217]
```
                item.colour = EC_SLIME;
```
[30.20810]
[30.20847]
```
                item.colour = ETC_SLIME;
```

Replacement in crawl-ref/source/makeitem.cc at line 730 [30.927]

B:BD[30.20933] → [9.1218:1259]

                item.colour = EC_POISON;

[30.20933]

[9.1259]

                item.colour = ETC_POISON;

Replacement in crawl-ref/source/makeitem.cc at line 734 [30.927]
B:BD[30.20990] → [9.1300:1340]
```
                item.colour = EC_ELVEN;
```
[30.20990]
[30.21032]
```
                item.colour = ETC_ELVEN;
```
Replacement in crawl-ref/source/makeitem.cc at line 738 [30.927]
B:BD[30.21114] → [9.1341:1382]
```
                item.colour = EC_SILVER;
```
[30.21114]
[30.21155]
```
                item.colour = ETC_SILVER;
```
Replacement in crawl-ref/source/makeitem.cc at line 742 [30.927]
B:BD[30.21237] → [9.1383:1422]
```
                item.colour = EC_GOLD;
```
[30.21237]
[30.21275]
```
                item.colour = ETC_GOLD;
```
Replacement in crawl-ref/source/makeitem.cc at line 746 [30.927]
B:BD[30.21359] → [9.1423:1463]
```
                item.colour = EC_DECAY;
```
[30.21359]
[30.21396]
```
                item.colour = ETC_DECAY;
```
Replacement in crawl-ref/source/makeitem.cc at line 750 [30.927]
∅:D[31.296] → [9.1522:1562]
B:BD[9.1522] → [9.1522:1562]
```
                item.colour = EC_WATER;
```
[31.296]
[9.1562]
```
                item.colour = ETC_WATER;
```

Replacement in crawl-ref/source/makeitem.cc at line 758 [30.927]

B:BD[9.1715] → [9.1715:1933]

                    {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};

[9.1715]

[32.5203]

                    {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};

Replacement in crawl-ref/source/makeitem.cc at line 767 [30.927]
B:BD[30.21819] → [9.2042:2083]
```
                item.colour = EC_RANDOM;
```
[30.21819]
[30.21866]
```
                item.colour = ETC_RANDOM;
```

Replacement in crawl-ref/source/makeitem.cc at line 771 [30.927]

B:BD[30.21949] → [9.2084:2128]

                item.colour = EC_MUTAGENIC;

[30.21949]

[30.22016]

                item.colour = ETC_MUTAGENIC;

Replacement in crawl-ref/source/makeitem.cc at line 775 [30.927]
B:BD[30.22099] → [9.2129:2169]
```
                item.colour = EC_MAGIC;
```
[30.22099]
[30.22135]
```
                item.colour = ETC_MAGIC;
```
Replacement in crawl-ref/source/makeitem.cc at line 779 [30.927]
B:BD[30.22216] → [9.2170:2209]
```
                item.colour = EC_FIRE;
```
[30.22216]
[30.22275]
```
                item.colour = ETC_FIRE;
```
Replacement in crawl-ref/source/makeitem.cc at line 785 [30.927]
B:BD[30.22436] → [9.2210:2249]
```
                item.colour = EC_DARK;
```
[30.22436]
[30.22476]
```
                item.colour = ETC_DARK;
```
Replacement in crawl-ref/source/item_use.cc at line 2036 [7.2781507]
B:BD[5.15271] → [5.15271:15305]
```
        beam.colour  = EC_RANDOM;
```
[5.15271]
[5.15305]
```
        beam.colour  = ETC_RANDOM;
```

Replacement in crawl-ref/source/initfile.cc at line 142 [7.2957258]

B:BD[15.785709] → [33.6998:7062]

    ASSERT(ARRAYSZ(element_cols) == (EC_RANDOM - EC_FIRE) + 1);

[15.785709]

[34.936]

    ASSERT(ARRAYSZ(element_cols) == (ETC_RANDOM - ETC_FIRE) + 1);

Replacement in crawl-ref/source/initfile.cc at line 168 [7.2957258]

B:BD[15.785953] → [15.785953:786002]

                ret = element_type(EC_FIRE + i);

[15.785953]

[15.786002]

                ret = element_type(ETC_FIRE + i);

Replacement in crawl-ref/source/beam.cc at line 155 [7.4128068]
B:BD[13.17103] → [13.17103:17134]
```
            colour = EC_MAGIC;
```
[13.17103]
[13.17134]
```
            colour = ETC_MAGIC;
```

Replacement in crawl-ref/source/beam.cc at line 173 [7.4128068]

B:BD[15.1221636] → [15.1221636:1221903]

    const int elem = (flavour == BEAM_HEALING)       ? EC_HEAL :
                     (flavour == BEAM_PAIN)          ? EC_UNHOLY :
                     (flavour == BEAM_DISPEL_UNDEAD) ? EC_HOLY :
                     (flavour == BEAM_POLYMORPH)     ? EC_MUTAGENIC :

[15.1221636]

[13.17136]

    const int elem = (flavour == BEAM_HEALING)       ? ETC_HEAL :
                     (flavour == BEAM_PAIN)          ? ETC_UNHOLY :
                     (flavour == BEAM_DISPEL_UNDEAD) ? ETC_HOLY :
                     (flavour == BEAM_POLYMORPH)     ? ETC_MUTAGENIC :

Replacement in crawl-ref/source/beam.cc at line 178 [7.4128068]

B:BD[13.17180] → [13.17180:17247]

                        || flavour == BEAM_RANDOM)   ? EC_RANDOM :

[13.17180]

[15.1221903]

                        || flavour == BEAM_RANDOM)   ? ETC_RANDOM :

Replacement in crawl-ref/source/beam.cc at line 181 [7.4128068]

B:BD[35.7873] → [35.7873:7936]

∅:D[36.766] → [15.1222066:1222133]

∅:D[35.7936] → [15.1222066:1222133]

B:BD[15.1222066] → [15.1222066:1222133]

                        || flavour == BEAM_BLINK)    ? EC_WARP
                                                     : EC_ENCHANT;

[35.7873]

[37.5817]

                        || flavour == BEAM_BLINK)    ? ETC_WARP
                                                     : ETC_ENCHANT;

Replacement in crawl-ref/source/abyss.cc at line 939 [7.4482606]
B:BD[38.21299] → [38.21299:21336]
```
    you.flash_colour = EC_MUTAGENIC;
```
[38.21299]
[38.21336]
```
    you.flash_colour = ETC_MUTAGENIC;
```
Replacement in crawl-ref/source/abyss.cc at line 960 [7.4482606]
B:BD[38.21850] → [38.21850:21887]
```
    you.flash_colour = EC_MUTAGENIC;
```
[38.21850]
[38.21887]
```
    you.flash_colour = ETC_MUTAGENIC;
```

Change elemental type colour enum to use ETC_ prefix instead of EC_

Dependencies

In channels

Change contents

Replacement in crawl-ref/source/view.h at line 21 [7.13254]

Replacement in crawl-ref/source/view.h at line 104 [7.13254]

Replacement in crawl-ref/source/view.cc at line 1572 [7.16817]

Replacement in crawl-ref/source/view.cc at line 1576 [7.16817]

Replacement in crawl-ref/source/view.cc at line 4163 [7.16817]

Replacement in crawl-ref/source/view.cc at line 4170 [7.16817]

Replacement in crawl-ref/source/view.cc at line 4207 [7.16817]

Replacement in crawl-ref/source/view.cc at line 4258 [7.16817]

Replacement in crawl-ref/source/view.cc at line 4310 [7.16817]

Replacement in crawl-ref/source/view.cc at line 4346 [7.16817]

Replacement in crawl-ref/source/view.cc at line 4348 [7.16817]

Replacement in crawl-ref/source/view.cc at line 4425 [7.16817]

Replacement in crawl-ref/source/view.cc at line 4429 [7.16817]

Replacement in crawl-ref/source/view.cc at line 4434 [7.16817]

Replacement in crawl-ref/source/view.cc at line 4436 [7.16817]

Replacement in crawl-ref/source/view.cc at line 4565 [7.16817]

Replacement in crawl-ref/source/view.cc at line 4569 [7.16817]

Replacement in crawl-ref/source/view.cc at line 4574 [7.16817]

Replacement in crawl-ref/source/view.cc at line 4578 [7.16817]

Replacement in crawl-ref/source/view.cc at line 4583 [7.16817]

Replacement in crawl-ref/source/view.cc at line 4587 [7.16817]

Replacement in crawl-ref/source/view.cc at line 4601 [7.16817]

Replacement in crawl-ref/source/view.cc at line 4605 [7.16817]

Replacement in crawl-ref/source/view.cc at line 4655 [7.16817]

Replacement in crawl-ref/source/view.cc at line 4659 [7.16817]

Replacement in crawl-ref/source/stuff.cc at line 1318 [7.224557]

Replacement in crawl-ref/source/stuff.cc at line 1326 [7.224557]

Replacement in crawl-ref/source/stuff.cc at line 1328 [7.224557]

Replacement in crawl-ref/source/stuff.cc at line 1344 [7.224557]

Replacement in crawl-ref/source/stuff.cc at line 1350 [7.224557]

Replacement in crawl-ref/source/stuff.cc at line 1356 [7.224557]

Replacement in crawl-ref/source/stuff.cc at line 1360 [7.224557]

Replacement in crawl-ref/source/stuff.cc at line 1364 [7.224557]

Replacement in crawl-ref/source/stuff.cc at line 1370 [7.224557]

Replacement in crawl-ref/source/stuff.cc at line 1374 [7.224557]

Replacement in crawl-ref/source/stuff.cc at line 1378 [7.224557]

Replacement in crawl-ref/source/stuff.cc at line 1385 [7.224557]

Replacement in crawl-ref/source/stuff.cc at line 1390 [7.224557]

Replacement in crawl-ref/source/stuff.cc at line 1394 [7.224557]

Replacement in crawl-ref/source/stuff.cc at line 1398 [7.224557]

Replacement in crawl-ref/source/stuff.cc at line 1402 [7.224557]

Replacement in crawl-ref/source/stuff.cc at line 1407 [7.224557]

Replacement in crawl-ref/source/stuff.cc at line 1411 [7.224557]

Replacement in crawl-ref/source/stuff.cc at line 1415 [7.224557]

Replacement in crawl-ref/source/stuff.cc at line 1419 [7.224557]

Replacement in crawl-ref/source/stuff.cc at line 1425 [7.224557]

Replacement in crawl-ref/source/stuff.cc at line 1430 [7.224557]

Replacement in crawl-ref/source/stuff.cc at line 1436 [7.224557]

Replacement in crawl-ref/source/stuff.cc at line 1442 [7.224557]

Replacement in crawl-ref/source/stuff.cc at line 1449 [7.224557]

Replacement in crawl-ref/source/stuff.cc at line 1462 [7.224557]

Replacement in crawl-ref/source/stuff.cc at line 1469 [7.224557]

Replacement in crawl-ref/source/stuff.cc at line 1476 [7.224557]

Replacement in crawl-ref/source/stuff.cc at line 1483 [7.224557]

Replacement in crawl-ref/source/stuff.cc at line 1491 [7.224557]

Replacement in crawl-ref/source/stuff.cc at line 1498 [7.224557]

Replacement in crawl-ref/source/stuff.cc at line 1502 [7.224557]

Replacement in crawl-ref/source/stuff.cc at line 1506 [7.224557]

Replacement in crawl-ref/source/stuff.cc at line 1510 [7.224557]

Replacement in crawl-ref/source/stuff.cc at line 1514 [7.224557]

Replacement in crawl-ref/source/stuff.cc at line 1518 [7.224557]

Replacement in crawl-ref/source/stuff.cc at line 1524 [7.224557]

Replacement in crawl-ref/source/stuff.cc at line 1528 [7.224557]

Replacement in crawl-ref/source/stuff.cc at line 1532 [7.224557]

Replacement in crawl-ref/source/religion.cc at line 5705 [7.804403]

Replacement in crawl-ref/source/mon-data.h at line 1606 [7.1826214]

Replacement in crawl-ref/source/mon-data.h at line 2920 [7.1826214]

Replacement in crawl-ref/source/mon-data.h at line 3366 [7.1826214]

Replacement in crawl-ref/source/mon-data.h at line 3477 [7.1826214]

Replacement in crawl-ref/source/makeitem.cc at line 678 [30.927]

Replacement in crawl-ref/source/makeitem.cc at line 714 [30.927]

Replacement in crawl-ref/source/makeitem.cc at line 718 [30.927]

Replacement in crawl-ref/source/makeitem.cc at line 722 [30.927]

Replacement in crawl-ref/source/makeitem.cc at line 726 [30.927]

Replacement in crawl-ref/source/makeitem.cc at line 730 [30.927]

Replacement in crawl-ref/source/makeitem.cc at line 734 [30.927]