fiddlerwoaroof/crawl - Change 6NTCURCJQA4PBNDD5VGFBQAF5QCZZPLWRDZTA65R3EOGMVA475IAC

Removed SPMSL_POISONED_II, which was functionally identical

to SPMSL_POISONED. This should fix the 'duplicate needles don't stack' bug. Sort of breaks savefiles: your poison ammo will now be buggy and might not poison.

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

Created by haranp on December 27, 2006

6NTCURCJQA4PBNDD5VGFBQAF5QCZZPLWRDZTA65R3EOGMVA475IAC

Dependencies

In channels

main

Change contents

Replacement in crawl-ref/source/mstuff2.cc at line 1116 [3.1340842]

B:BD[3.1370870] → [3.1370870:1370984]

        bool poison = (ammo_brand == SPMSL_POISONED 
                        || ammo_brand == SPMSL_POISONED_II);

[3.1370576]

[3.1370984]

        const bool poison = (ammo_brand == SPMSL_POISONED);

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

B:BD[3.2692701] → [3.2692701:2692778]

        if (brand == SPMSL_POISONED || brand == SPMSL_POISONED_II)
        {

[3.2692701]

[3.2692778]

        if (brand == SPMSL_POISONED)

Deletion in crawl-ref/source/itemname.cc at line 574 [3.2667494]
B:BD[3.2692857] → [3.2692857:2692867]
```
        }
```
Deletion in crawl-ref/source/itemname.cc at line 622 [3.2667494]
B:BD[3.2694492] → [4.712056:712106]
```
              (brand == SPMSL_POISONED_II) ? "" :
```

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

B:BD[3.2816453] → [3.2816453:2816572]

        bool poisoned = (ammo_brand == SPMSL_POISONED
                            || ammo_brand == SPMSL_POISONED_II);

[3.2816453]

[4.742599]

        bool poisoned = (ammo_brand == SPMSL_POISONED);

Replacement in crawl-ref/source/enum.h at line 3069 [3.3287960]

B:BD[3.3358496] → [3.3358496:3358563]

B:BD[3.3358563] → [4.928538:928585]

    SPMSL_POISONED, //    3 - from poison_ammo() enchantment {dlb}
    SPMSL_POISONED_II,                 //    4

[3.3358496]

[4.928585]

    SPMSL_POISONED,                    //    3
    SPMSL_POISONED_II,                 //    4 - unused

Replacement in crawl-ref/source/dungeon.cc at line 1387 [3.3429798]

B:BD[4.953241] → [4.953241:953337]

                got_curare_roll(item_level)
                ? SPMSL_CURARE : SPMSL_POISONED_II;

[4.953241]

[4.953337]

                got_curare_roll(item_level) ? SPMSL_CURARE : SPMSL_POISONED;

Replacement in crawl-ref/source/dungeon.cc at line 1401 [3.3429798]

B:BD[3.3479233] → [3.3479233:3479302]

                               (temp_rand < 150) ? SPMSL_POISONED_II

[3.3479233]

[3.3479302]

                               (temp_rand < 150) ? SPMSL_POISONED

Replacement in crawl-ref/source/dungeon.cc at line 1408 [3.3429798]

∅:D[4.953474] → [3.3479572:3479647]

B:BD[3.3479572] → [3.3479572:3479647]

            set_item_ego_type( mitm[p], OBJ_MISSILES, SPMSL_POISONED_II );

[4.953474]

[3.3479647]

            set_item_ego_type( mitm[p], OBJ_MISSILES, SPMSL_POISONED );

Replacement in crawl-ref/source/dungeon.cc at line 3218 [3.3429798]

B:BD[2.1839] → [2.1839:1887]

                          : SPMSL_POISONED_II);

[2.1839]

[3.3541775]

                          : SPMSL_POISONED);