fiddlerwoaroof/crawl - Change 6O5667Y65C5GTP4V3NBKWUN22IRGCAXEELJ6MCANMYPBOKDUO75QC

Reintroduce parts of the old get_species_by_index to code to fix

misbehaviuor with wizmode-defined ghosts (doesn't really work anyway) and (hopefully) the highscores.

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

Created by j-p-e-g on March 3, 2008

6O5667Y65C5GTP4V3NBKWUN22IRGCAXEELJ6MCANMYPBOKDUO75QC

Dependencies

In channels

main

Change contents

Insertion in crawl-ref/source/newgame.h at line 27 [3.1131725]

[2.3724]


/* ***********************************************************************
 * called from: debug and hiscores
 * *********************************************************************** */
int get_species_by_abbrev( const char *abbrev );
int get_species_by_name( const char *name );
int get_class_by_abbrev( const char *abbrev  );
int get_class_by_name( const char *name );

Insertion in crawl-ref/source/newgame.cc at line 320 [3.1132300]

[2.5683]

}
// needed for debug.cc and hiscores.cc
int get_species_by_abbrev( const char *abbrev )
{
    int i;
    COMPILE_CHECK(ARRAYSIZE(Species_Abbrev_List) == NUM_SPECIES, c1);
    for (i = SP_HUMAN; i < NUM_SPECIES; i++)
    {
         if (tolower( abbrev[0] ) == tolower( Species_Abbrev_List[i][0] )
             && tolower( abbrev[1] ) == tolower( Species_Abbrev_List[i][1] ))
         {
             break;
         }
    }
    return ((i < NUM_SPECIES) ? i : -1);

Deletion in crawl-ref/source/newgame.cc at line 355 [3.1132300]
B:BD[2.6502] → [2.6502:6567]
```
    COMPILE_CHECK(ARRAYSIZE(Class_Name_List)   == NUM_JOBS, c2);
```
Insertion in crawl-ref/source/newgame.cc at line 356 [3.1132300]
[2.6572]
[2.6572]
```
    unsigned int job;
```

Replacement in crawl-ref/source/newgame.cc at line 359 [3.1132300]

B:BD[2.6643] → [2.6643:6820]

        const job_type job
                   = (Options.use_old_selection_order ? old_jobs_order[i]
                                                      : new_jobs_order[i]);

[2.6643]

[2.6820]

        job = (Options.use_old_selection_order ? old_jobs_order[i]
                                               : new_jobs_order[i]);

Insertion in crawl-ref/source/newgame.cc at line 377 [3.1132300]

[2.7224]

}
int get_class_by_abbrev( const char *abbrev )
{
    int i;
    for (i = 0; i < NUM_JOBS; i++)
    {
        if (tolower( abbrev[0] ) == tolower( Class_Abbrev_List[i][0] )
            && tolower( abbrev[1] ) == tolower( Class_Abbrev_List[i][1] ))
        {
            break;
        }
    }
    return ((i < NUM_JOBS) ? i : -1);

Insertion in crawl-ref/source/newgame.cc at line 397 [3.1132300]
[2.7277]
[2.7277]
```
    COMPILE_CHECK(ARRAYSIZE(Class_Name_List)   == NUM_JOBS, c1);
    
```
Insertion in crawl-ref/source/newgame.cc at line 407 [3.1132300]
[2.7453]
[2.7453]
```
    unsigned int job;
```

Replacement in crawl-ref/source/newgame.cc at line 410 [3.1132300]

B:BD[2.7524] → [2.7524:7735]

        const int job = (Options.use_old_selection_order ? old_jobs_order[i]
                                                         : new_jobs_order[i]);

[2.7524]

[2.7735]

        job = (Options.use_old_selection_order ? old_jobs_order[i]
                                               : new_jobs_order[i]);

Insertion in crawl-ref/source/newgame.cc at line 434 [3.1132300]
[2.8212]
[2.8212]
```
int get_class_by_name( const char *name )
{
    int i;
    int cl = -1;
```

Insertion in crawl-ref/source/newgame.cc at line 440 [3.1132300]

[2.8213]

[4.214742]

    char *ptr;
    char lowered_buff[80];
    char lowered_class[80];
    strncpy( lowered_buff, name, sizeof( lowered_buff ) );
    strlwr( lowered_buff );
    for (i = 0; i < NUM_JOBS; i++)
    {
        strncpy( lowered_class, Class_Name_List[i], sizeof( lowered_class ) );
        strlwr( lowered_class );
        ptr = strstr( lowered_class, lowered_buff );
        if (ptr != NULL)
        {
            cl = i;
            if (ptr == lowered_class)  // prefix takes preference
                break;
        }
    }
    return (cl);
}

Replacement in crawl-ref/source/hiscores.cc at line 615 [3.2987663]

B:BD[5.6120] → [5.6120:6192]

    cls    = get_class_index_by_name(fields->str_field("cls").c_str());

[5.6120]

[3.3039458]

    cls    = get_class_by_name(fields->str_field("cls").c_str());

Replacement in crawl-ref/source/debug.cc at line 428 [3.4016436]
B:BD[6.2390] → [6.2390:2439]
```
    const bool force_place = x != -1 && y != -1;
```
[6.2390]
[6.2439]
```
    const bool force_place = (x != -1 && y != -1);
```

Replacement in crawl-ref/source/debug.cc at line 476 [3.4016436]

B:BD[7.37220] → [7.37220:37248]

        char class_str[80];

[7.37220]

[7.37248]

        char input_str[80];
        mpr( "Make player ghost which species? ", MSGCH_PROMPT );
        get_input_line( input_str, sizeof( input_str ) );
        int sp_id = get_species_by_abbrev(input_str);
        if (sp_id == -1)
            sp_id = str_to_species(input_str);
        if (sp_id == -1)
        {
            mpr("No such species, making it Human.");
            sp_id = SP_HUMAN;
        }
        ghost.species = static_cast<species_type>(sp_id);

Replacement in crawl-ref/source/debug.cc at line 492 [3.4016436]

B:BD[7.37312] → [7.37312:37370]

        get_input_line( class_str, sizeof( class_str ) );

[7.37312]

[7.37370]

        get_input_line( input_str, sizeof( input_str ) );

Replacement in crawl-ref/source/debug.cc at line 494 [3.4016436]

B:BD[7.37371] → [7.37371:37432]

        int class_id = get_class_index_by_abbrev(class_str);

[7.37371]

[7.37432]

        int class_id = get_class_by_abbrev(input_str);

Replacement in crawl-ref/source/debug.cc at line 497 [3.4016436]

B:BD[7.37461] → [7.37461:37520]

            class_id = get_class_index_by_name(class_str);

[7.37461]

[7.37520]

            class_id = get_class_by_name(input_str);