fiddlerwoaroof/crawl - Change M7THNJTZZ2MRBFR7XZWIR7WZLL6PFXBDQNYKTRWNUNIFQSSVZOPQC

Use species_type/job_type instead of int.

Created by Robert Vollmert on October 23, 2009

M7THNJTZZ2MRBFR7XZWIR7WZLL6PFXBDQNYKTRWNUNIFQSSVZOPQC

Dependencies

In channels

main

Change contents

Replacement in crawl-ref/source/species.h at line 8 [3.180]

B:BD[3.350] → [3.350:448]

int get_species_by_abbrev(const char *abbrev);
const char *get_species_abbrev(int which_species);

[3.350]

[3.448]

species_type get_species_by_abbrev(const char *abbrev);
const char *get_species_abbrev(species_type which_species);

Replacement in crawl-ref/source/species.h at line 14 [3.180]

B:BD[3.569] → [3.569:740]

std::string species_name( species_type speci, int level, bool genus = false,
                          bool adj = false );
int str_to_species(const std::string &species);

[3.569]

[3.740]

std::string species_name(species_type speci, int level, bool genus = false,
                         bool adj = false);
species_type str_to_species(const std::string &species);

Replacement in crawl-ref/source/species.cc at line 64 [3.785]

B:BD[3.2841] → [2.99:161]

    ASSERT(index >= 0 && index < ARRAYSZ(old_species_order));

[3.2841]

[3.2943]

    if(index < 0 || index >= ng_num_species())
        return (SP_UNKNOWN);

Replacement in crawl-ref/source/species.cc at line 130 [3.785]

B:BD[3.4864] → [2.162:212]

const char *get_species_abbrev(int which_species)

[3.4864]

[3.4916]

const char *get_species_abbrev(species_type which_species)

Replacement in crawl-ref/source/species.cc at line 132 [3.785]

B:BD[3.4918] → [3.4918:4982]

    ASSERT( which_species > 0 && which_species < NUM_SPECIES );

[3.4918]

[3.4982]

    ASSERT(which_species > 0 && which_species < NUM_SPECIES);

Replacement in crawl-ref/source/species.cc at line 134 [3.785]
B:BD[3.4983] → [3.4983:5034]
```
    return (Species_Abbrev_List[ which_species ]);
```
[3.4983]
[3.5034]
```
    return (Species_Abbrev_List[which_species]);
```
Replacement in crawl-ref/source/species.cc at line 138 [3.785]
B:BD[3.5077] → [2.213:259]
```
int get_species_by_abbrev(const char *abbrev)
```
[3.5077]
[3.5125]
```
species_type get_species_by_abbrev(const char *abbrev)
```

Replacement in crawl-ref/source/species.cc at line 144 [3.785]

B:BD[3.5257] → [3.5257:5407]

        if (tolower( abbrev[0] ) == tolower( Species_Abbrev_List[i][0] )
            && tolower( abbrev[1] ) == tolower( Species_Abbrev_List[i][1] ))

[3.5257]

[3.5407]

        if (tolower(abbrev[0]) == tolower(Species_Abbrev_List[i][0])
            && tolower(abbrev[1]) == tolower(Species_Abbrev_List[i][1]))

Replacement in crawl-ref/source/species.cc at line 151 [3.785]

B:BD[3.5453] → [3.5453:5494]

    return ((i < NUM_SPECIES) ? i : -1);

[3.5453]

[3.5494]

    return ((i < NUM_SPECIES) ? static_cast<species_type>(i) : SP_UNKNOWN);

Replacement in crawl-ref/source/species.cc at line 164 [3.785]
B:BD[3.5896] → [3.5896:5943]
```
int str_to_species(const std::string &species)
```
[3.5896]
[3.5943]
```
species_type str_to_species(const std::string &species)
```
Insertion in crawl-ref/source/species.cc at line 166 [3.785]
[3.5945]
[3.5945]
```
    species_type sp;
```
Replacement in crawl-ref/source/species.cc at line 168 [3.785]
B:BD[3.5970] → [3.5970:5995]
```
        return SP_HUMAN;
```
[3.5970]
[3.5995]
```
        return SP_UNKNOWN;
```

Replacement in crawl-ref/source/species.cc at line 173 [3.785]

B:BD[3.6106] → [3.6106:6201]

        if (species == species_name(static_cast<species_type>(i), 10))
            return (i);

[3.6106]

[3.6201]

        sp = static_cast<species_type>(i);
        if (species == species_name(sp, 10))
            return (sp);

Replacement in crawl-ref/source/species.cc at line 181 [3.785]

B:BD[3.6311] → [3.6311:6405]

        if (species == species_name(static_cast<species_type>(i), 1))
            return (i);

[3.6311]

[3.6405]

        sp = static_cast<species_type>(i);
        if (species == species_name(sp, 1))
            return (sp);

Replacement in crawl-ref/source/species.cc at line 186 [3.785]
B:BD[3.6412] → [3.6412:6435]
```
    return (SP_HUMAN);
```
[3.6412]
[3.6435]
```
    return (SP_UNKNOWN);
```
Replacement in crawl-ref/source/species.cc at line 194 [3.785]
B:BD[3.6614] → [3.6614:6662]
```
    if (player_genus( GENPC_DRACONIAN, speci ))
```
[3.6614]
[3.6662]
```
    if (player_genus(GENPC_DRACONIAN, speci))
```
Replacement in crawl-ref/source/newgame.cc at line 152 [5.1132300]
∅:D[3.13294] → [4.7631:7700]
∅:D[6.14943] → [4.7631:7700]
B:BD[4.7631] → [4.7631:7700]
```
    return (prace == SP_UNKNOWN? "Random" : species_name(prace, 1));
```
[3.13294]
[7.216068]
```
    return (prace == SP_UNKNOWN ? "Random" : species_name(prace, 1));
```
Replacement in crawl-ref/source/newgame.cc at line 158 [5.1132300]
∅:D[3.13353] → [4.7759:7830]
∅:D[6.15056] → [4.7759:7830]
B:BD[4.7759] → [4.7759:7830]
```
    return (pclass == JOB_UNKNOWN? "Random" : get_class_name(pclass));
```
[3.13353]
[7.216230]
```
    return (pclass == JOB_UNKNOWN ? "Random" : get_class_name(pclass));
```
Replacement in crawl-ref/source/jobs.h at line 8 [3.14397]
B:BD[3.14584] → [3.14584:14629]
```
int get_class_by_abbrev(const char *abbrev);
```
[3.14584]
[3.14629]
```
job_type get_class_by_abbrev(const char *abbrev);
```
Replacement in crawl-ref/source/jobs.h at line 11 [3.14397]
B:BD[3.14719] → [3.14719:14760]
```
int get_class_by_name(const char *name);
```
[3.14719]
[3.14760]
```
job_type get_class_by_name(const char *name);
```

Replacement in crawl-ref/source/jobs.cc at line 52 [3.14801]

B:BD[3.16724] → [3.16724:16823]

    if (index < 0 || (unsigned int) index >= ARRAYSZ(old_jobs_order))
       return (JOB_UNKNOWN);

[3.16724]

[3.16823]

    if (index < 0 || index >= ng_num_classes())
        return (JOB_UNKNOWN);

Replacement in crawl-ref/source/jobs.cc at line 72 [3.14801]
B:BD[3.17679] → [3.17679:17731]
```
int get_class_index_by_abbrev( const char *abbrev )
```
[3.17679]
[3.17731]
```
int get_class_index_by_abbrev(const char *abbrev)
```
Replacement in crawl-ref/source/jobs.cc at line 92 [3.14801]
B:BD[3.18244] → [3.18244:18290]
```
const char *get_class_abbrev( int which_job )
```
[3.18244]
[3.18290]
```
const char *get_class_abbrev(int which_job)
```
Replacement in crawl-ref/source/jobs.cc at line 94 [3.14801]
B:BD[3.18292] → [3.18292:18328]
```
    ASSERT( which_job < NUM_JOBS );
```
[3.18292]
[3.18328]
```
    ASSERT(which_job >= 0 && which_job < NUM_JOBS);
```
Replacement in crawl-ref/source/jobs.cc at line 96 [3.14801]
B:BD[3.18329] → [3.18329:18374]
```
    return (Class_Abbrev_List[ which_job ]);
```
[3.18329]
[3.18374]
```
    return (Class_Abbrev_List[which_job]);
```
Replacement in crawl-ref/source/jobs.cc at line 99 [3.14801]
B:BD[3.18377] → [3.18377:18423]
```
int get_class_by_abbrev( const char *abbrev )
```
[3.18377]
[3.18423]
```
job_type get_class_by_abbrev(const char *abbrev)
```

Replacement in crawl-ref/source/jobs.cc at line 105 [3.14801]

B:BD[3.18478] → [3.18478:18624]

        if (tolower( abbrev[0] ) == tolower( Class_Abbrev_List[i][0] )
            && tolower( abbrev[1] ) == tolower( Class_Abbrev_List[i][1] ))

[3.18478]

[3.18624]

        if (tolower(abbrev[0]) == tolower(Class_Abbrev_List[i][0])
            && tolower(abbrev[1]) == tolower(Class_Abbrev_List[i][1]))

Replacement in crawl-ref/source/jobs.cc at line 112 [3.14801]

B:BD[3.18670] → [3.18670:18708]

    return ((i < NUM_JOBS) ? i : -1);

[3.18670]

[3.18708]

    return ((i < NUM_JOBS) ? static_cast<job_type>(i) : JOB_UNKNOWN);

Replacement in crawl-ref/source/jobs.cc at line 115 [3.14801]
B:BD[3.18711] → [3.18711:18759]
```
int get_class_index_by_name( const char *name )
```
[3.18711]
[3.18759]
```
int get_class_index_by_name(const char *name)
```

Replacement in crawl-ref/source/jobs.cc at line 117 [3.14801]

B:BD[3.18761] → [3.18761:18824]

    COMPILE_CHECK(ARRAYSZ(Class_Name_List)   == NUM_JOBS, c1);

[3.18761]

[3.18824]

    COMPILE_CHECK(ARRAYSZ(Class_Name_List) == NUM_JOBS, c1);

Replacement in crawl-ref/source/jobs.cc at line 123 [3.14801]

B:BD[3.18896] → [3.18896:18983]

    strncpy( lowered_buff, name, sizeof( lowered_buff ) );
    strlwr( lowered_buff );

[3.18896]

[3.18983]

    strncpy(lowered_buff, name, sizeof(lowered_buff));
    strlwr(lowered_buff);

Replacement in crawl-ref/source/jobs.cc at line 150 [3.14801]
B:BD[3.19624] → [3.19624:19660]
```
    ASSERT( which_job < NUM_JOBS );
```
[3.19624]
[3.19660]
```
    ASSERT(which_job >= 0 && which_job < NUM_JOBS);
```
Replacement in crawl-ref/source/jobs.cc at line 152 [3.14801]
B:BD[3.19661] → [3.19661:19704]
```
    return (Class_Name_List[ which_job ]);
```
[3.19661]
[3.19704]
```
    return (Class_Name_List[which_job]);
```
Replacement in crawl-ref/source/jobs.cc at line 155 [3.14801]
B:BD[3.19707] → [3.19707:19749]
```
int get_class_by_name( const char *name )
```
[3.19707]
[3.19749]
```
job_type get_class_by_name(const char *name)
```
Replacement in crawl-ref/source/jobs.cc at line 158 [3.14801]
B:BD[3.19762] → [3.19762:19779]
```
    int cl = -1;
```
[3.19762]
[3.19779]
```
    job_type cl = JOB_UNKNOWN;
```

Replacement in crawl-ref/source/jobs.cc at line 164 [3.14801]

B:BD[3.19851] → [3.19851:19938]

    strncpy( lowered_buff, name, sizeof( lowered_buff ) );
    strlwr( lowered_buff );

[3.19851]

[3.19938]

    strncpy(lowered_buff, name, sizeof(lowered_buff));
    strlwr(lowered_buff);

Replacement in crawl-ref/source/jobs.cc at line 169 [3.14801]

B:BD[3.19980] → [3.19980:20092]

        strncpy( lowered_class, Class_Name_List[i], sizeof( lowered_class ) );
        strlwr( lowered_class );

[3.19980]

[3.20092]

        strncpy(lowered_class, Class_Name_List[i], sizeof(lowered_class));
        strlwr(lowered_class);

Replacement in crawl-ref/source/jobs.cc at line 172 [3.14801]

B:BD[3.20093] → [3.20093:20146]

        ptr = strstr( lowered_class, lowered_buff );

[3.20093]

[3.20146]

        ptr = strstr(lowered_class, lowered_buff);

Replacement in crawl-ref/source/jobs.cc at line 175 [3.14801]
B:BD[3.20181] → [3.20181:20201]
```
            cl = i;
```
[3.20181]
[3.20201]
```
            cl = static_cast<job_type>(i);
```
Replacement in crawl-ref/source/hiscores.h at line 87 [5.2986382]
B:BD[8.1945] → [8.1945:1988]
```
    char        race;
    char        cls;
```
[8.1945]
[8.1988]
```
    species_type race;
    job_type    cls;
```

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

B:BD[9.4902] → [9.4902:5020]

                      species_name(static_cast<species_type>(race),
                                   lvl).c_str());

[9.4902]

[10.8063]

                      species_name(race, lvl).c_str());

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

B:BD[11.3049] → [10.8300:8363]

∅:D[10.8363] → [11.3113:3181]

B:BD[11.3113] → [11.3113:3181]

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

[11.3049]

[12.15165]

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

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

B:BD[10.8897] → [10.8897:8957]

    race                 = 0;
    cls                  = 0;

[10.8897]

[10.8957]

    race                 = SP_UNKNOWN;
    cls                  = JOB_UNKNOWN;

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

B:BD[13.5110] → [13.5110:5189]

        int sp_id = get_species_by_abbrev(input_str);
        if (sp_id == -1)

[13.5110]

[13.5189]

        species_type sp_id = get_species_by_abbrev(input_str);
        if (sp_id == SP_UNKNOWN)

Replacement in crawl-ref/source/debug.cc at line 602 [5.4016436]
B:BD[13.5236] → [13.5236:5262]
```
        if (sp_id == -1)
```
[13.5236]
[13.5262]
```
        if (sp_id == SP_UNKNOWN)
```

Use species_type/job_type instead of int.

Dependencies

In channels

Change contents

Replacement in crawl-ref/source/species.h at line 8 [3.180]

Replacement in crawl-ref/source/species.h at line 14 [3.180]

Replacement in crawl-ref/source/species.cc at line 64 [3.785]

Replacement in crawl-ref/source/species.cc at line 130 [3.785]

Replacement in crawl-ref/source/species.cc at line 132 [3.785]

Replacement in crawl-ref/source/species.cc at line 134 [3.785]

Replacement in crawl-ref/source/species.cc at line 138 [3.785]

Replacement in crawl-ref/source/species.cc at line 144 [3.785]

Replacement in crawl-ref/source/species.cc at line 151 [3.785]

Replacement in crawl-ref/source/species.cc at line 164 [3.785]

Insertion in crawl-ref/source/species.cc at line 166 [3.785]

Replacement in crawl-ref/source/species.cc at line 168 [3.785]

Replacement in crawl-ref/source/species.cc at line 173 [3.785]

Replacement in crawl-ref/source/species.cc at line 181 [3.785]

Replacement in crawl-ref/source/species.cc at line 186 [3.785]

Replacement in crawl-ref/source/species.cc at line 194 [3.785]

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

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

Replacement in crawl-ref/source/jobs.h at line 8 [3.14397]

Replacement in crawl-ref/source/jobs.h at line 11 [3.14397]

Replacement in crawl-ref/source/jobs.cc at line 52 [3.14801]

Replacement in crawl-ref/source/jobs.cc at line 72 [3.14801]

Replacement in crawl-ref/source/jobs.cc at line 92 [3.14801]

Replacement in crawl-ref/source/jobs.cc at line 94 [3.14801]

Replacement in crawl-ref/source/jobs.cc at line 96 [3.14801]

Replacement in crawl-ref/source/jobs.cc at line 99 [3.14801]

Replacement in crawl-ref/source/jobs.cc at line 105 [3.14801]

Replacement in crawl-ref/source/jobs.cc at line 112 [3.14801]

Replacement in crawl-ref/source/jobs.cc at line 115 [3.14801]

Replacement in crawl-ref/source/jobs.cc at line 117 [3.14801]

Replacement in crawl-ref/source/jobs.cc at line 123 [3.14801]

Replacement in crawl-ref/source/jobs.cc at line 150 [3.14801]

Replacement in crawl-ref/source/jobs.cc at line 152 [3.14801]

Replacement in crawl-ref/source/jobs.cc at line 155 [3.14801]

Replacement in crawl-ref/source/jobs.cc at line 158 [3.14801]