fiddlerwoaroof/crawl - Change BMF6Y2AW2UKQ4J2KKWZOF4MFRMIU4PJG5DT72D4H6ZUV56MXR7SQC

Remove "#define SPWPN_FOOBAR UNRAND_FOOBAR" backwards compatibility for

fixed-art brand_type enumerations.

git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@10041 c06c8d41-db1a-0410-9941-cceddc491573

Created by zelgadis on June 25, 2009

BMF6Y2AW2UKQ4J2KKWZOF4MFRMIU4PJG5DT72D4H6ZUV56MXR7SQC

Dependencies

In channels

main

Change contents

Replacement in crawl-ref/source/tilepick.cc at line 1086 [4.96318]

B:BD[3.1160] → [3.1160:2169]

    case SPWPN_SINGING_SWORD:       return TILE_SPWPN_SINGING_SWORD;
    case SPWPN_WRATH_OF_TROG:       return TILE_SPWPN_WRATH_OF_TROG;
    case SPWPN_SCYTHE_OF_CURSES:    return TILE_SPWPN_SCYTHE_OF_CURSES;
    case SPWPN_MACE_OF_VARIABILITY: return TILE_SPWPN_MACE_OF_VARIABILITY;
    case SPWPN_GLAIVE_OF_PRUNE:     return TILE_SPWPN_GLAIVE_OF_PRUNE;
    case SPWPN_SCEPTRE_OF_TORMENT:  return TILE_SPWPN_SCEPTRE_OF_TORMENT;
    case SPWPN_SWORD_OF_ZONGULDROK: return TILE_SPWPN_SWORD_OF_ZONGULDROK;
    case SPWPN_SWORD_OF_CEREBOV:    return TILE_SPWPN_SWORD_OF_CEREBOV;
    case SPWPN_STAFF_OF_DISPATER:   return TILE_SPWPN_STAFF_OF_DISPATER;
    case SPWPN_SCEPTRE_OF_ASMODEUS: return TILE_SPWPN_SCEPTRE_OF_ASMODEUS;
    case SPWPN_SWORD_OF_POWER:      return TILE_SPWPN_SWORD_OF_POWER;
    case SPWPN_STAFF_OF_OLGREB:     return TILE_SPWPN_STAFF_OF_OLGREB;
    case SPWPN_VAMPIRES_TOOTH:      return TILE_SPWPN_VAMPIRES_TOOTH;
    case SPWPN_STAFF_OF_WUCAD_MU:   return TILE_SPWPN_STAFF_OF_WUCAD_MU;

[3.1160]

[5.3359]

    case UNRAND_SINGING_SWORD:  return TILE_SPWPN_SINGING_SWORD;
    case UNRAND_TROG:           return TILE_SPWPN_WRATH_OF_TROG;
    case UNRAND_CURSES:         return TILE_SPWPN_SCYTHE_OF_CURSES;
    case UNRAND_VARIABILITY:    return TILE_SPWPN_MACE_OF_VARIABILITY;
    case UNRAND_PRUNE:          return TILE_SPWPN_GLAIVE_OF_PRUNE;
    case UNRAND_TORMENT:        return TILE_SPWPN_SCEPTRE_OF_TORMENT;
    case UNRAND_ZONGULDROK:     return TILE_SPWPN_SWORD_OF_ZONGULDROK;
    case UNRAND_CEREBOV:        return TILE_SPWPN_SWORD_OF_CEREBOV;
    case UNRAND_DISPATER:       return TILE_SPWPN_STAFF_OF_DISPATER;
    case UNRAND_ASMODEUS:       return TILE_SPWPN_SCEPTRE_OF_ASMODEUS;
    case UNRAND_POWER:          return TILE_SPWPN_SWORD_OF_POWER;
    case UNRAND_OLGREB:         return TILE_SPWPN_STAFF_OF_OLGREB;
    case UNRAND_VAMPIRES_TOOTH: return TILE_SPWPN_VAMPIRES_TOOTH;
    case UNRAND_WUCAD_MU:       return TILE_SPWPN_STAFF_OF_WUCAD_MU;

Replacement in crawl-ref/source/tilepick.cc at line 3394 [4.96318]

B:BD[4.179815] → [6.23881:24105]

∅:D[6.24105] → [4.180024:180108]

B:BD[4.180024] → [4.180024:180108]

B:BD[4.180108] → [6.24106:24260]

∅:D[6.24260] → [4.180257:180332]

B:BD[4.180257] → [4.180257:180332]

B:BD[4.180332] → [6.24261:24410]

∅:D[6.24410] → [4.180476:180549]

B:BD[4.180476] → [4.180476:180549]

B:BD[4.180549] → [6.24411:24482]

B:BD[6.24483] → [7.448:527]

B:BD[7.609] → [7.609:761]

            case SPWPN_SINGING_SWORD:       return TILEP_HAND1_SINGING_SWORD;
            case SPWPN_WRATH_OF_TROG:       return TILEP_HAND1_AXE_TROG;
            case SPWPN_SCYTHE_OF_CURSES:    return TILEP_HAND1_FINISHER;
            case SPWPN_MACE_OF_VARIABILITY: return TILEP_HAND1_MACE_OF_VARIABILITY;
            case SPWPN_GLAIVE_OF_PRUNE:     return TILEP_HAND1_GLAIVE_OF_PRUNE;
            case SPWPN_SCEPTRE_OF_TORMENT:  return TILEP_HAND1_MACE_RUBY;
            case SPWPN_SWORD_OF_ZONGULDROK: return TILEP_HAND1_ZONGULDROK;
            case SPWPN_SWORD_OF_CEREBOV:    return TILEP_HAND1_SWORD_TWIST;
            case SPWPN_STAFF_OF_DISPATER:   return TILEP_HAND1_DISPATER;
            case SPWPN_SCEPTRE_OF_ASMODEUS: return TILEP_HAND1_ASMODEUS;
            case SPWPN_STAFF_OF_OLGREB:     return TILEP_HAND1_OLGREB;
            case SPWPN_SWORD_OF_POWER:      return TILEP_HAND1_SWORD_OF_POWER;
            case SPWPN_VAMPIRES_TOOTH:      return TILEP_HAND1_VAMPIRES_TOOTH;
            case SPWPN_STAFF_OF_WUCAD_MU:   return TILEP_HAND1_WUCAD_MU;

[4.179815]

[2.465]

            case UNRAND_SINGING_SWORD:  return TILEP_HAND1_SINGING_SWORD;
            case UNRAND_TROG:           return TILEP_HAND1_AXE_TROG;
            case UNRAND_CURSES:         return TILEP_HAND1_FINISHER;
            case UNRAND_VARIABILITY:    return TILEP_HAND1_MACE_OF_VARIABILITY;
            case UNRAND_PRUNE:          return TILEP_HAND1_GLAIVE_OF_PRUNE;
            case UNRAND_TORMENT:        return TILEP_HAND1_MACE_RUBY;
            case UNRAND_ZONGULDROK:     return TILEP_HAND1_ZONGULDROK;
            case UNRAND_CEREBOV:        return TILEP_HAND1_SWORD_TWIST;
            case UNRAND_DISPATER:       return TILEP_HAND1_DISPATER;
            case UNRAND_ASMODEUS:       return TILEP_HAND1_ASMODEUS;
            case UNRAND_OLGREB:         return TILEP_HAND1_OLGREB;
            case UNRAND_POWER:          return TILEP_HAND1_SWORD_OF_POWER;
            case UNRAND_VAMPIRES_TOOTH: return TILEP_HAND1_VAMPIRES_TOOTH;
            case UNRAND_WUCAD_MU:       return TILEP_HAND1_WUCAD_MU;
            case UNRAND_BLOODBANE:      return TILEP_HAND1_BLOODBANE;
            case UNRAND_FLAMING_DEATH:  return TILEP_HAND1_FLAMING_DEATH;
            case UNRAND_BRILLIANCE:     return TILEP_HAND1_MACE_OF_BRILLIANCE;
            case UNRAND_LEECH:          return TILEP_HAND1_LEECH;
            case UNRAND_CHILLY_DEATH:   return TILEP_HAND1_CHILLY_DEATH;
            case UNRAND_MORG:           return TILEP_HAND1_MORG;
            case UNRAND_FINISHER:       return TILEP_HAND1_FINISHER;
            case UNRAND_PUNK:           return TILEP_HAND1_PUNK;
            case UNRAND_KRISHNA:        return TILEP_HAND1_KRISHNA;
            case UNRAND_SKULLCRUSHER:   return TILEP_HAND1_GIANT_CLUB_SLANT;
            case UNRAND_GUARD:          return TILEP_HAND1_GLAIVE_OF_THE_GUARD;
            case UNRAND_JIHAD:          return TILEP_HAND1_JIHAD;
            case UNRAND_HELLFIRE:       return TILEP_HAND1_FIERY_DEVIL;
            case UNRAND_DOOM_KNIGHT:    return TILEP_HAND1_DOOM_KNIGHT;
            case UNRAND_EOS:            return TILEP_HAND1_EOS;
            case UNRAND_BOTONO:         return TILEP_HAND1_VOODOO;
            case UNRAND_OCTOPUS_KING:   return TILEP_HAND1_TRIDENT_OCTOPUS_KING;

Replacement in crawl-ref/source/tilepick.cc at line 3427 [4.96318]

B:BD[2.466] → [2.466:2512]

            case UNRAND_BLOODBANE:          return TILEP_HAND1_BLOODBANE;
            case UNRAND_FLAMING_DEATH:      return TILEP_HAND1_FLAMING_DEATH;
            case UNRAND_BRILLIANCE:         return TILEP_HAND1_MACE_OF_BRILLIANCE;
            case UNRAND_LEECH:              return TILEP_HAND1_LEECH;
            case UNRAND_CHILLY_DEATH:       return TILEP_HAND1_CHILLY_DEATH;
            case UNRAND_MORG:               return TILEP_HAND1_MORG;
            case UNRAND_FINISHER:           return TILEP_HAND1_FINISHER;
            case UNRAND_PUNK:               return TILEP_HAND1_PUNK;
            case UNRAND_KRISHNA:            return TILEP_HAND1_KRISHNA;
            case UNRAND_SKULLCRUSHER:       return TILEP_HAND1_GIANT_CLUB_SLANT;
            case UNRAND_GUARD:              return TILEP_HAND1_GLAIVE_OF_THE_GUARD;
            case UNRAND_JIHAD:              return TILEP_HAND1_JIHAD;
            case UNRAND_HELLFIRE:           return TILEP_HAND1_FIERY_DEVIL;
            case UNRAND_DOOM_KNIGHT:        return TILEP_HAND1_DOOM_KNIGHT;
            case UNRAND_EOS:                return TILEP_HAND1_EOS;
            case UNRAND_BOTONO:             return TILEP_HAND1_VOODOO;
            case UNRAND_OCTOPUS_KING:       return TILEP_HAND1_TRIDENT_OCTOPUS_KING;
            case UNRAND_ARGA:               return TILEP_HAND1_ARGA;
            case UNRAND_ELEMENTAL_STAFF:    return TILEP_HAND1_ELEMENTAL_STAFF;
            case UNRAND_SNIPER:             return TILEP_HAND1_SNIPER;
            case UNRAND_PLUTONIUM_SWORD:    return TILEP_HAND1_PLUTONIUM_SWORD;
            case UNRAND_BLOWGUN_ASSASSIN:   return TILEP_HAND1_BLOWGUN_ASSASSIN;
            case UNRAND_WYRMBANE:           return TILEP_HAND1_WYRMBANE;
            case UNRAND_SPRIGGANS_KNIFE:    return TILEP_HAND1_SPRIGGANS_KNIFE;
            case UNRAND_SERPENT_SCOURGE:    return TILEP_HAND1_SERPENT_SCOURGE;
            case UNRAND_ACCURACY:           return TILEP_HAND1_KNIFE_OF_ACCURACY;
            case UNRAND_PIERCER:            return TILEP_HAND1_GREAT_BOW;

[2.466]

[4.182754]

            case UNRAND_ARGA:             return TILEP_HAND1_ARGA;
            case UNRAND_ELEMENTAL_STAFF:  return TILEP_HAND1_ELEMENTAL_STAFF;
            case UNRAND_SNIPER:           return TILEP_HAND1_SNIPER;
            case UNRAND_PLUTONIUM_SWORD:  return TILEP_HAND1_PLUTONIUM_SWORD;
            case UNRAND_BLOWGUN_ASSASSIN: return TILEP_HAND1_BLOWGUN_ASSASSIN;
            case UNRAND_WYRMBANE:         return TILEP_HAND1_WYRMBANE;
            case UNRAND_SPRIGGANS_KNIFE:  return TILEP_HAND1_SPRIGGANS_KNIFE;
            case UNRAND_SERPENT_SCOURGE:  return TILEP_HAND1_SERPENT_SCOURGE;
            case UNRAND_ACCURACY:         return TILEP_HAND1_KNIFE_OF_ACCURACY;
            case UNRAND_PIERCER:          return TILEP_HAND1_GREAT_BOW;

Replacement in crawl-ref/source/shopping.cc at line 630 [8.759950]
B:BD[8.772397] → [8.772397:772442]
```
                case SPWPN_SWORD_OF_CEREBOV:
```
[8.772397]
[8.772442]
```
                case UNRAND_CEREBOV:
```
Replacement in crawl-ref/source/shopping.cc at line 634 [8.759950]
B:BD[8.772506] → [8.772506:772554]
```
                case SPWPN_SCEPTRE_OF_ASMODEUS:
```
[8.772506]
[8.772554]
```
                case UNRAND_ASMODEUS:
```
Replacement in crawl-ref/source/shopping.cc at line 638 [8.759950]
B:BD[8.772618] → [8.772618:772666]
```
                case SPWPN_SWORD_OF_ZONGULDROK:
```
[8.772618]
[8.772666]
```
                case UNRAND_ZONGULDROK:
```

Replacement in crawl-ref/source/shopping.cc at line 642 [8.759950]

B:BD[8.772730] → [8.772730:772865]

                case SPWPN_SCEPTRE_OF_TORMENT:
                case SPWPN_SINGING_SWORD:
                case SPWPN_STAFF_OF_DISPATER:

[8.772730]

[8.772865]

                case UNRAND_TORMENT:
                case UNRAND_SINGING_SWORD:
                case UNRAND_DISPATER:

Replacement in crawl-ref/source/shopping.cc at line 648 [8.759950]

B:BD[8.772929] → [8.772929:773015]

                case SPWPN_GLAIVE_OF_PRUNE:
                case SPWPN_WRATH_OF_TROG:

[8.772929]

[8.773015]

                case UNRAND_PRUNE:
                case UNRAND_TROG:

Replacement in crawl-ref/source/shopping.cc at line 653 [8.759950]
B:BD[8.773079] → [8.773079:773124]
```
                case SPWPN_SCYTHE_OF_CURSES:
```
[8.773079]
[8.773124]
```
                case UNRAND_CURSES:
```
Replacement in crawl-ref/source/shopping.cc at line 657 [8.759950]
B:BD[8.773187] → [8.773187:773235]
```
                case SPWPN_MACE_OF_VARIABILITY:
```
[8.773187]
[8.773235]
```
                case UNRAND_VARIABILITY:
```

Replacement in crawl-ref/source/religion.cc at line 3461 [8.804403]

B:BD[9.2874] → [10.2528:2712]

                  || item.special == SPWPN_SCEPTRE_OF_ASMODEUS
                  || item.special == SPWPN_STAFF_OF_DISPATER
                  || item.special == SPWPN_SWORD_OF_CEREBOV

[9.2874]

[10.2712]

                  || item.special == UNRAND_ASMODEUS
                  || item.special == UNRAND_DISPATER
                  || item.special == UNRAND_CEREBOV

Replacement in crawl-ref/source/player.cc at line 1246 [8.962854]

B:BD[11.27624] → [11.27624:27697]

              hunger += 3 * player_equip_unrand( SPWPN_VAMPIRES_TOOTH );

[11.27624]

[11.27697]

              hunger += 3 * player_equip_unrand( UNRAND_VAMPIRES_TOOTH );

Replacement in crawl-ref/source/player.cc at line 1254 [8.962854]

B:BD[11.27810] → [11.27810:27881]

            hunger += 1 * player_equip_unrand( SPWPN_VAMPIRES_TOOTH );

[11.27810]

[11.27881]

            hunger += 1 * player_equip_unrand( UNRAND_VAMPIRES_TOOTH );

Replacement in crawl-ref/source/player.cc at line 1859 [8.962854]
B:BD[8.985035] → [11.27892:27944]
```
    if (player_equip_unrand(SPWPN_STAFF_OF_OLGREB))
```
[8.985035]
[8.985217]
```
    if (player_equip_unrand(UNRAND_OLGREB))
```
Replacement in crawl-ref/source/mon-util.cc at line 4624 [8.1699344]
B:BD[12.3410] → [12.3410:3450]
```
        case SPWPN_SCEPTRE_OF_ASMODEUS:
```
[12.3410]
[12.3450]
```
        case UNRAND_ASMODEUS:
```
Replacement in crawl-ref/source/mon-util.cc at line 4626 [8.1699344]
B:BD[12.3503] → [12.3503:3541]
```
        case SPWPN_STAFF_OF_DISPATER:
```
[12.3503]
[12.3541]
```
        case UNRAND_DISPATER:
```
Replacement in crawl-ref/source/mon-util.cc at line 4628 [8.1699344]
B:BD[12.3594] → [12.3594:3631]
```
        case SPWPN_SWORD_OF_CEREBOV:
```
[12.3594]
[12.3631]
```
        case UNRAND_CEREBOV:
```
Replacement in crawl-ref/source/makeitem.cc at line 3737 [13.927]
B:BD[13.121348] → [11.31661:31722]
∅:D[11.31722] → [13.121421:121436]
B:BD[13.121421] → [13.121421:121436]
```
        make_item_unrandart( item, SPWPN_SWORD_OF_CEREBOV );
        break;
```
[13.121348]
[13.121436]
```
        make_item_unrandart( item, UNRAND_CEREBOV ); break;
```

Replacement in crawl-ref/source/makeitem.cc at line 3741 [13.927]

B:BD[13.121488] → [11.31723:31785]

        make_item_unrandart( item, SPWPN_STAFF_OF_DISPATER );

[13.121488]

[13.121562]

        make_item_unrandart( item, UNRAND_DISPATER );

Replacement in crawl-ref/source/makeitem.cc at line 3746 [13.927]

B:BD[13.121629] → [11.31786:31850]

        make_item_unrandart( item, SPWPN_SCEPTRE_OF_ASMODEUS );

[13.121629]

[13.121705]

        make_item_unrandart( item, UNRAND_ASMODEUS );

Replacement in crawl-ref/source/item_use.cc at line 454 [8.2781507]
B:BD[14.24031] → [14.24031:24061]
```
    case SPWPN_SINGING_SWORD:
```
[14.24031]
[14.24061]
```
    case UNRAND_SINGING_SWORD:
```
Replacement in crawl-ref/source/item_use.cc at line 457 [8.2781507]
∅:D[15.4510] → [14.24099:24129]
B:BD[14.24099] → [14.24099:24129]
```
    case SPWPN_WRATH_OF_TROG:
```
[15.4510]
[14.24129]
```
    case UNRAND_TROG:
```
Replacement in crawl-ref/source/item_use.cc at line 460 [8.2781507]
B:BD[14.24159] → [14.24159:24192]
```
    case SPWPN_SCYTHE_OF_CURSES:
```
[14.24159]
[14.24192]
```
    case UNRAND_CURSES:
```
Replacement in crawl-ref/source/item_use.cc at line 463 [8.2781507]
B:BD[14.24223] → [14.24223:24259]
```
    case SPWPN_MACE_OF_VARIABILITY:
```
[14.24223]
[14.24259]
```
    case UNRAND_VARIABILITY:
```
Replacement in crawl-ref/source/item_use.cc at line 466 [8.2781507]
B:BD[14.24355] → [14.24355:24390]
```
    case SPWPN_SCEPTRE_OF_TORMENT:
```
[14.24355]
[14.24390]
```
    case UNRAND_TORMENT:
```
Replacement in crawl-ref/source/item_use.cc at line 469 [8.2781507]
B:BD[14.24423] → [14.24423:24459]
```
    case SPWPN_SWORD_OF_ZONGULDROK:
```
[14.24423]
[14.24459]
```
    case UNRAND_ZONGULDROK:
```
Replacement in crawl-ref/source/item_use.cc at line 472 [8.2781507]
B:BD[14.24495] → [14.24495:24526]
```
    case SPWPN_SWORD_OF_POWER:
```
[14.24495]
[14.24526]
```
    case UNRAND_POWER:
```
Replacement in crawl-ref/source/item_use.cc at line 475 [8.2781507]
B:BD[14.24557] → [14.24557:24589]
```
    case SPWPN_STAFF_OF_OLGREB:
```
[14.24557]
[14.24589]
```
    case UNRAND_OLGREB:
```
Replacement in crawl-ref/source/item_use.cc at line 478 [8.2781507]
B:BD[14.24621] → [14.24621:24655]
```
    case SPWPN_STAFF_OF_WUCAD_MU:
```
[14.24621]
[14.24655]
```
    case UNRAND_WUCAD_MU:
```
Deletion in crawl-ref/source/item_use.cc at line 580 [8.2781507]
B:BD[8.2790882] → [8.2790882:2790927]
```
                case SPWPN_SWORD_OF_CEREBOV:
```
Replacement in crawl-ref/source/item_use.cc at line 669 [8.2781507]
∅:D[16.3528] → [8.2792894:2792936]
B:BD[8.2792894] → [8.2792894:2792936]
```
                case SPWPN_SINGING_SWORD:
```
[16.3528]
[17.473]
```
                case UNRAND_SINGING_SWORD:
```
Replacement in crawl-ref/source/item_use.cc at line 680 [8.2781507]
B:BD[8.2793027] → [8.2793027:2793069]
```
                case SPWPN_WRATH_OF_TROG:
```
[8.2793027]
[8.2793069]
```
                case UNRAND_TROG:
```
Replacement in crawl-ref/source/item_use.cc at line 684 [8.2781507]
B:BD[8.2793148] → [8.2793148:2793193]
```
                case SPWPN_SCYTHE_OF_CURSES:
```
[8.2793148]
[8.2793193]
```
                case UNRAND_CURSES:
```
Replacement in crawl-ref/source/item_use.cc at line 688 [8.2781507]
B:BD[8.2793280] → [8.2793280:2793324]
```
                case SPWPN_GLAIVE_OF_PRUNE:
```
[8.2793280]
[8.2793324]
```
                case UNRAND_PRUNE:
```
Replacement in crawl-ref/source/item_use.cc at line 692 [8.2781507]
B:BD[8.2793397] → [8.2793397:2793444]
```
                case SPWPN_SCEPTRE_OF_TORMENT:
```
[8.2793397]
[8.2793444]
```
                case UNRAND_TORMENT:
```
Replacement in crawl-ref/source/item_use.cc at line 696 [8.2781507]
B:BD[8.2793544] → [8.2793544:2793592]
```
                case SPWPN_SWORD_OF_ZONGULDROK:
```
[8.2793544]
[8.2793592]
```
                case UNRAND_ZONGULDROK:
```
Replacement in crawl-ref/source/item_use.cc at line 700 [8.2781507]
B:BD[8.2793684] → [8.2793684:2793727]
```
                case SPWPN_SWORD_OF_POWER:
```
[8.2793684]
[8.2793727]
```
                case UNRAND_POWER:
```
Replacement in crawl-ref/source/item_use.cc at line 704 [8.2781507]
B:BD[8.2793819] → [8.2793819:2793863]
```
                case SPWPN_STAFF_OF_OLGREB:
```
[8.2793819]
[18.286]
```
                case UNRAND_OLGREB:
```
Replacement in crawl-ref/source/item_use.cc at line 711 [8.2781507]
B:BD[8.2794125] → [8.2794125:2794168]
```
                case SPWPN_VAMPIRES_TOOTH:
```
[8.2794125]
[19.3053]
```
                case UNRAND_VAMPIRES_TOOTH:
```
Replacement in crawl-ref/source/item_use.cc at line 748 [8.2781507]
B:BD[8.2795105] → [8.2795105:2795146]
```
            case SPWPN_SCYTHE_OF_CURSES:
```
[8.2795105]
[20.8583]
```
            case UNRAND_CURSES:
```
Replacement in crawl-ref/source/item_use.cc at line 753 [8.2781507]
B:BD[8.2796075] → [8.2796075:2796117]
```
            case SPWPN_STAFF_OF_WUCAD_MU:
```
[8.2795901]
[21.82743]
```
            case UNRAND_WUCAD_MU:
```

Replacement in crawl-ref/source/item_use.cc at line 770 [8.2781507]

B:BD[22.11943] → [22.11943:12013]

                && !(was_known && special == SPWPN_SCYTHE_OF_CURSES))

[22.11943]

[22.12013]

                && !(was_known && special == UNRAND_CURSES))

Replacement in crawl-ref/source/it_use3.cc at line 856 [8.2870456]
B:BD[23.5135] → [23.5135:5177]
```
            case SPWPN_STAFF_OF_DISPATER:
```
[23.5135]
[23.5177]
```
            case UNRAND_DISPATER:
```
Replacement in crawl-ref/source/it_use3.cc at line 875 [8.2870456]
B:BD[23.5819] → [23.5819:5863]
```
            case SPWPN_SCEPTRE_OF_ASMODEUS:
```
[23.5819]
[23.5863]
```
            case UNRAND_ASMODEUS:
```
Replacement in crawl-ref/source/it_use3.cc at line 884 [8.2870456]
B:BD[23.6091] → [23.6091:6131]
```
            case SPWPN_STAFF_OF_OLGREB:
```
[23.6091]
[23.6131]
```
            case UNRAND_OLGREB:
```
Replacement in crawl-ref/source/it_use3.cc at line 904 [8.2870456]
B:BD[23.6732] → [23.6732:6774]
```
            case SPWPN_STAFF_OF_WUCAD_MU:
```
[23.6732]
[23.6774]
```
            case UNRAND_WUCAD_MU:
```
Replacement in crawl-ref/source/it_use2.cc at line 426 [8.2904329]
B:BD[8.2912429] → [8.2912429:2912467]
```
            case SPWPN_SINGING_SWORD:
```
[8.2912429]
[24.766359]
```
            case UNRAND_SINGING_SWORD:
```
Replacement in crawl-ref/source/it_use2.cc at line 430 [8.2904329]
B:BD[8.2912539] → [8.2912539:2912577]
```
            case SPWPN_WRATH_OF_TROG:
```
[8.2912539]
[24.766443]
```
            case UNRAND_TROG:
```
Replacement in crawl-ref/source/it_use2.cc at line 434 [8.2904329]
B:BD[8.2912688] → [8.2912688:2912728]
```
            case SPWPN_STAFF_OF_OLGREB:
```
[8.2912647]
[25.6180]
```
            case UNRAND_OLGREB:
```
Replacement in crawl-ref/source/it_use2.cc at line 438 [8.2904329]
B:BD[8.2912830] → [8.2912830:2912872]
```
            case SPWPN_STAFF_OF_WUCAD_MU:
```
[8.2912830]
[25.6213]
```
            case UNRAND_WUCAD_MU:
```
Deletion in crawl-ref/source/it_use2.cc at line 462 [8.2904329]
B:BD[8.2913507] → [8.2913507:2913548]
```
            case SPWPN_SWORD_OF_CEREBOV:
```

Replacement in crawl-ref/source/invent.cc at line 1761 [8.2920632]

B:BD[26.7019] → [26.7019:7187]

            case SPWPN_SCEPTRE_OF_ASMODEUS:
            case SPWPN_STAFF_OF_WUCAD_MU:
            case SPWPN_STAFF_OF_DISPATER:
            case SPWPN_STAFF_OF_OLGREB:

[26.7019]

[26.7187]

            case UNRAND_ASMODEUS:
            case UNRAND_WUCAD_MU:
            case UNRAND_DISPATER:
            case UNRAND_OLGREB:

Replacement in crawl-ref/source/fight.cc at line 1890 [8.3140790]

B:BD[27.648] → [27.648:775]

            case SPWPN_SCEPTRE_OF_ASMODEUS:
            case SPWPN_STAFF_OF_DISPATER:
            case SPWPN_SWORD_OF_CEREBOV:

[27.648]

[27.775]

            case UNRAND_ASMODEUS:
            case UNRAND_DISPATER:
            case UNRAND_CEREBOV:

Replacement in crawl-ref/source/fight.cc at line 2115 [8.3140790]

B:BD[28.58378] → [28.58378:58439]

    if (weapon && weapon->special == SPWPN_SWORD_OF_CEREBOV)

[28.58378]

[28.58439]

    if (weapon && weapon->special == UNRAND_CEREBOV)

Deletion in crawl-ref/source/fight.cc at line 3106 [8.3140790]
B:BD[14.58812] → [28.60619:60651]
```
    case SPWPN_STAFF_OF_OLGREB:
```
Replacement in crawl-ref/source/fight.cc at line 3194 [8.3140790]
∅:D[29.2711] → [30.10342:10398]
∅:D[11.35283] → [30.10342:10398]
B:BD[30.10342] → [30.10342:10398]
```
            && weapon->special == SPWPN_VAMPIRES_TOOTH)
```
[11.35283]
[30.10398]
```
            && weapon->special == UNRAND_VAMPIRES_TOOTH)
```

Replacement in crawl-ref/source/effects.cc at line 1650 [8.3382105]

∅:D[11.35690] → [31.4055:4194]

B:BD[32.3161] → [31.4055:4194]

                       && (doodad.special == SPWPN_WRATH_OF_TROG
                           || doodad.special == SPWPN_STAFF_OF_WUCAD_MU))

[11.35690]

[32.3226]

                       && (doodad.special == UNRAND_TROG
                           || doodad.special == UNRAND_WUCAD_MU))

Deletion in crawl-ref/source/artefact.h at line 22 [11.43896]

B:BD[11.44369] → [11.44369:45174]


#define SPWPN_SINGING_SWORD       UNRAND_SINGING_SWORD
#define SPWPN_WRATH_OF_TROG       UNRAND_TROG
#define SPWPN_SCYTHE_OF_CURSES    UNRAND_CURSES
#define SPWPN_MACE_OF_VARIABILITY UNRAND_VARIABILITY
#define SPWPN_GLAIVE_OF_PRUNE     UNRAND_PRUNE
#define SPWPN_SCEPTRE_OF_TORMENT  UNRAND_TORMENT
#define SPWPN_SWORD_OF_ZONGULDROK UNRAND_ZONGULDROK
#define SPWPN_SWORD_OF_POWER      UNRAND_POWER
#define SPWPN_STAFF_OF_OLGREB     UNRAND_OLGREB
#define SPWPN_VAMPIRES_TOOTH      UNRAND_VAMPIRES_TOOTH
#define SPWPN_STAFF_OF_WUCAD_MU   UNRAND_WUCAD_MU
#define SPWPN_SWORD_OF_CEREBOV    UNRAND_CEREBOV
#define SPWPN_STAFF_OF_DISPATER   UNRAND_DISPATER
#define SPWPN_SCEPTRE_OF_ASMODEUS UNRAND_ASMODEUS
#define SPWPN_START_NOGEN_FIXEDARTS UNRAND_CEREBOV
#define SPWPN_END_FIXEDARTS         UNRAND_ASMODEUS

Replacement in crawl-ref/source/artefact.cc at line 1584 [8.893152]

B:BD[11.59042] → [11.59042:59139]

            && index >= SPWPN_START_NOGEN_FIXEDARTS
            && index <= SPWPN_END_FIXEDARTS)

[11.59042]

[11.59139]

            && index >= UNRAND_CEREBOV && index <= UNRAND_ASMODEUS)

Remove "#define SPWPN_FOOBAR UNRAND_FOOBAR" backwards compatibility for

Dependencies

In channels

Change contents

Replacement in crawl-ref/source/tilepick.cc at line 1086 [4.96318]

Replacement in crawl-ref/source/tilepick.cc at line 3394 [4.96318]

Replacement in crawl-ref/source/tilepick.cc at line 3427 [4.96318]

Replacement in crawl-ref/source/shopping.cc at line 630 [8.759950]

Replacement in crawl-ref/source/shopping.cc at line 634 [8.759950]

Replacement in crawl-ref/source/shopping.cc at line 638 [8.759950]

Replacement in crawl-ref/source/shopping.cc at line 642 [8.759950]

Replacement in crawl-ref/source/shopping.cc at line 648 [8.759950]

Replacement in crawl-ref/source/shopping.cc at line 653 [8.759950]

Replacement in crawl-ref/source/shopping.cc at line 657 [8.759950]

Replacement in crawl-ref/source/religion.cc at line 3461 [8.804403]

Replacement in crawl-ref/source/player.cc at line 1246 [8.962854]

Replacement in crawl-ref/source/player.cc at line 1254 [8.962854]

Replacement in crawl-ref/source/player.cc at line 1859 [8.962854]

Replacement in crawl-ref/source/mon-util.cc at line 4624 [8.1699344]

Replacement in crawl-ref/source/mon-util.cc at line 4626 [8.1699344]

Replacement in crawl-ref/source/mon-util.cc at line 4628 [8.1699344]

Replacement in crawl-ref/source/makeitem.cc at line 3737 [13.927]

Replacement in crawl-ref/source/makeitem.cc at line 3741 [13.927]

Replacement in crawl-ref/source/makeitem.cc at line 3746 [13.927]

Replacement in crawl-ref/source/item_use.cc at line 454 [8.2781507]

Replacement in crawl-ref/source/item_use.cc at line 457 [8.2781507]

Replacement in crawl-ref/source/item_use.cc at line 460 [8.2781507]

Replacement in crawl-ref/source/item_use.cc at line 463 [8.2781507]

Replacement in crawl-ref/source/item_use.cc at line 466 [8.2781507]

Replacement in crawl-ref/source/item_use.cc at line 469 [8.2781507]

Replacement in crawl-ref/source/item_use.cc at line 472 [8.2781507]

Replacement in crawl-ref/source/item_use.cc at line 475 [8.2781507]

Replacement in crawl-ref/source/item_use.cc at line 478 [8.2781507]

Deletion in crawl-ref/source/item_use.cc at line 580 [8.2781507]

Replacement in crawl-ref/source/item_use.cc at line 669 [8.2781507]

Replacement in crawl-ref/source/item_use.cc at line 680 [8.2781507]

Replacement in crawl-ref/source/item_use.cc at line 684 [8.2781507]

Replacement in crawl-ref/source/item_use.cc at line 688 [8.2781507]

Replacement in crawl-ref/source/item_use.cc at line 692 [8.2781507]

Replacement in crawl-ref/source/item_use.cc at line 696 [8.2781507]

Replacement in crawl-ref/source/item_use.cc at line 700 [8.2781507]

Replacement in crawl-ref/source/item_use.cc at line 704 [8.2781507]

Replacement in crawl-ref/source/item_use.cc at line 711 [8.2781507]

Replacement in crawl-ref/source/item_use.cc at line 748 [8.2781507]

Replacement in crawl-ref/source/item_use.cc at line 753 [8.2781507]

Replacement in crawl-ref/source/item_use.cc at line 770 [8.2781507]

Replacement in crawl-ref/source/it_use3.cc at line 856 [8.2870456]

Replacement in crawl-ref/source/it_use3.cc at line 875 [8.2870456]

Replacement in crawl-ref/source/it_use3.cc at line 884 [8.2870456]

Replacement in crawl-ref/source/it_use3.cc at line 904 [8.2870456]

Replacement in crawl-ref/source/it_use2.cc at line 426 [8.2904329]

Replacement in crawl-ref/source/it_use2.cc at line 430 [8.2904329]

Replacement in crawl-ref/source/it_use2.cc at line 434 [8.2904329]

Replacement in crawl-ref/source/it_use2.cc at line 438 [8.2904329]

Deletion in crawl-ref/source/it_use2.cc at line 462 [8.2904329]