fiddlerwoaroof/crawl - Change IKKMJHAWBTZFUVGXCLQZ46PV5RRAMNJGUWKPJTVXVMMWW5QGWPLAC

Fixed bad message with RAP_MAGICAL_POWER.

Type safety; this required moving randart_prop_type to enum.h.

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

Created by haranp on October 23, 2007

IKKMJHAWBTZFUVGXCLQZ46PV5RRAMNJGUWKPJTVXVMMWW5QGWPLAC

Dependencies

In channels

main

Change contents

Deletion in crawl-ref/source/randart.h at line 15 [3.889057]
B:BD[3.889328] → [3.889328:889346]
```
#include "enum.h"
```

Deletion in crawl-ref/source/randart.h at line 16 [3.889057]

B:BD[3.889367] → [3.889367:889368]

B:BD[3.889368] → [4.48554:49299]

B:BD[4.49299] → [5.174:221]

∅:D[5.221] → [4.49299:49325]

B:BD[4.49299] → [4.49299:49325]


enum randart_prop_type
{
    RAP_BRAND,                         //    0
    RAP_AC,
    RAP_EVASION,
    RAP_STRENGTH,
    RAP_INTELLIGENCE,
    RAP_DEXTERITY,                     //    5
    RAP_FIRE,
    RAP_COLD,
    RAP_ELECTRICITY,
    RAP_POISON,
    RAP_NEGATIVE_ENERGY,               //   10
    RAP_MAGIC,
    RAP_EYESIGHT,
    RAP_INVISIBLE,
    RAP_LEVITATE,
    RAP_BLINK,                         //   15
    RAP_CAN_TELEPORT,
    RAP_BERSERK,
    RAP_MAPPING,
    RAP_NOISES,
    RAP_PREVENT_SPELLCASTING,          //   20
    RAP_CAUSE_TELEPORTATION,
    RAP_PREVENT_TELEPORTATION,
    RAP_ANGRY,
    RAP_METABOLISM,
    RAP_MUTAGENIC,                     //   25
    RAP_ACCURACY,
    RAP_DAMAGE,
    RAP_CURSED,
    RAP_STEALTH,
    RAP_MAGICAL_POWER,                 //   30
    RAP_NUM_PROPERTIES
};

Replacement in crawl-ref/source/randart.h at line 30 [3.889057]

B:BD[3.889818] → [6.1094:1223]

unique_item_status_type get_unique_item_status( int base_type, int type );
void set_unique_item_status( int base_type, int type,

[3.889818]

[6.1223]

unique_item_status_type get_unique_item_status( object_class_type base_type,
                                                int type );
void set_unique_item_status( object_class_type base_type, int type,

Replacement in crawl-ref/source/randart.h at line 79 [3.889057]

B:BD[7.481] → [7.481:539]

int randart_wpn_property( const item_def &item, int prop,

[7.481]

[7.539]

int randart_wpn_property( const item_def &item, randart_prop_type prop,

Replacement in crawl-ref/source/randart.h at line 82 [3.889057]

B:BD[3.891714] → [8.1314:1374]

int randart_wpn_property( const item_def &item, int prop );

[3.891714]

[3.891775]

int randart_wpn_property( const item_def &item, randart_prop_type prop );

Replacement in crawl-ref/source/randart.h at line 87 [3.889057]

∅:D[9.291] → [7.581:695]

B:BD[3.891776] → [7.581:695]

void randart_wpn_learn_prop( item_def &item, int prop );
bool randart_wpn_known_prop( item_def &item, int prop );

[9.291]

[3.891776]

void randart_wpn_learn_prop( item_def &item, randart_prop_type prop );
bool randart_wpn_known_prop( item_def &item, randart_prop_type prop );

Replacement in crawl-ref/source/randart.cc at line 837 [3.893152]

B:BD[3.907575] → [6.1288:1361]

unique_item_status_type get_unique_item_status( int base_type, int art )

[3.907575]

[3.907628]

unique_item_status_type get_unique_item_status( object_class_type base_type,
                                                int art )

Replacement in crawl-ref/source/randart.cc at line 859 [3.893152]

B:BD[3.908234] → [6.1362:1415]

void set_unique_item_status( int base_type, int art,

[3.908234]

[6.1415]

void set_unique_item_status( object_class_type base_type, int art,

Replacement in crawl-ref/source/randart.cc at line 1423 [3.893152]

B:BD[7.1708] → [7.1708:1781]

int randart_wpn_property( const item_def &item, int prop, bool &_known )

[7.1708]

[7.1781]

int randart_wpn_property( const item_def &item, randart_prop_type prop,
                          bool &_known )

Replacement in crawl-ref/source/randart.cc at line 1436 [3.893152]

B:BD[3.922881] → [8.1550:1609]

int randart_wpn_property( const item_def &item, int prop )

[3.922881]

[3.922941]

int randart_wpn_property( const item_def &item, randart_prop_type prop )

Replacement in crawl-ref/source/randart.cc at line 1462 [3.893152]

B:BD[7.2034] → [7.2034:2090]

void randart_wpn_learn_prop( item_def &item, int prop )

[7.2034]

[7.2090]

void randart_wpn_learn_prop( item_def &item, randart_prop_type prop )

Replacement in crawl-ref/source/randart.cc at line 1479 [3.893152]

B:BD[3.923036] → [7.2618:2680]

bool randart_wpn_known_prop( const item_def &item, int prop )

[3.923036]

[7.2680]

bool randart_wpn_known_prop( const item_def &item, randart_prop_type prop )

Replacement in crawl-ref/source/player.h at line 248 [3.945993]

B:BD[3.955888] → [10.170:222]

∅:D[10.222] → [11.197390:197453]

B:BD[3.955888] → [11.197390:197453]

bool items_give_ability(const int slot, char abil);
int scan_randarts(char which_property, bool calc_unid = true);

[3.955888]

[3.955928]

bool items_give_ability(const int slot, randart_prop_type abil);
int scan_randarts(randart_prop_type which_property, bool calc_unid = true);

Replacement in crawl-ref/source/player.cc at line 4120 [3.962854]

B:BD[10.371] → [10.371:422]

bool items_give_ability(const int slot, char abil)

[10.371]

[10.422]

bool items_give_ability(const int slot, randart_prop_type abil)

Replacement in crawl-ref/source/player.cc at line 4166 [3.962854]
B:BD[3.1049194] → [11.200587:200642]
```
int scan_randarts(char which_property, bool calc_unid)
```
[3.1049194]
[3.1049233]
```
int scan_randarts(randart_prop_type which_property, bool calc_unid)
```

Replacement in crawl-ref/source/mon-util.cc at line 297 [3.1699344]

B:BD[12.469578] → [12.469578:469647]

static int scan_mon_inv_randarts( const monsters *mon, int ra_prop )

[12.469578]

[3.1703060]

static int scan_mon_inv_randarts( const monsters *mon,
                                  randart_prop_type ra_prop)

Replacement in crawl-ref/source/itemprop.cc at line 2051 [12.646661]

B:BD[13.14571] → [13.14571:14641]

       if (randart_wpn_property( item, rap ))
           return true;

[13.14571]

[13.14641]

        if (randart_wpn_property( item, static_cast<randart_prop_type>(rap) ))
            return true;

Replacement in crawl-ref/source/itemprop.cc at line 2152 [12.646661]

B:BD[14.11207] → [14.11207:11390]

       if (rap == RAP_MAGIC || rap >= RAP_INVISIBLE && rap != RAP_CAN_TELEPORT)
           continue;
           
       if (randart_wpn_property( item, rap ))
           return true;

[14.11207]

[14.11390]

        if (rap == RAP_MAGIC || rap >= RAP_INVISIBLE && rap != RAP_CAN_TELEPORT)
            continue;
        
        if (randart_wpn_property( item, static_cast<randart_prop_type>(rap) ))
            return true;

Replacement in crawl-ref/source/item_use.cc at line 3989 [3.2781507]
∅:D[10.3601] → [3.2868689:2868726]
B:BD[3.2868689] → [3.2868689:2868726]
```
        you.redraw_armour_class = 1;
```
[10.3601]
[7.3840]
```
        you.redraw_armour_class = true;
```
Replacement in crawl-ref/source/item_use.cc at line 4000 [3.2781507]
∅:D[10.3764] → [3.2868756:2868788]
B:BD[3.2868756] → [3.2868756:2868788]
```
        you.redraw_evasion = 1;
```
[10.3764]
[7.3920]
```
        you.redraw_evasion = true;
```
Replacement in crawl-ref/source/item_use.cc at line 4011 [3.2781507]
B:BD[5.3264] → [5.3264:3301]
```
        you.redraw_magic_points = 1;
```
[5.3264]
[5.3301]
```
        you.redraw_magic_points = true;
```

Replacement in crawl-ref/source/item_use.cc at line 4014 [3.2781507]

B:BD[5.3350] → [2.646:723]

∅:D[2.723] → [5.3426:3469]

B:BD[5.3426] → [5.3426:3469]

            mprf("You feel your mana capacity %s.", proprt[RAP_EVASION] > 0?
                 "increase" : "decrease");

[5.3350]

[5.3469]

            mprf("You feel your mana capacity %s.",
                 proprt[RAP_MAGICAL_POWER] > 0? "increase" : "decrease");

Replacement in crawl-ref/source/item_use.cc at line 4026 [3.2781507]

B:BD[10.4213] → [7.4010:4083]

    int stat_props[3] = {RAP_STRENGTH, RAP_INTELLIGENCE, RAP_DEXTERITY};

[10.4213]

[7.4083]

    const randart_prop_type stat_props[3] =
        {RAP_STRENGTH, RAP_INTELLIGENCE, RAP_DEXTERITY};

Replacement in crawl-ref/source/it_use2.cc at line 612 [3.2904329]
∅:D[10.5014] → [3.2918565:2918602]
B:BD[3.2918565] → [3.2918565:2918602]
```
        you.redraw_armour_class = 1;
```
[10.5014]
[7.5247]
```
        you.redraw_armour_class = true;
```

Replacement in crawl-ref/source/it_use2.cc at line 616 [3.2904329]

B:BD[10.5083] → [10.5083:5149]

            proprt[RAP_AC] > 0? "well-protected" : "vulnerable");

[10.5083]

[10.5149]

                 proprt[RAP_AC] > 0? "well-protected" : "vulnerable");

Replacement in crawl-ref/source/it_use2.cc at line 622 [3.2904329]
∅:D[10.5172] → [3.2918632:2918664]
B:BD[3.2918632] → [3.2918632:2918664]
```
        you.redraw_evasion = 1;
```
[10.5172]
[7.5276]
```
        you.redraw_evasion = true;
```
Replacement in crawl-ref/source/it_use2.cc at line 632 [3.2904329]
B:BD[5.3661] → [5.3661:3698]
```
        you.redraw_magic_points = 1;
```
[5.3661]
[5.3698]
```
        you.redraw_magic_points = true;
```

Replacement in crawl-ref/source/it_use2.cc at line 635 [3.2904329]

B:BD[5.3747] → [2.728:805]

∅:D[2.805] → [5.3823:3866]

B:BD[5.3823] → [5.3823:3866]

            mprf("You feel your mana capacity %s.", proprt[RAP_EVASION] > 0?
                 "decrease" : "increase");

[5.3747]

[5.3866]

            mprf("You feel your mana capacity %s.",
                 proprt[RAP_MAGICAL_POWER] > 0 ? "decrease" : "increase");

Insertion in crawl-ref/source/enum.h at line 2103 [3.3287960]

[3.3352974]

};
enum randart_prop_type
{
    RAP_BRAND,                         //    0
    RAP_AC,
    RAP_EVASION,
    RAP_STRENGTH,
    RAP_INTELLIGENCE,
    RAP_DEXTERITY,                     //    5
    RAP_FIRE,
    RAP_COLD,
    RAP_ELECTRICITY,
    RAP_POISON,
    RAP_NEGATIVE_ENERGY,               //   10
    RAP_MAGIC,
    RAP_EYESIGHT,
    RAP_INVISIBLE,
    RAP_LEVITATE,
    RAP_BLINK,                         //   15
    RAP_CAN_TELEPORT,
    RAP_BERSERK,
    RAP_MAPPING,
    RAP_NOISES,
    RAP_PREVENT_SPELLCASTING,          //   20
    RAP_CAUSE_TELEPORTATION,
    RAP_PREVENT_TELEPORTATION,
    RAP_ANGRY,
    RAP_METABOLISM,
    RAP_MUTAGENIC,                     //   25
    RAP_ACCURACY,
    RAP_DAMAGE,
    RAP_CURSED,
    RAP_STEALTH,
    RAP_MAGICAL_POWER,                 //   30
    RAP_NUM_PROPERTIES