fiddlerwoaroof/crawl - Change PFDWNTN3NEZCP6NKPIM2FK3KRVDBQUCGIAWWOU2DJVS4KWWJLYYAC

Temporarily revert previosu crash fix, as there has to be a better way

to deal with it.

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

Created by dolorous on May 17, 2008

PFDWNTN3NEZCP6NKPIM2FK3KRVDBQUCGIAWWOU2DJVS4KWWJLYYAC

Dependencies

In channels

main

Change contents

Replacement in crawl-ref/source/fight.cc at line 766 [4.3140790]

B:BD[3.7674] → [2.2661:2687]

        if (def->alive())

[3.7674]

[3.7703]

        // always upset monster regardless of damage
        behaviour_event(def, ME_WHACK, MHITYOU);
        if (damage_done > 0)

Replacement in crawl-ref/source/fight.cc at line 771 [4.3140790]

B:BD[3.7713] → [2.2688:2798]

            // always upset monster regardless of damage
            behaviour_event(def, ME_WHACK, MHITYOU);

[3.7713]

[5.1146]

            int blood =
                _modify_blood_amount(damage_done, attacker->damage_type());
            if (blood > defender->stat_hp())
                blood = defender->stat_hp();

Replacement in crawl-ref/source/fight.cc at line 776 [4.3140790]

B:BD[5.1147] → [2.2799:3052]

            if (damage_done > 0)
            {
                int blood =
                    _modify_blood_amount(damage_done, attacker->damage_type());
                if (blood > defender->stat_hp())
                    blood = defender->stat_hp();

[5.1147]

[2.3052]

            bleed_onto_floor(where.x, where.y, defender->id(), blood, true);
        }

Replacement in crawl-ref/source/fight.cc at line 779 [4.3140790]

B:BD[2.3053] → [2.3053:3148]

∅:D[2.3148] → [6.5226:5227]

B:BD[6.5226] → [6.5226:5227]

B:BD[6.5227] → [2.3149:3506]

                bleed_onto_floor(where.x, where.y, defender->id(), blood, true);
            }
            if (damage_done > 0 || !defender_visible)
                player_announce_hit();
            else if (!shield_blocked && damage_done <= 0)
            {
                no_damage_message =
                    make_stringf("You %s %s.", attack_verb.c_str(),
                                 defender->name(DESC_NOCAP_THE).c_str());
            }

[2.3053]

[7.8733]

        if (damage_done > 0 || !defender_visible)
            player_announce_hit();
        else if (!shield_blocked && damage_done <= 0)
        {
            no_damage_message =
                make_stringf("You %s %s.", attack_verb.c_str(),
                             defender->name(DESC_NOCAP_THE).c_str());
        }

Replacement in crawl-ref/source/fight.cc at line 788 [4.3140790]
B:BD[7.8734] → [2.3507:3542]
```
            player_hurt_monster();
```
[7.8734]
[8.2705]
```
        player_hurt_monster();
```

Replacement in crawl-ref/source/fight.cc at line 790 [4.3140790]

B:BD[8.2706] → [2.3543:3631]

            if (damage_done)
                player_exercise_combat_skills();
        }

[8.2706]

[8.2707]

        if (damage_done)
            player_exercise_combat_skills();