fiddlerwoaroof/crawl - Change HQYQ6ZCUZBFKNPREFNSWSMRA4UD7VJXW6XK2GQONE5F3OX5NOMUQC

A few more char*s fall by the wayside, replaced by strings.

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

Created by haranp on June 18, 2007

HQYQ6ZCUZBFKNPREFNSWSMRA4UD7VJXW6XK2GQONE5F3OX5NOMUQC

Dependencies

In channels

main

Change contents

Replacement in crawl-ref/source/randart.h at line 37 [4.889057]
B:BD[4.890121] → [4.890121:890178]
```
const char *randart_armour_name( const item_def &item );
```
[4.890121]
[4.890178]
```
std::string randart_armour_name( const item_def &item );
```
Replacement in crawl-ref/source/randart.h at line 42 [4.889057]
B:BD[4.890357] → [4.890357:890407]
```
const char *randart_name( const item_def &item );
```
[4.890357]
[4.890407]
```
std::string randart_name( const item_def &item );
```

Replacement in crawl-ref/source/randart.h at line 47 [4.889057]

B:BD[4.890586] → [2.187:247]

const char *randart_jewellery_name( const item_def &item );

[4.890586]

[4.890641]

std::string randart_jewellery_name( const item_def &item );

Deletion in crawl-ref/source/randart.cc at line 464 [4.893152]
B:BD[4.902695] → [4.902695:902718]
```
// Not yet possible...
```

Replacement in crawl-ref/source/randart.cc at line 465 [4.893152]

B:BD[4.902729] → [4.902729:903221]

    " of Joyful Slaughter",
    " of ",
    " of ",
    " of ",
    " of ",
    " of ",
    " of ",
    " of ",
    " of ",
    " of ",
/* 390: */
    "\"\"",
    "\"\"",
    "\"\"",
    "\"\"",
    "\"\"",
    "\"\"",
    "\"\"",
    "\"\"",
    "\"\"",
    "\"\"",
/* 340: */
    " of ",
    " of ",
    " of ",
    " of ",
    " of ",
    " of ",
    " of ",
    " of ",
    " of ",
    " of ",
/* 200: */
    "",
    "",
    "",
    "",
    "",
    "",
    "",
    "",
    "",
    "",

[4.902729]

[4.903221]

    " of Joyful Slaughter"

Replacement in crawl-ref/source/randart.cc at line 548 [4.893152]

B:BD[4.904882] → [4.904882:905027]

    " of the Loofah",
    " of ",
    " of ",
    " of ",
    " of ",
    " of ",
    " of ",
    " of ",
    " of ",
    " of ",
// Sarcophagus

[4.904882]

[4.905027]

    " of the Loofah"

Deletion in crawl-ref/source/randart.cc at line 602 [4.893152]
B:BD[4.906351] → [5.312:339]
```
char art_n[ITEMNAME_SIZE];
```
Replacement in crawl-ref/source/randart.cc at line 1169 [4.893152]
B:BD[4.923066] → [4.923066:923115]
```
const char *randart_name( const item_def &item )
```
[4.923066]
[4.923115]
```
std::string randart_name( const item_def &item )
```
Deletion in crawl-ref/source/randart.cc at line 1178 [4.893152]
B:BD[4.923483] → [4.923483:923484]
B:BD[4.923484] → [5.4111:4129]
```
    art_n[0] = 0;
```
Deletion in crawl-ref/source/randart.cc at line 1179 [4.893152]
B:BD[4.923572] → [4.923572:923639]
```
    // long seed = aclass + adam * (aplus % 100) + atype * aplus2;
```
Replacement in crawl-ref/source/randart.cc at line 1182 [4.893152]
∅:D[6.196629] → [4.923722:923723]
B:BD[4.923722] → [4.923722:923723]
[6.196629]
[7.650]
```
    
    std::string result;
    
```

Replacement in crawl-ref/source/randart.cc at line 1189 [4.893152]

B:BD[4.923818] → [4.923818:924916]

        case  0: strcat(art_n, "brightly glowing "); break;
        case  1: strcat(art_n, "runed "); break;
        case  2: strcat(art_n, "smoking "); break;
        case  3: strcat(art_n, "bloodstained "); break;
        case  4: strcat(art_n, "twisted "); break;
        case  5: strcat(art_n, "shimmering "); break;
        case  6: strcat(art_n, "warped "); break;
        case  7: strcat(art_n, "crystal "); break;
        case  8: strcat(art_n, "jewelled "); break;
        case  9: strcat(art_n, "transparent "); break;
        case 10: strcat(art_n, "encrusted "); break;
        case 11: strcat(art_n, "pitted "); break;
        case 12: strcat(art_n, "slimy "); break;
        case 13: strcat(art_n, "polished "); break;
        case 14: strcat(art_n, "fine "); break;
        case 15: strcat(art_n, "crude "); break;
        case 16: strcat(art_n, "ancient "); break;
        case 17: strcat(art_n, "ichor-stained "); break;
        case 18: strcat(art_n, "faintly glowing "); break;
        case 19: strcat(art_n, "steaming "); break;
        case 20: strcat(art_n, "shiny "); break;

[4.923818]

[4.924916]

        case  0: result += "brightly glowing "; break;
        case  1: result += "runed "; break;
        case  2: result += "smoking "; break;
        case  3: result += "bloodstained "; break;
        case  4: result += "twisted "; break;
        case  5: result += "shimmering "; break;
        case  6: result += "warped "; break;
        case  7: result += "crystal "; break;
        case  8: result += "jewelled "; break;
        case  9: result += "transparent "; break;
        case 10: result += "encrusted "; break;
        case 11: result += "pitted "; break;
        case 12: result += "slimy "; break;
        case 13: result += "polished "; break;
        case 14: result += "fine "; break;
        case 15: result += "crude "; break;
        case 16: result += "ancient "; break;
        case 17: result += "ichor-stained "; break;
        case 18: result += "faintly glowing "; break;
        case 19: result += "steaming "; break;
        case 20: result += "shiny "; break;

Replacement in crawl-ref/source/randart.cc at line 1211 [4.893152]
B:BD[4.924926] → [4.924926:924927]
B:BD[4.924927] → [8.99:152]
```
        strcat(art_n, item_base_name(item).c_str());
```
[4.924926]
[6.196630]
```
        
        result += item_base_name(item);
```
Replacement in crawl-ref/source/randart.cc at line 1214 [4.893152]
∅:D[6.196655] → [4.925071:925095]
B:BD[4.925071] → [4.925071:925095]
```
        return (art_n);
```
[6.196655]
[4.925095]
```
        return result;
```

Replacement in crawl-ref/source/randart.cc at line 1219 [4.893152]

B:BD[4.925164] → [8.153:206]

∅:D[8.206] → [5.4314:4367]

B:BD[5.4314] → [5.4314:4367]

        strcat(art_n, item_base_name(item).c_str());
        strcat(art_n, rand_wpn_names[random2(390)]);

[4.925164]

[4.925297]

        result += item_base_name(item);
        result += rand_wpn_names[random2(ARRAYSIZE(rand_wpn_names))];

Replacement in crawl-ref/source/randart.cc at line 1227 [4.893152]
B:BD[9.197250] → [8.207:260]
```
        strcat(art_n, item_base_name(item).c_str());
```
[9.197250]
[4.925506]
```
        result += item_base_name(item);
```

Replacement in crawl-ref/source/randart.cc at line 1231 [4.893152]

B:BD[4.925546] → [4.925546:925614]

            strcat(art_n, " of ");
            strcat(art_n, st_p);

[4.925546]

[4.925614]

            result += " of ";
            result += st_p;

Replacement in crawl-ref/source/randart.cc at line 1236 [4.893152]

B:BD[4.925647] → [4.925647:925747]

            strcat(art_n, " \"");
            strcat(art_n, st_p);
            strcat(art_n, "\"");

[4.925647]

[4.925747]

            result += " \"";
            result += st_p;
            result += "\"";

Replacement in crawl-ref/source/randart.cc at line 1244 [4.893152]
B:BD[4.925787] → [4.925787:925807]
```
    return (art_n);
```
[4.925787]
[4.925807]
```
    return result;
```
Replacement in crawl-ref/source/randart.cc at line 1247 [4.893152]
B:BD[4.925810] → [4.925810:925866]
```
const char *randart_armour_name( const item_def &item )
```
[4.925810]
[4.925866]
```
std::string randart_armour_name( const item_def &item )
```
Deletion in crawl-ref/source/randart.cc at line 1257 [4.893152]
B:BD[4.926310] → [5.4626:4644]
∅:D[5.4644] → [4.926333:926401]
B:BD[4.926333] → [4.926333:926401]
```
    art_n[0] = 0;
    // long seed = aclass + adam * (aplus % 100) + atype * aplus2;
```
Insertion in crawl-ref/source/randart.cc at line 1262 [4.893152]
[4.926485]
[7.737]
```
    std::string result;
```

Replacement in crawl-ref/source/randart.cc at line 1268 [4.893152]

B:BD[4.926580] → [4.926580:927683]

        case  0: strcat(art_n, "brightly glowing "); break;
        case  1: strcat(art_n, "runed "); break;
        case  2: strcat(art_n, "smoking "); break;
        case  3: strcat(art_n, "bloodstained "); break;
        case  4: strcat(art_n, "twisted "); break;
        case  5: strcat(art_n, "shimmering "); break;
        case  6: strcat(art_n, "warped "); break;
        case  7: strcat(art_n, "heavily runed "); break;
        case  8: strcat(art_n, "jeweled "); break;
        case  9: strcat(art_n, "transparent "); break;
        case 10: strcat(art_n, "encrusted "); break;
        case 11: strcat(art_n, "pitted "); break;
        case 12: strcat(art_n, "slimy "); break;
        case 13: strcat(art_n, "polished "); break;
        case 14: strcat(art_n, "fine "); break;
        case 15: strcat(art_n, "crude "); break;
        case 16: strcat(art_n, "ancient "); break;
        case 17: strcat(art_n, "ichor-stained "); break;
        case 18: strcat(art_n, "faintly glowing "); break;
        case 19: strcat(art_n, "steaming "); break;
        case 20: strcat(art_n, "shiny "); break;

[4.926580]

[4.927683]

        case  0: result += "brightly glowing "; break;
        case  1: result += "runed "; break;
        case  2: result += "smoking "; break;
        case  3: result += "bloodstained "; break;
        case  4: result += "twisted "; break;
        case  5: result += "shimmering "; break;
        case  6: result += "warped "; break;
        case  7: result += "heavily runed "; break;
        case  8: result += "jeweled "; break;
        case  9: result += "transparent "; break;
        case 10: result += "encrusted "; break;
        case 11: result += "pitted "; break;
        case 12: result += "slimy "; break;
        case 13: result += "polished "; break;
        case 14: result += "fine "; break;
        case 15: result += "crude "; break;
        case 16: result += "ancient "; break;
        case 17: result += "ichor-stained "; break;
        case 18: result += "faintly glowing "; break;
        case 19: result += "steaming "; break;
        case 20: result += "shiny "; break;

Replacement in crawl-ref/source/randart.cc at line 1290 [4.893152]
B:BD[4.927693] → [8.261:314]
```
        strcat(art_n, item_base_name(item).c_str());
```
[4.927693]
[6.196728]
```
        result += item_base_name(item);
```
Replacement in crawl-ref/source/randart.cc at line 1292 [4.893152]
∅:D[6.196753] → [4.927828:927852]
B:BD[4.927828] → [4.927828:927852]
```
        return (art_n);
```
[6.196753]
[4.927852]
```
        return result;
```
Replacement in crawl-ref/source/randart.cc at line 1294 [4.893152]
B:BD[4.927858] → [4.927858:927859]
[4.927858]
[5.4717]
```
    
```

Replacement in crawl-ref/source/randart.cc at line 1297 [4.893152]

B:BD[4.927921] → [8.315:368]

∅:D[8.368] → [5.4738:4793]

B:BD[4.927992] → [5.4738:4793]

        strcat(art_n, item_base_name(item).c_str());
        strcat(art_n, rand_armour_names[random2(71)]);

[4.927921]

[4.928047]

        result += item_base_name(item);
        result += rand_armour_names[random2(ARRAYSIZE(rand_armour_names))];

Replacement in crawl-ref/source/randart.cc at line 1305 [4.893152]
B:BD[9.197345] → [8.404:457]
```
        strcat(art_n, item_base_name(item).c_str());
```
[9.197345]
[5.4794]
```
        result += item_base_name(item);
```

Replacement in crawl-ref/source/randart.cc at line 1308 [4.893152]

B:BD[4.928286] → [4.928286:928354]

            strcat(art_n, " of ");
            strcat(art_n, st_p);

[4.928286]

[4.928354]

            result += " of ";
            result += st_p;

Replacement in crawl-ref/source/randart.cc at line 1313 [4.893152]

B:BD[4.928387] → [4.928387:928487]

            strcat(art_n, " \"");
            strcat(art_n, st_p);
            strcat(art_n, "\"");

[4.928387]

[4.928487]

            result += " \"";
            result += st_p;
            result += "\"";

Replacement in crawl-ref/source/randart.cc at line 1321 [4.893152]
B:BD[4.928527] → [4.928527:928547]
```
    return (art_n);
```
[4.928527]
[4.928547]
```
    return result;
```

Replacement in crawl-ref/source/randart.cc at line 1324 [4.893152]

B:BD[4.928550] → [2.249:308]

const char *randart_jewellery_name( const item_def &item )

[4.928550]

[4.928604]

std::string randart_jewellery_name( const item_def &item )

Deletion in crawl-ref/source/randart.cc at line 1328 [4.893152]
B:BD[4.928654] → [4.928654:928721]
```
    int temp_rand = 0;          // probability determination {dlb}
```
Deletion in crawl-ref/source/randart.cc at line 1339 [4.893152]
B:BD[4.929138] → [5.4825:4843]
∅:D[5.4843] → [4.929161:929162]
B:BD[4.929161] → [4.929161:929162]
```
    art_n[0] = 0;
```
Insertion in crawl-ref/source/randart.cc at line 1343 [4.893152]
[6.196820]
[4.929312]
```
    std::string result;
```

Replacement in crawl-ref/source/randart.cc at line 1348 [4.893152]

B:BD[4.929369] → [5.4886:4919]

∅:D[5.4919] → [4.929402:930568]

B:BD[4.929402] → [4.929402:930568]

        temp_rand = random2(21);
        strcat(art_n,  (temp_rand == 0)  ? "brightly glowing" :
                       (temp_rand == 1)  ? "runed" :
                       (temp_rand == 2)  ? "smoking" :
                       (temp_rand == 3)  ? "ruby" :
                       (temp_rand == 4)  ? "twisted" :
                       (temp_rand == 5)  ? "shimmering" :
                       (temp_rand == 6)  ? "warped" :
                       (temp_rand == 7)  ? "crystal" :
                       (temp_rand == 8)  ? "diamond" :
                       (temp_rand == 9)  ? "transparent" :
                       (temp_rand == 10) ? "encrusted" :
                       (temp_rand == 11) ? "pitted" :
                       (temp_rand == 12) ? "slimy" :
                       (temp_rand == 13) ? "polished" :
                       (temp_rand == 14) ? "fine" :
                       (temp_rand == 15) ? "crude" :
                       (temp_rand == 16) ? "ancient" :
                       (temp_rand == 17) ? "emerald" :
                       (temp_rand == 18) ? "faintly glowing" :
                       (temp_rand == 19) ? "steaming"
                                         : "shiny");

[4.929369]

[4.930568]

        switch (random2(21))
        {
        case 0:  result += "brightly glowing"; break;
        case 1:  result += "runed"; break;
        case 2:  result += "smoking"; break;
        case 3:  result += "ruby"; break;
        case 4:  result += "twisted"; break;
        case 5:  result += "shimmering"; break;
        case 6:  result += "warped"; break;
        case 7:  result += "crystal"; break;
        case 8:  result += "diamond"; break;
        case 9:  result += "transparent"; break;
        case 10: result += "encrusted"; break;
        case 11: result += "pitted"; break;
        case 12: result += "slimy"; break;
        case 13: result += "polished"; break;
        case 14: result += "fine"; break;
        case 15: result += "crude"; break;
        case 16: result += "ancient"; break;
        case 17: result += "emerald"; break;
        case 18: result += "faintly glowing"; break;
        case 19: result += "steaming"; break;
        case 20: result += "shiny"; break;
        }

Replacement in crawl-ref/source/randart.cc at line 1373 [4.893152]

B:BD[4.930569] → [4.930569:930668]

        strcat(art_n, " ");
        strcat(art_n, (item.sub_type < AMU_RAGE) ? "ring" : "amulet");

[4.930569]

[4.930668]

        result += " ";
        result += (jewellery_is_amulet(item) ? "amulet" : "ring");

Replacement in crawl-ref/source/randart.cc at line 1378 [4.893152]
B:BD[4.930696] → [4.930696:930720]
```
        return (art_n);
```
[4.930696]
[4.930720]
```
        return result;
```

Replacement in crawl-ref/source/randart.cc at line 1383 [4.893152]

B:BD[4.930758] → [4.930758:930829]

B:BD[4.930829] → [5.4947:5002]

        strcat(art_n, (item.sub_type < AMU_RAGE) ? "ring" : "amulet");
        strcat(art_n, rand_armour_names[random2(71)]);

[4.930758]

[4.930884]

        result += (jewellery_is_amulet(item) ? "amulet" : "ring");
        result += rand_armour_names[random2(ARRAYSIZE(rand_armour_names))];

Replacement in crawl-ref/source/randart.cc at line 1390 [4.893152]

B:BD[4.930976] → [4.930976:931047]

        strcat(art_n, (item.sub_type < AMU_RAGE) ? "ring" : "amulet");

[4.930976]

[4.931047]

        result += (jewellery_is_amulet(item) ? "amulet" : "ring");

Replacement in crawl-ref/source/randart.cc at line 1394 [4.893152]

B:BD[4.931087] → [4.931087:931155]

            strcat(art_n, " of ");
            strcat(art_n, st_p);

[4.931087]

[4.931155]

            result += " of ";
            result += st_p;

Replacement in crawl-ref/source/randart.cc at line 1399 [4.893152]

B:BD[4.931188] → [4.931188:931288]

            strcat(art_n, " \"");
            strcat(art_n, st_p);
            strcat(art_n, "\"");

[4.931188]

[4.931288]

            result += " \"";
            result += st_p;
            result += "\"";

Replacement in crawl-ref/source/randart.cc at line 1407 [4.893152]
B:BD[4.931328] → [4.931328:931407]
```
    return (art_n);
}                               // end randart_ring_name()
```
[4.931328]
[4.931407]
```
    return result;
}
```
Replacement in crawl-ref/source/chardump.cc at line 981 [4.4100336]
B:BD[4.4124452] → [4.4124452:4124503]
```
}                               // end dump_char()
```
[4.4124452]
[9.1218436]
```
}
```

Replacement in crawl-ref/source/chardump.cc at line 998 [4.4100336]

B:BD[10.16122] → [3.315:373]

        if ( parts.size() == 0 ) // disregard empty notes

[10.16122]

[3.373]

        if ( parts.empty() ) // disregard pure-whitespace notes

A few more char*s fall by the wayside, replaced by strings.

Dependencies

In channels

Change contents

Replacement in crawl-ref/source/randart.h at line 37 [4.889057]

Replacement in crawl-ref/source/randart.h at line 42 [4.889057]

Replacement in crawl-ref/source/randart.h at line 47 [4.889057]

Deletion in crawl-ref/source/randart.cc at line 464 [4.893152]

Replacement in crawl-ref/source/randart.cc at line 465 [4.893152]

Replacement in crawl-ref/source/randart.cc at line 548 [4.893152]

Deletion in crawl-ref/source/randart.cc at line 602 [4.893152]

Replacement in crawl-ref/source/randart.cc at line 1169 [4.893152]

Deletion in crawl-ref/source/randart.cc at line 1178 [4.893152]

Deletion in crawl-ref/source/randart.cc at line 1179 [4.893152]

Replacement in crawl-ref/source/randart.cc at line 1182 [4.893152]

Replacement in crawl-ref/source/randart.cc at line 1189 [4.893152]

Replacement in crawl-ref/source/randart.cc at line 1211 [4.893152]

Replacement in crawl-ref/source/randart.cc at line 1214 [4.893152]

Replacement in crawl-ref/source/randart.cc at line 1219 [4.893152]

Replacement in crawl-ref/source/randart.cc at line 1227 [4.893152]

Replacement in crawl-ref/source/randart.cc at line 1231 [4.893152]

Replacement in crawl-ref/source/randart.cc at line 1236 [4.893152]

Replacement in crawl-ref/source/randart.cc at line 1244 [4.893152]

Replacement in crawl-ref/source/randart.cc at line 1247 [4.893152]

Deletion in crawl-ref/source/randart.cc at line 1257 [4.893152]

Insertion in crawl-ref/source/randart.cc at line 1262 [4.893152]

Replacement in crawl-ref/source/randart.cc at line 1268 [4.893152]

Replacement in crawl-ref/source/randart.cc at line 1290 [4.893152]

Replacement in crawl-ref/source/randart.cc at line 1292 [4.893152]

Replacement in crawl-ref/source/randart.cc at line 1294 [4.893152]

Replacement in crawl-ref/source/randart.cc at line 1297 [4.893152]

Replacement in crawl-ref/source/randart.cc at line 1305 [4.893152]

Replacement in crawl-ref/source/randart.cc at line 1308 [4.893152]

Replacement in crawl-ref/source/randart.cc at line 1313 [4.893152]

Replacement in crawl-ref/source/randart.cc at line 1321 [4.893152]

Replacement in crawl-ref/source/randart.cc at line 1324 [4.893152]

Deletion in crawl-ref/source/randart.cc at line 1328 [4.893152]

Deletion in crawl-ref/source/randart.cc at line 1339 [4.893152]

Insertion in crawl-ref/source/randart.cc at line 1343 [4.893152]