fiddlerwoaroof/crawl - Change IYDUDWPDA7JST3MVKYBAAX7GYDSM6FXXQ2QMMIKEDQLT4VXTHOUAC

Simplify.

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

Created by dolorous on June 25, 2008

IYDUDWPDA7JST3MVKYBAAX7GYDSM6FXXQ2QMMIKEDQLT4VXTHOUAC

Dependencies

In channels

main

Change contents

Replacement in crawl-ref/source/religion.cc at line 1687 [6.804403]

B:BD[5.3991] → [3.3021:3149]

    simple_god_message(make_stringf(" blesses %s with %s.",
                       whom.c_str(), result.c_str()).c_str(), god);

[5.3991]

[7.2628]

    simple_god_message(
        make_stringf(" blesses %s with %s.",
                     whom.c_str(), result.c_str()).c_str(),
        god);

Replacement in crawl-ref/source/religion.cc at line 2499 [6.804403]

∅:D[8.398] → [9.185212:185276]

∅:D[10.1362] → [9.185212:185276]

B:BD[9.185212] → [9.185212:185276]

B:BD[9.185276] → [11.2806:2882]

            snprintf( info, INFO_SIZE, " accepts your %skill.",
                      (thing_done == DID_KILL_HOLY) ? "" : "collateral " );

[8.398]

[9.185353]

            simple_god_message(
                make_stringf(" accepts your %skill.",
                             thing_done == DID_KILL_HOLY ? "" : "collateral ").c_str());

Deletion in crawl-ref/source/religion.cc at line 2503 [6.804403]
B:BD[9.185354] → [9.185354:185394]
∅:D[9.185394] → [6.839327:839328]
B:BD[6.839327] → [6.839327:839328]
```
            simple_god_message( info );
```
Insertion in crawl-ref/source/religion.cc at line 2904 [6.804403]
[12.4824]
[13.2432]
Replacement in crawl-ref/source/religion.cc at line 2907 [6.804403]
B:BD[12.4942] → [12.4942:4967]
```
            if ( first )
```
[12.4942]
[12.4967]
```
            if (first)
```

Replacement in crawl-ref/source/religion.cc at line 2914 [6.804403]

B:BD[12.5110] → [12.5110:5234]

                    snprintf(info, INFO_SIZE, "You can now %s.", pmsg);
                    god_speaks(you.religion, info);

[12.5110]

[12.5234]

                    god_speaks(you.religion,
                               make_stringf("You can now %s.", pmsg).c_str());

Insertion in crawl-ref/source/religion.cc at line 2917 [6.804403]
[12.5252]
[14.162]
Insertion in crawl-ref/source/religion.cc at line 3253 [6.804403]
[12.5554]
[4.2913]

Replacement in crawl-ref/source/religion.cc at line 3260 [6.804403]

B:BD[12.5746] → [12.5746:5881]

                        snprintf(info,INFO_SIZE,"You can no longer %s.",pmsg);
                        god_speaks(you.religion, info);

[12.5746]

[12.5881]

                        god_speaks(you.religion,
                                   make_stringf("You can no longer %s.", pmsg).c_str());

Replacement in crawl-ref/source/religion.cc at line 3267 [6.804403]

B:BD[15.6451] → [16.4923:5056]

                    fall_into_a_pool( you.x_pos, you.y_pos, true,
                                      grd[you.x_pos][you.y_pos] );

[15.6451]

[15.6581]

                    fall_into_a_pool(you.x_pos, you.y_pos, true,
                                     grd[you.x_pos][you.y_pos]);

Replacement in crawl-ref/source/religion.cc at line 3523 [6.804403]

B:BD[17.4073] → [18.4203:4364]

        snprintf(info, INFO_SIZE, " dulls %syour weapons.",
                 (num_dulled > 1) ? "" : "one of ");
        simple_god_message(info, GOD_ELYVILON);

[17.4073]

[18.4364]

        simple_god_message(
            make_stringf(" dulls %syour weapons.",
                         num_dulled > 1 ? "" : "one of ").c_str(),
            GOD_ELYVILON);

Replacement in crawl-ref/source/religion.cc at line 4717 [6.804403]

B:BD[19.2803] → [2.2579:2718]

∅:D[2.2718] → [19.2944:2988]

B:BD[19.2944] → [19.2944:2988]

        snprintf(info, INFO_SIZE, " does not appreciate desertion%s!",
            god_hates_your_god_reaction(old_god, new_god).c_str());
        simple_god_message(info, old_god);

[19.2803]

[19.2988]

        simple_god_message(
            make_stringf(" does not appreciate desertion%s!",
                         god_hates_your_god_reaction(old_god, new_god).c_str()).c_str(),
            old_god);

Replacement in crawl-ref/source/religion.cc at line 5449 [6.804403]

B:BD[20.147] → [21.3826:3877]

∅:D[21.3877] → [6.883452:883512]

B:BD[6.883452] → [6.883452:883512]

B:BD[6.883512] → [21.3878:3879]

∅:D[20.153] → [6.883513:883545]

∅:D[21.3879] → [6.883513:883545]

B:BD[6.883513] → [6.883513:883545]

    snprintf( info, INFO_SIZE, " welcomes you%s!",
              (you.worshipped[which_god]) ? " back" : "" );
    simple_god_message( info );

[20.147]

[6.883545]

    simple_god_message(
        make_stringf(" welcomes you%s!",
                     you.worshipped[which_god] ? " back" : "").c_str());

Replacement in crawl-ref/source/religion.cc at line 5633 [6.804403]

B:BD[22.1802] → [22.1802:1872]

B:BD[22.1872] → [23.2640:2704]

∅:D[23.2704] → [22.1934:1974]

B:BD[22.1934] → [22.1934:1974]

        snprintf(info, INFO_SIZE, "Mortal, I have averted the wrath "
                 "of %s... this time.", god_name(god).c_str());
        god_speaks(you.religion, info);

[22.1802]

[22.1974]

        god_speaks(you.religion,
                   make_stringf("Mortal, I have averted the wrath of %s... "
                                "this time.", god_name(god).c_str()).c_str());