fiddlerwoaroof/crawl - Change R7B6DUQQPRHSTBC5HT363VYF4ZCXDDSXOQQJOVCFPLP52P4NMTCAC

Add more minor cosmetic fixes.

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

Created by dolorous on May 19, 2008

R7B6DUQQPRHSTBC5HT363VYF4ZCXDDSXOQQJOVCFPLP52P4NMTCAC

Dependencies

In channels

main

Change contents

Insertion in crawl-ref/source/fight.cc at line 2837 [5.3140790]

[3.5016]

[4.73485]

    if (unchivalric)
    {
        if (you.religion == GOD_SHINING_ONE
            && !tso_unchivalric_attack_safe_monster(defender))
        {
            if (!you.confused()
                && !yesno("Really attack this helpless creature?", false, 'n'))
            {
                cancel_attack = true;
                return;
            }
        }
        did_god_conduct(DID_UNCHIVALRIC_ATTACK, 4, true, def);
    }

Deletion in crawl-ref/source/fight.cc at line 2899 [5.3140790]
∅:D[3.5580] → [6.2662:2663]
B:BD[7.515] → [6.2662:2663]
B:BD[6.2663] → [8.2824:2845]
∅:D[9.351] → [10.321:327]
∅:D[11.420] → [10.321:327]
∅:D[8.2845] → [10.321:327]
∅:D[12.2859] → [10.321:327]
∅:D[3.5637] → [10.321:327]
∅:D[13.14193] → [10.321:327]
B:BD[10.321] → [10.321:327]
B:BD[10.327] → [14.2714:2821]
∅:D[15.1477] → [10.400:410]
∅:D[14.2821] → [10.400:410]
∅:D[16.2989] → [10.400:410]
B:BD[10.400] → [10.400:410]
B:BD[10.410] → [14.2822:2986]
B:BD[14.2986] → [17.2661:2685]
∅:D[17.2685] → [14.2986:3000]
B:BD[14.2986] → [14.2986:3000]
∅:D[14.3088] → [10.479:489]
B:BD[10.479] → [10.479:489]
B:BD[10.489] → [18.4417:4418]
B:BD[18.4418] → [2.2945:3008]
∅:D[17.2749] → [10.489:495]
∅:D[19.2998] → [10.489:495]
∅:D[2.3008] → [10.489:495]
∅:D[20.3466] → [10.489:495]
∅:D[18.4513] → [10.489:495]
∅:D[3.5694] → [10.489:495]
B:BD[10.489] → [10.489:495]
```
    if (unchivalric)
    {
        if (you.religion == GOD_SHINING_ONE
            && !tso_unchivalric_attack_safe_monster(defender))
        {
            if (!you.confused()
                && !yesno("Really attack this helpless creature?", false, 'n'))
            {
                cancel_attack = true;
                return;
            }
        }
        did_god_conduct(DID_UNCHIVALRIC_ATTACK, 4, true, def);
    }
```

Replacement in crawl-ref/source/fight.cc at line 2903 [5.3140790]

B:BD[4.74682] → [4.74682:74761]

    int attack_delay = weapon? player_weapon_speed() : player_unarmed_speed();

[4.74682]

[4.74761]

    int attack_delay = weapon ? player_weapon_speed() : player_unarmed_speed();