fiddlerwoaroof/crawl - Change ZZCDMQ2W5QDHGTW3SA2PCMXIBBDMMTUBO4NHGYHXGXRBU4BO3CKAC

Fix 2162809: scrolls of immolation shouldn't burn inventory.

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

Created by haranp on October 13, 2008

ZZCDMQ2W5QDHGTW3SA2PCMXIBBDMMTUBO4NHGYHXGXRBU4BO3CKAC

Dependencies

In channels

main

Change contents

Replacement in crawl-ref/source/beam.cc at line 77 [4.4128068]

∅:D[2.55500] → [3.11411:11474]

B:BD[5.11993] → [3.11411:11474]

static int  _affect_player(bolt &beam, item_def *item = NULL);

[2.55500]

[3.11475]

static int  _affect_player(bolt &beam, item_def *item = NULL,
                           bool affect_items = true);

Replacement in crawl-ref/source/beam.cc at line 2815 [4.4128068]

B:BD[6.1239039] → [3.35612:35667]

            rangeUsed += _affect_player( beam, item );

[6.1239039]

[6.1239087]

            rangeUsed += _affect_player( beam, item, affect_items );

Replacement in crawl-ref/source/beam.cc at line 3374 [4.4128068]
∅:D[7.32665] → [3.36668:36724]
B:BD[4.4222656] → [3.36668:36724]
```
static int _affect_player( bolt &beam, item_def *item )
```
[7.32665]
[4.4222702]
```
static int _affect_player( bolt &beam, item_def *item, bool affect_items )
```
Deletion in crawl-ref/source/beam.cc at line 3900 [4.4128068]
B:BD[4.4232646] → [4.4232646:4232647]
B:BD[4.4232647] → [8.10324:10362]
∅:D[8.10362] → [6.1245768:1245887]
∅:D[9.24276] → [6.1245768:1245887]
B:BD[6.1245768] → [6.1245768:1245887]
∅:D[6.1245887] → [4.4232812:4232813]
B:BD[4.4232812] → [4.4232812:4232813]
B:BD[4.4232813] → [8.10363:10392]
∅:D[8.10392] → [6.1245888:1246012]
B:BD[4.4232842] → [6.1245888:1246012]
```
    // Simple cases for scroll burns.
    if (beam.flavour == BEAM_LAVA || beam.name == "hellfire")
        expose_player_to_element(BEAM_LAVA, burn_power);
    // More complex (geez..)
    if (beam.flavour == BEAM_FIRE && beam.name != "ball of steam")
        expose_player_to_element(BEAM_FIRE, burn_power);
```

Replacement in crawl-ref/source/beam.cc at line 3901 [4.4128068]

B:BD[4.4232975] → [8.10393:10419]

∅:D[8.10419] → [4.4233000:4233035]

B:BD[4.4233000] → [4.4233000:4233035]

B:BD[4.4233035] → [6.1246013:1246070]

∅:D[6.1246070] → [4.4233084:4233149]

B:BD[4.4233084] → [4.4233084:4233149]

    // Potions exploding.
    if (beam.flavour == BEAM_COLD)
        expose_player_to_element(BEAM_COLD, burn_power);
    if (beam.flavour == BEAM_ACID)
        splash_with_acid(5);

[4.4232975]

[4.4233149]

    if (affect_items)
    {
        // Simple cases for scroll burns.
        if (beam.flavour == BEAM_LAVA || beam.name == "hellfire")
            expose_player_to_element(BEAM_LAVA, burn_power);
        
        // More complex (geez..)
        if (beam.flavour == BEAM_FIRE && beam.name != "ball of steam")
            expose_player_to_element(BEAM_FIRE, burn_power);

Replacement in crawl-ref/source/beam.cc at line 3911 [4.4128068]

B:BD[4.4233150] → [8.10420:10439]

∅:D[8.10439] → [6.1246071:1246192]

B:BD[4.4233168] → [6.1246071:1246192]

    // Spore pops.
    if (beam.in_explosion_phase && beam.flavour == BEAM_SPORE)
        expose_player_to_element(BEAM_SPORE, burn_power);

[4.4233150]

[4.4233261]

        // Potions exploding.
        if (beam.flavour == BEAM_COLD)
            expose_player_to_element(BEAM_COLD, burn_power);
        
        if (beam.flavour == BEAM_ACID)
            splash_with_acid(5);

Insertion in crawl-ref/source/beam.cc at line 3918 [4.4128068]

[4.4233262]

        // Spore pops.
        if (beam.in_explosion_phase && beam.flavour == BEAM_SPORE)
            expose_player_to_element(BEAM_SPORE, burn_power);
    }