fiddlerwoaroof/crawl - Change LACOILN7WCNIM3GTLY56TQOMC3MFPW2XX3RHDWXRSMBQQPI4AQXQC

2142294: bad messaging for thrown non-missiles.

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

Created by haranp on October 2, 2008

LACOILN7WCNIM3GTLY56TQOMC3MFPW2XX3RHDWXRSMBQQPI4AQXQC

Dependencies

In channels

main

Change contents

Replacement in crawl-ref/source/item_use.cc at line 2572 [3.2781507]
B:BD[2.5244] → [2.5244:5280]
```
    if (pbolt.flavour == BEAM_FIRE)
```
[2.5244]
[2.5280]
```
    if (ammo.base_type == OBJ_MISSILES)
```

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

B:BD[2.5286] → [2.5286:5497]

        if (ammo.special != SPMSL_FLAME)
            ammo.special = SPMSL_FLAME;
    }
    else if (pbolt.flavour == BEAM_COLD)
    {
        if (ammo.special != SPMSL_ICE)
            ammo.special = SPMSL_ICE;

[2.5286]

[2.5497]

        if (pbolt.flavour == BEAM_FIRE)
        {
            if (ammo.special != SPMSL_FLAME)
                ammo.special = SPMSL_FLAME;
        }
        else if (pbolt.flavour == BEAM_COLD)
        {
            if (ammo.special != SPMSL_ICE)
                ammo.special = SPMSL_ICE;
        }
        else
        {
            if (ammo.special != SPMSL_NORMAL && ammo.special != SPMSL_POISONED)
                ammo.special = SPMSL_NORMAL;
        }

Deletion in crawl-ref/source/item_use.cc at line 2590 [3.2781507]

B:BD[2.5503] → [2.5503:5641]

    else
    {
        if (ammo.special != SPMSL_NORMAL && ammo.special != SPMSL_POISONED)
            ammo.special = SPMSL_NORMAL;
    }