fiddlerwoaroof/crawl - Change AMAPVOFKH3YS5VCVOG2YNHXNDAZATMXFUL6ODZUIOF5OYYKBVKGAC

[1871387] Fixed issue where the wrong tile was used for weapons of returning.

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

Created by ennewalker on January 15, 2008

AMAPVOFKH3YS5VCVOG2YNHXNDAZATMXFUL6ODZUIOF5OYYKBVKGAC

Dependencies

In channels

main

Change contents

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

B:BD[4.554] → [4.554:609]

    fire_beam( pbolt, really_returns ? NULL : &item );

[4.554]

[6.485]

    fire_beam( pbolt, &item, !really_returns );

Replacement in crawl-ref/source/mstuff2.cc at line 1463 [5.1340842]
B:BD[7.297] → [7.297:329]
```
        fire_beam(pbolt, NULL);
```
[7.297]
[4.642]
```
        fire_beam(pbolt, &item, false);
```

Replacement in crawl-ref/source/item_use.cc at line 2409 [5.2781507]

B:BD[8.605] → [3.4892:4944]

        fire_beam(pbolt, did_return? NULL : &item);

[8.605]

[6.2225]

        fire_beam(pbolt, &item, !did_return);

Replacement in crawl-ref/source/item_use.cc at line 2424 [5.2781507]
B:BD[7.545] → [7.545:577]
```
        fire_beam(pbolt, NULL);
```
[7.545]
[2.546]
```
        fire_beam(pbolt, &item, false);
```

Replacement in crawl-ref/source/beam.h at line 177 [5.4124541]

B:BD[5.4125082] → [5.4125082:4125143]

void fire_beam( struct bolt &pbolt, item_def *item = NULL );

[5.4125082]

[5.4125143]

void fire_beam( struct bolt &pbolt, item_def *item = NULL,
    bool drop_item = false );

Replacement in crawl-ref/source/beam.cc at line 1303 [5.4128068]
B:BD[5.4169427] → [9.8467:8513]
```
void fire_beam( bolt &pbolt, item_def *item )
```
[5.4169427]
[5.4169480]
```
void fire_beam( bolt &pbolt, item_def *item, bool drop_item )
```
Replacement in crawl-ref/source/beam.cc at line 1549 [5.4128068]
B:BD[5.4178623] → [5.4178623:4178637]
```
    if (item)
```
[5.4178623]
[5.4178637]
```
    if (drop_item && item)
    {
```
Insertion in crawl-ref/source/beam.cc at line 1552 [5.4128068]
[5.4178686]
[5.4178686]
```
    }
    ASSERT(!drop_item || item);
```