fiddlerwoaroof/crawl - Change UURAYLSSITZLQR56MCWFPIWMECU7F3USMA2UPJAO4IPIY5WVKP5QC

Minor cleanups.

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

Created by haranp on May 15, 2007

UURAYLSSITZLQR56MCWFPIWMECU7F3USMA2UPJAO4IPIY5WVKP5QC

Dependencies

In channels

main

Change contents

Replacement in crawl-ref/source/spl-cast.cc at line 1957 [4.293070]

B:BD[4.345528] → [5.902:970]

                mprf("Sparks fly from your %s!", your_hand(true) );

[4.345528]

[4.345672]

                msg::stream << "Sparks fly from your " << your_hand(true)
                            << '!' << std::endl;

Deletion in crawl-ref/source/spl-cast.cc at line 1960 [4.293070]
B:BD[4.345695] → [4.345695:345696]
Deletion in crawl-ref/source/spl-cast.cc at line 1963 [4.293070]
B:BD[4.345804] → [4.345804:345805]

Replacement in crawl-ref/source/spl-cast.cc at line 1964 [4.293070]

B:BD[4.345825] → [5.971:1048]

                mprf("Wisps of smoke drift from your %s.", your_hand(true));

[4.345825]

[4.345977]

                msg::stream << "Wisps of smoke drift from your "
                            << your_hand(true) << '.' << std::endl;

Replacement in crawl-ref/source/spl-cast.cc at line 1997 [4.293070]

B:BD[4.347007] → [5.1049:1117]

                mprf("Smoke pours from your %s!", your_hand(true));

[4.347007]

[6.2663]

                msg::stream << "Smoke pours from your " << your_hand(true)
                            << '!' << std::endl;

Replacement in crawl-ref/source/spl-cast.cc at line 2080 [4.293070]

B:BD[4.349847] → [5.1118:1187]

                mprf("Your %s glow momentarily.", your_hand(true) );

[4.349847]

[4.349992]

                msg::stream << "Your " << your_hand(true)
                            << " glow momentarily." << std::endl;

Replacement in crawl-ref/source/spl-cast.cc at line 2756 [4.293070]

B:BD[4.372324] → [5.1188:1256]

                mprf("Your %s glow momentarily.", your_hand(true));

[4.372324]

[4.372468]

                msg::stream << "Your " << your_hand(true)
                            << " glow momentarily." << std::endl;

Replacement in crawl-ref/source/spl-cast.cc at line 2860 [4.293070]

B:BD[4.375741] → [5.1257:1324]

                mprf("Sparks fly from your %s!", your_hand(true));

[4.375741]

[4.375883]

                msg::stream << "Sparks fly from your " << your_hand(true)
                            << '!' << std::endl;

Replacement in crawl-ref/source/spl-cast.cc at line 2867 [4.293070]

B:BD[4.376031] → [5.1325:1402]

                mprf("Wisps of smoke drift from your %s.", your_hand(true));

[4.376031]

[4.376183]

                msg::stream << "Wisps of smoke drift from your "
                            << your_hand(true) << '.' << std::endl;

Replacement in crawl-ref/source/spl-cast.cc at line 2902 [4.293070]

B:BD[4.377258] → [5.1403:1472]

                mprf("Smoke pours from your %s!", your_hand(true) );

[4.377258]

[3.1482]

                msg::stream << "Smoke pours from your "
                            << your_hand(true) << "!" << std::endl;

Replacement in crawl-ref/source/spl-cast.cc at line 3009 [4.293070]

B:BD[4.380590] → [5.1473:1578]

                mprf("Wisps of condensation drift from your %s.",
                     your_hand(true));

[4.380590]

[4.380749]

                msg::stream << "Wisps of condensation drift from your "
                            << your_hand(true) << "." << std::endl;

Replacement in crawl-ref/source/spl-cast.cc at line 3016 [4.293070]

B:BD[4.380895] → [5.1579:1650]

                mprf("Your %s feel numb with cold.", your_hand(true));

[4.380895]

[4.381040]

                msg::stream << "Your " << your_hand(true)
                            << " feel numb with cold." << std::endl;

Replacement in crawl-ref/source/spl-cast.cc at line 3103 [4.293070]

B:BD[4.383636] → [5.1651:1728]

                mprf("Freezing gasses pour from your %s!", your_hand(true));

[4.383636]

[6.2837]

                msg::stream << "Freezing gasses pour from your "
                            << your_hand(true) << "!" << std::endl;

Replacement in crawl-ref/source/spl-cast.cc at line 3127 [4.293070]

B:BD[4.384397] → [5.1729:1796]

                mprf("Sand pours from your %s.", your_hand(true));

[4.384397]

[4.384539]

                msg::stream << "Sand pours from your "
                            << your_hand(true) << "." << std::endl;

Replacement in crawl-ref/source/spl-cast.cc at line 3232 [4.293070]

B:BD[4.387816] → [5.2038:2116]

                mprf("Wisps of vapour drift from your %s.", your_hand(true));

[4.387816]

[4.387969]

                msg::stream << "Wisps of vapour drift from your "
                            << your_hand(true) << "." << std::endl;

Replacement in crawl-ref/source/spl-cast.cc at line 3242 [4.293070]

B:BD[4.388201] → [5.2117:2225]

                mprf("Sparks of electricity dance between your %s.",
                     your_hand(true));

[4.388201]

[4.388363]

                msg::stream << "Sparks of electricity dance between your "
                            << your_hand(true) << "." << std::endl;

Replacement in crawl-ref/source/spl-cast.cc at line 3288 [4.293070]

B:BD[4.389971] → [5.2349:2425]

                mprf("Noxious gasses pour from your %s!", your_hand(true));

[4.389971]

[6.2910]

                msg::stream << "Noxious gasses pour from your "
                            << your_hand(true) << "!" << std::endl;

Replacement in crawl-ref/source/spl-cast.cc at line 3320 [4.293070]

B:BD[4.391081] → [5.2426:2503]

                mprf("Venomous gasses pour from your %s!", your_hand(true));

[4.391081]

[6.2984]

                msg::stream << "Venomous gasses pour from your "
                            << your_hand(true) << "!" << std::endl;

Replacement in crawl-ref/source/spl-cast.cc at line 3343 [4.293070]

B:BD[4.391819] → [5.2504:2607]

                mprf("Wisps of poison gas drift from your %s.",
                     your_hand(true));

[4.391819]

[4.391977]

                msg::stream << "Wisps of poison gas drift from your "
                            << your_hand(true) << "." << std::endl;

Replacement in crawl-ref/source/spl-cast.cc at line 3388 [4.293070]

B:BD[4.393249] → [5.2608:2685]

                mprf("Noxious gasses pour from your %s!", your_hand(true) );

[4.393249]

[4.393402]

                msg::stream << "Noxious gasses pour from your "
                            << your_hand(true) << "!" << std::endl;

Replacement in crawl-ref/source/spl-cast.cc at line 3441 [4.293070]

B:BD[4.394906] → [5.2686:2763]

                mprf("Venomous gasses pour from your %s!", your_hand(true));

[4.394906]

[6.3188]

                msg::stream << "Venomous gasses pour from your "
                            << your_hand(true) << "!" << std::endl;

Replacement in crawl-ref/source/spells4.h at line 19 [4.434549]
B:BD[4.434859] → [4.434859:434895]
```
const char *your_hand(bool plural);
```
[4.434859]
[4.434895]
```
std::string your_hand(bool plural);
```
Insertion in crawl-ref/source/spells4.cc at line 18 [4.436250]
[4.436660]
[4.436660]
```
#include <iostream>
```
Insertion in crawl-ref/source/spells4.cc at line 38 [4.436250]
[7.165]
[4.436962]
```
#include "message.h"
```
Replacement in crawl-ref/source/spells4.cc at line 77 [4.436250]
B:BD[4.438144] → [4.438144:438181]
```
const char *your_hand( bool plural )
```
[4.438144]
[4.438181]
```
std::string your_hand( bool plural )
```
Replacement in crawl-ref/source/spells4.cc at line 79 [4.436250]
B:BD[4.438183] → [4.438183:438215]
```
    static char hand_buff[80];
```
[4.438183]
[4.438215]
```
    std::string result;
```
Replacement in crawl-ref/source/spells4.cc at line 88 [4.436250]
B:BD[4.438472] → [4.438472:438511]
```
            strcpy(hand_buff, "claw");
```
[4.438472]
[4.438511]
```
            result = "claw";
```
Replacement in crawl-ref/source/spells4.cc at line 94 [4.436250]
B:BD[4.438612] → [4.438612:438647]
```
        strcpy(hand_buff, "hand");
```
[4.438612]
[4.438647]
```
        result = "hand";
```
Replacement in crawl-ref/source/spells4.cc at line 97 [4.436250]
B:BD[4.438684] → [4.438684:438724]
```
        strcpy(hand_buff, "front leg");
```
[4.438684]
[4.438724]
```
        result = "front leg";
```
Replacement in crawl-ref/source/spells4.cc at line 101 [4.436250]
B:BD[4.438792] → [4.438792:438831]
```
        strcpy(hand_buff, "foreclaw");
```
[4.438792]
[4.438831]
```
        result = "foreclaw";
```
Replacement in crawl-ref/source/spells4.cc at line 104 [4.436250]
B:BD[4.438873] → [4.438873:438921]
```
        strcpy(hand_buff, "scythe-like blade");
```
[4.438873]
[4.438921]
```
        result = "scythe-like blade";
```
Replacement in crawl-ref/source/spells4.cc at line 107 [4.436250]
B:BD[4.438955] → [4.438955:438999]
```
        strcpy(hand_buff, "misty tendril");
```
[4.438955]
[4.438999]
```
        result = "misty tendril";
```
Replacement in crawl-ref/source/spells4.cc at line 112 [4.436250]
B:BD[4.439037] → [4.439037:439069]
```
        strcat(hand_buff, "s");
```
[4.439037]
[4.439069]
```
        result += 's';
```
Replacement in crawl-ref/source/spells4.cc at line 114 [4.436250]
B:BD[4.439070] → [4.439070:439094]
```
    return (hand_buff);
```
[4.439070]
[4.439094]
```
    return result;
```

Replacement in crawl-ref/source/spells4.cc at line 672 [4.436250]

B:BD[4.453589] → [5.3849:3906]

        mprf("Your %s feel slithery!", your_hand(true));

[4.453589]

[4.453687]

        msg::stream << "Your " << your_hand(true) << " feel slithery!"
                    << std::endl;

Replacement in crawl-ref/source/spells4.cc at line 770 [4.436250]

B:BD[4.456737] → [5.4015:4072]

        mprf("Your %s feel slithery!", your_hand(true));

[4.456737]

[4.456816]

        msg::stream << "Your " << your_hand(true) << " feel slithery!"
                    << std::endl;

Replacement in crawl-ref/source/spells4.cc at line 1885 [4.436250]

B:BD[4.488297] → [5.5162:5231]

        mprf("Wisps of steam play over your %s!", your_hand(true) );

[4.488297]

[4.488427]

        msg::stream << "Wisps of steam play over your " << your_hand(true)
                    << std::endl;

Insertion in crawl-ref/source/spells3.cc at line 21 [4.531613]
[4.532076]
[4.532076]
```
#include <iostream>
```

Replacement in crawl-ref/source/spells3.cc at line 479 [4.531613]

B:BD[8.147519] → [8.147519:147590]

        mprf(MSGCH_PLAIN, "Your %s twitch.", your_hand(true));

[8.147519]

[4.545218]

        msg::stream <<"Your " << your_hand(true) << " twitch" << std::endl;

Insertion in crawl-ref/source/spells1.cc at line 24 [4.616635]
[4.617331]
[4.617331]
```
#include <iostream>
```

Replacement in crawl-ref/source/spells1.cc at line 1093 [4.616635]

B:BD[4.641714] → [5.7585:7696]

    mprf("Your %s begin to glow %s.",
         your_hand(true), (you.confusing_touch ? "brighter" : "red") );

[4.641714]

[4.641852]

    msg::stream << "Your " << your_hand(true) << " begin to glow "
                << (you.confusing_touch ? "brighter" : "red") << std::endl;

Insertion in crawl-ref/source/ouch.cc at line 31 [4.1104358]
[9.213909]
[4.1105635]
```
#include <iostream>
```

Replacement in crawl-ref/source/ouch.cc at line 311 [4.1104358]

B:BD[4.1110677] → [5.13874:13923]

        mprf("Your %s burn!", your_hand(true) );

[4.1110677]

[4.1110770]

        msg::stream << "Your " << your_hand(true) << " burn!" << std::endl;

Deletion in crawl-ref/source/mon-pick.cc at line 374 [4.1767507]

B:BD[4.1780484] → [4.1780484:1780614]

    //case MONS_RAKSHASA_FAKE:    //jmf: FIXME: really create these?
                                  // I'm guessing not -- bwr

Replacement in crawl-ref/source/invent.cc at line 64 [4.2920632]

B:BD[8.772173] → [8.772173:772182]

B:BD[8.772211] → [8.772211:772244]

B:BD[8.772244] → [10.26062:26158]

∅:D[10.26158] → [8.772244:772310]

B:BD[8.772244] → [8.772244:772310]

B:BD[8.772310] → [10.26159:26231]

∅:D[10.26231] → [8.772355:772364]

B:BD[8.772355] → [8.772355:772364]

B:BD[8.772364] → [10.26232:26350]

        
    if (i.base_type == OBJ_GOLD)
    {
        // XXX XXX FIXME XXX XXX Why the special-casing?
        char buf[ITEMNAME_SIZE];
        snprintf(buf, sizeof buf, "%d gold piece%s", i.quantity, 
                 (i.quantity > 1? "s" : ""));
        text = buf;
    }
    else
    {
        text = i.name(in_inventory(i)? DESC_INVENTORY_EQUIP : DESC_NOCAP_A,
                      false);
    }

[8.772173]

[8.772510]

    text = i.name(DESC_NOCAP_A, false);

Deletion in crawl-ref/source/invent.cc at line 67 [4.2920632]

B:BD[8.772563] → [8.772563:772724]

    {
        // FIXME: This is HORRIBLE! We're skipping the inventory letter prefix 
        // which looks like this: "a - ".
        text = text.substr( 4 );

Deletion in crawl-ref/source/invent.cc at line 68 [4.2920632]
B:BD[8.772771] → [8.772771:772777]
```
    }
```
Replacement in crawl-ref/source/invent.cc at line 69 [4.2920632]
∅:D[8.772786] → [9.370511:370517]
B:BD[9.370511] → [9.370511:370517]
B:BD[9.370517] → [8.772787:772869]
∅:D[8.772869] → [9.370562:370568]
B:BD[9.370562] → [9.370562:370568]
```
    {
        // Dummy hotkey for gold or non-inventory items.
        add_hotkey(' ');
    }
```
[8.772786]
[8.772870]
```
        add_hotkey(' ');        // dummy hotkey
```

Insertion in crawl-ref/source/files.cc at line 851 [4.3084589]

[2.8604]

    for (int clouty = 0; clouty < MAX_CLOUDS; ++clouty)
        delete_cloud( clouty );

Replacement in crawl-ref/source/files.cc at line 855 [4.3084589]

B:BD[2.8676] → [2.8676:8719]

            env.cgrid[i][j] = EMPTY_CLOUD;

[2.8676]

[2.8719]

            ASSERT(env.cgrid[i][j] == EMPTY_CLOUD);

Replacement in crawl-ref/source/files.cc at line 922 [4.3084589]

B:BD[4.3092937] → [4.3092937:3093009]

    // Don't delete clouds just because the player saved and restarted.

[4.3092816]

[4.3093009]

    // We clear twice - on save and on load.
    // Once would be enough...

Replacement in crawl-ref/source/files.cc at line 925 [4.3084589]

B:BD[4.3093049] → [4.3093049:3093055]

B:BD[4.3093055] → [2.9942:10011]

∅:D[2.10011] → [4.3093055:3093195]

B:BD[4.3093055] → [4.3093055:3093195]

    {
        // XXX XXX FIXME shouldn't this just go into clear_clouds()?
        for (int clouty = 0; clouty < MAX_CLOUDS; ++clouty)
            delete_cloud( clouty );
        ASSERT( env.cloud_no == 0 );
    }

[4.3093049]

[4.3093195]

        clear_clouds();

Insertion in crawl-ref/source/files.cc at line 992 [4.3084589]
[4.3098680]
[2.10289]
```
    // Here's the second cloud clearing, on load (see above)
```

Replacement in crawl-ref/source/clua.cc at line 1115 [9.483969]

B:BD[9.510026] → [9.510026:510146]

                if (item->sub_type < AMU_RAGE)
                    s = ring_types[item->sub_type];
                else

[9.510026]

[9.510146]

                if (jewellery_is_amulet(*item))

Insertion in crawl-ref/source/clua.cc at line 1117 [9.483969]

[9.510213]

                else
                    s = ring_types[item->sub_type];

Replacement in crawl-ref/source/acr.cc at line 2018 [4.4397395]

B:BD[4.4454417] → [5.28049:28122]

        mprf(MSGCH_DURATION, "Your %s stop glowing.", your_hand(true) );

[4.4454417]

[4.4454533]

        msg::streams(MSGCH_DURATION) << "Your " << your_hand(true)
                                     << " stop glowing." << std::endl;

Minor cleanups.

Dependencies

In channels

Change contents

Replacement in crawl-ref/source/spl-cast.cc at line 1957 [4.293070]

Deletion in crawl-ref/source/spl-cast.cc at line 1960 [4.293070]

Deletion in crawl-ref/source/spl-cast.cc at line 1963 [4.293070]

Replacement in crawl-ref/source/spl-cast.cc at line 1964 [4.293070]

Replacement in crawl-ref/source/spl-cast.cc at line 1997 [4.293070]

Replacement in crawl-ref/source/spl-cast.cc at line 2080 [4.293070]

Replacement in crawl-ref/source/spl-cast.cc at line 2756 [4.293070]

Replacement in crawl-ref/source/spl-cast.cc at line 2860 [4.293070]

Replacement in crawl-ref/source/spl-cast.cc at line 2867 [4.293070]

Replacement in crawl-ref/source/spl-cast.cc at line 2902 [4.293070]

Replacement in crawl-ref/source/spl-cast.cc at line 3009 [4.293070]

Replacement in crawl-ref/source/spl-cast.cc at line 3016 [4.293070]

Replacement in crawl-ref/source/spl-cast.cc at line 3103 [4.293070]

Replacement in crawl-ref/source/spl-cast.cc at line 3127 [4.293070]

Replacement in crawl-ref/source/spl-cast.cc at line 3232 [4.293070]

Replacement in crawl-ref/source/spl-cast.cc at line 3242 [4.293070]

Replacement in crawl-ref/source/spl-cast.cc at line 3288 [4.293070]

Replacement in crawl-ref/source/spl-cast.cc at line 3320 [4.293070]

Replacement in crawl-ref/source/spl-cast.cc at line 3343 [4.293070]

Replacement in crawl-ref/source/spl-cast.cc at line 3388 [4.293070]

Replacement in crawl-ref/source/spl-cast.cc at line 3441 [4.293070]

Replacement in crawl-ref/source/spells4.h at line 19 [4.434549]

Insertion in crawl-ref/source/spells4.cc at line 18 [4.436250]

Insertion in crawl-ref/source/spells4.cc at line 38 [4.436250]

Replacement in crawl-ref/source/spells4.cc at line 77 [4.436250]

Replacement in crawl-ref/source/spells4.cc at line 79 [4.436250]

Replacement in crawl-ref/source/spells4.cc at line 88 [4.436250]

Replacement in crawl-ref/source/spells4.cc at line 94 [4.436250]

Replacement in crawl-ref/source/spells4.cc at line 97 [4.436250]

Replacement in crawl-ref/source/spells4.cc at line 101 [4.436250]

Replacement in crawl-ref/source/spells4.cc at line 104 [4.436250]

Replacement in crawl-ref/source/spells4.cc at line 107 [4.436250]

Replacement in crawl-ref/source/spells4.cc at line 112 [4.436250]

Replacement in crawl-ref/source/spells4.cc at line 114 [4.436250]