fiddlerwoaroof/crawl - Change T5XERKCC6UL2UI2HKE34BTKNINTOXOSDCBYGC3A3JY7XMKIQW4GQC

Blinking/teleporting monsters should not be able to land on the player's position.

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

Created by dshaligram on January 2, 2007

T5XERKCC6UL2UI2HKE34BTKNINTOXOSDCBYGC3A3JY7XMKIQW4GQC

Dependencies

In channels

main

Change contents

Replacement in crawl-ref/source/spells2.cc at line 340 [3.569242]

B:BD[3.576367] → [3.576367:576444]

                    //this searches all the items on the ground for a corpse

[3.576367]

[3.576444]

                    // This searches all the items on the ground for a corpse

Deletion in crawl-ref/source/spells2.cc at line 366 [3.569242]

B:BD[3.577125] → [3.577125:577479]

        //else
        //  mpr("The dark energy consumes the dead!"); - no, this
        // means that no corpses were found. Better to say:
        // mpr("You receive no reply.");
        //jmf: Why do I have to get an uninformative message when some random
        //jmf: monster fails to do something?
        // IMHO there's too much noise already.

Replacement in crawl-ref/source/mstuff2.cc at line 805 [3.1340842]

B:BD[3.1363382] → [3.1363382:1363427]

        if (mgrd[newx][newy] != NON_MONSTER)

[3.1363382]

[3.1363427]

        if (mgrd[newx][newy] != NON_MONSTER
            || (newx == you.x_pos && newy == you.y_pos))
        {

Insertion in crawl-ref/source/mstuff2.cc at line 809 [3.1340842]
[3.1363449]
[3.1363449]
```
        }
```
Insertion in crawl-ref/source/monstuff.cc at line 1114 [3.1396662]
[3.1429659]
[3.1429659]
```
           || (tx == you.x_pos && ty == you.y_pos)
```

Replacement in crawl-ref/source/items.cc at line 1966 [3.2584728]

B:BD[3.2627445] → [3.2627445:2627479]

        if (mitm[c].quantity < 1)

[3.2627445]

[3.2627479]

        item_def &it = mitm[c];
        
        if (!is_valid_item(it))

Replacement in crawl-ref/source/items.cc at line 1971 [3.2584728]

B:BD[3.2627502] → [3.2627502:2627581]

        if (mitm[c].base_type != OBJ_CORPSES && mitm[c].base_type != OBJ_FOOD)

[3.2627502]

[3.2627581]

        if (it.base_type != OBJ_CORPSES && it.base_type != OBJ_FOOD)

Replacement in crawl-ref/source/items.cc at line 1976 [3.2584728]

B:BD[3.2627624] → [3.2627624:2627720]

        if (mitm[c].base_type == OBJ_CORPSES
            && mitm[c].sub_type > CORPSE_SKELETON)

[3.2627624]

[3.2627720]

        if (it.base_type == OBJ_CORPSES
            && it.sub_type > CORPSE_SKELETON)

Replacement in crawl-ref/source/items.cc at line 1982 [3.2584728]

B:BD[3.2627763] → [3.2627763:2627840]

        if (mitm[c].base_type == OBJ_FOOD && mitm[c].sub_type != FOOD_CHUNK)

[3.2627763]

[3.2627840]

        if (it.base_type == OBJ_FOOD && it.sub_type != FOOD_CHUNK)

Replacement in crawl-ref/source/items.cc at line 1987 [3.2584728]
B:BD[3.2627883] → [3.2627883:2627924]
```
        if (rot_time >= mitm[c].special)
```
[3.2627883]
[3.2627924]
```
        if (rot_time >= it.special)
```
Replacement in crawl-ref/source/items.cc at line 1989 [3.2584728]
B:BD[3.2627934] → [3.2627934:2627981]
```
            if (mitm[c].base_type == OBJ_FOOD)
```
[3.2627934]
[3.2627981]
```
            if (it.base_type == OBJ_FOOD)
```

Replacement in crawl-ref/source/items.cc at line 1995 [3.2584728]

B:BD[3.2628073] → [3.2628073:2628184]

                if (mitm[c].sub_type == CORPSE_SKELETON
                    || !mons_skeleton( mitm[c].plus ))

[3.2628073]

[3.2628184]

                if (it.sub_type == CORPSE_SKELETON
                    || !mons_skeleton( it.plus ))

Replacement in crawl-ref/source/items.cc at line 2002 [3.2584728]

B:BD[3.2628296] → [3.2628296:2628443]

                    mitm[c].sub_type = CORPSE_SKELETON;
                    mitm[c].special = 200;
                    mitm[c].colour = LIGHTGREY;

[3.2628296]

[3.2628443]

                    it.sub_type = CORPSE_SKELETON;
                    it.special = 200;
                    it.colour = LIGHTGREY;

Replacement in crawl-ref/source/items.cc at line 2011 [3.2584728]
B:BD[3.2628544] → [3.2628544:2628585]
```
            mitm[c].special -= rot_time;
```
[3.2628544]
[3.2628585]
```
            it.special -= rot_time;
```
Deletion in crawl-ref/source/items.cc at line 2015 [3.2584728]
B:BD[3.2628602] → [3.2628602:2628603]
Replacement in crawl-ref/source/externs.h at line 293 [3.3270163]
∅:D[2.896185] → [4.440779:440811]
B:BD[4.440779] → [4.440779:440811]
```
                 orig_monnum(0)
```
[2.896185]
[2.896186]
```
                 orig_monnum(0), inscription()
```
Deletion in crawl-ref/source/externs.h at line 295 [3.3270163]
B:BD[2.896192] → [2.896192:896221]
```
        inscription.clear();
```

Blinking/teleporting monsters should not be able to land on the player's position.

Dependencies

In channels

Change contents

Replacement in crawl-ref/source/spells2.cc at line 340 [3.569242]

Deletion in crawl-ref/source/spells2.cc at line 366 [3.569242]

Replacement in crawl-ref/source/mstuff2.cc at line 805 [3.1340842]

Insertion in crawl-ref/source/mstuff2.cc at line 809 [3.1340842]

Insertion in crawl-ref/source/monstuff.cc at line 1114 [3.1396662]

Replacement in crawl-ref/source/items.cc at line 1966 [3.2584728]

Replacement in crawl-ref/source/items.cc at line 1971 [3.2584728]

Replacement in crawl-ref/source/items.cc at line 1976 [3.2584728]

Replacement in crawl-ref/source/items.cc at line 1982 [3.2584728]

Replacement in crawl-ref/source/items.cc at line 1987 [3.2584728]

Replacement in crawl-ref/source/items.cc at line 1989 [3.2584728]

Replacement in crawl-ref/source/items.cc at line 1995 [3.2584728]

Replacement in crawl-ref/source/items.cc at line 2002 [3.2584728]

Replacement in crawl-ref/source/items.cc at line 2011 [3.2584728]

Deletion in crawl-ref/source/items.cc at line 2015 [3.2584728]

Replacement in crawl-ref/source/externs.h at line 293 [3.3270163]

Deletion in crawl-ref/source/externs.h at line 295 [3.3270163]