fiddlerwoaroof/crawl - Change H7BW6SEIQ57X6V4BM2RX54W42W6BH5XJBAS6FYCYKLQQG43ZMU4QC

Cleaned up some of the randart code.

Fixed a free-without-malloc security issue (of art_n.)

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

Created by haranp on April 13, 2007

H7BW6SEIQ57X6V4BM2RX54W42W6BH5XJBAS6FYCYKLQQG43ZMU4QC

Dependencies

In channels

main

Change contents

Deletion in crawl-ref/source/skills2.cc at line 2323 [3.647133]
B:BD[3.742306] → [3.742306:742339]
```
    char wepstr2[ITEMNAME_SIZE];
```

Replacement in crawl-ref/source/skills2.cc at line 2333 [3.647133]

B:BD[3.742518] → [3.742518:742577]

    int wepType  = you.inv[you.equip[EQ_WEAPON]].sub_type;

[3.742518]

[3.742577]

    const item_def& wep = you.inv[you.equip[EQ_WEAPON]];

Replacement in crawl-ref/source/skills2.cc at line 2336 [3.647133]
B:BD[3.742624] → [3.742624:742688]
```
    if (you.inv[you.equip[EQ_WEAPON]].base_type != OBJ_WEAPONS)
```
[3.742624]
[3.742688]
```
    if (wep.base_type != OBJ_WEAPONS)
```

Replacement in crawl-ref/source/skills2.cc at line 2340 [3.647133]

B:BD[3.742742] → [3.742742:742813]

    standard_name_weap(wepType, wepstr2);
    strcat(wepstr, wepstr2);

[3.742742]

[3.742813]

    strcat(wepstr, item_base_name(wep));

Replacement in crawl-ref/source/skills2.cc at line 2343 [3.647133]
B:BD[3.742870] → [4.164140:164199]
```
    if (!is_range_weapon( you.inv[you.equip[EQ_WEAPON]] ))
```
[3.742870]
[3.742905]
```
    if (!is_range_weapon( wep ))
```

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

B:BD[3.890895] → [3.890895:891108]


/* ***********************************************************************
 * called from: files
 * *********************************************************************** */
char does_unrandart_exist(int whun);

Insertion in crawl-ref/source/randart.h at line 54 [3.889057]
[3.891109]
[3.891109]
```
bool does_unrandart_exist(int whun);
```
Replacement in crawl-ref/source/randart.h at line 84 [3.889057]
B:BD[3.892325] → [3.892325:892376]
```
void set_unrandart_exist(int whun, char is_exist);
```
[3.892325]
[3.892376]
```
void set_unrandart_exist(int whun, bool is_exist);
```
Deletion in crawl-ref/source/randart.h at line 92 [3.889057]
B:BD[3.892635] → [3.892635:892636]

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

B:BD[3.892711] → [3.892711:892966]

 * called from: itemname
 * *********************************************************************** */
void standard_name_weap(unsigned char item_typ, char glog[ITEMNAME_SIZE]);
/* ***********************************************************************

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

B:BD[3.906351] → [3.906351:906424]

char *art_n;
static FixedVector < char, NO_UNRANDARTS > unrandart_exist;

[3.906351]

[3.906424]

char art_n[ITEMNAME_SIZE];
static FixedVector < bool, NO_UNRANDARTS > unrandart_exist;

Deletion in crawl-ref/source/randart.cc at line 659 [3.893152]
B:BD[3.906425] → [5.196407:196445]
```
// static int random5( int randmax );
```
Deletion in crawl-ref/source/randart.cc at line 660 [3.893152]
B:BD[3.906530] → [3.906530:906531]
B:BD[3.906531] → [5.196446:196487]
∅:D[5.196487] → [3.906565:906567]
B:BD[3.906565] → [3.906565:906567]
B:BD[3.906567] → [5.196488:196517]
∅:D[5.196517] → [3.906806:906808]
B:BD[3.906806] → [3.906806:906808]
```
static inline int random5( int randmax )
{
    return random2(randmax);
}
```
Replacement in crawl-ref/source/randart.cc at line 661 [3.893152]
B:BD[3.906809] → [3.906809:906859]
```
void set_unrandart_exist(int whun, char is_exist)
```
[3.906809]
[3.906859]
```
void set_unrandart_exist(int whun, bool is_exist)
```
Replacement in crawl-ref/source/randart.cc at line 666 [3.893152]
B:BD[3.906902] → [3.906902:906938]
```
char does_unrandart_exist(int whun)
```
[3.906902]
[3.906938]
```
bool does_unrandart_exist(int whun)
```
Replacement in crawl-ref/source/randart.cc at line 775 [3.893152]
B:BD[3.909749] → [3.909749:909800]
```
        power_level = 1 + random5(3) + random5(2);
```
[3.909749]
[3.909800]
```
        power_level = 1 + random2(3) + random2(2);
```

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

B:BD[3.910072] → [3.910072:910148]

        proprt[RAP_BRAND] = SPWPN_FLAMING + random5(15);        /* brand */

[3.910072]

[3.910148]

        proprt[RAP_BRAND] = SPWPN_FLAMING + random2(15);        /* brand */

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

B:BD[3.910149] → [3.910149:910238]

        if (random5(6) == 0)
            proprt[RAP_BRAND] = SPWPN_FLAMING + random5(2);

[3.910149]

[3.910238]

        if (one_chance_in(6))
            proprt[RAP_BRAND] = SPWPN_FLAMING + random2(2);

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

B:BD[3.910239] → [3.910239:910332]

        if (random5(6) == 0)
            proprt[RAP_BRAND] = SPWPN_ORC_SLAYING + random5(4);

[3.910239]

[3.910332]

        if (one_chance_in(6))
            proprt[RAP_BRAND] = SPWPN_ORC_SLAYING + random2(4);

Replacement in crawl-ref/source/randart.cc at line 795 [3.893152]
B:BD[3.910333] → [3.910333:910362]
```
        if (random5(6) == 0)
```
[3.910333]
[3.910362]
```
        if (one_chance_in(6))
```
Replacement in crawl-ref/source/randart.cc at line 822 [3.893152]
B:BD[3.911188] → [3.911188:911221]
```
            if (random5(3) == 0)
```
[3.911188]
[3.911221]
```
            if (one_chance_in(3))
```
Replacement in crawl-ref/source/randart.cc at line 824 [3.893152]
B:BD[3.911235] → [3.911235:911274]
```
                int tmp = random5(20);
```
[3.911235]
[3.911274]
```
                int tmp = random2(20);
```
Replacement in crawl-ref/source/randart.cc at line 842 [3.893152]
B:BD[3.911631] → [3.911631:911663]
```
            switch (random5(9))
```
[3.911631]
[3.911663]
```
            switch (random2(9))
```
Replacement in crawl-ref/source/randart.cc at line 870 [3.893152]
B:BD[3.912451] → [3.912451:912485]
```
        else if (random5(3) == 0)
```
[3.912451]
[3.912485]
```
        else if (one_chance_in(3))
```
Replacement in crawl-ref/source/randart.cc at line 876 [3.893152]
B:BD[3.912578] → [3.912578:912603]
```
    if (random5(5) == 0)
```
[3.912578]
[3.912603]
```
    if (one_chance_in(5))
```
Replacement in crawl-ref/source/randart.cc at line 880 [3.893152]
B:BD[3.912686] → [3.912686:912725]
```
    if (random5(4 + power_level) == 0 
```
[3.912686]
[3.912725]
```
    if (one_chance_in(4 + power_level)
```

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

B:BD[3.912829] → [3.912829:912896]

        proprt[RAP_AC] = 1 + random5(3) + random5(3) + random5(3);

[3.912829]

[3.912896]

        proprt[RAP_AC] = 1 + random2(3) + random2(3) + random2(3);

Replacement in crawl-ref/source/randart.cc at line 886 [3.893152]
B:BD[3.912919] → [3.912919:912948]
```
        if (random5(4) == 0)
```
[3.912919]
[3.912948]
```
        if (one_chance_in(4))
```

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

B:BD[3.912958] → [3.912958:913030]

            proprt[RAP_AC] -= 1 + random5(3) + random5(3) + random5(3);

[3.912958]

[3.913030]

            proprt[RAP_AC] -= 1 + random2(3) + random2(3) + random2(3);

Replacement in crawl-ref/source/randart.cc at line 894 [3.893152]
B:BD[3.913118] → [3.913118:913158]
```
    if (random5(4 + power_level) == 0  
```
[3.913118]
[3.913158]
```
    if (one_chance_in(4 + power_level)
```

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

B:BD[3.913227] → [3.913227:913299]

        proprt[RAP_EVASION] = 1 + random5(3) + random5(3) + random5(3);

[3.913227]

[3.913299]

        proprt[RAP_EVASION] = 1 + random2(3) + random2(3) + random2(3);

Replacement in crawl-ref/source/randart.cc at line 899 [3.893152]
B:BD[3.913322] → [3.913322:913351]
```
        if (random5(4) == 0)
```
[3.913322]
[3.913351]
```
        if (one_chance_in(4))
```

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

B:BD[3.913361] → [3.913361:913438]

            proprt[RAP_EVASION] -= 1 + random5(3) + random5(3) + random5(3);

[3.913361]

[3.913438]

            proprt[RAP_EVASION] -= 1 + random2(3) + random2(3) + random2(3);

Replacement in crawl-ref/source/randart.cc at line 907 [3.893152]
B:BD[3.913528] → [3.913528:913566]
```
    if (random5(4 + power_level) == 0
```
[3.913528]
[3.913566]
```
    if (one_chance_in(4 + power_level)
```

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

B:BD[3.913636] → [3.913636:913696]

        proprt[RAP_STRENGTH] = 1 + random5(3) + random5(2);

[3.913636]

[3.913696]

        proprt[RAP_STRENGTH] = 1 + random2(3) + random2(2);

Replacement in crawl-ref/source/randart.cc at line 912 [3.893152]
B:BD[3.913719] → [3.913719:913748]
```
        if (random5(4) == 0)
```
[3.913719]
[3.913748]
```
        if (one_chance_in(4))
```

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

B:BD[3.913758] → [3.913758:913836]

            proprt[RAP_STRENGTH] -= 1 + random5(3) + random5(3) + random5(3);

[3.913758]

[3.913836]

            proprt[RAP_STRENGTH] -= 1 + random2(3) + random2(3) + random2(3);

Replacement in crawl-ref/source/randart.cc at line 920 [3.893152]
B:BD[3.913930] → [3.913930:913968]
```
    if (random5(4 + power_level) == 0
```
[3.913930]
[3.913968]
```
    if (one_chance_in(4 + power_level)
```

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

B:BD[3.914042] → [3.914042:914106]

        proprt[RAP_INTELLIGENCE] = 1 + random5(3) + random5(2);

[3.914042]

[3.914106]

        proprt[RAP_INTELLIGENCE] = 1 + random2(3) + random2(2);

Replacement in crawl-ref/source/randart.cc at line 925 [3.893152]
B:BD[3.914129] → [3.914129:914158]
```
        if (random5(4) == 0)
```
[3.914129]
[3.914158]
```
        if (one_chance_in(4))
```

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

B:BD[3.914168] → [3.914168:914250]

            proprt[RAP_INTELLIGENCE] -= 1 + random5(3) + random5(3) + random5(3);

[3.914168]

[3.914250]

            proprt[RAP_INTELLIGENCE] -= 1 + random2(3) + random2(3) + random2(3);

Replacement in crawl-ref/source/randart.cc at line 933 [3.893152]
B:BD[3.914341] → [3.914341:914379]
```
    if (random5(4 + power_level) == 0
```
[3.914341]
[3.914379]
```
    if (one_chance_in(4 + power_level)
```

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

B:BD[3.914450] → [3.914450:914511]

        proprt[RAP_DEXTERITY] = 1 + random5(3) + random5(2);

[3.914450]

[3.914511]

        proprt[RAP_DEXTERITY] = 1 + random2(3) + random2(2);

Replacement in crawl-ref/source/randart.cc at line 938 [3.893152]
B:BD[3.914534] → [3.914534:914563]
```
        if (random5(4) == 0)
```
[3.914534]
[3.914563]
```
        if (one_chance_in(4))
```

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

B:BD[3.914573] → [3.914573:914652]

            proprt[RAP_DEXTERITY] -= 1 + random5(3) + random5(3) + random5(3);

[3.914573]

[3.914652]

            proprt[RAP_DEXTERITY] -= 1 + random2(3) + random2(3) + random2(3);

Replacement in crawl-ref/source/randart.cc at line 946 [3.893152]
B:BD[3.914709] → [3.914709:914744]
```
    if (random5(15) < power_level 
```
[3.914709]
[3.914744]
```
    if (random2(15) < power_level 
```
Replacement in crawl-ref/source/randart.cc at line 954 [3.893152]
B:BD[3.914934] → [3.914934:914987]
```
    if (random5(4 + power_level) == 0)  /* to-hit */
```
[3.914934]
[3.914987]
```
    if (one_chance_in(4 + power_level))  /* to-hit */
```

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

B:BD[3.914993] → [3.914993:915053]

        proprt[RAP_ACCURACY] = 1 + random5(3) + random5(2);

[3.914993]

[3.915053]

        proprt[RAP_ACCURACY] = 1 + random2(3) + random2(2);

Replacement in crawl-ref/source/randart.cc at line 958 [3.893152]
B:BD[3.915076] → [3.915076:915105]
```
        if (random5(4) == 0)
```
[3.915076]
[3.915105]
```
        if (one_chance_in(4))
```

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

B:BD[3.915115] → [3.915115:915193]

            proprt[RAP_ACCURACY] -= 1 + random5(3) + random5(3) + random5(3);

[3.915115]

[3.915193]

            proprt[RAP_ACCURACY] -= 1 + random2(3) + random2(3) + random2(3);

Replacement in crawl-ref/source/randart.cc at line 965 [3.893152]
B:BD[3.915237] → [3.915237:915290]
```
    if (random5(4 + power_level) == 0)  /* to-dam */
```
[3.915237]
[3.915290]
```
    if (one_chance_in(4 + power_level))  /* to-dam */
```

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

B:BD[3.915296] → [3.915296:915354]

        proprt[RAP_DAMAGE] = 1 + random5(3) + random5(2);

[3.915296]

[3.915354]

        proprt[RAP_DAMAGE] = 1 + random2(3) + random2(2);

Replacement in crawl-ref/source/randart.cc at line 969 [3.893152]
B:BD[3.915377] → [3.915377:915406]
```
        if (random5(4) == 0)
```
[3.915377]
[3.915406]
```
        if (one_chance_in(4))
```

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

B:BD[3.915416] → [3.915416:915492]

            proprt[RAP_DAMAGE] -= 1 + random5(3) + random5(3) + random5(3);

[3.915416]

[3.915492]

            proprt[RAP_DAMAGE] -= 1 + random2(3) + random2(3) + random2(3);

Replacement in crawl-ref/source/randart.cc at line 977 [3.893152]
B:BD[3.915551] → [3.915551:915586]
```
    if (random5(12) < power_level)
```
[3.915551]
[3.915586]
```
    if (random2(12) < power_level)
```

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

B:BD[3.915616] → [3.915616:915670]


/* res_fire */
    if (random5(4 + power_level) == 0

[3.915616]

[3.915670]

    
    /* res_fire */
    if (one_chance_in(4 + power_level)

Replacement in crawl-ref/source/randart.cc at line 992 [3.893152]
B:BD[3.916050] → [3.916050:916079]
```
        if (random5(5) == 0)
```
[3.916050]
[3.916079]
```
        if (one_chance_in(5))
```
Replacement in crawl-ref/source/randart.cc at line 998 [3.893152]
B:BD[3.916160] → [3.916160:916198]
```
    if (random5(4 + power_level) == 0
```
[3.916160]
[3.916198]
```
    if (one_chance_in(4 + power_level)
```
Replacement in crawl-ref/source/randart.cc at line 1009 [3.893152]
B:BD[3.916578] → [3.916578:916607]
```
        if (random5(5) == 0)
```
[3.916578]
[3.916607]
```
        if (one_chance_in(5))
```
Replacement in crawl-ref/source/randart.cc at line 1014 [3.893152]
B:BD[3.916669] → [3.916669:916723]
```
    if (random5(12) < power_level || power_level > 7)
```
[3.916669]
[3.916723]
```
    if (random2(12) < power_level || power_level > 7)
```
Replacement in crawl-ref/source/randart.cc at line 1018 [3.893152]
B:BD[3.916773] → [3.916773:916811]
```
    if (random5(4 + power_level) == 0
```
[3.916773]
[3.916811]
```
    if (one_chance_in(4 + power_level)
```
Replacement in crawl-ref/source/randart.cc at line 1026 [3.893152]
B:BD[3.916972] → [3.916972:917010]
```
    if (random5(5 + power_level) == 0
```
[3.916972]
[3.917010]
```
    if (one_chance_in(5 + power_level)
```
Replacement in crawl-ref/source/randart.cc at line 1037 [3.893152]
B:BD[3.917343] → [3.917343:917381]
```
    if (random5(4 + power_level) == 0
```
[3.917343]
[3.917381]
```
    if (one_chance_in(4 + power_level)
```
Replacement in crawl-ref/source/randart.cc at line 1048 [3.893152]
B:BD[3.917687] → [3.917687:917725]
```
    if (random5(4 + power_level) == 0
```
[3.917687]
[3.917725]
```
    if (one_chance_in(4 + power_level)
```
Replacement in crawl-ref/source/randart.cc at line 1051 [3.893152]
B:BD[3.917808] → [3.917808:917854]
```
        proprt[RAP_MAGIC] = 20 + random5(40);
```
[3.917808]
[3.917854]
```
        proprt[RAP_MAGIC] = 20 + random2(40);
```
Replacement in crawl-ref/source/randart.cc at line 1056 [3.893152]
B:BD[3.917904] → [3.917904:917942]
```
    if (random5(4 + power_level) == 0
```
[3.917904]
[3.917942]
```
    if (one_chance_in(4 + power_level)
```
Replacement in crawl-ref/source/randart.cc at line 1063 [3.893152]
B:BD[3.918080] → [3.918080:918135]
```
    if (random5(12) < power_level || power_level > 10)
```
[3.918080]
[3.918135]
```
    if (random2(12) < power_level || power_level > 10)
```
Replacement in crawl-ref/source/randart.cc at line 1067 [3.893152]
B:BD[3.918187] → [3.918187:918212]
```
    if (random5(10) == 0
```
[3.918187]
[3.918212]
```
    if (one_chance_in(10)
```
Replacement in crawl-ref/source/randart.cc at line 1075 [3.893152]
B:BD[3.918370] → [3.918370:918395]
```
    if (random5(10) == 0
```
[3.918370]
[3.918395]
```
    if (one_chance_in(10)
```
Replacement in crawl-ref/source/randart.cc at line 1082 [3.893152]
B:BD[3.918531] → [3.918531:918575]
```
    if (random5(10) == 0)       /* blink */
```
[3.918531]
[3.918575]
```
    if (one_chance_in(10))       /* blink */
```
Replacement in crawl-ref/source/randart.cc at line 1089 [3.893152]
B:BD[3.918661] → [3.918661:918686]
```
    if (random5(10) == 0
```
[3.918661]
[3.918686]
```
    if (one_chance_in(10)
```

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

B:BD[3.918850] → [3.918850:918926]

    if (random5(10) == 0 && (aclass != OBJ_JEWELLERY || atype != AMU_RAGE))

[3.918850]

[3.918926]

    if (one_chance_in(10) && (aclass != OBJ_JEWELLERY || atype != AMU_RAGE))

Replacement in crawl-ref/source/randart.cc at line 1103 [3.893152]
B:BD[3.918995] → [3.918995:919044]
```
    if (random5(10) == 0)       /* sense surr */
```
[3.918995]
[3.919044]
```
    if (one_chance_in(10))       /* sense surr */
```
Replacement in crawl-ref/source/randart.cc at line 1116 [3.893152]
B:BD[3.919280] → [3.919280:919335]
```
    if (random5(17) >= power_level || power_level < 2)
```
[3.919280]
[3.919335]
```
    if (random2(17) >= power_level || power_level < 2)
```
Replacement in crawl-ref/source/randart.cc at line 1119 [3.893152]
B:BD[3.919366] → [3.919366:919390]
```
    switch (random5(9))
```
[3.919366]
[3.919390]
```
    switch (random2(9))
```
Replacement in crawl-ref/source/randart.cc at line 1124 [3.893152]
B:BD[3.919500] → [3.919500:919545]
```
        proprt[RAP_NOISES] = 1 + random5(4);
```
[3.919500]
[3.919545]
```
        proprt[RAP_NOISES] = 1 + random2(4);
```

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

B:BD[3.919776] → [3.919776:919835]

        proprt[RAP_CAUSE_TELEPORTATION] = 5 + random5(15);

[3.919776]

[3.919835]

        proprt[RAP_CAUSE_TELEPORTATION] = 5 + random2(15);

Replacement in crawl-ref/source/randart.cc at line 1146 [3.893152]
B:BD[3.920443] → [3.920443:920487]
```
        proprt[RAP_ANGRY] = 1 + random5(8);
```
[3.920443]
[3.920487]
```
        proprt[RAP_ANGRY] = 1 + random2(8);
```
Replacement in crawl-ref/source/randart.cc at line 1175 [3.893152]
B:BD[3.921825] → [3.921825:921874]
```
        proprt[RAP_METABOLISM] = 1 + random5(3);
```
[3.921825]
[3.921874]
```
        proprt[RAP_METABOLISM] = 1 + random2(3);
```
Replacement in crawl-ref/source/randart.cc at line 1179 [3.893152]
B:BD[3.922045] → [3.922045:922093]
```
        proprt[RAP_MUTAGENIC] = 2 + random5(4);
```
[3.922045]
[3.922093]
```
        proprt[RAP_MUTAGENIC] = 2 + random2(4);
```
Replacement in crawl-ref/source/randart.cc at line 1189 [3.893152]
B:BD[3.922192] → [3.922192:922218]
```
    if (random5(10) == 0 
```
[3.922192]
[3.922218]
```
    if (one_chance_in(10) 
```
Replacement in crawl-ref/source/randart.cc at line 1199 [3.893152]
B:BD[3.922550] → [3.922550:922598]
```
        proprt[RAP_STEALTH] = 10 + random5(70);
```
[3.922550]
[3.922598]
```
        proprt[RAP_STEALTH] = 10 + random2(70);
```
Replacement in crawl-ref/source/randart.cc at line 1201 [3.893152]
B:BD[3.922599] → [3.922599:922628]
```
        if (random5(4) == 0)
```
[3.922599]
[3.922628]
```
        if (one_chance_in(4))
```

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

B:BD[3.922638] → [3.922638:922712]

            proprt[RAP_STEALTH] = -proprt[RAP_STEALTH] - random5(20);

[3.922638]

[3.922712]

            proprt[RAP_STEALTH] = -proprt[RAP_STEALTH] - random2(20);

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

B:BD[3.922756] → [3.922756:922822]

    if ((power_level < 2 && random5(5) == 0) || random5(30) == 0)

[3.922756]

[3.922822]

    if ((power_level < 2 && one_chance_in(5)) || one_chance_in(30))

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

B:BD[3.923207] → [3.923207:923272]

B:BD[3.923272] → [2.596:649]

∅:D[2.649] → [3.923338:923411]

B:BD[3.923338] → [3.923338:923411]

        struct unrandart_entry *unrand = seekunrandart( item );
        return (item_type_known(item) ? unrand->name
                                                   : unrand->unid_name);

[3.923207]

[3.923411]

        const struct unrandart_entry *unrand = seekunrandart( item );
        return (item_type_known(item) ? unrand->name : unrand->unid_name);

Deletion in crawl-ref/source/randart.cc at line 1233 [3.893152]
B:BD[3.923417] → [3.923417:923483]
```
    free(art_n);
    art_n = (char *) malloc(sizeof(char) * 80);
```
Replacement in crawl-ref/source/randart.cc at line 1234 [3.893152]
B:BD[3.923484] → [3.923484:923547]
```
    if (art_n == NULL)
        return ("Malloc Failed Error");
```
[3.923484]
[3.923547]
```
    art_n[0] = 0;
```
Deletion in crawl-ref/source/randart.cc at line 1236 [3.893152]
B:BD[3.923548] → [3.923548:923572]
```
    strcpy(art_n, "");
```
Replacement in crawl-ref/source/randart.cc at line 1237 [3.893152]
B:BD[3.923639] → [3.923639:923674]
```
    long seed = calc_seed( item );
```
[3.923639]
[5.196585]
```
    const long seed = calc_seed( item );
```
Replacement in crawl-ref/source/randart.cc at line 1243 [3.893152]
B:BD[3.923779] → [3.923779:923808]
```
        switch (random5(21))
```
[3.923779]
[3.923808]
```
        switch (random2(21))
```

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

B:BD[3.924927] → [3.924927:925045]

        char st_p3[ITEMNAME_SIZE];
        standard_name_weap( item.sub_type, st_p3 );
        strcat(art_n, st_p3);

[3.924927]

[5.196630]

        strcat(art_n, item_base_name(item));

Replacement in crawl-ref/source/randart.cc at line 1273 [3.893152]
B:BD[3.925102] → [3.925102:925158]
```
    char st_p[ITEMNAME_SIZE];
    if (random5(2) == 0)
```
[3.925102]
[3.925158]
```
    if (coinflip())
```

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

B:BD[3.925164] → [3.925164:925297]

        standard_name_weap( item.sub_type, st_p );
        strcat(art_n, st_p);
        strcat(art_n, rand_wpn_names[random5(390)]);

[3.925164]

[3.925297]

        strcat(art_n, item_base_name(item));
        strcat(art_n, rand_wpn_names[random2(390)]);

Replacement in crawl-ref/source/randart.cc at line 1280 [3.893152]
B:BD[3.925318] → [3.925318:925353]
```
        char st_p2[ITEMNAME_SIZE];
```
[3.925318]
[3.925353]
```
        char st_p[ITEMNAME_SIZE];
```
Replacement in crawl-ref/source/randart.cc at line 1283 [3.893152]
∅:D[4.197250] → [3.925424:925506]
B:BD[3.925424] → [3.925424:925506]
```
        standard_name_weap( item.sub_type, st_p2 );
        strcat(art_n, st_p2);
```
[4.197250]
[3.925506]
```
        strcat(art_n, item_base_name(item));
```
Replacement in crawl-ref/source/randart.cc at line 1285 [3.893152]
B:BD[3.925507] → [3.925507:925536]
```
        if (random5(3) == 0)
```
[3.925507]
[3.925536]
```
        if (one_chance_in(3))
```

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

B:BD[3.925957] → [3.925957:926022]

B:BD[3.926022] → [2.683:736]

∅:D[2.736] → [3.926088:926303]

B:BD[3.926088] → [3.926088:926303]

        struct unrandart_entry *unrand = seekunrandart( item );
        return (item_type_known(item) ? unrand->name
                                                   : unrand->unid_name);
    }
    free(art_n);
    art_n = (char *) malloc(sizeof(char) * 80);
    if (art_n == NULL)
    {
        return ("Malloc Failed Error");

[3.925957]

[3.926303]

        const struct unrandart_entry *unrand = seekunrandart( item );
        return (item_type_known(item) ? unrand->name : unrand->unid_name);

Replacement in crawl-ref/source/randart.cc at line 1313 [3.893152]
B:BD[3.926310] → [3.926310:926333]
```
    strcpy(art_n, "");
```
[3.926310]
[3.926333]
```
    art_n[0] = 0;
```
Replacement in crawl-ref/source/randart.cc at line 1316 [3.893152]
B:BD[3.926401] → [3.926401:926436]
```
    long seed = calc_seed( item );
```
[3.926401]
[5.196678]
```
    const long seed = calc_seed( item );
```
Replacement in crawl-ref/source/randart.cc at line 1323 [3.893152]
B:BD[3.926541] → [3.926541:926570]
```
        switch (random5(21))
```
[3.926541]
[3.926570]
```
        switch (random2(21))
```
Replacement in crawl-ref/source/randart.cc at line 1357 [3.893152]
B:BD[3.927890] → [3.927890:927915]
```
    if (random5(2) == 0)
```
[3.927890]
[3.927915]
```
    if (coinflip())
```

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

B:BD[3.927992] → [3.927992:928047]

        strcat(art_n, rand_armour_names[random5(71)]);

[3.927992]

[3.928047]

        strcat(art_n, rand_armour_names[random2(71)]);

Replacement in crawl-ref/source/randart.cc at line 1370 [3.893152]
B:BD[3.928247] → [3.928247:928276]
```
        if (random5(3) == 0)
```
[3.928247]
[3.928276]
```
        if (one_chance_in(3))
```

Deletion in crawl-ref/source/randart.cc at line 1403 [3.893152]

B:BD[3.929007] → [3.929007:929137]


    free(art_n);
    art_n = (char *) malloc(sizeof(char) * 80);
    if (art_n == NULL)
        return ("Malloc Failed Error");

Replacement in crawl-ref/source/randart.cc at line 1404 [3.893152]
B:BD[3.929138] → [3.929138:929161]
```
    strcpy(art_n, "");
```
[3.929138]
[3.929161]
```
    art_n[0] = 0;
```
Replacement in crawl-ref/source/randart.cc at line 1407 [3.893152]
B:BD[3.929229] → [3.929229:929264]
```
    long seed = calc_seed( item );
```
[3.929229]
[5.196776]
```
    const long seed = calc_seed( item );
```
Replacement in crawl-ref/source/randart.cc at line 1413 [3.893152]
B:BD[3.929369] → [3.929369:929402]
```
        temp_rand = random5(21);
```
[3.929369]
[3.929402]
```
        temp_rand = random2(21);
```
Replacement in crawl-ref/source/randart.cc at line 1445 [3.893152]
B:BD[3.930727] → [3.930727:930752]
```
    if (random5(5) == 0)
```
[3.930727]
[3.930752]
```
    if (one_chance_in(5))
```

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

B:BD[3.930829] → [3.930829:930884]

        strcat(art_n, rand_armour_names[random5(71)]);

[3.930829]

[3.930884]

        strcat(art_n, rand_armour_names[random2(71)]);

Replacement in crawl-ref/source/randart.cc at line 1456 [3.893152]
B:BD[3.931048] → [3.931048:931077]
```
        if (random5(3) == 0)
```
[3.931048]
[3.931077]
```
        if (one_chance_in(3))
```
Replacement in crawl-ref/source/randart.cc at line 1520 [3.893152]
B:BD[3.932552] → [3.932552:932596]
```
            && does_unrandart_exist(x) == 0
```
[3.932552]
[3.932596]
```
            && !does_unrandart_exist(x)
```
Replacement in crawl-ref/source/randart.cc at line 1525 [3.893152]
B:BD[3.932699] → [3.932699:932736]
```
            if (random5(count) == 0)
```
[3.932699]
[3.932736]
```
            if (one_chance_in(count))
```

Deletion in crawl-ref/source/randart.cc at line 1733 [3.893152]

B:BD[3.938453] → [3.938453:939533]

B:BD[3.939533] → [4.197441:197500]

∅:D[4.197500] → [3.939533:940098]

B:BD[3.939533] → [3.939533:940098]

B:BD[3.940098] → [4.197501:197562]

∅:D[4.197562] → [3.940098:940601]

B:BD[3.940098] → [3.940098:940601]

B:BD[3.940601] → [4.197563:197702]

∅:D[4.197702] → [3.940601:940993]

B:BD[3.940601] → [3.940601:940993]

B:BD[3.940993] → [4.197703:197768]

∅:D[4.197768] → [3.941060:941621]

B:BD[3.941060] → [3.941060:941621]

void standard_name_weap(unsigned char item_typ, char glorg[ITEMNAME_SIZE])
{
    strcpy(glorg,  (item_typ == WPN_CLUB) ? "club" :
                   (item_typ == WPN_MACE) ? "mace" :
                   (item_typ == WPN_FLAIL) ? "flail" :
                   (item_typ == WPN_KNIFE) ? "knife" :
                   (item_typ == WPN_DAGGER) ? "dagger" :
                   (item_typ == WPN_MORNINGSTAR) ? "morningstar" :
                   (item_typ == WPN_SHORT_SWORD) ? "short sword" :
                   (item_typ == WPN_LONG_SWORD) ? "long sword" :
                   (item_typ == WPN_GREAT_SWORD) ? "great sword" :
                   (item_typ == WPN_SCIMITAR) ? "scimitar" :
                   (item_typ == WPN_HAND_AXE) ? "hand axe" :
                   (item_typ == WPN_BATTLEAXE) ? "battleaxe" :
                   (item_typ == WPN_SPEAR) ? "spear" :
                   (item_typ == WPN_TRIDENT) ? "trident" :
                   (item_typ == WPN_HALBERD) ? "halberd" :
                   (item_typ == WPN_SLING) ? "sling" :
                   (item_typ == WPN_BOW) ? "bow" :
                   (item_typ == WPN_LONGBOW) ? "longbow" :
                   (item_typ == WPN_BLOWGUN) ? "blowgun" :
                   (item_typ == WPN_CROSSBOW) ? "crossbow" :
                   (item_typ == WPN_HAND_CROSSBOW) ? "hand crossbow" :
                   (item_typ == WPN_GLAIVE) ? "glaive" :
                   (item_typ == WPN_QUARTERSTAFF) ? "quarterstaff" :
                   (item_typ == WPN_SCYTHE) ? "scythe" :
                   (item_typ == WPN_EVENINGSTAR) ? "eveningstar" :
                   (item_typ == WPN_QUICK_BLADE) ? "quick blade" :
                   (item_typ == WPN_KATANA) ? "katana" :
                   (item_typ == WPN_LAJATANG) ? "lajatang" :
                   (item_typ == WPN_EXECUTIONERS_AXE) ? "executioner's axe" :
                   (item_typ == WPN_DOUBLE_SWORD) ? "double sword" :
                   (item_typ == WPN_TRIPLE_SWORD) ? "triple sword" :
                   (item_typ == WPN_HAMMER) ? "hammer" :
                   (item_typ == WPN_ANCUS) ? "ancus" :
                   (item_typ == WPN_WHIP) ? "whip" :
                   (item_typ == WPN_SABRE) ? "sabre" :
                   (item_typ == WPN_DEMON_BLADE) ? "demon blade" :
                   (item_typ == WPN_BLESSED_BLADE)? "blessed blade" :
                   (item_typ == WPN_LOCHABER_AXE) ? "lochaber axe" :
                   (item_typ == WPN_DEMON_WHIP) ? "demon whip" :
                   (item_typ == WPN_DEMON_TRIDENT) ? "demon trident" :
                   (item_typ == WPN_BROAD_AXE) ? "broad axe" :
                   (item_typ == WPN_WAR_AXE) ? "war axe" :
                   (item_typ == WPN_SPIKED_FLAIL) ? "spiked flail" :
                   (item_typ == WPN_GREAT_MACE) ? "great mace" :
                   (item_typ == WPN_DIRE_FLAIL) ? "dire flail" :
                   (item_typ == WPN_FALCHION) ? "falchion" :
           (item_typ == WPN_GIANT_CLUB) 
                           ? (SysEnv.board_with_nail ? "two-by-four" 
                                                     : "giant club") :
           (item_typ == WPN_GIANT_SPIKED_CLUB) 
                           ? (SysEnv.board_with_nail ? "board with nail" 
                                                     : "giant spiked club")
                                   : "unknown weapon");
}                               // end standard_name_weap()

Replacement in crawl-ref/source/newgame.cc at line 1503 [3.1132300]
∅:D[4.385863] → [3.1168083:1168138]
B:BD[3.1168083] → [3.1168083:1168138]
```
static char startwep[5] = { WPN_SHORT_SWORD, WPN_MACE,
```
[4.385863]
[3.1168138]
```
static const weapon_type startwep[5] = { WPN_SHORT_SWORD, WPN_MACE,
```
Deletion in crawl-ref/source/newgame.cc at line 1508 [3.1132300]
B:BD[3.1168212] → [3.1168212:1168247]
```
    char wepName[ ITEMNAME_SIZE ];
```

Replacement in crawl-ref/source/newgame.cc at line 1545 [3.1132300]

B:BD[3.1169290] → [3.1169290:1169344]

B:BD[3.1169476] → [3.1169476:1169477]

B:BD[3.1169477] → [4.385864:385919]

            standard_name_weap(startwep[i], wepName);
            cprintf("%c - %s%s" EOL, 'a' + i, wepName,

[3.1169290]

[4.385919]

            cprintf("%c - %s%s" EOL, 'a' + i,
                    item_base_name(OBJ_WEAPONS, startwep[i]),

Deletion in crawl-ref/source/newgame.cc at line 1559 [3.1132300]

B:BD[5.217432] → [5.217432:217590]

            char weapbuf[ITEMNAME_SIZE];
            if (Options.prev_weapon != WPN_RANDOM)
                standard_name_weap(Options.prev_weapon, weapbuf);

Replacement in crawl-ref/source/newgame.cc at line 1560 [3.1132300]

B:BD[5.217626] → [5.217626:217757]

                    Options.prev_weapon == WPN_RANDOM? "Random" :
                                                       weapbuf);

[5.217626]

[5.217757]

                    Options.prev_weapon == WPN_RANDOM ? "Random" :
                    item_base_name(OBJ_WEAPONS, Options.prev_weapon));

Insertion in crawl-ref/source/itemprop.h at line 147 [4.641567]

[4.646616]


// Only works for armour/weapons/missiles
const char* item_base_name(const item_def &item);
const char* item_base_name(object_class_type basetype, unsigned char subtype);

Insertion in crawl-ref/source/itemprop.cc at line 2087 [4.646661]

[4.708792]

}
const char* item_base_name(const item_def &item)
{
    return item_base_name(static_cast<object_class_type>(item.base_type),
                          item.sub_type);

Insertion in crawl-ref/source/itemprop.cc at line 2094 [4.646661]

[4.708794]


const char* item_base_name(object_class_type basetype, unsigned char subtype)
{
    switch (basetype)
    {
    case OBJ_WEAPONS:
        return Weapon_prop[Weapon_index[subtype]].name;
    case OBJ_ARMOUR:
        return Armour_prop[Armour_index[subtype]].name;
    case OBJ_MISSILES:
        return Missile_prop[Missile_index[subtype]].name;
    default:
        return "";
    }
}

Replacement in crawl-ref/source/itemname.cc at line 484 [3.2667494]

B:BD[3.2689062] → [3.2689062:2689162]

        standard_name_weap( item_typ, tmp_buff );
        strncat( buff, tmp_buff, ITEMNAME_SIZE );

[3.2689062]

[3.2689162]

        strncat(buff, item_base_name(item), ITEMNAME_SIZE);

Cleaned up some of the randart code.

Dependencies

In channels

Change contents

Deletion in crawl-ref/source/skills2.cc at line 2323 [3.647133]

Replacement in crawl-ref/source/skills2.cc at line 2333 [3.647133]

Replacement in crawl-ref/source/skills2.cc at line 2336 [3.647133]

Replacement in crawl-ref/source/skills2.cc at line 2340 [3.647133]

Replacement in crawl-ref/source/skills2.cc at line 2343 [3.647133]

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

Insertion in crawl-ref/source/randart.h at line 54 [3.889057]

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

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

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

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

Deletion in crawl-ref/source/randart.cc at line 659 [3.893152]

Deletion in crawl-ref/source/randart.cc at line 660 [3.893152]

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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