fiddlerwoaroof/crawl - Change 2TZT4GURBCNHSVOXO5ZMN7XEIO3K4GWJCDPVSYUCMVZ6UFDL4DIQC

* Force ?immolation to never burn scrolls, whether in inventory or on

the floor.

List new amount of charges when recharging identified wands.
Tweak some checks for travel_path to be on the safe side.

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

Created by j-p-e-g on August 18, 2008

2TZT4GURBCNHSVOXO5ZMN7XEIO3K4GWJCDPVSYUCMVZ6UFDL4DIQC

Dependencies

In channels

main

Change contents

Deletion in crawl-ref/source/monstuff.cc at line 2528 [7.1396662]
∅:D[5.2751] → [6.3885:3929]
B:BD[8.5177] → [6.3885:3929]
```
    bool travelling = mon->is_travelling();
```

Replacement in crawl-ref/source/monstuff.cc at line 2694 [7.1396662]

B:BD[7.1444364] → [9.3897:3951]

                if (mon->foe == MHITYOU && travelling

[7.1444364]

[9.3951]

                if (mon->foe == MHITYOU && mon->is_travelling()

Replacement in crawl-ref/source/monstuff.cc at line 2848 [7.1396662]

B:BD[9.4520] → [10.4719:4759]

                        if (travelling)

[9.4520]

[10.4759]

                        if (mon->is_travelling())

Replacement in crawl-ref/source/monstuff.cc at line 2861 [7.1396662]

B:BD[9.5074] → [9.5074:5148]

                    if (travelling && mon->travel_target == MTRAV_PLAYER)

[9.5074]

[9.5148]

                    if (mon->is_travelling()
                        && mon->travel_target == MTRAV_PLAYER)

Replacement in crawl-ref/source/monstuff.cc at line 3056 [7.1396662]

B:BD[11.3157] → [12.25162:25219]

∅:D[12.25219] → [13.2574:2617]

B:BD[11.3229] → [13.2574:2617]

                if (grid_distance(mon->pos(), you.pos())
                        >= LOS_RADIUS * 4)

[11.3157]

[11.3285]

                if (grid_distance(mon->pos(), you.pos()) >= LOS_RADIUS * 4)

Replacement in crawl-ref/source/monstuff.cc at line 3086 [7.1396662]
B:BD[6.4259] → [6.4259:4291]
```
                if (travelling)
```
[6.4259]
[6.4291]
```
                if (mon->is_travelling())
```

Replacement in crawl-ref/source/monstuff.cc at line 3139 [7.1396662]

B:BD[6.6132] → [3.2591:2670]

                        for (int i = mon->travel_path.size() - 1; i >= 0; --i)

[6.6132]

[6.6249]

                        int size = mon->travel_path.size();
                        for (int i = size - 1; i >= 0; --i)

Replacement in crawl-ref/source/monstuff.cc at line 3307 [7.1396662]

B:BD[14.13902] → [15.3173:3242]

                if (travelling && mon->travel_target != MTRAV_PATROL

[14.13902]

[15.3242]

                if (mon->is_travelling() && mon->travel_target != MTRAV_PATROL

Replacement in crawl-ref/source/item_use.cc at line 4458 [7.2781507]
∅:D[16.667] → [7.2863291:2863316]
B:BD[7.2863291] → [7.2863291:2863316]
```
        explosion(beam);
```
[16.667]
[7.2863573]
```
        explosion(beam, false, false, true, true, true, false);
```

Replacement in crawl-ref/source/effects.cc at line 1780 [7.3382105]

B:BD[2.2975] → [2.2975:3011]

        mprf("%s %s for a moment.",

[2.2975]

[2.3011]


        std::string desc = "";
        if (charged && item_ident(wand, ISFLAG_KNOW_PLUSES))
        {
            snprintf(info, INFO_SIZE, " and now has %d charges", new_charges);
            desc = info;
        }
        mprf("%s %s for a moment%s.",

Replacement in crawl-ref/source/effects.cc at line 1789 [7.3382105]

B:BD[2.3058] → [2.3058:3103]

             charged? "glows" : "flickers");

[2.3058]

[2.3103]

             charged? "glows" : "flickers",
             desc.c_str());

Replacement in crawl-ref/source/effects.cc at line 2098 [7.3382105]
B:BD[4.8785] → [4.8785:8794]
```
        
```
[4.8785]
[4.8794]
Replacement in crawl-ref/source/dat/descript/items.txt at line 1254 [18.62757]
B:BD[17.25660] → [17.25660:25713]
```
under pressure.  Do not use near flammable objects."
```
[17.25660]
[19.41933]
```
under pressure. May be harmful to the reader."
```

Replacement in crawl-ref/source/beam.h at line 191 [7.4124541]

B:BD[20.3236] → [20.3236:3281]

               bool show_more       = true);

[20.3236]

[7.4125770]

               bool show_more       = true,
               bool affect_items    = true);

Replacement in crawl-ref/source/beam.h at line 243 [7.4124541]

B:BD[21.16594] → [12.55027:55094]

int affect(bolt &beam, const coord_def& p, item_def *item = NULL);

[21.16594]

[22.2917]

int affect(bolt &beam, const coord_def& p, item_def *item = NULL,
           bool affect_items = true);

Replacement in crawl-ref/source/beam.cc at line 102 [7.4128068]

B:BD[23.12471] → [12.55561:55637]

static void _explosion_cell(bolt &beam, const coord_def& p, bool drawOnly);

[23.12471]

[7.4131394]

static void _explosion_cell(bolt &beam, const coord_def& p, bool drawOnly,
                            bool affect_items = true);

Replacement in crawl-ref/source/beam.cc at line 3098 [7.4128068]

B:BD[7.4209918] → [12.58987:59046]

int affect(bolt &beam, const coord_def& p, item_def *item)

[7.4209918]

[7.4210530]

int affect(bolt &beam, const coord_def& p, item_def *item, bool affect_items)

Replacement in crawl-ref/source/beam.cc at line 3144 [7.4128068]

B:BD[24.2822] → [25.4928:5045]

        const int burn_power = (beam.is_explosion) ? 5 :
                                    (beam.is_beam) ? 3 : 2;

[24.2822]

[25.5045]

        if (affect_items)
        {
            const int burn_power = (beam.is_explosion) ? 5 :
                                        (beam.is_beam) ? 3 : 2;

Replacement in crawl-ref/source/beam.cc at line 3149 [7.4128068]

B:BD[25.5046] → [12.59364:59426]

        expose_items_to_element(beam.flavour, p, burn_power);

[25.5046]

[12.59426]

            expose_items_to_element(beam.flavour, p, burn_power);
        }

Replacement in crawl-ref/source/beam.cc at line 5319 [7.4128068]

B:BD[20.4341] → [20.4341:4392]

               bool stop_at_walls, bool show_more)

[20.4341]

[7.4253379]

               bool stop_at_walls, bool show_more, bool affect_items)

Replacement in crawl-ref/source/beam.cc at line 5460 [7.4128068]

B:BD[7.4255086] → [12.63245:63306]

            _explosion_cell(beam, coord_def(0, 0), drawing);

[7.4255086]

[26.15985]

            _explosion_cell(beam, coord_def(0, 0), drawing, affect_items);

Replacement in crawl-ref/source/beam.cc at line 5469 [7.4128068]

B:BD[7.4255363] → [12.63307:63380]

∅:D[23.19887] → [7.4255424:4255425]

∅:D[12.63380] → [7.4255424:4255425]

B:BD[7.4255424] → [7.4255424:4255425]

                    _explosion_cell(beam, coord_def(-rad, ay), drawing);

[7.4255363]

[7.4255425]

                {
                    _explosion_cell(beam, coord_def(-rad, ay), drawing,
                                    affect_items);
                }

Replacement in crawl-ref/source/beam.cc at line 5474 [7.4128068]

B:BD[7.4255471] → [12.63381:63453]

                    _explosion_cell(beam, coord_def(rad, ay), drawing);

[7.4255471]

[7.4255531]

                {
                    _explosion_cell(beam, coord_def(rad, ay), drawing,
                                    affect_items);
                }

Replacement in crawl-ref/source/beam.cc at line 5484 [7.4128068]

B:BD[7.4255690] → [12.63454:63527]

∅:D[23.20012] → [7.4255751:4255752]

∅:D[12.63527] → [7.4255751:4255752]

B:BD[7.4255751] → [7.4255751:4255752]

                    _explosion_cell(beam, coord_def(ax, -rad), drawing);

[7.4255690]

[7.4255752]

                {
                    _explosion_cell(beam, coord_def(ax, -rad), drawing,
                                    affect_items);
                }

Replacement in crawl-ref/source/beam.cc at line 5489 [7.4128068]

B:BD[7.4255798] → [12.63528:63600]

                    _explosion_cell(beam, coord_def(ax, rad), drawing);

[7.4255798]

[7.4255858]

                {
                    _explosion_cell(beam, coord_def(ax, rad), drawing,
                                    affect_items);
                }

Replacement in crawl-ref/source/beam.cc at line 5532 [7.4128068]

B:BD[7.4256539] → [12.63601:63676]

static void _explosion_cell(bolt &beam, const coord_def& p, bool drawOnly)

[7.4256539]

[7.4256614]

static void _explosion_cell(bolt &beam, const coord_def& p, bool drawOnly,
                            bool affect_items)

Replacement in crawl-ref/source/beam.cc at line 5548 [7.4128068]
B:BD[7.4256936] → [12.63721:63752]
```
        affect(beam, realpos);
```
[7.4256936]
[7.4256972]
```
        affect(beam, realpos, NULL, affect_items);
```