fiddlerwoaroof/crawl - Change SH5BS5AJPUFPXQHM5MZPIY3CCVT4EAIRLSAQWZYL5WX2J7FPBSQQC

Add minor cosmetic fixes.

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

Created by dolorous on September 6, 2008

SH5BS5AJPUFPXQHM5MZPIY3CCVT4EAIRLSAQWZYL5WX2J7FPBSQQC

Dependencies

In channels

main

Change contents

Replacement in crawl-ref/source/mstuff2.cc at line 1195 [5.1340842]
∅:D[3.2639] → [4.188:226]
B:BD[5.1366599] → [4.188:226]
```
    char throw_buff[ ITEMNAME_SIZE ];
```
[3.2639]
[4.226]
```
    char throw_buff[ITEMNAME_SIZE];
```
Replacement in crawl-ref/source/mstuff2.cc at line 1215 [5.1340842]
∅:D[6.2897] → [5.1367353:1367425]
B:BD[5.1367353] → [5.1367353:1367425]
```
    int lnchType  = (weapon != NON_ITEM) ? mitm[weapon].sub_type  :  0;
```
[6.2897]
[7.634]
```
    int lnchType  = (weapon != NON_ITEM) ? mitm[weapon].sub_type : 0;
```

Replacement in crawl-ref/source/mstuff2.cc at line 1243 [5.1340842]

B:BD[5.1367951] → [5.1367951:1368040]

        lnchHitBonus = mitm[ weapon ].plus;
        lnchDamBonus = mitm[ weapon ].plus2;

[5.1367951]

[8.402367]

        lnchHitBonus = mitm[weapon].plus;
        lnchDamBonus = mitm[weapon].plus2;

Replacement in crawl-ref/source/mstuff2.cc at line 1276 [5.1340842]
B:BD[5.1368474] → [5.1368474:1368523]
```
        baseDam = property( item, PWPN_DAMAGE );
```
[5.1368474]
[5.1368523]
```
        baseDam = property(item, PWPN_DAMAGE);
```

Replacement in crawl-ref/source/mstuff2.cc at line 1298 [5.1340842]

B:BD[2.2572] → [2.2572:2717]

    // Monsters no longer gain unfair advantages with weapons of fire/ice
    // and incorrect ammo.  They now have same restriction as players.

[2.2572]

[2.2717]

    // Monsters no longer gain unfair advantages with weapons of
    // fire/ice and incorrect ammo.  They now have the same restrictions
    // as players.

Replacement in crawl-ref/source/mstuff2.cc at line 1303 [5.1340842]
B:BD[2.2752] → [2.2752:2803]
```
    const int ammo_brand = get_ammo_brand( item );
```
[2.2752]
[2.2803]
```
    const int ammo_brand = get_ammo_brand(item);
```

Replacement in crawl-ref/source/mstuff2.cc at line 1361 [5.1340842]

B:BD[8.403281] → [8.403281:403396]

        // [dshaligram] This is a horrible hack - we force beam.cc to consider
        // this beam "needle-like".

[8.403281]

[8.403396]

        // [dshaligram] This is a horrible hack - we force beam.cc to
        // consider this beam "needle-like".

Replacement in crawl-ref/source/mstuff2.cc at line 1367 [5.1340842]

B:BD[5.1370264] → [5.1370264:1370399]

        if (get_equip_race( mitm[monster->inv[MSLOT_WEAPON]] )
                == get_equip_race( mitm[monster->inv[MSLOT_MISSILE]] ))

[5.1370264]

[5.1370399]

        if (get_equip_race(mitm[monster->inv[MSLOT_WEAPON]])
                == get_equip_race(mitm[monster->inv[MSLOT_MISSILE]]))

Replacement in crawl-ref/source/mstuff2.cc at line 1379 [5.1340842]

B:BD[5.1371099] → [5.1371099:1371168]

            set_item_ego_type( item, OBJ_MISSILES, SPMSL_POISONED );

[5.1371099]

[5.1371168]

            set_item_ego_type(item, OBJ_MISSILES, SPMSL_POISONED);

Replacement in crawl-ref/source/mstuff2.cc at line 1488 [5.1340842]

B:BD[5.1373331] → [5.1373331:1373407]

B:BD[5.1373407] → [9.7613:7689]

∅:D[9.7689] → [10.1483:1540]

B:BD[8.404422] → [10.1483:1540]

        snprintf( throw_buff, sizeof(throw_buff), "Shot with a%s %s by %s",
                  (is_vowel(pbolt.name[0]) ? "n" : ""), pbolt.name.c_str(),
                  monster->name(DESC_NOCAP_A).c_str() );

[5.1373331]

[5.1373542]

        snprintf(throw_buff, sizeof(throw_buff), "Shot with a%s %s by %s",
                 (is_vowel(pbolt.name[0]) ? "n" : ""), pbolt.name.c_str(),
                 monster->name(DESC_NOCAP_A).c_str());

Replacement in crawl-ref/source/mstuff2.cc at line 1494 [5.1340842]

B:BD[5.1373563] → [5.1373563:1373643]

B:BD[5.1373643] → [9.7690:7766]

∅:D[9.7766] → [10.1541:1598]

B:BD[8.404500] → [10.1541:1598]

        snprintf( throw_buff, sizeof(throw_buff), "Hit by a%s %s thrown by %s",
                  (is_vowel(pbolt.name[0]) ? "n" : ""), pbolt.name.c_str(),
                  monster->name(DESC_NOCAP_A).c_str() );

[5.1373563]

[5.1373778]

        snprintf(throw_buff, sizeof(throw_buff), "Hit by a%s %s thrown by %s",
                 (is_vowel(pbolt.name[0]) ? "n" : ""), pbolt.name.c_str(),
                 monster->name(DESC_NOCAP_A).c_str());

Replacement in crawl-ref/source/mstuff2.cc at line 1501 [5.1340842]
B:BD[5.1373821] → [5.1373821:1373847]
```
    // add everything up.
```
[5.1373821]
[5.1373847]
```
    // Add everything up.
```

Replacement in crawl-ref/source/mstuff2.cc at line 1504 [5.1340842]

B:BD[7.776] → [7.776:851]

        dice_def( 1, baseDam + random2avg(exDamBonus, 2) + ammoDamBonus );

[7.776]

[5.1374001]

        dice_def(1, baseDam + random2avg(exDamBonus, 2) + ammoDamBonus);

Replacement in crawl-ref/source/mstuff2.cc at line 1577 [5.1340842]

B:BD[4.797] → [11.5408:5536]

    else if (dec_mitm_item_quantity( hand_used, 1 ))
        monster->inv[returning ? MSLOT_WEAPON : MSLOT_MISSILE] = NON_ITEM;

[4.797]

[5.1374266]

    else if (dec_mitm_item_quantity(hand_used, 1))
        monster->inv[returning ? hand_used : MSLOT_MISSILE] = NON_ITEM;

Replacement in crawl-ref/source/mstuff2.cc at line 1581 [5.1340842]
B:BD[5.1374286] → [5.1374286:1374338]
```
}                               // end mons_throw()
```
[5.1374286]
[12.812]
```
}
```

Add minor cosmetic fixes.

Dependencies

In channels

Change contents

Replacement in crawl-ref/source/mstuff2.cc at line 1195 [5.1340842]

Replacement in crawl-ref/source/mstuff2.cc at line 1215 [5.1340842]

Replacement in crawl-ref/source/mstuff2.cc at line 1243 [5.1340842]

Replacement in crawl-ref/source/mstuff2.cc at line 1276 [5.1340842]