fiddlerwoaroof/crawl - Change K7J2IGELTIQL5KAMBV62MFVIVMEZEWCOLZ7GHFXHYPANYIF7BRZAC

Fix 2134320: mummy curse had disappeared.

Did some more work along the lines of r6985, review by dolorous would be appreciated. :)

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

Created by haranp on September 29, 2008

K7J2IGELTIQL5KAMBV62MFVIVMEZEWCOLZ7GHFXHYPANYIF7BRZAC

Dependencies

In channels

main

Change contents

Replacement in crawl-ref/source/stuff.cc at line 1640 [8.224557]

B:BD[5.2196] → [5.2196:2241]

        monster_die(mon, KILL_DISMISSED, 0);

[5.2196]

[5.2241]

        monster_die(mon, KILL_DISMISSED, NON_MONSTER);

Replacement in crawl-ref/source/spl-cast.cc at line 2467 [8.293070]

B:BD[9.17684] → [9.17684:17740]

    mprf(MSGCH_DIAGNOSTICS, "Sptype: %u, severity: %d",

[9.17684]

[9.17740]

    mprf(MSGCH_DIAGNOSTICS, "Sptype: %s, severity: %d",

Replacement in crawl-ref/source/spells4.cc at line 89 [8.436250]

B:BD[8.440656] → [8.440656:440712]

            monster_die( &menv[monster], KILL_YOU, 0 );

[8.440656]

[8.440712]

            monster_die(&menv[monster], KILL_YOU, NON_MONSTER);

Replacement in crawl-ref/source/spells4.cc at line 1762 [8.436250]

B:BD[8.503781] → [8.503781:503835]

                monster_die(&menv[mon], KILL_YOU, 0);

[8.503781]

[10.1426]

                monster_die(&menv[mon], KILL_YOU, NON_MONSTER);

Replacement in crawl-ref/source/spells4.cc at line 2222 [8.436250]
B:BD[8.517597] → [8.517597:517642]
```
        monster_die( monster, KILL_YOU, 0 );
```
[8.517597]
[8.517642]
```
        monster_die(monster, KILL_YOU, NON_MONSTER);
```

Replacement in crawl-ref/source/spells3.cc at line 227 [8.531613]

B:BD[11.796] → [11.796:847]

                monster_die(monster, KILL_YOU, 0);

[11.796]

[11.847]

                monster_die(monster, KILL_YOU, NON_MONSTER);

Replacement in crawl-ref/source/spells3.cc at line 284 [8.531613]

B:BD[8.538606] → [8.538606:538657]

                monster_die(monster, KILL_YOU, 0);

[8.538606]

[8.538657]

                monster_die(monster, KILL_YOU, NON_MONSTER);

Replacement in crawl-ref/source/spells2.cc at line 702 [8.569242]

B:BD[6.1559] → [6.1559:1610]

                monster_die(monster, KILL_YOU, 0);

[6.1559]

[6.1610]

                monster_die(monster, KILL_YOU, NON_MONSTER);

Replacement in crawl-ref/source/spells2.cc at line 749 [8.569242]

B:BD[8.593948] → [8.593948:593999]

                monster_die(monster, KILL_YOU, 0);

[8.593948]

[8.593999]

                monster_die(monster, KILL_YOU, NON_MONSTER);

Replacement in crawl-ref/source/spells2.cc at line 815 [8.569242]
B:BD[8.595936] → [8.595936:595979]
```
        monster_die(monster, KILL_YOU, 0);
```
[8.595936]
[8.595979]
```
        monster_die(monster, KILL_YOU, NON_MONSTER);
```
Replacement in crawl-ref/source/religion.cc at line 756 [8.804403]
B:BD[7.2740] → [7.2740:2779]
```
        monster_die(mon, KILL_YOU, 0);
```
[7.2740]
[7.2779]
```
        monster_die(mon, KILL_YOU, NON_MONSTER);
```
Replacement in crawl-ref/source/religion.cc at line 4427 [8.804403]
∅:D[12.2543] → [13.3825:3878]
B:BD[13.3825] → [13.3825:3878]
```
            monster_die(monster, KILL_DISMISSED, 0);
```
[12.2543]
[13.3878]
```
            monster_die(monster, KILL_DISMISSED, NON_MONSTER);
```

Replacement in crawl-ref/source/mstuff2.cc at line 413 [8.1340842]

B:BD[8.1351138] → [8.1351138:1351186]

            monster_die(monster, KILL_MISC, 0);

[8.1351138]

[8.1351186]

            monster_die(monster, KILL_MISC, NON_MONSTER);

Replacement in crawl-ref/source/monstuff.cc at line 749 [8.1396662]

B:BD[9.74354] → [9.74354:74416]

    if (monster->type == MONS_MUMMY && killer == NON_MONSTER)

[9.74354]

[9.74416]

    if (monster->type == MONS_MUMMY && YOU_KILL(killer))

Replacement in crawl-ref/source/monstuff.cc at line 2487 [8.1396662]
B:BD[14.3474] → [14.3474:3519]
```
        monster_die(mon, KILL_DISMISSED, 0);
```
[14.3474]
[14.3519]
```
        monster_die(mon, KILL_DISMISSED, NON_MONSTER);
```

Replacement in crawl-ref/source/monstuff.cc at line 6014 [8.1396662]

B:BD[15.2588] → [4.2645:2693]

            monster_die(monster, KILL_MISC, 0);

[15.2588]

[16.6575]

            monster_die(monster, KILL_MISC, NON_MONSTER);

Replacement in crawl-ref/source/mon-util.cc at line 4722 [8.1699344]
B:BD[17.12769] → [17.12769:12807]
```
    monster_die(this, KILL_RESET, 0);
```
[17.12640]
[17.12807]
```
    monster_die(this, KILL_RESET, NON_MONSTER);
```
Replacement in crawl-ref/source/mon-util.cc at line 4978 [8.1699344]
B:BD[17.15667] → [17.15667:15711]
```
            monster_die(this, KILL_YOU, 0);
```
[17.15667]
[17.15711]
```
            monster_die(this, KILL_YOU, NON_MONSTER);
```

Replacement in crawl-ref/source/mon-util.cc at line 5672 [8.1699344]

B:BD[18.345] → [3.3153:3220]

        monster_die(this, quiet ? KILL_DISMISSED : KILL_RESET, 0);

[18.345]

[19.17033]

        monster_die(this, quiet ? KILL_DISMISSED : KILL_RESET, NON_MONSTER);

Replacement in crawl-ref/source/items.cc at line 370 [8.2584728]

B:BD[8.2594106] → [8.2594106:2594170]

                    //     monster_die(monster, KILL_RESET, 0);

[8.2594106]

[8.2594170]

                    //     monster_die(monster, KILL_RESET, NON_MONSTER);

Replacement in crawl-ref/source/fight.cc at line 1225 [8.3140790]
B:BD[8.3158939] → [20.42450:42489]
```
        monster_die(def, KILL_YOU, 0);
```
[8.3158939]
[20.42489]
```
        monster_die(def, KILL_YOU, NON_MONSTER);
```
Replacement in crawl-ref/source/fight.cc at line 1859 [8.3140790]
B:BD[20.56436] → [20.56436:56475]
```
        monster_die(def, KILL_YOU, 0);
```
[20.56436]
[20.56475]
```
        monster_die(def, KILL_YOU, NON_MONSTER);
```
Replacement in crawl-ref/source/fight.cc at line 2641 [8.3140790]
∅:D[21.3115] → [20.68220:68259]
∅:D[22.10762] → [20.68220:68259]
∅:D[23.12134] → [20.68220:68259]
B:BD[8.3183892] → [20.68220:68259]
```
        monster_die(def, KILL_YOU, 0);
```
[8.3183781]
[8.3183992]
```
        monster_die(def, KILL_YOU, NON_MONSTER);
```
Replacement in crawl-ref/source/effects.cc at line 143 [8.3382105]
∅:D[2.2717] → [24.4563:4610]
B:BD[24.4563] → [24.4563:4610]
```
            monster_die(monster, KILL_YOU, 0);
```
[2.2717]
[2.2718]
```
            monster_die(monster, KILL_YOU, NON_MONSTER);
```
Replacement in crawl-ref/source/effects.cc at line 264 [8.3382105]
∅:D[2.2851] → [24.5703:5750]
B:BD[24.5703] → [24.5703:5750]
```
            monster_die(monster, KILL_YOU, 0);
```
[2.2851]
[2.2852]
```
            monster_die(monster, KILL_YOU, NON_MONSTER);
```
Replacement in crawl-ref/source/decks.cc at line 1603 [8.3987460]
∅:D[25.17267] → [26.1921:1971]
B:BD[26.1921] → [26.1921:1971]
```
                monster_die( &mon, KILL_YOU, 0 );
```
[25.17267]
[27.5716]
```
                monster_die(&mon, KILL_YOU, NON_MONSTER);
```
Replacement in crawl-ref/source/debug.cc at line 3513 [8.4016436]
B:BD[28.1037866] → [29.12371:12422]
```
    monster_die(&menv[mindex], KILL_DISMISSED, 0);
```
[28.1037866]
[28.1037936]
```
    monster_die(&menv[mindex], KILL_DISMISSED, NON_MONSTER);
```

Replacement in crawl-ref/source/debug.cc at line 3835 [8.4016436]

B:BD[30.5898] → [30.5898:5955]

                monster_die(monster, KILL_DISMISSED, 0);

[30.5898]

[30.5955]

                monster_die(monster, KILL_DISMISSED, NON_MONSTER);

Replacement in crawl-ref/source/debug.cc at line 3847 [8.4016436]
∅:D[30.6114] → [31.683:736]
B:BD[31.683] → [31.683:736]
```
            monster_die(monster, KILL_DISMISSED, 0);
```
[30.6114]
[31.736]
```
            monster_die(monster, KILL_DISMISSED, NON_MONSTER);
```

Fix 2134320: mummy curse had disappeared.

Dependencies

In channels

Change contents

Replacement in crawl-ref/source/stuff.cc at line 1640 [8.224557]

Replacement in crawl-ref/source/spl-cast.cc at line 2467 [8.293070]

Replacement in crawl-ref/source/spells4.cc at line 89 [8.436250]

Replacement in crawl-ref/source/spells4.cc at line 1762 [8.436250]

Replacement in crawl-ref/source/spells4.cc at line 2222 [8.436250]

Replacement in crawl-ref/source/spells3.cc at line 227 [8.531613]

Replacement in crawl-ref/source/spells3.cc at line 284 [8.531613]

Replacement in crawl-ref/source/spells2.cc at line 702 [8.569242]

Replacement in crawl-ref/source/spells2.cc at line 749 [8.569242]

Replacement in crawl-ref/source/spells2.cc at line 815 [8.569242]

Replacement in crawl-ref/source/religion.cc at line 756 [8.804403]

Replacement in crawl-ref/source/religion.cc at line 4427 [8.804403]

Replacement in crawl-ref/source/mstuff2.cc at line 413 [8.1340842]

Replacement in crawl-ref/source/monstuff.cc at line 749 [8.1396662]

Replacement in crawl-ref/source/monstuff.cc at line 2487 [8.1396662]

Replacement in crawl-ref/source/monstuff.cc at line 6014 [8.1396662]

Replacement in crawl-ref/source/mon-util.cc at line 4722 [8.1699344]

Replacement in crawl-ref/source/mon-util.cc at line 4978 [8.1699344]

Replacement in crawl-ref/source/mon-util.cc at line 5672 [8.1699344]

Replacement in crawl-ref/source/items.cc at line 370 [8.2584728]

Replacement in crawl-ref/source/fight.cc at line 1225 [8.3140790]

Replacement in crawl-ref/source/fight.cc at line 1859 [8.3140790]

Replacement in crawl-ref/source/fight.cc at line 2641 [8.3140790]

Replacement in crawl-ref/source/effects.cc at line 143 [8.3382105]

Replacement in crawl-ref/source/effects.cc at line 264 [8.3382105]

Replacement in crawl-ref/source/decks.cc at line 1603 [8.3987460]

Replacement in crawl-ref/source/debug.cc at line 3513 [8.4016436]

Replacement in crawl-ref/source/debug.cc at line 3835 [8.4016436]

Replacement in crawl-ref/source/debug.cc at line 3847 [8.4016436]