fiddlerwoaroof/crawl - Change QCIPZ52TOIKLA6O22P7USLEAYI4VAZRLGVXMAASSGEP37KN5PEVAC

Add more noise-related cleanups.

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

Created by dolorous on May 28, 2008

QCIPZ52TOIKLA6O22P7USLEAYI4VAZRLGVXMAASSGEP37KN5PEVAC

Dependencies

In channels

main

Change contents

Replacement in crawl-ref/source/view.h at line 108 [3.13254]

B:BD[3.15428] → [4.170:246]

bool noisy( int loudness, int nois_x, int nois_y, const char *msg = NULL );

[3.15428]

[5.7]

bool noisy(int loudness, int nois_x, int nois_y, const char *msg = NULL);

Replacement in crawl-ref/source/view.cc at line 1046 [3.16817]

B:BD[6.5632] → [6.5632:5686]

        noisy( noise_level, monster->x, monster->y );

[6.5632]

[6.5686]

        noisy(noise_level, monster->x, monster->y);

Replacement in crawl-ref/source/view.cc at line 1458 [3.16817]

B:BD[4.13519] → [4.13519:13587]

bool noisy( int loudness, int nois_x, int nois_y, const char *msg )

[4.13519]

[3.57809]

bool noisy(int loudness, int nois_x, int nois_y, const char *msg)

Replacement in crawl-ref/source/view.cc at line 1464 [3.16817]
∅:D[4.13663] → [3.57877:57913]
B:BD[3.57877] → [3.57877:57913]
```
    if (silenced( nois_x, nois_y ))
```
[4.13663]
[4.13664]
```
    if (silenced(nois_x, nois_y))
```

Replacement in crawl-ref/source/spl-cast.cc at line 1098 [3.293070]

B:BD[3.316361] → [3.316361:316416]

B:BD[3.316416] → [4.130224:130290]

∅:D[4.130290] → [3.316469:316526]

B:BD[3.316469] → [3.316469:316526]

        if (!silenced(you.x_pos, you.y_pos))
        {
            mpr("You hear a voice call your name!", MSGCH_SOUND);
            noisy( 25, you.x_pos, you.y_pos );
        }

[3.316361]

[3.316526]

        noisy(25, you.x_pos, you.y_pos, "You hear a voice call your name!");

Replacement in crawl-ref/source/spells4.cc at line 296 [3.436250]
B:BD[3.445676] → [3.445676:445738]
```
        if (!silenced( x, y ))
            noisy( 30, x, y );
```
[3.445676]
[3.445738]
```
        noisy(30, x, y);
```
Replacement in crawl-ref/source/spells4.cc at line 308 [3.436250]
B:BD[3.445954] → [3.445954:446009]
```
    const bool sil = silenced( you.x_pos, you.y_pos );
```
[3.445954]
[3.446009]
```
    const bool sil = silenced(you.x_pos, you.y_pos);
```
Replacement in crawl-ref/source/spells4.cc at line 310 [3.436250]
B:BD[3.446010] → [3.446010:446067]
```
    if (!sil)
        noisy( 30, you.x_pos, you.y_pos );
```
[3.446010]
[3.446067]
```
    noisy(30, you.x_pos, you.y_pos);
```
Replacement in crawl-ref/source/spells3.cc at line 1128 [3.531613]
B:BD[3.556694] → [7.1141:1180]
```
            noisy( 30, pos.x, pos.y );
```
[3.556694]
[3.556737]
```
            noisy(30, pos.x, pos.y);
```
Replacement in crawl-ref/source/spells2.cc at line 678 [3.569242]
∅:D[8.16029] → [9.587:630]
B:BD[9.587] → [9.587:630]
```
        noisy( 15, you.x_pos, you.y_pos );
```
[8.16029]
[9.630]
```
        noisy(15, you.x_pos, you.y_pos);
```

Replacement in crawl-ref/source/spells1.cc at line 394 [3.616635]

B:BD[4.157116] → [4.157116:157234]

        if (noisy( 25, sx, sy ) && !see_source)
            mpr( "You hear a mighty clap of thunder!", MSGCH_SOUND );

[4.157116]

[4.157234]

        if (!see_source)
            noisy(25, sx, sy, "You hear a mighty clap of thunder!");

Replacement in crawl-ref/source/religion.cc at line 3012 [3.804403]

∅:D[10.2618] → [11.2817:2890]

B:BD[11.2817] → [11.2817:2890]

           noisy( 25, you.x_pos, you.y_pos ); // same as scroll of noise

[10.2618]

[11.2890]

           noisy(25, you.x_pos, you.y_pos); // same as scroll of noise

Replacement in crawl-ref/source/religion.cc at line 3112 [3.804403]
B:BD[12.3805] → [12.3805:3849]
```
        make_hungry( you.hunger/2, false );
```
[12.3805]
[12.3849]
```
        make_hungry(you.hunger / 2, false);
```

Replacement in crawl-ref/source/religion.cc at line 3116 [3.804403]

B:BD[12.3944] → [12.3944:4014]

        noisy( 25, you.x_pos, you.y_pos ); // same as scroll of noise

[12.3944]

[12.4014]

        noisy(25, you.x_pos, you.y_pos); // same as scroll of noise

Replacement in crawl-ref/source/monstuff.cc at line 6218 [3.1396662]

B:BD[13.936] → [13.936:998]

                noisy( noise_level, monster->x, monster->y );

[13.936]

[13.998]

                noisy(noise_level, monster->x, monster->y);

Deletion in crawl-ref/source/monstuff.cc at line 6221 [3.1396662]
B:BD[13.1051] → [13.1051:1065]
```
            {
```
Deletion in crawl-ref/source/monstuff.cc at line 6222 [3.1396662]
B:BD[13.1119] → [13.1119:1133]
```
            }
```

Replacement in crawl-ref/source/monstuff.cc at line 6224 [3.1396662]

B:BD[2.8049] → [2.8049:8111]

∅:D[2.8111] → [13.1196:1258]

B:BD[13.1196] → [13.1196:1258]

                // Just be noisy without messaging the player
                noisy( noise_level, monster->x, monster->y );

[2.8049]

[2.8112]

                // Just be noisy without messaging the player.
                noisy(noise_level, monster->x, monster->y);

Replacement in crawl-ref/source/item_use.cc at line 2380 [3.2781507]

B:BD[14.545] → [15.14678:14741]

                // ... but accuracy is important for this one.

[14.545]

[16.24649]

                // ...but accuracy is important for this one.

Replacement in crawl-ref/source/item_use.cc at line 2553 [3.2781507]
B:BD[17.2219] → [15.15439:15479]
```
    // Throwing and blowguns are silent
```
[17.2219]
[18.14349]
```
    // Throwing and blowguns are silent...
```
Replacement in crawl-ref/source/item_use.cc at line 2555 [3.2781507]
∅:D[18.14412] → [3.2830523:2830565]
B:BD[3.2830523] → [3.2830523:2830565]
```
        noisy( 6, you.x_pos, you.y_pos );
```
[18.14412]
[3.2830565]
```
        noisy(6, you.x_pos, you.y_pos);
```

Replacement in crawl-ref/source/item_use.cc at line 2557 [3.2781507]

B:BD[3.2830566] → [15.15480:15554]

    // ... but any monster nearby can see that something has been thrown:

[3.2830566]

[3.2830636]

    // ...but any monster nearby can see that something has been thrown.

Replacement in crawl-ref/source/it_use3.cc at line 242 [3.2870456]
B:BD[3.2877599] → [3.2877599:2877642]
```
        noisy( 25, you.x_pos, you.y_pos );
```
[3.2877599]
[3.2877642]
```
        noisy(25, you.x_pos, you.y_pos);
```
Replacement in crawl-ref/source/effects.cc at line 1969 [3.3382105]
∅:D[19.1630] → [20.4064:4116]
B:BD[20.4064] → [20.4064:4116]
```
        noisy( noise_level, you.x_pos, you.y_pos );
```
[19.1630]
[20.4116]
```
        noisy(noise_level, you.x_pos, you.y_pos);
```
Insertion in crawl-ref/source/effects.cc at line 2006 [3.3382105]
[21.1484]
[4.947747]
```
        noisy(noise_level, you.x_pos, you.y_pos);
```
Deletion in crawl-ref/source/effects.cc at line 2008 [3.3382105]
B:BD[4.947780] → [21.1485:1537]
```
        noisy( noise_level, you.x_pos, you.y_pos );
```
Replacement in crawl-ref/source/effects.cc at line 2083 [3.3382105]
B:BD[3.3428044] → [3.3428044:3428083]
```
    noisy( 10, you.x_pos, you.y_pos );
```
[3.3428044]
[3.3428103]
```
    noisy(10, you.x_pos, you.y_pos);
```
Replacement in crawl-ref/source/beam.cc at line 268 [3.4128068]
B:BD[3.4132675] → [3.4132675:4132742]
```
    if (ztype == ZAP_LIGHTNING && !silenced(you.x_pos, you.y_pos))
```
[22.13244]
[3.4132806]
```
    if (ztype == ZAP_LIGHTNING)
```

Replacement in crawl-ref/source/beam.cc at line 271 [3.4128068]

B:BD[22.13615] → [15.18298:18362]

∅:D[15.18362] → [3.4132863:4132906]

B:BD[3.4132863] → [3.4132863:4132906]

        mpr("You hear a mighty clap of thunder!", MSGCH_SOUND);
        noisy( 25, you.x_pos, you.y_pos );

[22.13615]

[3.4132906]

        noisy(25, you.x_pos, you.y_pos, "You hear a mighty clap of thunder!");

Replacement in crawl-ref/source/beam.cc at line 5246 [3.4128068]
B:BD[3.4253975] → [3.4253975:4254028]
```
    noisy( 10 + 5*r, beam.target_x, beam.target_y );
```
[3.4253975]
[3.4254028]
```
    noisy(10 + 5 * r, beam.target_x, beam.target_y);
```
Deletion in crawl-ref/source/acr.cc at line 3542 [3.4397395]
B:BD[16.27124] → [16.27124:27125]
Deletion in crawl-ref/source/acr.cc at line 3618 [3.4397395]
B:BD[23.3096] → [24.4804:4818]
```
            {
```
Deletion in crawl-ref/source/acr.cc at line 3619 [3.4397395]
B:BD[24.4875] → [24.4875:4889]
```
            }
```

Replacement in crawl-ref/source/acr.cc at line 3621 [3.4397395]

B:BD[23.3172] → [24.4890:4959]

∅:D[25.3591] → [23.3229:3280]

∅:D[24.4959] → [23.3229:3280]

B:BD[23.3229] → [23.3229:3280]

                mprf("The %s%s flies open with a bang!", adj, noun);
                noisy( 15, you.x_pos, you.y_pos );

[23.3172]

[23.3280]

                mprf(MSGCH_SOUND, "The %s%s flies open with a bang!",
                     adj, noun);
                noisy(15, you.x_pos, you.y_pos);

Replacement in crawl-ref/source/acr.cc at line 3628 [3.4397395]

B:BD[3.4465983] → [24.4960:5034]

∅:D[25.3659] → [3.4466045:4466092]

∅:D[24.5034] → [3.4466045:4466092]

B:BD[3.4466045] → [3.4466045:4466092]

            mprf( "As you open the %s%s, it creaks loudly!", adj, noun );
            noisy( 10, you.x_pos, you.y_pos );

[3.4465983]

[3.4466092]

            mprf(MSGCH_SOUND, "As you open the %s%s, it creaks loudly!",
                 adj, noun);
            noisy(10, you.x_pos, you.y_pos);

Replacement in crawl-ref/source/acr.cc at line 3771 [3.4397395]

B:BD[23.3557] → [24.5477:5558]

∅:D[25.5257] → [23.3626:3677]

∅:D[24.5558] → [23.3626:3677]

B:BD[23.3626] → [23.3626:3677]

                mprf("You slam the %s%s shut with an echoing bang!", adj, noun);
                noisy( 25, you.x_pos, you.y_pos );

[23.3557]

[23.3677]

                mprf(MSGCH_SOUND, "You slam the %s%s shut with an echoing bang!",
                     adj, noun);
                noisy(25, you.x_pos, you.y_pos);

Replacement in crawl-ref/source/acr.cc at line 3778 [3.4397395]

B:BD[3.4467856] → [24.5559:5632]

∅:D[25.5324] → [3.4467917:4467964]

∅:D[24.5632] → [3.4467917:4467964]

B:BD[3.4467917] → [3.4467917:4467964]

            mprf("As you close the %s%s, it creaks loudly!", adj, noun);
            noisy( 10, you.x_pos, you.y_pos );

[3.4467856]

[3.4467964]

            mprf(MSGCH_SOUND, "As you close the %s%s, it creaks loudly!",
                 adj, noun);
            noisy(10, you.x_pos, you.y_pos);

Add more noise-related cleanups.

Dependencies

In channels

Change contents

Replacement in crawl-ref/source/view.h at line 108 [3.13254]

Replacement in crawl-ref/source/view.cc at line 1046 [3.16817]

Replacement in crawl-ref/source/view.cc at line 1458 [3.16817]

Replacement in crawl-ref/source/view.cc at line 1464 [3.16817]

Replacement in crawl-ref/source/spl-cast.cc at line 1098 [3.293070]

Replacement in crawl-ref/source/spells4.cc at line 296 [3.436250]

Replacement in crawl-ref/source/spells4.cc at line 308 [3.436250]

Replacement in crawl-ref/source/spells4.cc at line 310 [3.436250]

Replacement in crawl-ref/source/spells3.cc at line 1128 [3.531613]

Replacement in crawl-ref/source/spells2.cc at line 678 [3.569242]

Replacement in crawl-ref/source/spells1.cc at line 394 [3.616635]

Replacement in crawl-ref/source/religion.cc at line 3012 [3.804403]

Replacement in crawl-ref/source/religion.cc at line 3112 [3.804403]

Replacement in crawl-ref/source/religion.cc at line 3116 [3.804403]

Replacement in crawl-ref/source/monstuff.cc at line 6218 [3.1396662]

Deletion in crawl-ref/source/monstuff.cc at line 6221 [3.1396662]

Deletion in crawl-ref/source/monstuff.cc at line 6222 [3.1396662]

Replacement in crawl-ref/source/monstuff.cc at line 6224 [3.1396662]

Replacement in crawl-ref/source/item_use.cc at line 2380 [3.2781507]

Replacement in crawl-ref/source/item_use.cc at line 2553 [3.2781507]

Replacement in crawl-ref/source/item_use.cc at line 2555 [3.2781507]

Replacement in crawl-ref/source/item_use.cc at line 2557 [3.2781507]

Replacement in crawl-ref/source/it_use3.cc at line 242 [3.2870456]

Replacement in crawl-ref/source/effects.cc at line 1969 [3.3382105]

Insertion in crawl-ref/source/effects.cc at line 2006 [3.3382105]

Deletion in crawl-ref/source/effects.cc at line 2008 [3.3382105]

Replacement in crawl-ref/source/effects.cc at line 2083 [3.3382105]

Replacement in crawl-ref/source/beam.cc at line 268 [3.4128068]

Replacement in crawl-ref/source/beam.cc at line 271 [3.4128068]

Replacement in crawl-ref/source/beam.cc at line 5246 [3.4128068]

Deletion in crawl-ref/source/acr.cc at line 3542 [3.4397395]

Deletion in crawl-ref/source/acr.cc at line 3618 [3.4397395]

Deletion in crawl-ref/source/acr.cc at line 3619 [3.4397395]

Replacement in crawl-ref/source/acr.cc at line 3621 [3.4397395]

Replacement in crawl-ref/source/acr.cc at line 3628 [3.4397395]

Replacement in crawl-ref/source/acr.cc at line 3771 [3.4397395]

Replacement in crawl-ref/source/acr.cc at line 3778 [3.4397395]