fiddlerwoaroof/crawl - Change C4AR2MA3ZWV5WT3EKMK6NC5HF5ZL5MMHMLC23FEQTTSINPFGKTUQC

Fix 2726027: Warpwright card being broken.

Fix 2731677: Sleeping "patrolling" monsters being unwakable. Fix 2729898: Debugging markers on the level map showing up in nonwizmode games.

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

Created by j-p-e-g on April 5, 2009

C4AR2MA3ZWV5WT3EKMK6NC5HF5ZL5MMHMLC23FEQTTSINPFGKTUQC

Dependencies

In channels

main

Change contents

Replacement in crawl-ref/source/view.cc at line 688 [5.16817]

B:BD[4.363] → [4.363:436]

    if (travel_colour && testbits(env.map(p).property, FPROP_HIGHLIGHT))

[4.363]

[4.436]

    if (travel_colour && you.wizard
        && testbits(env.map(p).property, FPROP_HIGHLIGHT))
    {

Insertion in crawl-ref/source/view.cc at line 692 [5.16817]
[4.465]
[4.465]
```
    }
```

Replacement in crawl-ref/source/monstuff.cc at line 2620 [5.1396662]

B:BD[5.1438218] → [2.2574:2630]

        if (mons_friendly(mon) && mon->is_patrolling())

[5.1438218]

[6.3835]

        // Allow monsters falling asleep while patrolling (can happen if
        // they're left alone for a long time) to be woken by this event.
        if (mons_friendly(mon) && mon->is_patrolling()
            && !mons_is_sleeping(mon))
        {

Insertion in crawl-ref/source/monstuff.cc at line 2626 [5.1396662]
[6.3854]
[3.2789]
```
        }
```

Replacement in crawl-ref/source/decks.cc at line 1496 [5.3987460]

B:BD[7.97185] → [8.27932:28012]

        if (grd(*ai) == DNGN_FLOOR && find_trap(*ai) && one_chance_in(++count))

[7.97185]

[7.97303]

        if (grd(*ai) == DNGN_FLOOR && !find_trap(*ai) && one_chance_in(++count))