fiddlerwoaroof/crawl - Change LABXKXWWQY2V4FUDLGVTDYHXINAP6KRHZDHBQ2FE22FFOEIZPL6QC

A bit more type-safety (slightly intrusive this time): you.species and

you.char_class.

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

Created by haranp on June 19, 2007

LABXKXWWQY2V4FUDLGVTDYHXINAP6KRHZDHBQ2FE22FFOEIZPL6QC

Dependencies

In channels

main

Change contents

Replacement in crawl-ref/source/tutorial.cc at line 136 [6.5936]
B:BD[5.3333] → [5.3333:3362]
```
            you.species = 0;
```
[5.3333]
[5.3362]
```
            you.species = SP_UNKNOWN;
```
Replacement in crawl-ref/source/tags.cc at line 1004 [7.164589]
B:BD[7.187999] → [7.187999:188037]
```
    you.species = unmarshallByte(th);
```
[7.187999]
[7.188037]
```
    you.species = static_cast<species_type>(unmarshallByte(th));
```
Replacement in crawl-ref/source/tags.cc at line 1031 [7.164589]
B:BD[7.188934] → [7.188934:188975]
```
    you.char_class = unmarshallByte(th);
```
[7.188934]
[7.188975]
```
    you.char_class = static_cast<job_type>(unmarshallByte(th));
```
Replacement in crawl-ref/source/skills2.h at line 18 [7.643583]
B:BD[7.643943] → [7.643943:643976]
```
#include <stddef.h>  // For NULL
```
[7.643943]
[7.643976]
```
#define MAX_SKILL_ORDER         100
```
Replacement in crawl-ref/source/skills2.h at line 20 [7.643583]
B:BD[7.643977] → [7.643977:644013]
```
#define MAX_SKILL_ORDER         100
```
[7.643977]
[7.644013]
```
#include "enum.h"
```
Replacement in crawl-ref/source/skills2.h at line 73 [7.643583]
B:BD[7.646285] → [8.422:466]
```
int species_skills(int skill, int species);
```
[7.646285]
[7.646331]
```
int species_skills(int skill, species_type species);
```
Replacement in crawl-ref/source/skills2.cc at line 2330 [7.647133]
B:BD[7.741689] → [8.527:570]
```
int species_skills(int skill, int species)
```
[7.741689]
[7.741734]
```
int species_skills(int skill, species_type species)
```

Replacement in crawl-ref/source/player.h at line 283 [7.945993]

B:BD[7.957828] → [7.957828:957904]

void modify_stat(unsigned char which_stat, char amount, bool suppress_msg);

[7.957828]

[7.957904]

void modify_stat(stat_type which_stat, char amount, bool suppress_msg);

Insertion in crawl-ref/source/player.cc at line 2572 [7.962854]

[7.1018726]

                        break;
                    default:

Insertion in crawl-ref/source/player.cc at line 2799 [7.962854]

[7.1026310]

                break;
            case NUM_SPECIES:
            case SP_UNKNOWN:

Replacement in crawl-ref/source/player.cc at line 3744 [7.962854]

B:BD[7.1049788] → [7.1049788:1049863]

void modify_stat(unsigned char which_stat, char amount, bool suppress_msg)

[7.1049788]

[7.1049863]

void modify_stat(stat_type which_stat, char amount, bool suppress_msg)

Replacement in crawl-ref/source/player.cc at line 3762 [7.962854]
B:BD[7.1050121] → [7.1050121:1050162]
```
        which_stat = random2(NUM_STATS);
```
[7.1050121]
[7.1050162]
```
        which_stat = static_cast<stat_type>(random2(NUM_STATS));
```
Insertion in crawl-ref/source/player.cc at line 3786 [7.962854]
[7.1050937]
[7.1050937]
```
    default:
        break;
```
Insertion in crawl-ref/source/output.cc at line 1681 [7.1088282]
[9.67020]
[10.12915]
```
      default:
          break;
```

Replacement in crawl-ref/source/newgame.cc at line 98 [7.1132300]

B:BD[7.1135693] → [11.63:127]

static bool class_allowed(unsigned char speci, int char_class);

[7.1135693]

[12.63]

static bool class_allowed(species_type speci, job_type char_class);

Replacement in crawl-ref/source/newgame.cc at line 102 [7.1132300]

∅:D[12.157] → [11.239:436]

B:BD[11.239] → [11.239:436]

static void give_basic_knowledge(int which_job);
static void give_basic_spells(int which_job);
static void give_basic_mutations(unsigned char speci);
static void give_last_paycheck(int which_job);

[12.157]

[11.436]

static void give_basic_knowledge(job_type which_job);
static void give_basic_spells(job_type which_job);
static void give_basic_mutations(species_type speci);
static void give_last_paycheck(job_type which_job);

Replacement in crawl-ref/source/newgame.cc at line 107 [7.1132300]
B:BD[11.467] → [11.467:510]
```
static void jobs_stat_init(int which_job);
```
[11.467]
[11.510]
```
static void jobs_stat_init(job_type which_job);
```

Replacement in crawl-ref/source/newgame.cc at line 109 [7.1132300]

B:BD[11.543] → [11.543:603]

static void species_stat_init(unsigned char which_species);

[11.543]

[7.1136101]

static void species_stat_init(species_type which_species);

Replacement in crawl-ref/source/newgame.cc at line 121 [7.1132300]

B:BD[7.1136523] → [13.214440:214520]

static char letter_to_species(int keyn);
static char letter_to_class(int keyn);

[7.1136460]

[13.214520]

static species_type letter_to_species(int keyn);
static job_type letter_to_class(int keyn);

Replacement in crawl-ref/source/newgame.cc at line 188 [7.1132300]
B:BD[13.216124] → [13.216124:216165]
```
    int pcls  = letter_to_class(oclass);
```
[13.216124]
[13.216165]
```
    int pcls = letter_to_class(oclass);
```
Replacement in crawl-ref/source/newgame.cc at line 244 [7.1132300]
B:BD[7.1137949] → [7.1137949:1137989]
```
    int species = -1;
    int job = -1;
```
[7.1137949]
[7.1137989]
```
    species_type species = SP_UNKNOWN;
    job_type job = JOB_UNKNOWN;
```

Replacement in crawl-ref/source/newgame.cc at line 257 [7.1132300]

B:BD[7.1138376] → [7.1138376:1138415]

            if (class_allowed(sp, cl))

[7.1138376]

[7.1138415]

            if (class_allowed(static_cast<species_type>(sp),
                              static_cast<job_type>(cl)))

Replacement in crawl-ref/source/newgame.cc at line 263 [7.1132300]

B:BD[7.1138524] → [7.1138524:1138588]

                    species = sp;
                    job = cl;

[7.1138524]

[7.1138588]

                    species = static_cast<species_type>(sp);
                    job = static_cast<job_type>(cl);

Replacement in crawl-ref/source/newgame.cc at line 271 [7.1132300]
B:BD[7.1138710] → [7.1138710:1138752]
```
    ASSERT( species != -1 && job != -1 );
```
[7.1138710]
[7.1138752]
```
    ASSERT( species != SP_UNKNOWN && job != JOB_UNKNOWN );
```

Replacement in crawl-ref/source/newgame.cc at line 275 [7.1132300]

B:BD[7.1138827] → [7.1138827:1138880]

        you.species = SP_RED_DRACONIAN + random2(9);

[7.1138827]

[7.1138880]

        you.species = static_cast<species_type>(SP_RED_DRACONIAN + random2(9));

Insertion in crawl-ref/source/newgame.cc at line 532 [7.1132300]

[14.5665]

                    break;
                    
                default:

Replacement in crawl-ref/source/newgame.cc at line 864 [7.1132300]

B:BD[7.1154597] → [11.649:714]

static bool class_allowed( unsigned char speci, int char_class )

[7.1154597]

[7.1154655]

static bool class_allowed( species_type speci, job_type char_class )

Insertion in crawl-ref/source/newgame.cc at line 874 [7.1132300]
[7.1154821]
[7.1154821]
```
        default:
            return true;
```
Deletion in crawl-ref/source/newgame.cc at line 877 [7.1132300]
B:BD[7.1154831] → [7.1154831:1154852]
```
        return true;
```
Insertion in crawl-ref/source/newgame.cc at line 895 [7.1132300]
[7.1155247]
[7.1155247]
```
        default:
            return true;
```
Deletion in crawl-ref/source/newgame.cc at line 898 [7.1132300]
B:BD[7.1155257] → [7.1155257:1155278]
```
        return true;
```
Insertion in crawl-ref/source/newgame.cc at line 921 [7.1132300]
[7.1155822]
[7.1155822]
```
        default:
            return true;
```
Deletion in crawl-ref/source/newgame.cc at line 924 [7.1132300]
B:BD[7.1155832] → [7.1155832:1155853]
```
        return true;
```
Insertion in crawl-ref/source/newgame.cc at line 939 [7.1132300]
[7.1156172]
[7.1156172]
```
        default:
            return true;
```
Deletion in crawl-ref/source/newgame.cc at line 942 [7.1132300]
B:BD[7.1156182] → [7.1156182:1156203]
```
        return true;
```
Insertion in crawl-ref/source/newgame.cc at line 960 [7.1132300]
[7.1156619]
[7.1156619]
```
        default:
            return true;
```
Deletion in crawl-ref/source/newgame.cc at line 963 [7.1132300]
B:BD[7.1156629] → [7.1156629:1156650]
```
        return true;
```
Insertion in crawl-ref/source/newgame.cc at line 985 [7.1132300]
[7.1157179]
[7.1157179]
```
        default:
            return true;
```
Deletion in crawl-ref/source/newgame.cc at line 988 [7.1132300]
B:BD[7.1157189] → [7.1157189:1157210]
```
        return true;
```
Insertion in crawl-ref/source/newgame.cc at line 996 [7.1132300]
[7.1157372]
[7.1157372]
```
        default:
            return false;
```
Deletion in crawl-ref/source/newgame.cc at line 999 [7.1132300]
B:BD[7.1157382] → [7.1157382:1157404]
```
        return false;
```
Insertion in crawl-ref/source/newgame.cc at line 1016 [7.1132300]
[7.1157807]
[7.1157807]
```
        default:
            return true;
```
Deletion in crawl-ref/source/newgame.cc at line 1019 [7.1132300]
B:BD[7.1157817] → [7.1157817:1157838]
```
        return true;
```
Insertion in crawl-ref/source/newgame.cc at line 1041 [7.1132300]
[7.1158390]
[7.1158390]
```
        default:
            return true;
```
Deletion in crawl-ref/source/newgame.cc at line 1044 [7.1132300]
B:BD[7.1158400] → [7.1158400:1158421]
```
        return true;
```
Insertion in crawl-ref/source/newgame.cc at line 1073 [7.1132300]
[7.1159147]
[7.1159147]
```
        default:
            return false;
```
Deletion in crawl-ref/source/newgame.cc at line 1076 [7.1132300]
B:BD[7.1159157] → [7.1159157:1159179]
```
        return false;
```
Insertion in crawl-ref/source/newgame.cc at line 1094 [7.1132300]
[7.1159577]
[7.1159577]
```
        default:
            return true;
```
Deletion in crawl-ref/source/newgame.cc at line 1097 [7.1132300]
B:BD[7.1159587] → [7.1159587:1159608]
```
        return true;
```
Insertion in crawl-ref/source/newgame.cc at line 1115 [7.1132300]
[7.1160030]
[7.1160030]
```
        default:
            return true;
```
Deletion in crawl-ref/source/newgame.cc at line 1118 [7.1132300]
B:BD[7.1160040] → [7.1160040:1160061]
```
        return true;
```
Insertion in crawl-ref/source/newgame.cc at line 1138 [7.1132300]
[7.1160539]
[7.1160539]
```
        default:
            return true;
```
Deletion in crawl-ref/source/newgame.cc at line 1141 [7.1132300]
B:BD[7.1160549] → [7.1160549:1160570]
```
        return true;
```
Insertion in crawl-ref/source/newgame.cc at line 1164 [7.1132300]
[7.1161145]
[7.1161145]
```
        default:
            return true;
```
Deletion in crawl-ref/source/newgame.cc at line 1167 [7.1132300]
B:BD[7.1161155] → [7.1161155:1161176]
```
        return true;
```
Insertion in crawl-ref/source/newgame.cc at line 1184 [7.1132300]
[7.1161571]
[7.1161571]
```
        default:
            return true;
```
Deletion in crawl-ref/source/newgame.cc at line 1187 [7.1132300]
B:BD[7.1161581] → [7.1161581:1161602]
```
        return true;
```
Insertion in crawl-ref/source/newgame.cc at line 1209 [7.1132300]
[7.1162153]
[7.1162153]
```
        default:
            return true;
```
Deletion in crawl-ref/source/newgame.cc at line 1212 [7.1132300]
B:BD[7.1162163] → [7.1162163:1162184]
```
        return true;
```
Insertion in crawl-ref/source/newgame.cc at line 1234 [7.1132300]
[7.1162710]
[7.1162710]
```
        default:
            return true;
```
Deletion in crawl-ref/source/newgame.cc at line 1237 [7.1132300]
B:BD[7.1162720] → [7.1162720:1162741]
```
        return true;
```
Insertion in crawl-ref/source/newgame.cc at line 1260 [7.1132300]
[7.1163350]
[7.1163350]
```
        default:
            return true;
```
Deletion in crawl-ref/source/newgame.cc at line 1263 [7.1132300]
B:BD[7.1163360] → [7.1163360:1163381]
```
        return true;
```
Insertion in crawl-ref/source/newgame.cc at line 1284 [7.1132300]
[7.1163864]
[7.1163864]
```
        default:
            return true;
```
Deletion in crawl-ref/source/newgame.cc at line 1287 [7.1132300]
B:BD[7.1163874] → [7.1163874:1163895]
```
        return true;
```
Insertion in crawl-ref/source/newgame.cc at line 1306 [7.1132300]
[7.1164339]
[7.1164339]
```
        default:
            return true;
```
Deletion in crawl-ref/source/newgame.cc at line 1309 [7.1132300]
B:BD[7.1164349] → [7.1164349:1164370]
```
        return true;
```
Insertion in crawl-ref/source/newgame.cc at line 1329 [7.1132300]
[7.1164844]
[7.1164844]
```
        default:
            return true;
```
Deletion in crawl-ref/source/newgame.cc at line 1332 [7.1132300]
B:BD[7.1164854] → [7.1164854:1164875]
```
        return true;
```
Insertion in crawl-ref/source/newgame.cc at line 1347 [7.1132300]
[7.1165201]
[7.1165201]
```
        default:
            return true;
```
Deletion in crawl-ref/source/newgame.cc at line 1350 [7.1132300]
B:BD[7.1165211] → [7.1165211:1165232]
```
        return true;
```
Insertion in crawl-ref/source/newgame.cc at line 1372 [7.1132300]
[7.1165751]
[7.1165751]
```
        default:
            return true;
```
Deletion in crawl-ref/source/newgame.cc at line 1375 [7.1132300]
B:BD[7.1165761] → [7.1165761:1165782]
```
        return true;
```
Insertion in crawl-ref/source/newgame.cc at line 1394 [7.1132300]
[7.1166242]
[7.1166242]
```
        default:
            return true;
```
Deletion in crawl-ref/source/newgame.cc at line 1397 [7.1132300]
B:BD[7.1166252] → [7.1166252:1166273]
```
        return true;
```
Insertion in crawl-ref/source/newgame.cc at line 1416 [7.1132300]
[7.1166744]
[7.1166744]
```
        default:
            return true;
```
Deletion in crawl-ref/source/newgame.cc at line 1419 [7.1132300]
B:BD[7.1166754] → [7.1166754:1166775]
```
        return true;
```
Insertion in crawl-ref/source/newgame.cc at line 1436 [7.1132300]
[7.1167141]
[7.1167141]
```
        default:
            return true;
```
Deletion in crawl-ref/source/newgame.cc at line 1439 [7.1132300]
B:BD[7.1167151] → [7.1167151:1167172]
```
        return true;
```
Insertion in crawl-ref/source/newgame.cc at line 1460 [7.1132300]
[7.1167689]
[7.1167689]
```
        default:
            return true;
```
Deletion in crawl-ref/source/newgame.cc at line 1463 [7.1132300]
B:BD[7.1167699] → [7.1167699:1167720]
```
        return true;
```
Insertion in crawl-ref/source/newgame.cc at line 1472 [7.1132300]
[7.1167878]
[7.1167878]
```
        default:
            return false;
```
Deletion in crawl-ref/source/newgame.cc at line 1475 [7.1132300]
B:BD[7.1167888] → [7.1167888:1167910]
```
        return false;
```
Replacement in crawl-ref/source/newgame.cc at line 1682 [7.1132300]
B:BD[7.1173864] → [11.781:827]
```
static void give_last_paycheck(int which_job)
```
[7.1173864]
[7.1173903]
```
static void give_last_paycheck(job_type which_job)
```

Replacement in crawl-ref/source/newgame.cc at line 1711 [7.1132300]

B:BD[11.882] → [11.882:941]

static void species_stat_init(unsigned char which_species)

[11.882]

[7.1174527]

static void species_stat_init(species_type which_species)

Replacement in crawl-ref/source/newgame.cc at line 1775 [7.1132300]
B:BD[7.1177507] → [11.942:984]
```
static void jobs_stat_init(int which_job)
```
[7.1177507]
[7.1177542]
```
static void jobs_stat_init(job_type which_job)
```
Replacement in crawl-ref/source/newgame.cc at line 1830 [7.1132300]
B:BD[7.1180226] → [11.985:1039]
```
static void give_basic_mutations(unsigned char speci)
```
[7.1180226]
[11.1039]
```
static void give_basic_mutations(species_type speci)
```
Replacement in crawl-ref/source/newgame.cc at line 1895 [7.1132300]
B:BD[11.1161] → [11.1161:1209]
```
static void give_basic_knowledge(int which_job)
```
[11.1161]
[7.1180267]
```
static void give_basic_knowledge(job_type which_job)
```
Replacement in crawl-ref/source/newgame.cc at line 1932 [7.1132300]
B:BD[7.1181207] → [11.1210:1255]
```
static void give_basic_spells(int which_job)
```
[7.1181207]
[7.1181245]
```
static void give_basic_spells(job_type which_job)
```
Replacement in crawl-ref/source/newgame.cc at line 2820 [7.1132300]
B:BD[7.1205925] → [13.219615:219653]
```
static char letter_to_class(int keyn)
```
[7.1205925]
[13.219653]
```
static job_type letter_to_class(int keyn)
```
Replacement in crawl-ref/source/newgame.cc at line 2881 [7.1132300]
B:BD[13.221248] → [13.221248:221288]
```
static char letter_to_species(int keyn)
```
[13.221248]
[13.221288]
```
static species_type letter_to_species(int keyn)
```

Replacement in crawl-ref/source/newgame.cc at line 2920 [7.1132300]

B:BD[13.222057] → [13.222057:222121]

        return SP_RED_DRACONIAN + random2(9);    // random drac

[13.222057]

[13.222121]

        return static_cast<species_type>(SP_RED_DRACONIAN + random2(9));

Replacement in crawl-ref/source/newgame.cc at line 2938 [7.1132300]
B:BD[13.222463] → [13.222463:222481]
```
        return 0;
```
[13.222463]
[13.222481]
```
        return SP_UNKNOWN;
```

Replacement in crawl-ref/source/newgame.cc at line 3024 [7.1132300]

B:BD[13.224160] → [13.224160:224215]

                    !class_allowed(i, you.char_class))

[13.224160]

[13.224215]

                !class_allowed(static_cast<species_type>(i), you.char_class))

Replacement in crawl-ref/source/newgame.cc at line 3105 [7.1132300]
B:BD[13.226015] → [13.226015:226040]
```
        you.species = 0;
```
[13.226015]
[13.226040]
```
        you.species = SP_UNKNOWN;
```
Replacement in crawl-ref/source/newgame.cc at line 3112 [7.1132300]
B:BD[13.226146] → [13.226146:226171]
```
        you.species = 0;
```
[13.226146]
[13.226171]
```
        you.species = SP_UNKNOWN;
```
Replacement in crawl-ref/source/newgame.cc at line 3137 [7.1132300]
B:BD[7.1208046] → [13.226472:226522]
```
    if (!(you.species = letter_to_species(keyn)))
```
[7.1208046]
[7.1208064]
```
    if ((you.species = letter_to_species(keyn)) == SP_UNKNOWN)
```

Replacement in crawl-ref/source/newgame.cc at line 3154 [7.1132300]

B:BD[7.1210010] → [13.226817:226870]

    if (you.species && you.char_class != JOB_UNKNOWN

[7.1210010]

[13.226870]

    if (you.species != SP_UNKNOWN && you.char_class != JOB_UNKNOWN

Deletion in crawl-ref/source/newgame.cc at line 3171 [7.1132300]
B:BD[7.1210242] → [7.1210242:1210255]
```
    int i,j;
```

Replacement in crawl-ref/source/newgame.cc at line 3176 [7.1132300]

B:BD[13.226994] → [13.226994:227048]

    if (you.species && you.char_class != JOB_UNKNOWN)

[13.226994]

[13.227048]

    if (you.species != SP_UNKNOWN && you.char_class != JOB_UNKNOWN)

Replacement in crawl-ref/source/newgame.cc at line 3187 [7.1132300]
B:BD[7.1210386] → [13.227141:227166]
```
        if (you.species)
```
[7.1210386]
[7.1210538]
```
        if (you.species != SP_UNKNOWN)
```

Replacement in crawl-ref/source/newgame.cc at line 3190 [7.1132300]

B:BD[13.227199] → [13.227199:227446]

            bool shortgreet = false;
            if (strlen(you.your_name) || you.species)
                cprintf("Welcome, ");
            else
            {
                cprintf("Welcome.");
                shortgreet = true;
            }

[13.227199]

[13.227446]

            cprintf("Welcome, ");

Replacement in crawl-ref/source/newgame.cc at line 3192 [7.1132300]

B:BD[13.227479] → [13.227479:227536]

B:BD[13.227536] → [15.392582:392628]

∅:D[15.392628] → [13.227576:227690]

B:BD[13.227576] → [13.227576:227690]

B:BD[13.227690] → [15.392629:392708]

∅:D[15.392708] → [13.227763:227823]

B:BD[13.227763] → [13.227763:227823]

            if (strlen(you.your_name) > 0)
            {
                cprintf("%s", you.your_name);
                if (you.species)
                    cprintf(" the ");
            }
            if (you.species)
                cprintf("%s", species_name(you.species,you.experience_level));
            if (!shortgreet)
                cprintf(".");

[13.227479]

[7.1210614]

            if (you.your_name[0])
                cprintf("%s the ", you.your_name);
            cprintf("%s.", species_name(you.species,you.experience_level));

Replacement in crawl-ref/source/newgame.cc at line 3205 [7.1132300]
B:BD[7.1210747] → [13.227963:227995]
B:BD[13.227995] → [6.76436:76490]
∅:D[6.76490] → [13.227995:228022]
B:BD[13.227995] → [13.227995:228022]
```
        cprintf("You can be:");
        cprintf("  (Press ? for more information)"); 
        cprintf(EOL EOL);
```
[7.1210747]
[7.1210805]
```
        cprintf("You can be: (Press ? for more information)" EOL EOL);
```

Replacement in crawl-ref/source/newgame.cc at line 3208 [7.1132300]

B:BD[7.1210838] → [7.1210838:1210958]

        j = 0;               // used within for loop to determine newline {dlb}
        for (i = 0; i < NUM_JOBS; i++)

[7.1210838]

[7.1210958]

        int j = 0;
        for (int i = 0; i < NUM_JOBS; i++)

Replacement in crawl-ref/source/newgame.cc at line 3211 [7.1132300]

B:BD[7.1210968] → [13.228023:228103]

            if (you.species? !class_allowed(you.species, i) : i == JOB_QUITTER)

[7.1210968]

[7.1211016]

            if (you.species != SP_UNKNOWN ?
                !class_allowed(you.species, static_cast<job_type>(i)) :
                i == JOB_QUITTER)

Replacement in crawl-ref/source/newgame.cc at line 3237 [7.1132300]
B:BD[7.1211377] → [13.228333:228359]
```
        if (!you.species)
```
[7.1211377]
[16.519]
```
        if (you.species == SP_UNKNOWN)
```
Replacement in crawl-ref/source/newgame.cc at line 3296 [7.1132300]
B:BD[13.229597] → [13.229597:229622]
```
        you.species = 0;
```
[13.229597]
[13.229622]
```
        you.species = SP_UNKNOWN;
```
Replacement in crawl-ref/source/newgame.cc at line 3309 [7.1132300]
B:BD[13.229904] → [13.229904:229930]
```
            int job = -1;
```
[13.229904]
[13.229930]
```
            job_type job = JOB_UNKNOWN;
```
Replacement in crawl-ref/source/newgame.cc at line 3311 [7.1132300]
B:BD[13.229931] → [17.535:578]
```
            for (i = 0; i < NUM_JOBS; i++)
```
[13.229931]
[13.229978]
```
            for (int i = 0; i < NUM_JOBS; i++)
```

Replacement in crawl-ref/source/newgame.cc at line 3316 [7.1132300]

∅:D[3.244] → [13.229992:230059]

B:BD[13.229992] → [13.229992:230059]

                if (!you.species || class_allowed(you.species, i))

[3.244]

[13.230059]

                if (you.species == SP_UNKNOWN ||
                    class_allowed(you.species, static_cast<job_type>(i)))

Replacement in crawl-ref/source/newgame.cc at line 3321 [7.1132300]

B:BD[13.230162] → [13.230162:230195]

                        job = i;

[13.230162]

[13.230195]

                        job = static_cast<job_type>(i);

Replacement in crawl-ref/source/newgame.cc at line 3324 [7.1132300]

B:BD[13.230227] → [13.230227:230309]


            ASSERT( job != -1 );  // at least one class should have been allowed

[13.230227]

[13.230309]

            ASSERT( job != JOB_UNKNOWN );

Replacement in crawl-ref/source/newgame.cc at line 3341 [7.1132300]
∅:D[6.76697] → [13.230606:230656]
B:BD[7.1214485] → [13.230606:230656]
```
        else if ((keyn == ' ' && !you.species) ||
```
[6.76697]
[13.230656]
```
        else if ((keyn == ' ' && you.species == SP_UNKNOWN) ||
```
Insertion in crawl-ref/source/newgame.cc at line 4289 [7.1132300]
[7.1242964]
[7.1242964]
```
        default:
            break;
```
Insertion in crawl-ref/source/newgame.cc at line 4869 [7.1132300]
[7.1260119]
[7.1260119]
```
    default:
        break;
```
Insertion in crawl-ref/source/mutation.cc at line 1072 [7.1263003]
[2.470]
[7.1298764]
```
    default:
        break;
```
Replacement in crawl-ref/source/externs.h at line 579 [7.3270163]
B:BD[7.3275622] → [7.3275622:3275647]
```
  unsigned char species;
```
[7.3275622]
[13.441275]
```
  species_type species;
  job_type char_class;
```
Deletion in crawl-ref/source/externs.h at line 652 [7.3270163]
∅:D[4.1779] → [7.3277058:3277076]
B:BD[7.3277058] → [7.3277058:3277076]
```
  int char_class;
```
Replacement in crawl-ref/source/debug.cc at line 221 [7.4016436]
B:BD[7.4027995] → [7.4027995:4028012]
```
    int sp = -1;
```
[7.4027995]
[7.4028012]
```
    species_type sp = SP_UNKNOWN;
```
Replacement in crawl-ref/source/debug.cc at line 234 [7.4016436]
B:BD[7.4028404] → [7.4028404:4028428]
```
                sp = i;
```
[7.4028404]
[7.4028428]
```
                sp = static_cast<species_type>(i);
```
Replacement in crawl-ref/source/debug.cc at line 238 [7.4016436]
B:BD[7.4028482] → [7.4028482:4028506]
```
                sp = i;
```
[7.4028482]
[7.4028506]
```
                sp = static_cast<species_type>(i);
```
Replacement in crawl-ref/source/debug.cc at line 242 [7.4016436]
B:BD[7.4028523] → [7.4028523:4028541]
```
    if (sp == -1)
```
[7.4028523]
[7.4028541]
```
    if (sp == SP_UNKNOWN)
```

A bit more type-safety (slightly intrusive this time): you.species and

Dependencies

In channels

Change contents

Replacement in crawl-ref/source/tutorial.cc at line 136 [6.5936]

Replacement in crawl-ref/source/tags.cc at line 1004 [7.164589]

Replacement in crawl-ref/source/tags.cc at line 1031 [7.164589]

Replacement in crawl-ref/source/skills2.h at line 18 [7.643583]

Replacement in crawl-ref/source/skills2.h at line 20 [7.643583]

Replacement in crawl-ref/source/skills2.h at line 73 [7.643583]

Replacement in crawl-ref/source/skills2.cc at line 2330 [7.647133]

Replacement in crawl-ref/source/player.h at line 283 [7.945993]

Insertion in crawl-ref/source/player.cc at line 2572 [7.962854]

Insertion in crawl-ref/source/player.cc at line 2799 [7.962854]

Replacement in crawl-ref/source/player.cc at line 3744 [7.962854]

Replacement in crawl-ref/source/player.cc at line 3762 [7.962854]

Insertion in crawl-ref/source/player.cc at line 3786 [7.962854]

Insertion in crawl-ref/source/output.cc at line 1681 [7.1088282]

Replacement in crawl-ref/source/newgame.cc at line 98 [7.1132300]

Replacement in crawl-ref/source/newgame.cc at line 102 [7.1132300]

Replacement in crawl-ref/source/newgame.cc at line 107 [7.1132300]

Replacement in crawl-ref/source/newgame.cc at line 109 [7.1132300]

Replacement in crawl-ref/source/newgame.cc at line 121 [7.1132300]

Replacement in crawl-ref/source/newgame.cc at line 188 [7.1132300]

Replacement in crawl-ref/source/newgame.cc at line 244 [7.1132300]

Replacement in crawl-ref/source/newgame.cc at line 257 [7.1132300]

Replacement in crawl-ref/source/newgame.cc at line 263 [7.1132300]

Replacement in crawl-ref/source/newgame.cc at line 271 [7.1132300]

Replacement in crawl-ref/source/newgame.cc at line 275 [7.1132300]

Insertion in crawl-ref/source/newgame.cc at line 532 [7.1132300]

Replacement in crawl-ref/source/newgame.cc at line 864 [7.1132300]

Insertion in crawl-ref/source/newgame.cc at line 874 [7.1132300]

Deletion in crawl-ref/source/newgame.cc at line 877 [7.1132300]

Insertion in crawl-ref/source/newgame.cc at line 895 [7.1132300]

Deletion in crawl-ref/source/newgame.cc at line 898 [7.1132300]

Insertion in crawl-ref/source/newgame.cc at line 921 [7.1132300]

Deletion in crawl-ref/source/newgame.cc at line 924 [7.1132300]

Insertion in crawl-ref/source/newgame.cc at line 939 [7.1132300]

Deletion in crawl-ref/source/newgame.cc at line 942 [7.1132300]

Insertion in crawl-ref/source/newgame.cc at line 960 [7.1132300]

Deletion in crawl-ref/source/newgame.cc at line 963 [7.1132300]

Insertion in crawl-ref/source/newgame.cc at line 985 [7.1132300]

Deletion in crawl-ref/source/newgame.cc at line 988 [7.1132300]

Insertion in crawl-ref/source/newgame.cc at line 996 [7.1132300]

Deletion in crawl-ref/source/newgame.cc at line 999 [7.1132300]

Insertion in crawl-ref/source/newgame.cc at line 1016 [7.1132300]

Deletion in crawl-ref/source/newgame.cc at line 1019 [7.1132300]

Insertion in crawl-ref/source/newgame.cc at line 1041 [7.1132300]

Deletion in crawl-ref/source/newgame.cc at line 1044 [7.1132300]

Insertion in crawl-ref/source/newgame.cc at line 1073 [7.1132300]

Deletion in crawl-ref/source/newgame.cc at line 1076 [7.1132300]

Insertion in crawl-ref/source/newgame.cc at line 1094 [7.1132300]

Deletion in crawl-ref/source/newgame.cc at line 1097 [7.1132300]

Insertion in crawl-ref/source/newgame.cc at line 1115 [7.1132300]

Deletion in crawl-ref/source/newgame.cc at line 1118 [7.1132300]

Insertion in crawl-ref/source/newgame.cc at line 1138 [7.1132300]

Deletion in crawl-ref/source/newgame.cc at line 1141 [7.1132300]

Insertion in crawl-ref/source/newgame.cc at line 1164 [7.1132300]

Deletion in crawl-ref/source/newgame.cc at line 1167 [7.1132300]

Insertion in crawl-ref/source/newgame.cc at line 1184 [7.1132300]

Deletion in crawl-ref/source/newgame.cc at line 1187 [7.1132300]

Insertion in crawl-ref/source/newgame.cc at line 1209 [7.1132300]

Deletion in crawl-ref/source/newgame.cc at line 1212 [7.1132300]

Insertion in crawl-ref/source/newgame.cc at line 1234 [7.1132300]

Deletion in crawl-ref/source/newgame.cc at line 1237 [7.1132300]

Insertion in crawl-ref/source/newgame.cc at line 1260 [7.1132300]

Deletion in crawl-ref/source/newgame.cc at line 1263 [7.1132300]

Insertion in crawl-ref/source/newgame.cc at line 1284 [7.1132300]

Deletion in crawl-ref/source/newgame.cc at line 1287 [7.1132300]

Insertion in crawl-ref/source/newgame.cc at line 1306 [7.1132300]

Deletion in crawl-ref/source/newgame.cc at line 1309 [7.1132300]

Insertion in crawl-ref/source/newgame.cc at line 1329 [7.1132300]

Deletion in crawl-ref/source/newgame.cc at line 1332 [7.1132300]

Insertion in crawl-ref/source/newgame.cc at line 1347 [7.1132300]

Deletion in crawl-ref/source/newgame.cc at line 1350 [7.1132300]

Insertion in crawl-ref/source/newgame.cc at line 1372 [7.1132300]

Deletion in crawl-ref/source/newgame.cc at line 1375 [7.1132300]

Insertion in crawl-ref/source/newgame.cc at line 1394 [7.1132300]

Deletion in crawl-ref/source/newgame.cc at line 1397 [7.1132300]

Insertion in crawl-ref/source/newgame.cc at line 1416 [7.1132300]