fiddlerwoaroof/crawl - Change ACOSZYTKONG2IJLNNCE5IJPO46ISV45OJOLYCXMOUMZIMY2C6B7AC

Fix repeated messages when getting HP/MP restored interrupts with

multiple delays queued (e.g., when butchering several items.) However, this fix means that Lua can't suppress the "HP restored" message on the relevant interrupt. If this is a problem it should be changed. Fixes [2494104].

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

Created by haranp on January 25, 2009

ACOSZYTKONG2IJLNNCE5IJPO46ISV45OJOLYCXMOUMZIMY2C6B7AC

Dependencies

In channels

main

Change contents

Replacement in crawl-ref/source/state.cc at line 218 [5.1546]

∅:D[2.153] → [4.192:265]

B:BD[5.6780] → [4.192:265]

    // If command repitition is being used to immitate the rest command,

[2.153]

[4.265]

    // If command repetition is being used to imitate the rest command,

Replacement in crawl-ref/source/state.cc at line 475 [5.1546]

B:BD[6.2121] → [3.844:900]

        fprintf(file, "Doing command repitition:" EOL);

[6.2121]

[6.2178]

        fprintf(file, "Doing command repetition:" EOL);

Deletion in crawl-ref/source/delay.cc at line 1743 [8.3963459]

B:BD[7.3795] → [7.3795:3860]

B:BD[7.3860] → [9.4358:4394]

∅:D[9.4394] → [7.3895:4007]

B:BD[7.3895] → [7.3895:4007]

B:BD[7.4007] → [9.4395:4432]

∅:D[9.4432] → [7.4043:4044]

B:BD[7.4043] → [7.4043:4044]

        // No recursive interruptions from messages (AI_MESSAGE)
        _block_interruptions(true);
        if (ai == AI_FULL_HP)
            mpr("HP restored.");
        else
            mpr("Magic restored.");
        _block_interruptions(false);

Insertion in crawl-ref/source/delay.cc at line 1914 [8.3963459]

[10.1015637]

[8.3980423]


    // No recursive interruptions from messages (AI_MESSAGE)
    _block_interruptions(true);
    if (ai == AI_FULL_HP)
        mpr("HP restored.");
    else if (ai == AI_FULL_MP)
        mpr("Magic restored.");
    _block_interruptions(false);