fiddlerwoaroof/crawl - Change ZBPZZ5A7AB2VFZKQ2UJXVDGUK22OCZJCEN2RWTGDGK3VXFCCDKVAC

Fixed bad species name (eg: deep elves with the bows title) in dump because of reuse of static buffers (Iaido).

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

Created by dshaligram on October 1, 2007

ZBPZZ5A7AB2VFZKQ2UJXVDGUK22OCZJCEN2RWTGDGK3VXFCCDKVAC

Dependencies

In channels

main

Change contents

Replacement in crawl-ref/source/view.cc at line 2380 [5.16817]

∅:D[4.147] → [5.70046:70176]

B:BD[5.70046] → [5.70046:70176]

    cprintf( "%s %s", species_name( you.species, you.experience_level ), 
                     (you.wizard ? "*WIZARD*" : "" ) );

[4.147]

[5.70176]

    cprintf( "%s %s",
             species_name( you.species, you.experience_level ).c_str(),
             (you.wizard ? "*WIZARD*" : "" ) );

Replacement in crawl-ref/source/tutorial.cc at line 191 [7.5936]

B:BD[6.5554] → [6.5554:5640]

    cprintf("%c - %s %s %s" EOL, letter, species_name(get_tutorial_species(type), 1),

[6.5554]

[6.5640]

    cprintf("%c - %s %s %s" EOL,
            letter, species_name(get_tutorial_species(type), 1).c_str(),

Replacement in crawl-ref/source/skills2.h at line 33 [5.643583]

B:BD[5.644517] → [5.644517:644732]

const char * skill_title( unsigned char best_skill, unsigned char skill_lev, 
                 // these used for ghosts and hiscores:
                 int species = -1, int str = -1, int dex = -1, int god = -1 );

[5.644517]

[5.644732]

std::string skill_title(
    unsigned char best_skill, unsigned char skill_lev, 
    // these used for ghosts and hiscores:
    int species = -1, int str = -1, int dex = -1, int god = -1 );

Replacement in crawl-ref/source/skills2.h at line 42 [5.643583]
B:BD[5.644974] → [5.644974:645008]
```
const char *player_title( void );
```
[5.644974]
[5.645008]
```
std::string player_title( void );
```

Replacement in crawl-ref/source/skills2.cc at line 2000 [5.647133]

B:BD[5.732691] → [5.732691:732767]

const char *skill_title( unsigned char best_skill, unsigned char skill_lev,

[5.732691]

[5.732767]

std::string skill_title( unsigned char best_skill, unsigned char skill_lev,

Replacement in crawl-ref/source/skills2.cc at line 2070 [5.647133]

B:BD[5.734740] → [5.734740:734824]

                                (ptr == tempstr && best_skill != SK_NECROMANCY)) );

[5.734740]

[5.734824]

                               (ptr == tempstr
                                && best_skill != SK_NECROMANCY)).c_str() );

Replacement in crawl-ref/source/skills2.cc at line 2079 [5.647133]
B:BD[5.735054] → [5.735054:735087]
```
const char *player_title( void )
```
[5.735054]
[5.735087]
```
std::string player_title( void )
```
Deletion in crawl-ref/source/skills2.cc at line 2082 [5.647133]
B:BD[5.735169] → [5.735169:735170]

Replacement in crawl-ref/source/player.h at line 82 [5.945993]

B:BD[5.948117] → [5.948117:948216]

char *species_name( int speci, int level, bool genus = false, bool adj = false, bool cap = true );

[5.948117]

[8.939]

std::string species_name( int speci, int level, bool genus = false,
                          bool adj = false, bool cap = true );

Replacement in crawl-ref/source/player.h at line 317 [5.945993]

B:BD[5.958335] → [5.958335:958413]

void redraw_skill(const char your_name[kNameLen], const char class_name[80]);

[5.958335]

[5.958413]

void redraw_skill(const std::string &your_name, const std::string &class_name);

Replacement in crawl-ref/source/player.cc at line 3520 [5.962854]

B:BD[5.1035912] → [5.1035912:1035989]

void redraw_skill(const char your_name[kNameLen], const char class_name[80])

[5.1035912]

[5.1035989]

void redraw_skill(const std::string &your_name, const std::string &class_name)

Replacement in crawl-ref/source/player.cc at line 3522 [5.962854]

B:BD[5.1035991] → [5.1035991:1036015]

B:BD[5.1036062] → [5.1036062:1036142]

    char print_it[80];
    snprintf( print_it, sizeof(print_it), "%s the %s", your_name, class_name );

[5.1035991]

[5.1036142]

    std::string title = your_name + " the " + class_name;

Replacement in crawl-ref/source/player.cc at line 3524 [5.962854]
B:BD[5.1036143] → [5.1036143:1036180]
```
    int in_len = strlen( print_it );
```
[5.1036143]
[5.1036180]
```
    int in_len = title.length();
```

Replacement in crawl-ref/source/player.cc at line 3529 [5.962854]

B:BD[5.1036277] → [5.1036277:1036410]

        const int name_len = strlen(your_name);
        char name_buff[kNameLen];
        strncpy( name_buff, your_name, kNameLen );

[5.1036277]

[5.1036410]

        const int name_len = your_name.length();
        std::string trimmed_name = your_name;

Replacement in crawl-ref/source/player.cc at line 3532 [5.962854]

B:BD[5.1036411] → [9.352406:352481]

        // squeeze name if required, the "- 8" is too not squeeze too much

[5.1036411]

[5.1036486]

        // squeeze name if required, the "- 8" is to not squeeze too much

Replacement in crawl-ref/source/player.cc at line 3534 [5.962854]

B:BD[5.1036545] → [9.352482:352541]

∅:D[9.352541] → [5.1036607:1036621]

B:BD[5.1036607] → [5.1036607:1036621]

B:BD[5.1036621] → [9.352542:352585]

            name_buff[ name_len - (in_len - 40) - 1 ] = 0;
        else 
            name_buff[ kNameLen - 1 ] = 0;

[5.1036545]

[5.1036667]

            trimmed_name =
                trimmed_name.substr(0, name_len - (in_len - 40) - 1);

Replacement in crawl-ref/source/player.cc at line 3537 [5.962854]

B:BD[5.1036668] → [5.1036668:1036749]

        snprintf( print_it, sizeof(print_it), "%s, %s", name_buff, class_name );

[5.1036668]

[5.1036749]

        title = trimmed_name + ", " + class_name;

Deletion in crawl-ref/source/player.cc at line 3540 [5.962854]
B:BD[5.1036756] → [5.1036756:1036832]
B:BD[5.1036832] → [9.352586:352608]
∅:D[9.352608] → [5.1036857:1036858]
B:BD[5.1036857] → [5.1036857:1036858]
```
    for (int i = strlen(print_it); i < 41; i++)
        print_it[i] = ' ';
    print_it[40] = 0;
```
Replacement in crawl-ref/source/player.cc at line 3543 [5.962854]
B:BD[5.1036955] → [9.352609:352640]
∅:D[9.352640] → [5.1036980:1037034]
B:BD[5.1036980] → [5.1036980:1037034]
```
    cprintf( "%s", print_it );
}                               // end redraw_skill()
```
[5.1036955]
[8.1060]
```
    cprintf( "%-41s", title.c_str() );
}
```

Replacement in crawl-ref/source/player.cc at line 3569 [5.962854]

B:BD[5.1037160] → [5.1037160:1037236]

char *species_name( int  speci, int level, bool genus, bool adj, bool cap )

[5.1037160]

[5.1037236]

std::string species_name( int  speci, int level, bool genus,
                          bool adj, bool cap )

Replacement in crawl-ref/source/player.cc at line 4493 [5.962854]
B:BD[5.1056658] → [5.1056658:1056673]
```
    char *ptr;
```
[5.1056658]
[5.1056673]
```
    std::string::size_type pos = std::string::npos;
```

Replacement in crawl-ref/source/player.cc at line 4501 [5.962854]

B:BD[5.1056840] → [5.1056840:1056995]

        char *lowered_species = species_name( i, 0, false, false, false );
        ptr = strstr( lowered_species, lowered_buff );
        if (ptr != NULL)

[5.1056840]

[5.1056995]

        std::string lowered_species =
            lowercase_string( species_name( i, 0, false, false, false ) );
        pos = lowered_species.find( lowered_buff );
        if (pos != std::string::npos)

Replacement in crawl-ref/source/player.cc at line 4507 [5.962854]

B:BD[5.1057025] → [5.1057025:1057093]

            if (ptr == lowered_species)  // prefix takes preference

[5.1057025]

[5.1057093]

            if (pos == 0)  // prefix takes preference

Replacement in crawl-ref/source/output.cc at line 729 [5.1088282]

B:BD[10.1461] → [10.1461:1505]

             you.your_name, player_title(),

[10.1461]

[2.730]

             you.your_name,
             player_title().c_str(),

Replacement in crawl-ref/source/output.cc at line 732 [5.1088282]

∅:D[2.758] → [10.1505:1566]

B:BD[10.1505] → [10.1505:1566]

             species_name(you.species,you.experience_level),

[2.758]

[10.1566]

             species_name(you.species,you.experience_level).c_str(),

Replacement in crawl-ref/source/output.cc at line 734 [5.1088282]

B:BD[10.1595] → [11.1340:1388]

             god_colour_tag, godpowers.c_str(),

[10.1595]

[10.1665]

             god_colour_tag,
             godpowers.c_str(),

Replacement in crawl-ref/source/output.cc at line 998 [5.1088282]

B:BD[12.884] → [12.884:947]

    snprintf(title, sizeof title, " the %s ", player_title());

[12.884]

[13.1149]

    snprintf(title, sizeof title, " the %s ", player_title().c_str());

Replacement in crawl-ref/source/output.cc at line 1003 [5.1088282]

B:BD[12.1045] → [12.1045:1124]

             species_name(you.species, you.experience_level), you.class_name);

[12.1045]

[13.1151]

             species_name(you.species, you.experience_level).c_str(),
             you.class_name);

Replacement in crawl-ref/source/newgame.cc at line 780 [5.1132300]

B:BD[5.1149622] → [14.8383:8508]

        char spec_buff[80];
        strncpy(spec_buff,
                species_name(you.species, you.experience_level), 80);

[5.1149622]

[5.1149959]

        std::string specs = species_name(you.species, you.experience_level);
        if (specs.length() > 79)
            specs = specs.substr(0, 79);

Replacement in crawl-ref/source/newgame.cc at line 785 [5.1132300]

B:BD[15.17073] → [15.17073:17140]

                 (is_vowel( spec_buff[0] )) ? "n" : "", spec_buff,

[15.17073]

[15.17140]

                 (is_vowel( specs[0] )) ? "n" : "", specs.c_str(),

Replacement in crawl-ref/source/newgame.cc at line 3102 [5.1132300]

B:BD[16.224370] → [16.224370:224448]

                        sletter,
                        species_name(i, 1));

[16.224370]

[16.224448]

                     sletter,
                     species_name(i, 1).c_str());

Replacement in crawl-ref/source/newgame.cc at line 3269 [5.1132300]

B:BD[17.4281] → [17.4281:4357]

            cprintf("%s.", species_name(you.species,you.experience_level));

[17.4281]

[5.1210614]

            cprintf("%s.",
                    species_name(you.species,you.experience_level).c_str());

Replacement in crawl-ref/source/hiscores.cc at line 662 [5.2987663]

B:BD[18.7662] → [18.7662:7724]

    fields->add_field("race", "%s", species_name(race, lvl));

[18.7662]

[18.7724]

    fields->add_field("race", "%s", species_name(race, lvl).c_str());

Replacement in crawl-ref/source/hiscores.cc at line 670 [5.2987663]

B:BD[18.7934] → [18.7934:8013]

∅:D[18.8013] → [8.14945:15020]

B:BD[8.14945] → [8.14945:15020]

    fields->add_field("title", "%s", skill_title( best_skill, best_skill_lvl, 
                                                  race, str, dex, god ) );

[18.7934]

[8.15165]

    fields->add_field("title", "%s",
                      skill_title( best_skill, best_skill_lvl, 
                                   race, str, dex, god ).c_str() );

Deletion in crawl-ref/source/hiscores.cc at line 1205 [5.2987663]

B:BD[9.833825] → [9.833825:833987]

        strncpy( scratch, skill_title( best_skill, best_skill_lvl, 
                                       race, str, dex, god ), 
                 INFO_SIZE );

Replacement in crawl-ref/source/hiscores.cc at line 1206 [5.2987663]

B:BD[9.834054] → [8.22131:22187]

∅:D[8.22187] → [9.834102:834103]

B:BD[9.834102] → [9.834102:834103]

                  points, name.c_str(), scratch, lvl );

[9.834054]

[9.834103]

                  points, name.c_str(),
                  skill_title( best_skill, best_skill_lvl, 
                               race, str, dex, god ).c_str(),
                  lvl );

Replacement in crawl-ref/source/hiscores.cc at line 1215 [5.2987663]

B:BD[9.834215] → [8.22188:22254]

                  points, name.c_str(), species_name(race, lvl),

[9.834215]

[9.834273]

                  points, name.c_str(), species_name(race, lvl).c_str(),

Replacement in crawl-ref/source/hiscores.cc at line 1239 [5.2987663]

B:BD[9.834818] → [9.834818:834880]

        const char *const srace = species_name( race, lvl );

[9.834818]

[9.834880]

        std::string srace = species_name( race, lvl );

Replacement in crawl-ref/source/hiscores.cc at line 1241 [5.2987663]

B:BD[9.834940] → [9.834940:835017]

                  is_vowel(*srace) ? "n" : "", srace, get_class_name(cls) );

[9.834940]

[9.835017]

                  is_vowel(srace[0]) ? "n" : "",
                  srace.c_str(),
                  get_class_name(cls) );

Insertion in crawl-ref/source/debug.cc at line 245 [5.4016436]
[5.4027994]
[5.4027994]
```
    strlwr(specs);
```

Replacement in crawl-ref/source/debug.cc at line 251 [5.4016436]

B:BD[5.4028068] → [5.4028068:4028180]

        char sp_name[80];
        strncpy( sp_name, species_name(i, you.experience_level), sizeof( sp_name ) );

[5.4028068]

[5.4028180]

        const std::string sp_name =
            lowercase_string(species_name(i, you.experience_level));

Replacement in crawl-ref/source/debug.cc at line 254 [5.4016436]

B:BD[5.4028181] → [5.4028181:4028268]

        char *ptr = strstr( strlwr(sp_name), strlwr(specs) );
        if (ptr != NULL)

[5.4028181]

[5.4028268]

        std::string::size_type pos = sp_name.find(specs);
        if (pos != std::string::npos)

Replacement in crawl-ref/source/debug.cc at line 257 [5.4016436]
B:BD[5.4028278] → [5.4028278:4028331]
```
            if (ptr == sp_name && strlen(specs) > 0)
```
[5.4028278]
[5.4028331]
```
            if (pos == 0 && *specs)
```

Replacement in crawl-ref/source/debug.cc at line 280 [5.4016436]

B:BD[19.233] → [3.589:699]

∅:D[19.314] → [5.4028830:4028831]

∅:D[3.699] → [5.4028830:4028831]

B:BD[5.4028830] → [5.4028830:4028831]

                         (you.species == SP_GHOUL || you.species == SP_VAMPIRE) ? US_HUNGRY_DEAD : US_ALIVE);

[19.233]

[5.4028831]

                         (you.species == SP_GHOUL
                          || you.species == SP_VAMPIRE) ? US_HUNGRY_DEAD
                         : US_ALIVE);

Replacement in crawl-ref/source/debug.cc at line 2372 [5.4016436]

B:BD[9.1032444] → [9.1032444:1032505]

            species_name(you.species, you.experience_level),

[9.1032444]

[9.1032505]

            species_name(you.species, you.experience_level).c_str(),

Replacement in crawl-ref/source/debug.cc at line 2396 [5.4016436]

B:BD[20.10343] → [20.10343:10404]

            species_name(you.species, you.experience_level),

[20.10343]

[20.10404]

            species_name(you.species, you.experience_level).c_str(),

Replacement in crawl-ref/source/clua.cc at line 710 [16.483969]

B:BD[16.498829] → [16.498829:498904]

LUARET1(you_race, string, species_name(you.species, you.experience_level))

[16.498829]

[16.498904]

LUARET1(you_race, string,
        species_name(you.species, you.experience_level).c_str())

Replacement in crawl-ref/source/acr.cc at line 1505 [5.4397395]

B:BD[21.27590] → [21.27590:27669]

         you.experience_level, species_name(you.species,you.experience_level),

[21.27590]

[21.27669]

         you.experience_level,
         species_name(you.species,you.experience_level).c_str(),