fiddlerwoaroof/crawl - Change BFZZ7DFLZM4WNHQOKWDJENZOLMXH3UPHZ437BMISYJ3VSO2Y57WQC

Fixed a bug that made silence last forever. This also meant

moving "Your hearing returns." where it belongs, thus fixing 1773460.

I also moved a couple of messages (namely weapon noises, and hell effects) into MSGCH_TALK and MSGCH_SOUND, both of which now are ignored as travel stoppers. I didn't check all instances of potential talk and noises, but if there are cases where we want a message to always stop resting, we could move the message in question to MSGCH_WARN or MSGCH_MONSTER_SPELL. Conversely, there's probably lots of stuff around that could also get ignored.

Users can still specify messages in stop_travel that will interrupt both rest and travel. (There's currently no distinction, and I made no changes on that account.)

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

Created by j-p-e-g on September 15, 2007

BFZZ7DFLZM4WNHQOKWDJENZOLMXH3UPHZ437BMISYJ3VSO2Y57WQC

Dependencies

In channels

main

Change contents

Replacement in crawl-ref/source/message.cc at line 482 [6.1993826]

B:BD[4.254039] → [5.461:529]

    if (channel != MSGCH_DIAGNOSTICS && channel != MSGCH_EQUIPMENT)

[4.254039]

[7.4050]

    // reusing travel_stop_message here
    if (channel != MSGCH_DIAGNOSTICS && channel != MSGCH_EQUIPMENT
        && channel != MSGCH_SOUND && channel != MSGCH_TALK)
    {

Insertion in crawl-ref/source/message.cc at line 487 [6.1993826]
[7.4133]
[6.1999198]
```
    }
```

Insertion in crawl-ref/source/message.cc at line 594 [6.1993826]

[8.1475]

        return;
    if (silenced(you.x_pos, you.y_pos) &&
        (channel == MSGCH_SOUND || channel == MSGCH_TALK))
    {

Insertion in crawl-ref/source/message.cc at line 600 [6.1993826]
[8.1491]
[8.1491]
```
    }
```

Replacement in crawl-ref/source/items.cc at line 2199 [6.2584728]

B:BD[6.2641361] → [6.2641361:2642010]

B:BD[6.2642010] → [9.156:279]

∅:D[9.279] → [6.2642149:2642378]

B:BD[6.2642149] → [6.2642149:2642378]

        mpr((temp_rand == 0) ? "\"You will not leave this place.\"" :
            (temp_rand == 1) ? "\"Die, mortal!\"" :
            (temp_rand == 2) ? "\"We do not forgive those who trespass against us!\"" :
            (temp_rand == 3) ? "\"Trespassers are not welcome here!\"" :
            (temp_rand == 4) ? "\"You do not belong in this place!\"" :
            (temp_rand == 5) ? "\"Leave now, before it is too late!\"" :
            (temp_rand == 6) ? "\"We have you now!\"" :
            (temp_rand == 7) ? "You feel a terrible foreboding..." :
            (temp_rand == 8) ? "You hear words spoken in a strange and terrible language..." :
            (temp_rand == 9) ? (player_can_smell()) ? "You smell brimstone." :
            "Brimstone rains from above." :
            (temp_rand == 10) ? "Something frightening happens." :
            (temp_rand == 11) ? "You sense an ancient evil watching you..." :
            (temp_rand == 12) ? "You feel lost and a long, long way from home..." :

[6.2641361]

[6.2642378]

        mpr((temp_rand == 0)  ? "\"You will not leave this place.\"" :
            (temp_rand == 1)  ? "\"Die, mortal!\"" :
            (temp_rand == 2)  ? "\"We do not forgive those who trespass against us!\"" :
            (temp_rand == 3)  ? "\"Trespassers are not welcome here!\"" :
            (temp_rand == 4)  ? "\"You do not belong in this place!\"" :
            (temp_rand == 5)  ? "\"Leave now, before it is too late!\"" :
            (temp_rand == 6)  ? "\"We have you now!\"" :
            // plain messages
            (temp_rand == 7)  ? (player_can_smell()) ? "You smell brimstone." :
                                "Brimstone rains from above." :
            (temp_rand == 8)  ? "You feel lost and a long, long way from home..." :
            (temp_rand == 9)  ? "You shiver with fear." :
            // warning
            (temp_rand == 10) ? "You feel a terrible foreboding..." :
            (temp_rand == 11) ? "Something frightening happens." :
            (temp_rand == 12) ? "You sense an ancient evil watching you..." :

Replacement in crawl-ref/source/items.cc at line 2216 [6.2584728]

B:BD[6.2642458] → [6.2642458:2642732]

            (temp_rand == 14) ? "A gut-wrenching scream fills the air!" :
            (temp_rand == 15) ? "You shiver with fear." :
            (temp_rand == 16) ? "You sense a hostile presence."
                              : "You hear diabolical laughter!", MSGCH_TALK);

[6.2642458]

[6.2642732]

            (temp_rand == 14) ? "You sense a hostile presence." :
            // sounds
            (temp_rand == 15) ? "A gut-wrenching scream fills the air!" :
            (temp_rand == 16) ? "You hear words spoken in a strange and terrible language..."
                              : "You hear diabolical laughter!",
                                (temp_rand < 7  ? MSGCH_TALK :
                                 temp_rand < 10 ? MSGCH_PLAIN :
                                 temp_rand < 15 ? MSGCH_WARN
                                                : MSGCH_SOUND) );

Replacement in crawl-ref/source/item_use.cc at line 478 [6.2781507]

B:BD[6.2791344] → [6.2791344:2791409]

                    mpr("You hear the crackle of electricity.");

[6.2791344]

[6.2791409]

                    if (!silenced(you.x_pos, you.y_pos))
                        mpr("You hear the crackle of electricity.", MSGCH_SOUND);
                    else
                        mpr("You see sparks fly.");

Replacement in crawl-ref/source/item_use.cc at line 535 [6.2781507]

B:BD[3.509] → [3.509:590]

                        mprf("%s says, 'Hi! I'm the Singing Sword!'", old_desc);

[3.509]

[3.590]

                        mprf(MSGCH_TALK, "%s says, 'Hi! I'm the Singing Sword!'", old_desc);

Replacement in crawl-ref/source/item_use.cc at line 537 [6.2781507]

B:BD[3.615] → [3.615:682]

                        mpr("The Singing Sword hums in delight!");

[3.615]

[6.2792999]

                        mpr("The Singing Sword hums in delight!", MSGCH_TALK);

Replacement in crawl-ref/source/it_use3.cc at line 115 [6.2870456]

B:BD[3.3420] → [3.3420:3495]

                 "regales you with its life story.", "intones a prayer.",

[3.3420]

[3.3495]

                 "regales you with its life story.", "intones a prayer.",

Insertion in crawl-ref/source/it_use3.cc at line 151 [6.2870456]

[3.5629]

            msg_channel_type channel = MSGCH_TALK;

Insertion in crawl-ref/source/it_use3.cc at line 177 [6.2870456]
[3.6646]
[3.6646]
```
                    channel = MSGCH_SOUND;
```

Replacement in crawl-ref/source/it_use3.cc at line 189 [6.2870456]

B:BD[3.7082] → [3.7082:7129]

            mpr(message.c_str(), MSGCH_SOUND);

[3.7082]

[3.7129]

            mpr(message.c_str(), channel);

Replacement in crawl-ref/source/it_use2.cc at line 386 [6.2904329]

B:BD[10.766389] → [10.766389:766442]

                    mpr("The Singing Sword sighs.");

[10.766389]

[6.2912516]

                    mpr("The Singing Sword sighs.", MSGCH_TALK);

Insertion in crawl-ref/source/acr.cc at line 1800 [6.4397395]

[2.1250]

[6.4441263]


    if (decrement_a_duration(DUR_SILENCE, "Your hearing returns."))
        you.attribute[ATTR_WAS_SILENCED] = 0;

Deletion in crawl-ref/source/acr.cc at line 2207 [6.4397395]
∅:D[9.2031] → [10.1270087:1270148]
∅:D[11.16878] → [10.1270087:1270148]
B:BD[10.1270087] → [10.1270087:1270148]
```
    bool its_quiet;             //jmf: for silence messages
```

Replacement in crawl-ref/source/acr.cc at line 2338 [6.4397395]

B:BD[6.4462619] → [6.4462619:4462667]

    its_quiet = silenced(you.x_pos, you.y_pos);

[6.4462619]

[6.4462667]

    // [jpeg] Commenting out until we add other sources of Silence
    // than the player casting the spell (messages handled elsewhere)
/*
    bool its_quiet = silenced(you.x_pos, you.y_pos);

Replacement in crawl-ref/source/acr.cc at line 2359 [6.4397395]
B:BD[6.4463120] → [6.4463120:4463121]
[6.4463120]
[12.384]
```
*/
```