fiddlerwoaroof/crawl - Change SNH6UWOYVWP4A6B4NC6YZ6KRYPYCGGNYCW5TILTALPH552H2EUFQC

Moving data out of newgame.cc.

Also move species<->string translation from player.cc to species.cc.

Created by Robert Vollmert on October 23, 2009

SNH6UWOYVWP4A6B4NC6YZ6KRYPYCGGNYCW5TILTALPH552H2EUFQC

Dependencies

In channels

main

Change contents

Insertion in crawl-ref/source/view.cc at line 47 [9.16817]
[7.29]
[8.7]
```
#include "jobs.h"
```
Insertion in crawl-ref/source/tutorial.cc at line 41 [11.5936]
[10.1499]
[10.1519]
```
#include "jobs.h"
```
Insertion in crawl-ref/source/tutorial.cc at line 46 [11.5936]
[12.433]
[13.518]
```
#include "species.h"
```
Insertion in crawl-ref/source/spl-book.cc at line 23 [9.397614]
[9.398234]
[14.1894]
```
#include "species.h"
```

File addition: species.h (----------)

[15.24]

#ifndef SPECIES_H
#define SPECIES_H
// from newgame.cc
species_type get_species(const int index);
species_type random_draconian_player_species();
int ng_num_species();
int get_species_by_abbrev(const char *abbrev);
const char *get_species_abbrev(int which_species);
int get_species_index_by_abbrev(const char *abbrev);
int get_species_index_by_name(const char *name);
// from player.cc
std::string species_name( species_type speci, int level, bool genus = false,
                          bool adj = false );
int str_to_species(const std::string &species);
#endif

File addition: species.cc (----------)

[15.24]

#include "AppHdr.h"
#include "species.h"
#include "stuff.h"
// March 2008: change order of species and jobs on character selection
// screen as suggested by Markus Maier. Summarizing comments below are
// copied directly from Markus' SourceForge comments. (jpeg)
//
// These are listed in two columns to match the selection screen output.
// Take care to list all valid species here, or they cannot be directly
// chosen.
//
// The red draconian is later replaced by a random variant.
// The old and new lists are expected to have the same length.
static species_type old_species_order[] = {
    SP_HUMAN,          SP_HIGH_ELF,
    SP_DEEP_ELF,       SP_SLUDGE_ELF,
    SP_MOUNTAIN_DWARF, SP_HALFLING,
    SP_HILL_ORC,       SP_KOBOLD,
    SP_MUMMY,          SP_NAGA,
    SP_OGRE,           SP_TROLL,
    SP_RED_DRACONIAN,  SP_CENTAUR,
    SP_DEMIGOD,        SP_SPRIGGAN,
    SP_MINOTAUR,       SP_DEMONSPAWN,
    SP_GHOUL,          SP_KENKU,
    SP_MERFOLK,        SP_VAMPIRE,
    SP_DEEP_DWARF
};
// Fantasy staples and humanoid creatures come first, then diminutive and
// stealthy creatures, then monstrous creatures, then planetouched and after
// all living creatures finally the undead. (MM)
static species_type new_species_order[] = {
    // comparatively human-like looks
    SP_HUMAN,          SP_HIGH_ELF,
    SP_DEEP_ELF,       SP_SLUDGE_ELF,
    SP_MOUNTAIN_DWARF, SP_DEEP_DWARF,
    SP_HILL_ORC,       SP_MERFOLK,
    // small species
    SP_HALFLING,       SP_KOBOLD,
    SP_SPRIGGAN,
    // significantly different body type from human
    SP_NAGA,           SP_CENTAUR,
    SP_OGRE,           SP_TROLL,
    SP_MINOTAUR,       SP_KENKU,
    SP_RED_DRACONIAN,
    // celestial species
    SP_DEMIGOD,        SP_DEMONSPAWN,
    // undead species
    SP_MUMMY,          SP_GHOUL,
    SP_VAMPIRE
};
species_type random_draconian_player_species()
{
    const int num_drac = SP_PALE_DRACONIAN - SP_RED_DRACONIAN + 1;
    return static_cast<species_type>(SP_RED_DRACONIAN + random2(num_drac));
}
species_type get_species(const int index)
{
    if (index < 0 || (unsigned int) index >= ARRAYSZ(old_species_order))
        return (SP_UNKNOWN);
    return (Options.use_old_selection_order ? old_species_order[index]
                                            : new_species_order[index]);
}
static const char * Species_Abbrev_List[NUM_SPECIES] =
    { "XX", "Hu", "HE", "DE", "SE", "MD", "Ha",
      "HO", "Ko", "Mu", "Na", "Og", "Tr",
      // the draconians
      "Dr", "Dr", "Dr", "Dr", "Dr", "Dr", "Dr", "Dr", "Dr", "Dr",
      "Ce", "DG", "Sp", "Mi", "DS", "Gh", "Ke", "Mf", "Vp", "DD",
      // placeholders
      "El", "HD", "OM", "GE", "Gn" };
int get_species_index_by_abbrev(const char *abbrev)
{
    COMPILE_CHECK(ARRAYSZ(Species_Abbrev_List) == NUM_SPECIES, c1);
    for (unsigned i = 0; i < ARRAYSZ(old_species_order); i++)
    {
        const int sp = (Options.use_old_selection_order ? old_species_order[i]
                                                        : new_species_order[i]);
        if (tolower( abbrev[0] ) == tolower( Species_Abbrev_List[sp][0] )
            && tolower( abbrev[1] ) == tolower( Species_Abbrev_List[sp][1] ))
        {
            return (i);
        }
    }
    return (-1);
}
int get_species_index_by_name( const char *name )
{
    unsigned int i;
    int sp = -1;
    std::string::size_type pos = std::string::npos;
    char lowered_buff[80];
    strncpy(lowered_buff, name, sizeof(lowered_buff));
    strlwr(lowered_buff);
    for (i = 0; i < ARRAYSZ(old_species_order); i++)
    {
        const species_type real_sp
                   = (Options.use_old_selection_order ? old_species_order[i]
                                                      : new_species_order[i]);
        const std::string lowered_species =
            lowercase_string(species_name(real_sp,1));
        pos = lowered_species.find( lowered_buff );
        if (pos != std::string::npos)
        {
            sp = i;
            if (pos == 0)  // prefix takes preference
                break;
        }
    }
    return (sp);
}
const char *get_species_abbrev( int which_species )
{
    ASSERT( which_species > 0 && which_species < NUM_SPECIES );
    return (Species_Abbrev_List[ which_species ]);
}
// Needed for debug.cc and hiscores.cc.
int get_species_by_abbrev( const char *abbrev )
{
    int i;
    COMPILE_CHECK(ARRAYSZ(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);
}
int ng_num_species()
{
    // The list musn't be longer than the number of actual species.
    COMPILE_CHECK(ARRAYSZ(old_species_order) <= NUM_SPECIES, c1);
    // Check whether the two lists have the same size.
    COMPILE_CHECK(ARRAYSZ(old_species_order) == ARRAYSZ(new_species_order), c2);
    return (ARRAYSZ(old_species_order));
}
// Does a case-sensitive lookup of the species name supplied.
int str_to_species(const std::string &species)
{
    if (species.empty())
        return SP_HUMAN;
    // first look for full name (e.g. Green Draconian)
    for (int i = SP_HUMAN; i < NUM_SPECIES; ++i)
    {
        if (species == species_name(static_cast<species_type>(i), 10))
            return (i);
    }
    // nothing found, try again with plain name
    for (int i = SP_HUMAN; i < NUM_SPECIES; ++i)
    {
        if (species == species_name(static_cast<species_type>(i), 1))
            return (i);
    }
    return (SP_HUMAN);
}
std::string species_name(species_type speci, int level, bool genus, bool adj)
// defaults:                                            false       false
{
    std::string res;
    if (player_genus( GENPC_DRACONIAN, speci ))
    {
        if (adj || genus)  // adj doesn't care about exact species
            res = "Draconian";
        else
        {
            if (level < 7)
                res = "Draconian";
            else
            {
                switch (speci)
                {
                case SP_RED_DRACONIAN:     res = "Red Draconian";     break;
                case SP_WHITE_DRACONIAN:   res = "White Draconian";   break;
                case SP_GREEN_DRACONIAN:   res = "Green Draconian";   break;
                case SP_YELLOW_DRACONIAN:  res = "Yellow Draconian";  break;
                case SP_GREY_DRACONIAN:    res = "Grey Draconian";    break;
                case SP_BLACK_DRACONIAN:   res = "Black Draconian";   break;
                case SP_PURPLE_DRACONIAN:  res = "Purple Draconian";  break;
                case SP_MOTTLED_DRACONIAN: res = "Mottled Draconian"; break;
                case SP_PALE_DRACONIAN:    res = "Pale Draconian";    break;
                case SP_BASE_DRACONIAN:
                default:
                    res = "Draconian";
                    break;
                }
            }
        }
    }
    else if (player_genus( GENPC_ELVEN, speci ))
    {
        if (adj)  // doesn't care about species/genus
            res = "Elven";
        else if (genus)
            res = "Elf";
        else
        {
            switch (speci)
            {
            case SP_HIGH_ELF:   res = "High Elf";   break;
            case SP_DEEP_ELF:   res = "Deep Elf";   break;
            case SP_SLUDGE_ELF: res = "Sludge Elf"; break;
            default:            res = "Elf";        break;
            }
        }
    }
    else if (player_genus(GENPC_DWARVEN, speci))
    {
        if (adj)  // doesn't care about species/genus
            res = "Dwarven";
        else if (genus)
            res = "Dwarf";
        else
        {
            switch (speci)
            {
            case SP_MOUNTAIN_DWARF: res = "Mountain Dwarf";            break;
            case SP_DEEP_DWARF:     res = "Deep Dwarf";                break;
            default:                res = "Dwarf";                     break;
            }
        }
    }
    else
    {
        switch (speci)
        {
        case SP_HUMAN:      res = "Human";                             break;
        case SP_HALFLING:   res = "Halfling";                          break;
        case SP_KOBOLD:     res = "Kobold";                            break;
        case SP_MUMMY:      res = "Mummy";                             break;
        case SP_NAGA:       res = "Naga";                              break;
        case SP_CENTAUR:    res = "Centaur";                           break;
        case SP_SPRIGGAN:   res = "Spriggan";                          break;
        case SP_MINOTAUR:   res = "Minotaur";                          break;
        case SP_KENKU:      res = "Kenku";                             break;
        case SP_HILL_ORC:
            res = (adj ? "Orcish" : genus ? "Orc" : "Hill Orc");
            break;
        case SP_OGRE:       res = (adj ? "Ogreish"    : "Ogre");       break;
        case SP_TROLL:      res = (adj ? "Trollish"   : "Troll");      break;
        case SP_DEMIGOD:    res = (adj ? "Divine"     : "Demigod");    break;
        case SP_DEMONSPAWN: res = (adj ? "Demonic"    : "Demonspawn"); break;
        case SP_GHOUL:      res = (adj ? "Ghoulish"   : "Ghoul");      break;
        case SP_MERFOLK:    res = (adj ? "Merfolkian" : "Merfolk");    break;
        case SP_VAMPIRE:    res = (adj ? "Vampiric"   : "Vampire");    break;
        default:            res = (adj ? "Yakish"     : "Yak");        break;
        }
    }
    return res;
}

Insertion in crawl-ref/source/skills2.cc at line 31 [9.647133]
[9.647981]
[9.648024]
```
#include "species.h"
```

Deletion in crawl-ref/source/player.h at line 561 [9.945993]

B:BD[9.947980] → [9.947980:948117]

B:BD[9.948117] → [16.8602:8679]

B:BD[16.8679] → [17.3760:3806]

∅:D[18.380] → [19.939:987]

∅:D[20.1022] → [19.939:987]

∅:D[17.3806] → [19.939:987]

∅:D[16.8744] → [19.939:987]

B:BD[9.948216] → [19.939:987]

∅:D[19.987] → [9.948217:948293]

B:BD[9.948217] → [9.948217:948293]

 * called from: acr - chardump - describe - newgame - view
 * *********************************************************************** */
std::string species_name( species_type speci, int level, bool genus = false,
                          bool adj = false );
int str_to_species(const std::string &species);
/* ***********************************************************************

Insertion in crawl-ref/source/player.cc at line 53 [9.962854]
[9.963860]
[21.982]
```
#include "species.h"
```

Deletion in crawl-ref/source/player.cc at line 4297 [9.962854]

∅:D[20.1546] → [9.1036667:1036668]

∅:D[22.3177] → [9.1036667:1036668]

∅:D[23.352585] → [9.1036667:1036668]

B:BD[9.1036667] → [9.1036667:1036668]

B:BD[19.1061] → [19.1061:1223]

B:BD[19.1223] → [24.2891:2946]

∅:D[24.2946] → [19.1223:1278]

B:BD[19.1223] → [19.1223:1278]

B:BD[19.1278] → [18.681:752]

∅:D[18.752] → [19.1322:1353]

B:BD[19.1322] → [19.1322:1353]

B:BD[19.1353] → [24.2947:2995]

∅:D[24.2995] → [19.1353:1408]

B:BD[19.1353] → [19.1353:1408]

B:BD[19.1408] → [18.753:823]

∅:D[18.823] → [19.1451:1481]

B:BD[19.1451] → [19.1451:1481]

∅:D[19.1481] → [9.1037034:1037035]

B:BD[9.1037034] → [9.1037034:1037035]

B:BD[9.1037035] → [19.1482:1508]

B:BD[19.1508] → [17.3976:4054]

B:BD[17.4054] → [25.7817:7891]

∅:D[18.977] → [9.1037306:1037308]

∅:D[26.7887] → [9.1037306:1037308]

∅:D[25.7891] → [9.1037306:1037308]

∅:D[16.8934] → [9.1037306:1037308]

B:BD[9.1037306] → [9.1037306:1037308]

B:BD[9.1037308] → [18.978:999]

B:BD[18.999] → [16.8935:8936]

B:BD[9.1037343] → [9.1037343:1037464]

B:BD[9.1037464] → [18.1000:1031]

∅:D[18.1031] → [9.1037513:1037536]

B:BD[9.1037513] → [9.1037513:1037536]

B:BD[9.1037609] → [9.1037609:1037636]

B:BD[9.1037636] → [18.1032:1067]

∅:D[18.1067] → [9.1037689:1037769]

B:BD[9.1037689] → [9.1037689:1037769]

B:BD[9.1037769] → [18.1068:1299]

B:BD[18.1299] → [27.2821:2898]

∅:D[27.2898] → [18.1376:1761]

B:BD[18.1376] → [18.1376:1761]


// Does a case-sensitive lookup of the species name supplied.
int str_to_species(const std::string &species)
{
    if (species.empty())
        return SP_HUMAN;
    // first look for full name (e.g. Green Draconian)
    for (int i = SP_HUMAN; i < NUM_SPECIES; ++i)
    {
        if (species == species_name(static_cast<species_type>(i), 10))
            return (i);
    }
    // nothing found, try again with plain name
    for (int i = SP_HUMAN; i < NUM_SPECIES; ++i)
    {
        if (species == species_name(static_cast<species_type>(i), 1))
            return (i);
    }
    return (SP_HUMAN);
}
std::string species_name(species_type speci, int level, bool genus, bool adj)
// defaults:                                            false       false
{
    std::string res;
    if (player_genus( GENPC_DRACONIAN, speci ))
    {
        if (adj || genus)  // adj doesn't care about exact species
            res = "Draconian";
        else
        {
            if (level < 7)
                res = "Draconian";
            else
            {
                switch (speci)
                {
                case SP_RED_DRACONIAN:     res = "Red Draconian";     break;
                case SP_WHITE_DRACONIAN:   res = "White Draconian";   break;
                case SP_GREEN_DRACONIAN:   res = "Green Draconian";   break;
                case SP_YELLOW_DRACONIAN:  res = "Yellow Draconian";  break;
                case SP_GREY_DRACONIAN:    res = "Grey Draconian";    break;
                case SP_BLACK_DRACONIAN:   res = "Black Draconian";   break;
                case SP_PURPLE_DRACONIAN:  res = "Purple Draconian";  break;
                case SP_MOTTLED_DRACONIAN: res = "Mottled Draconian"; break;
                case SP_PALE_DRACONIAN:    res = "Pale Draconian";    break;

Deletion in crawl-ref/source/player.cc at line 4298 [9.962854]

B:BD[9.1039028] → [23.352641:352681]

∅:D[23.352681] → [9.1039068:1039093]

B:BD[9.1039068] → [9.1039068:1039093]

B:BD[9.1039093] → [18.1763:1802]

∅:D[18.1802] → [9.1039150:1039334]

B:BD[9.1039150] → [9.1039150:1039334]

B:BD[9.1039334] → [18.1803:1830]

∅:D[18.1830] → [9.1039379:1039403]

B:BD[9.1039379] → [9.1039379:1039403]

B:BD[9.1039403] → [18.1831:1856]

∅:D[18.1856] → [9.1039446:1039510]

B:BD[9.1039446] → [9.1039446:1039510]

B:BD[9.1039510] → [18.1857:1916]

B:BD[18.1975] → [18.1975:2152]

∅:D[18.2152] → [9.1040050:1040080]

B:BD[9.1040050] → [9.1040050:1040080]

B:BD[9.1040080] → [3.2733:2782]

∅:D[3.2782] → [9.1040131:1040191]

B:BD[9.1040131] → [9.1040131:1040191]

B:BD[9.1040191] → [18.2153:2182]

∅:D[18.2182] → [9.1040238:1040262]

B:BD[9.1040238] → [9.1040238:1040262]

B:BD[9.1040262] → [18.2183:2210]

∅:D[18.2210] → [9.1040307:1040371]

B:BD[9.1040307] → [9.1040307:1040371]

B:BD[9.1040371] → [28.2447:2525]

B:BD[28.2525] → [29.7574:7652]

∅:D[29.7652] → [28.2525:2603]

B:BD[28.2525] → [28.2525:2603]

∅:D[18.2345] → [9.1040690:1040768]

∅:D[28.2603] → [9.1040690:1040768]

B:BD[9.1040690] → [9.1040690:1040768]

B:BD[9.1040768] → [28.2604:3306]

∅:D[28.3306] → [18.3346:3347]

B:BD[18.3346] → [18.3346:3347]

∅:D[18.3347] → [9.1040948:1040974]

B:BD[9.1040948] → [9.1040948:1040974]

B:BD[9.1040974] → [18.3348:3413]

∅:D[18.3413] → [9.1041973:1041992]

B:BD[9.1041973] → [9.1041973:1041992]

B:BD[9.1041992] → [18.3414:3415]

B:BD[28.3385] → [28.3385:4009]

∅:D[7.3158] → [9.1042903:1042919]

∅:D[28.4009] → [9.1042903:1042919]

∅:D[18.4023] → [9.1042903:1042919]

B:BD[9.1042903] → [9.1042903:1042919]

B:BD[9.1042919] → [18.4024:4042]

∅:D[18.4042] → [23.352682:352683]

B:BD[9.1043048] → [23.352682:352683]

                case SP_BASE_DRACONIAN:
                default:
                    res = "Draconian";
                    break;
                }
            }
        }
    }
    else if (player_genus( GENPC_ELVEN, speci ))
    {
        if (adj)  // doesn't care about species/genus
            res = "Elven";
        else if (genus)
            res = "Elf";
        else
        {
            switch (speci)
            {
            case SP_HIGH_ELF:   res = "High Elf";   break;
            case SP_DEEP_ELF:   res = "Deep Elf";   break;
            case SP_SLUDGE_ELF: res = "Sludge Elf"; break;
            default:            res = "Elf";        break;
            }
        }
    }
    else if (player_genus(GENPC_DWARVEN, speci))
    {
        if (adj)  // doesn't care about species/genus
            res = "Dwarven";
        else if (genus)
            res = "Dwarf";
        else
        {
            switch (speci)
            {
            case SP_MOUNTAIN_DWARF: res = "Mountain Dwarf";            break;
            case SP_DEEP_DWARF:     res = "Deep Dwarf";                break;
            default:                res = "Dwarf";                     break;
            }
        }
    }
    else
    {
        switch (speci)
        {
        case SP_HUMAN:      res = "Human";                             break;
        case SP_HALFLING:   res = "Halfling";                          break;
        case SP_KOBOLD:     res = "Kobold";                            break;
        case SP_MUMMY:      res = "Mummy";                             break;
        case SP_NAGA:       res = "Naga";                              break;
        case SP_CENTAUR:    res = "Centaur";                           break;
        case SP_SPRIGGAN:   res = "Spriggan";                          break;
        case SP_MINOTAUR:   res = "Minotaur";                          break;
        case SP_KENKU:      res = "Kenku";                             break;
        case SP_HILL_ORC:
            res = (adj ? "Orcish" : genus ? "Orc" : "Hill Orc");
            break;
        case SP_OGRE:       res = (adj ? "Ogreish"    : "Ogre");       break;
        case SP_TROLL:      res = (adj ? "Trollish"   : "Troll");      break;
        case SP_DEMIGOD:    res = (adj ? "Divine"     : "Demigod");    break;
        case SP_DEMONSPAWN: res = (adj ? "Demonic"    : "Demonspawn"); break;
        case SP_GHOUL:      res = (adj ? "Ghoulish"   : "Ghoul");      break;
        case SP_MERFOLK:    res = (adj ? "Merfolkian" : "Merfolk");    break;
        case SP_VAMPIRE:    res = (adj ? "Vampiric"   : "Vampire");    break;
        default:            res = (adj ? "Yakish"     : "Yak");        break;
        }
    }
    return res;
}

Insertion in crawl-ref/source/output.cc at line 19 [9.1088282]
[9.1088711]
[9.1088711]
```
#include "species.h"
```
Insertion in crawl-ref/source/output.cc at line 39 [9.1088282]
[7.3186]
[9.1088734]
```
#include "jobs.h"
```
Insertion in crawl-ref/source/newgame.h at line 10 [9.1131725]
[9.1131996]
[9.1131996]
```
#include "itemprop.h"
```

Deletion in crawl-ref/source/newgame.h at line 42 [9.1131725]

∅:D[6.3196] → [9.1131997:1131998]

B:BD[9.1131997] → [9.1131997:1131998]

B:BD[9.1131998] → [7.3192:3370]

B:BD[7.3370] → [6.3197:3350]


/* ***********************************************************************
 * called from: initfile
 * *********************************************************************** */
int get_species_index_by_abbrev(const char *abbrev);
int get_species_index_by_name(const char *name);
const char *get_species_abbrev(int which_species);

Deletion in crawl-ref/source/newgame.h at line 43 [9.1131725]

B:BD[7.3530] → [6.3351:3537]

∅:D[6.3537] → [30.2515:2889]

B:BD[7.3724] → [30.2515:2889]

B:BD[30.2889] → [31.2632:2633]

int get_class_index_by_abbrev(const char *abbrev);
int get_class_index_by_name(const char *name);
const char *get_class_abbrev(int which_job);
const char *get_class_name(int which_job);
/* ***********************************************************************
 * 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 10 [9.1132300]
[9.1134961]
[9.1134961]
```
#include "jobs.h"
```
Insertion in crawl-ref/source/newgame.cc at line 31 [9.1132300]
[9.1135351]
[9.1135351]
```
#include "species.h"
```

Deletion in crawl-ref/source/newgame.cc at line 100 [9.1132300]

B:BD[23.381659] → [32.2962:2963]

B:BD[32.2963] → [33.2556:2698]

B:BD[33.2698] → [34.2595:2656]

B:BD[34.2656] → [4.2942:2945]

∅:D[4.2945] → [33.2753:2826]

B:BD[32.3163] → [33.2753:2826]

B:BD[33.2826] → [4.2946:3032]

∅:D[4.3032] → [32.3305:3472]

B:BD[32.3305] → [32.3305:3472]

B:BD[32.3472] → [35.4470:4856]

∅:D[35.4856] → [29.8331:8349]

B:BD[29.8331] → [29.8331:8349]

∅:D[17.4720] → [32.3880:3883]

∅:D[29.8349] → [32.3880:3883]

B:BD[32.3880] → [32.3880:3883]

∅:D[32.3883] → [36.214741:214742]

∅:D[23.381659] → [36.214741:214742]

B:BD[36.214741] → [36.214741:214742]

B:BD[36.214742] → [37.2658:2732]

∅:D[37.2732] → [32.3958:4166]

B:BD[32.3958] → [32.3958:4166]

B:BD[32.4166] → [35.4857:5004]

∅:D[37.2878] → [32.4303:4324]

∅:D[35.5004] → [32.4303:4324]

∅:D[29.8401] → [32.4303:4324]

B:BD[32.4303] → [32.4303:4324]

B:BD[32.4324] → [35.5005:5056]

∅:D[35.5056] → [37.2946:2998]

B:BD[37.2946] → [37.2946:2998]

B:BD[37.2998] → [35.5057:5158]

∅:D[37.3096] → [17.4781:4803]

∅:D[35.5158] → [17.4781:4803]

B:BD[17.4781] → [17.4781:4803]

∅:D[17.4803] → [32.4576:4601]

B:BD[32.4576] → [32.4576:4601]

B:BD[32.4601] → [35.5159:5197]

∅:D[37.3134] → [32.4636:4658]

∅:D[35.5197] → [32.4636:4658]

B:BD[32.4636] → [32.4636:4658]

B:BD[32.4658] → [35.5198:5231]

∅:D[37.3167] → [32.4688:4707]

∅:D[35.5231] → [32.4688:4707]

B:BD[32.4688] → [32.4688:4707]

B:BD[32.4707] → [2.2629:2684]

∅:D[2.2684] → [32.4708:4710]

∅:D[38.14566] → [32.4708:4710]

B:BD[39.7808] → [32.4708:4710]

B:BD[32.4710] → [2.2685:2752]

∅:D[40.2692] → [32.4773:4852]

∅:D[2.2752] → [32.4773:4852]

∅:D[37.3231] → [32.4773:4852]

B:BD[32.4773] → [32.4773:4852]

B:BD[32.4852] → [38.14567:14617]

∅:D[32.4901] → [39.7808:7810]

∅:D[38.14617] → [39.7808:7810]

B:BD[39.7808] → [39.7808:7810]

B:BD[39.7810] → [41.4179:4252]

B:BD[32.4983] → [32.4983:5012]

B:BD[32.5018] → [32.5018:5166]

B:BD[32.5166] → [42.2812:2875]

∅:D[42.2875] → [32.5228:5965]

B:BD[32.5228] → [32.5228:5965]

B:BD[32.5965] → [43.2519:2579]

∅:D[43.2579] → [32.6006:6385]

B:BD[32.6006] → [32.6006:6385]

B:BD[32.6385] → [44.2641:2729]

∅:D[44.2729] → [32.6473:6534]

B:BD[32.6473] → [32.6473:6534]

B:BD[32.6534] → [45.2569:2737]

∅:D[45.2737] → [32.6706:6930]

B:BD[32.6706] → [32.6706:6930]

B:BD[32.6930] → [43.2580:2640]

∅:D[43.2640] → [32.6971:6975]

B:BD[32.6971] → [32.6971:6975]

B:BD[32.6975] → [38.14618:14662]

∅:D[38.14662] → [32.7018:7020]

B:BD[32.7018] → [32.7018:7020]

B:BD[32.7020] → [41.4253:4323]

B:BD[41.4323] → [37.3232:3261]

∅:D[37.3261] → [32.7131:7268]

B:BD[32.7131] → [32.7131:7268]

B:BD[32.7268] → [7.3727:3787]

B:BD[7.3787] → [35.5232:5322]

∅:D[46.2504] → [7.3895:3985]

∅:D[35.5322] → [7.3895:3985]

B:BD[7.3895] → [7.3895:3985]

B:BD[7.3985] → [29.8402:8468]

∅:D[29.8468] → [7.4045:4067]

B:BD[7.4045] → [7.4045:4067]

B:BD[7.4067] → [35.5323:5361]

∅:D[46.2531] → [7.4087:4144]

∅:D[35.5361] → [7.4087:4144]

B:BD[7.4087] → [7.4087:4144]

B:BD[7.4144] → [41.4324:4392]

∅:D[41.4392] → [26.8717:8718]

B:BD[7.4214] → [26.8717:8718]

B:BD[26.8718] → [41.4393:4455]

∅:D[41.4455] → [7.4283:4612]

B:BD[7.4283] → [7.4283:4612]

B:BD[7.4612] → [37.3262:3286]

∅:D[37.3286] → [7.4634:4929]

B:BD[7.4634] → [7.4634:4929]

B:BD[7.4929] → [41.4456:4509]

∅:D[41.4509] → [7.4984:5512]

B:BD[7.4984] → [7.4984:5512]

∅:D[7.5512] → [39.7879:7882]

∅:D[32.7268] → [39.7879:7882]

B:BD[39.7879] → [39.7879:7882]

B:BD[39.7882] → [7.5513:5683]

B:BD[7.5683] → [30.2891:2894]

B:BD[30.2894] → [42.2876:2916]

∅:D[42.2916] → [30.2933:2994]

B:BD[30.2933] → [30.2933:2994]

B:BD[30.2994] → [41.4510:4578]

∅:D[41.4578] → [30.3064:3115]

B:BD[30.3064] → [30.3064:3115]

B:BD[30.3115] → [47.2556:2745]

∅:D[47.2745] → [30.3309:3357]

B:BD[30.3309] → [30.3309:3357]

∅:D[30.3357] → [7.5683:5870]

B:BD[7.5683] → [7.5683:5870]

B:BD[7.5870] → [43.2641:2703]

∅:D[43.2703] → [7.5926:6344]

B:BD[7.5926] → [7.5926:6344]

B:BD[7.6344] → [43.2704:2755]

∅:D[43.2755] → [7.6382:6437]

B:BD[7.6382] → [7.6382:6437]

B:BD[7.6437] → [41.4579:4642]

∅:D[41.4642] → [26.8719:8720]

B:BD[7.6502] → [26.8719:8720]

∅:D[26.8720] → [30.3358:3380]

B:BD[7.6572] → [30.3358:3380]

B:BD[30.3380] → [41.4643:4706]

∅:D[41.4706] → [7.6637:6643]

B:BD[7.6637] → [7.6637:6643]

B:BD[7.6643] → [30.3381:3517]

B:BD[30.3517] → [26.8721:8722]

∅:D[26.8722] → [7.6875:7224]

B:BD[7.6875] → [7.6875:7224]

B:BD[7.7224] → [30.3518:3852]

∅:D[30.3852] → [7.7224:7277]

B:BD[7.7224] → [7.7224:7277]

B:BD[7.7277] → [41.4707:4770]

∅:D[41.4770] → [26.8723:8724]

B:BD[30.3918] → [26.8723:8724]

∅:D[30.3923] → [7.7277:7453]

∅:D[26.8724] → [7.7277:7453]

B:BD[7.7277] → [7.7277:7453]

B:BD[7.7453] → [30.3924:3946]

B:BD[30.3946] → [41.4771:4834]

∅:D[41.4834] → [7.7518:7524]

B:BD[7.7518] → [7.7518:7524]

B:BD[7.7524] → [30.3947:4084]

∅:D[30.4084] → [7.7735:8212]

B:BD[7.7735] → [7.7735:8212]

B:BD[7.8212] → [30.4085:4158]


// March 2008: change order of species and jobs on character selection
// screen as suggested by Markus Maier. Summarizing comments below are
// copied directly from Markus' SourceForge comments. (jpeg)
//
// These are listed in two columns to match the selection screen output.
// Take care to list all valid species here, or they cannot be directly
// chosen.
//
// The red draconian is later replaced by a random variant.
// The old and new lists are expected to have the same length.
static species_type old_species_order[] = {
    SP_HUMAN,          SP_HIGH_ELF,
    SP_DEEP_ELF,       SP_SLUDGE_ELF,
    SP_MOUNTAIN_DWARF, SP_HALFLING,
    SP_HILL_ORC,       SP_KOBOLD,
    SP_MUMMY,          SP_NAGA,
    SP_OGRE,           SP_TROLL,
    SP_RED_DRACONIAN,  SP_CENTAUR,
    SP_DEMIGOD,        SP_SPRIGGAN,
    SP_MINOTAUR,       SP_DEMONSPAWN,
    SP_GHOUL,          SP_KENKU,
    SP_MERFOLK,        SP_VAMPIRE,
    SP_DEEP_DWARF
};
// Fantasy staples and humanoid creatures come first, then diminutive and
// stealthy creatures, then monstrous creatures, then planetouched and after
// all living creatures finally the undead. (MM)
static species_type new_species_order[] = {
    // comparatively human-like looks
    SP_HUMAN,          SP_HIGH_ELF,
    SP_DEEP_ELF,       SP_SLUDGE_ELF,
    SP_MOUNTAIN_DWARF, SP_DEEP_DWARF,
    SP_HILL_ORC,       SP_MERFOLK,
    // small species
    SP_HALFLING,       SP_KOBOLD,
    SP_SPRIGGAN,
    // significantly different body type from human
    SP_NAGA,           SP_CENTAUR,
    SP_OGRE,           SP_TROLL,
    SP_MINOTAUR,       SP_KENKU,
    SP_RED_DRACONIAN,
    // celestial species
    SP_DEMIGOD,        SP_DEMONSPAWN,
    // undead species
    SP_MUMMY,          SP_GHOUL,
    SP_VAMPIRE
};
static species_type _random_draconian_player_species()
{
    const int num_drac = SP_PALE_DRACONIAN - SP_RED_DRACONIAN + 1;
    return static_cast<species_type>(SP_RED_DRACONIAN + random2(num_drac));
}
static species_type _get_species(const int index)
{
    if (index < 0 || (unsigned int) index >= ARRAYSZ(old_species_order))
        return (SP_UNKNOWN);
    return (Options.use_old_selection_order ? old_species_order[index]
                                            : new_species_order[index]);
}
// Listed in two columns to match the selection screen output.
// Take care to list all valid classes here, or they cannot be directly chosen.
// The old and new lists are expected to have the same length.
static job_type old_jobs_order[] = {
    JOB_FIGHTER,            JOB_WIZARD,
    JOB_PRIEST,             JOB_THIEF,
    JOB_GLADIATOR,          JOB_NECROMANCER,
    JOB_PALADIN,            JOB_ASSASSIN,
    JOB_BERSERKER,          JOB_HUNTER,
    JOB_CONJURER,           JOB_ENCHANTER,
    JOB_FIRE_ELEMENTALIST,  JOB_ICE_ELEMENTALIST,
    JOB_SUMMONER,           JOB_AIR_ELEMENTALIST,
    JOB_EARTH_ELEMENTALIST, JOB_CRUSADER,
    JOB_DEATH_KNIGHT,       JOB_VENOM_MAGE,
    JOB_CHAOS_KNIGHT,       JOB_TRANSMUTER,
    JOB_HEALER,             JOB_REAVER,
    JOB_STALKER,            JOB_MONK,
    JOB_WARPER,             JOB_WANDERER,
    JOB_ARTIFICER
};
// First plain fighters, then religious fighters, then spell-casting
// fighters, then primary spell-casters, then stabbers and shooters. (MM)
static job_type new_jobs_order[] = {
    // fighters
    JOB_FIGHTER,            JOB_GLADIATOR,
    JOB_MONK,               JOB_BERSERKER,
    // religious professions (incl. Berserker above)
    JOB_PALADIN,            JOB_PRIEST,
    JOB_HEALER,             JOB_CHAOS_KNIGHT,
    JOB_DEATH_KNIGHT,       JOB_CRUSADER,
    // general and niche spellcasters (incl. Crusader above)
    JOB_REAVER,             JOB_WARPER,
    JOB_WIZARD,             JOB_CONJURER,
    JOB_ENCHANTER,          JOB_SUMMONER,
    JOB_NECROMANCER,        JOB_TRANSMUTER,
    JOB_FIRE_ELEMENTALIST,  JOB_ICE_ELEMENTALIST,
    JOB_AIR_ELEMENTALIST,   JOB_EARTH_ELEMENTALIST,
    // poison specialists and stabbers
    JOB_VENOM_MAGE,         JOB_STALKER,
    JOB_THIEF,              JOB_ASSASSIN,
    JOB_HUNTER,             JOB_ARTIFICER,
    JOB_WANDERER
};
static job_type _get_class(const int index)
{
    if (index < 0 || (unsigned int) index >= ARRAYSZ(old_jobs_order))
       return (JOB_UNKNOWN);
    return (Options.use_old_selection_order? old_jobs_order[index]
                                           : new_jobs_order[index]);
}
static const char * Species_Abbrev_List[ NUM_SPECIES ] =
    { "XX", "Hu", "HE", "DE", "SE", "MD", "Ha",
      "HO", "Ko", "Mu", "Na", "Og", "Tr",
      // the draconians
      "Dr", "Dr", "Dr", "Dr", "Dr", "Dr", "Dr", "Dr", "Dr", "Dr",
      "Ce", "DG", "Sp", "Mi", "DS", "Gh", "Ke", "Mf", "Vp", "DD",
      // placeholders
      "El", "HD", "OM", "GE", "Gn" };
int get_species_index_by_abbrev( const char *abbrev )
{
    COMPILE_CHECK(ARRAYSZ(Species_Abbrev_List) == NUM_SPECIES, c1);
    for (unsigned i = 0; i < ARRAYSZ(old_species_order); i++)
    {
        const int sp = (Options.use_old_selection_order ? old_species_order[i]
                                                        : new_species_order[i]);
        if (tolower( abbrev[0] ) == tolower( Species_Abbrev_List[sp][0] )
            && tolower( abbrev[1] ) == tolower( Species_Abbrev_List[sp][1] ))
        {
            return (i);
        }
    }
    return (-1);
}
int get_species_index_by_name( const char *name )
{
    unsigned int i;
    int sp = -1;
    std::string::size_type pos = std::string::npos;
    char lowered_buff[80];
    strncpy( lowered_buff, name, sizeof( lowered_buff ) );
    strlwr( lowered_buff );
    for (i = 0; i < ARRAYSZ(old_species_order); i++)
    {
        const species_type real_sp
                   = (Options.use_old_selection_order ? old_species_order[i]
                                                      : new_species_order[i]);
        const std::string lowered_species =
            lowercase_string(species_name(real_sp,1));
        pos = lowered_species.find( lowered_buff );
        if (pos != std::string::npos)
        {
            sp = i;
            if (pos == 0)  // prefix takes preference
                break;
        }
    }
    return (sp);
}
const char *get_species_abbrev( int which_species )
{
    ASSERT( which_species > 0 && which_species < NUM_SPECIES );
    return (Species_Abbrev_List[ which_species ]);
}
// Needed for debug.cc and hiscores.cc.
int get_species_by_abbrev( const char *abbrev )
{
    int i;
    COMPILE_CHECK(ARRAYSZ(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);
}
static const char * Class_Abbrev_List[ NUM_JOBS ] =
    { "Fi", "Wz", "Pr", "Th", "Gl", "Ne", "Pa", "As", "Be", "Hu",
      "Cj", "En", "FE", "IE", "Su", "AE", "EE", "Cr", "DK", "VM",
      "CK", "Tm", "He", "Re", "St", "Mo", "Wr", "Wn", "Ar" };
static const char * Class_Name_List[ NUM_JOBS ] =
    { "Fighter", "Wizard", "Priest", "Thief", "Gladiator", "Necromancer",
      "Paladin", "Assassin", "Berserker", "Hunter", "Conjurer", "Enchanter",
      "Fire Elementalist", "Ice Elementalist", "Summoner", "Air Elementalist",
      "Earth Elementalist", "Crusader", "Death Knight", "Venom Mage",
      "Chaos Knight", "Transmuter", "Healer", "Reaver", "Stalker",
      "Monk", "Warper", "Wanderer", "Artificer" };
int get_class_index_by_abbrev( const char *abbrev )
{
    COMPILE_CHECK(ARRAYSZ(Class_Abbrev_List) == NUM_JOBS, c1);
    unsigned int job;
    for (unsigned int i = 0; i < ARRAYSZ(old_jobs_order); i++)
    {
        job = (Options.use_old_selection_order ? old_jobs_order[i]
                                               : new_jobs_order[i]);
        if (tolower( abbrev[0] ) == tolower( Class_Abbrev_List[job][0] )
            && tolower( abbrev[1] ) == tolower( Class_Abbrev_List[job][1] ))
        {
            return i;
        }
    }
    return (-1);
}
const char *get_class_abbrev( int which_job )
{
    ASSERT( which_job < NUM_JOBS );
    return (Class_Abbrev_List[ which_job ]);
}
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);
}
int get_class_index_by_name( const char *name )
{
    COMPILE_CHECK(ARRAYSZ(Class_Name_List)   == NUM_JOBS, c1);
    char *ptr;
    char lowered_buff[80];
    char lowered_class[80];
    strncpy( lowered_buff, name, sizeof( lowered_buff ) );
    strlwr( lowered_buff );
    int cl = -1;
    unsigned int job;
    for (unsigned int i = 0; i < ARRAYSZ(old_jobs_order); i++)
    {
        job = (Options.use_old_selection_order ? old_jobs_order[i]
                                               : new_jobs_order[i]);
        strncpy( lowered_class, Class_Name_List[job], 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);
}
const char *get_class_name( int which_job )
{
    ASSERT( which_job < NUM_JOBS );
    return (Class_Name_List[ which_job ]);
}
int get_class_by_name( const char *name )
{
    int i;
    int cl = -1;

Deletion in crawl-ref/source/newgame.cc at line 101 [9.1132300]

B:BD[7.8213] → [30.4159:4706]

    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/newgame.cc at line 151 [9.1132300]

B:BD[36.215974] → [38.14881:14943]

    species_type prace = _get_species(letter_to_index(race));

[36.215974]

[32.7631]

    species_type prace = get_species(letter_to_index(race));

Replacement in crawl-ref/source/newgame.cc at line 157 [9.1132300]

B:BD[36.216124] → [38.14997:15056]

    job_type pclass = _get_class(letter_to_index(oclass));

[36.216124]

[32.7759]

    job_type pclass = get_class(letter_to_index(oclass));

Replacement in crawl-ref/source/newgame.cc at line 279 [9.1132300]

B:BD[9.1138827] → [2.2753:2811]

        you.species = _random_draconian_player_species();

[9.1138827]

[9.1138880]

        you.species = random_draconian_player_species();

Replacement in crawl-ref/source/newgame.cc at line 895 [9.1132300]

B:BD[48.3099] → [38.16856:17006]

            && !_class_allowed(_get_species(letter_to_index(Options.race)),
                               _get_class(letter_to_index(Options.cls))))

[48.3099]

[49.364]

            && !_class_allowed(get_species(letter_to_index(Options.race)),
                               get_class(letter_to_index(Options.cls))))

Replacement in crawl-ref/source/newgame.cc at line 907 [9.1132300]

B:BD[42.5781] → [2.2812:2870]

        you.species = _random_draconian_player_species();

[42.5781]

[9.1149448]

        you.species = random_draconian_player_species();

Replacement in crawl-ref/source/newgame.cc at line 4137 [9.1132300]

B:BD[36.222779] → [38.21339:21406]

        you.char_class = _get_class(letter_to_index(Options.cls));

[36.222779]

[36.222834]

        you.char_class = get_class(letter_to_index(Options.cls));

Deletion in crawl-ref/source/newgame.cc at line 4143 [9.1132300]
B:BD[9.1206234] → [9.1206234:1206235]
B:BD[9.1206235] → [42.20739:20807]
∅:D[42.20807] → [41.4835:4901]
B:BD[32.10635] → [41.4835:4901]
∅:D[41.4901] → [26.9525:9526]
B:BD[32.10703] → [26.9525:9526]
B:BD[26.9526] → [42.20808:20863]
∅:D[42.20863] → [41.4902:4983]
B:BD[32.10762] → [41.4902:4983]
∅:D[41.4983] → [32.10847:10848]
B:BD[32.10847] → [32.10847:10848]
B:BD[32.10848] → [41.4984:5040]
```
    // The list musn't be longer than the number of actual species.
    COMPILE_CHECK(ARRAYSZ(old_species_order) <= NUM_SPECIES, c1);
    // Check whether the two lists have the same size.
    COMPILE_CHECK(ARRAYSZ(old_species_order) == ARRAYSZ(new_species_order), c2);
    const int num_species = ARRAYSZ(old_species_order);
```
Replacement in crawl-ref/source/newgame.cc at line 4192 [9.1132300]
∅:D[50.3283] → [32.11157:11203]
B:BD[32.11157] → [32.11157:11203]
```
        for (int i = 0; i < num_species; ++i)
```
[50.3283]
[36.224009]
```
        for (int i = 0; i < ng_num_species(); ++i)
```

Replacement in crawl-ref/source/newgame.cc at line 4194 [9.1132300]

B:BD[36.224019] → [38.21407:21460]

            const species_type si = _get_species(i);

[36.224019]

[26.9529]

            const species_type si = get_species(i);

Replacement in crawl-ref/source/newgame.cc at line 4351 [9.1132300]
B:BD[32.12931] → [32.12931:12973]
```
            index = random2(num_species);
```
[32.12931]
[32.12973]
```
            index = random2(ng_num_species());
```

Replacement in crawl-ref/source/newgame.cc at line 4353 [9.1132300]

B:BD[32.12983] → [38.21967:22036]

        while (!_is_species_valid_choice(_get_species(index), false)

[32.12983]

[51.2681]

        while (!_is_species_valid_choice(get_species(index), false)

Replacement in crawl-ref/source/newgame.cc at line 4355 [9.1132300]

B:BD[51.2729] → [51.2729:2809]

                  && !_is_good_combination(_get_species(index), you.char_class,

[51.2729]

[51.2809]

                  && !_is_good_combination(get_species(index), you.char_class,

Replacement in crawl-ref/source/newgame.cc at line 4362 [9.1132300]

B:BD[11.76342] → [38.22164:22223]

        you.species = _get_species(letter_to_index(keyn));

[32.13236]

[26.9656]

        you.species = get_species(letter_to_index(keyn));

Deletion in crawl-ref/source/newgame.cc at line 4403 [9.1132300]
B:BD[26.9659] → [42.22844:22912]
∅:D[42.22912] → [41.5041:5101]
B:BD[32.13705] → [41.5041:5101]
∅:D[41.5101] → [32.13767:13768]
B:BD[32.13767] → [32.13767:13768]
B:BD[32.13768] → [42.22913:22968]
∅:D[42.22968] → [41.5102:5177]
B:BD[32.13822] → [41.5102:5177]
∅:D[41.5177] → [32.13901:13902]
B:BD[32.13901] → [32.13901:13902]
B:BD[32.13902] → [41.5178:5231]
∅:D[41.5231] → [32.13957:13958]
B:BD[32.13957] → [32.13957:13958]
```
    // The list musn't be longer than the number of actual classes.
    COMPILE_CHECK(ARRAYSZ(old_jobs_order) <= NUM_JOBS, c1);
    // Check whether the two lists have the same size.
    COMPILE_CHECK(ARRAYSZ(old_jobs_order) == ARRAYSZ(new_jobs_order), c2);
    const int num_classes = ARRAYSZ(old_jobs_order);
```
Replacement in crawl-ref/source/newgame.cc at line 4434 [9.1132300]
∅:D[52.3748] → [32.14229:14275]
∅:D[42.23115] → [32.14229:14275]
B:BD[53.4449] → [32.14229:14275]
```
        for (int i = 0; i < num_classes; i++)
```
[42.23081]
[9.1210958]
```
        for (int i = 0; i < ng_num_classes(); i++)
```
Replacement in crawl-ref/source/newgame.cc at line 4436 [9.1132300]
B:BD[9.1210968] → [42.23116:23155]
```
            which_job = _get_class(i);
```
[9.1210968]
[42.23155]
```
            which_job = get_class(i);
```

Replacement in crawl-ref/source/newgame.cc at line 4614 [9.1132300]

B:BD[32.16534] → [42.25514:25570]

        chosen_job = _get_class(letter_to_index(keyn));

[32.16534]

[36.230343]

        chosen_job = get_class(letter_to_index(keyn));

Replacement in crawl-ref/source/monspeak.cc at line 28 [9.1558496]
B:BD[9.1559046] → [7.15163:15184]
```
#include "newgame.h"
```
[9.1559025]
[9.1559046]
```
#include "jobs.h"
```
Insertion in crawl-ref/source/mon-util.cc at line 24 [9.1699344]
[9.1700063]
[9.1700063]
```
#include "species.h"
```
Insertion in crawl-ref/source/makefile.obj at line 89 [54.79]
[54.549]
[23.609963]
```
jobs.o \
species.o \
```
Replacement in crawl-ref/source/l_you.cc at line 13 [56.2866]
B:BD[55.2982] → [55.2982:3003]
```
#include "newgame.h"
```
[55.2982]
[5.2973]
```
#include "jobs.h"
```
Replacement in crawl-ref/source/l_you.cc at line 15 [56.2866]
∅:D[5.2991] → [55.3003:3023]
B:BD[55.3003] → [55.3003:3023]
```
#include "player.h"
```
[5.2991]
[55.3023]
```
#include "species.h"
```

File addition: jobs.h (----------)

[15.24]

#ifndef JOBS_H
#define JOBS_H
int ng_num_classes();
job_type get_class(const int index);
int get_class_index_by_abbrev(const char *abbrev);
const char *get_class_abbrev(int which_job);
int get_class_by_abbrev(const char *abbrev);
int get_class_index_by_name(const char *name);
const char *get_class_name(int which_job);
int get_class_by_name(const char *name);
#endif

File addition: jobs.cc (----------)

[15.24]

#include "AppHdr.h"
#include "jobs.h"
// Listed in two columns to match the selection screen output.
// Take care to list all valid classes here, or they cannot be directly chosen.
// The old and new lists are expected to have the same length.
static job_type old_jobs_order[] = {
    JOB_FIGHTER,            JOB_WIZARD,
    JOB_PRIEST,             JOB_THIEF,
    JOB_GLADIATOR,          JOB_NECROMANCER,
    JOB_PALADIN,            JOB_ASSASSIN,
    JOB_BERSERKER,          JOB_HUNTER,
    JOB_CONJURER,           JOB_ENCHANTER,
    JOB_FIRE_ELEMENTALIST,  JOB_ICE_ELEMENTALIST,
    JOB_SUMMONER,           JOB_AIR_ELEMENTALIST,
    JOB_EARTH_ELEMENTALIST, JOB_CRUSADER,
    JOB_DEATH_KNIGHT,       JOB_VENOM_MAGE,
    JOB_CHAOS_KNIGHT,       JOB_TRANSMUTER,
    JOB_HEALER,             JOB_REAVER,
    JOB_STALKER,            JOB_MONK,
    JOB_WARPER,             JOB_WANDERER,
    JOB_ARTIFICER
};
// First plain fighters, then religious fighters, then spell-casting
// fighters, then primary spell-casters, then stabbers and shooters. (MM)
static job_type new_jobs_order[] = {
    // fighters
    JOB_FIGHTER,            JOB_GLADIATOR,
    JOB_MONK,               JOB_BERSERKER,
    // religious professions (incl. Berserker above)
    JOB_PALADIN,            JOB_PRIEST,
    JOB_HEALER,             JOB_CHAOS_KNIGHT,
    JOB_DEATH_KNIGHT,       JOB_CRUSADER,
    // general and niche spellcasters (incl. Crusader above)
    JOB_REAVER,             JOB_WARPER,
    JOB_WIZARD,             JOB_CONJURER,
    JOB_ENCHANTER,          JOB_SUMMONER,
    JOB_NECROMANCER,        JOB_TRANSMUTER,
    JOB_FIRE_ELEMENTALIST,  JOB_ICE_ELEMENTALIST,
    JOB_AIR_ELEMENTALIST,   JOB_EARTH_ELEMENTALIST,
    // poison specialists and stabbers
    JOB_VENOM_MAGE,         JOB_STALKER,
    JOB_THIEF,              JOB_ASSASSIN,
    JOB_HUNTER,             JOB_ARTIFICER,
    JOB_WANDERER
};
job_type get_class(const int index)
{
    if (index < 0 || (unsigned int) index >= ARRAYSZ(old_jobs_order))
       return (JOB_UNKNOWN);
    return (Options.use_old_selection_order? old_jobs_order[index]
                                           : new_jobs_order[index]);
}
static const char * Class_Abbrev_List[ NUM_JOBS ] =
    { "Fi", "Wz", "Pr", "Th", "Gl", "Ne", "Pa", "As", "Be", "Hu",
      "Cj", "En", "FE", "IE", "Su", "AE", "EE", "Cr", "DK", "VM",
      "CK", "Tm", "He", "Re", "St", "Mo", "Wr", "Wn", "Ar" };
static const char * Class_Name_List[ NUM_JOBS ] =
    { "Fighter", "Wizard", "Priest", "Thief", "Gladiator", "Necromancer",
      "Paladin", "Assassin", "Berserker", "Hunter", "Conjurer", "Enchanter",
      "Fire Elementalist", "Ice Elementalist", "Summoner", "Air Elementalist",
      "Earth Elementalist", "Crusader", "Death Knight", "Venom Mage",
      "Chaos Knight", "Transmuter", "Healer", "Reaver", "Stalker",
      "Monk", "Warper", "Wanderer", "Artificer" };
int get_class_index_by_abbrev( const char *abbrev )
{
    COMPILE_CHECK(ARRAYSZ(Class_Abbrev_List) == NUM_JOBS, c1);
    unsigned int job;
    for (unsigned int i = 0; i < ARRAYSZ(old_jobs_order); i++)
    {
        job = (Options.use_old_selection_order ? old_jobs_order[i]
                                               : new_jobs_order[i]);
        if (tolower( abbrev[0] ) == tolower( Class_Abbrev_List[job][0] )
            && tolower( abbrev[1] ) == tolower( Class_Abbrev_List[job][1] ))
        {
            return i;
        }
    }
    return (-1);
}
const char *get_class_abbrev( int which_job )
{
    ASSERT( which_job < NUM_JOBS );
    return (Class_Abbrev_List[ which_job ]);
}
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);
}
int get_class_index_by_name( const char *name )
{
    COMPILE_CHECK(ARRAYSZ(Class_Name_List)   == NUM_JOBS, c1);
    char *ptr;
    char lowered_buff[80];
    char lowered_class[80];
    strncpy( lowered_buff, name, sizeof( lowered_buff ) );
    strlwr( lowered_buff );
    int cl = -1;
    unsigned int job;
    for (unsigned int i = 0; i < ARRAYSZ(old_jobs_order); i++)
    {
        job = (Options.use_old_selection_order ? old_jobs_order[i]
                                               : new_jobs_order[i]);
        strncpy( lowered_class, Class_Name_List[job], 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);
}
const char *get_class_name( int which_job )
{
    ASSERT( which_job < NUM_JOBS );
    return (Class_Name_List[ which_job ]);
}
int get_class_by_name( const char *name )
{
    int i;
    int cl = -1;
    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);
}
int ng_num_classes()
{
    // The list musn't be longer than the number of actual classes.
    COMPILE_CHECK(ARRAYSZ(old_jobs_order) <= NUM_JOBS, c1);
    // Check whether the two lists have the same size.
    COMPILE_CHECK(ARRAYSZ(old_jobs_order) == ARRAYSZ(new_jobs_order), c2);
    return ARRAYSZ(old_jobs_order);
}

Insertion in crawl-ref/source/initfile.cc at line 35 [9.2957258]
[7.15311]
[9.2957817]
```
#include "jobs.h"
```
Insertion in crawl-ref/source/initfile.cc at line 38 [9.2957258]
[57.6711]
[36.391050]
```
#include "species.h"
```
Insertion in crawl-ref/source/hiscores.cc at line 48 [9.2987663]
[7.15395]
[58.92474]
```
#include "jobs.h"
```
Insertion in crawl-ref/source/hiscores.cc at line 54 [9.2987663]
[23.813969]
[58.92512]
```
#include "species.h"
```
Insertion in crawl-ref/source/describe.cc at line 23 [9.3736416]
[9.3737349]
[9.3737349]
```
#include "species.h"
```
Insertion in crawl-ref/source/describe.cc at line 46 [9.3736416]
[7.15443]
[9.3737473]
```
#include "jobs.h"
```
Insertion in crawl-ref/source/debug.cc at line 26 [9.4016436]
[9.4017179]
[9.4017179]
```
#include "species.h"
```
Insertion in crawl-ref/source/debug.cc at line 64 [9.4016436]
[7.15472]
[59.566]
```
#include "jobs.h"
```
Insertion in crawl-ref/source/command.cc at line 17 [9.4082507]
[9.4083068]
[9.4083068]
```
#include "species.h"
```
Insertion in crawl-ref/source/artefact.cc at line 18 [9.893152]
[9.893622]
[60.3019]
```
#include "species.h"
```
Insertion in crawl-ref/source/acr.cc at line 42 [9.4397395]
[9.4399924]
[9.4399924]
```
#include "species.h"
```

Moving data out of newgame.cc.

Dependencies

In channels

Change contents

Insertion in crawl-ref/source/view.cc at line 47 [9.16817]

Insertion in crawl-ref/source/tutorial.cc at line 41 [11.5936]

Insertion in crawl-ref/source/tutorial.cc at line 46 [11.5936]

Insertion in crawl-ref/source/spl-book.cc at line 23 [9.397614]

File addition: species.h (----------)

File addition: species.cc (----------)

Insertion in crawl-ref/source/skills2.cc at line 31 [9.647133]

Deletion in crawl-ref/source/player.h at line 561 [9.945993]

Insertion in crawl-ref/source/player.cc at line 53 [9.962854]

Deletion in crawl-ref/source/player.cc at line 4297 [9.962854]

Deletion in crawl-ref/source/player.cc at line 4298 [9.962854]

Insertion in crawl-ref/source/output.cc at line 19 [9.1088282]

Insertion in crawl-ref/source/output.cc at line 39 [9.1088282]

Insertion in crawl-ref/source/newgame.h at line 10 [9.1131725]

Deletion in crawl-ref/source/newgame.h at line 42 [9.1131725]

Deletion in crawl-ref/source/newgame.h at line 43 [9.1131725]

Insertion in crawl-ref/source/newgame.cc at line 10 [9.1132300]

Insertion in crawl-ref/source/newgame.cc at line 31 [9.1132300]

Deletion in crawl-ref/source/newgame.cc at line 100 [9.1132300]

Deletion in crawl-ref/source/newgame.cc at line 101 [9.1132300]

Replacement in crawl-ref/source/newgame.cc at line 151 [9.1132300]

Replacement in crawl-ref/source/newgame.cc at line 157 [9.1132300]

Replacement in crawl-ref/source/newgame.cc at line 279 [9.1132300]

Replacement in crawl-ref/source/newgame.cc at line 895 [9.1132300]

Replacement in crawl-ref/source/newgame.cc at line 907 [9.1132300]

Replacement in crawl-ref/source/newgame.cc at line 4137 [9.1132300]

Deletion in crawl-ref/source/newgame.cc at line 4143 [9.1132300]

Replacement in crawl-ref/source/newgame.cc at line 4192 [9.1132300]

Replacement in crawl-ref/source/newgame.cc at line 4194 [9.1132300]

Replacement in crawl-ref/source/newgame.cc at line 4351 [9.1132300]

Replacement in crawl-ref/source/newgame.cc at line 4353 [9.1132300]

Replacement in crawl-ref/source/newgame.cc at line 4355 [9.1132300]

Replacement in crawl-ref/source/newgame.cc at line 4362 [9.1132300]

Deletion in crawl-ref/source/newgame.cc at line 4403 [9.1132300]

Replacement in crawl-ref/source/newgame.cc at line 4434 [9.1132300]

Replacement in crawl-ref/source/newgame.cc at line 4436 [9.1132300]

Replacement in crawl-ref/source/newgame.cc at line 4614 [9.1132300]

Replacement in crawl-ref/source/monspeak.cc at line 28 [9.1558496]

Insertion in crawl-ref/source/mon-util.cc at line 24 [9.1699344]

Insertion in crawl-ref/source/makefile.obj at line 89 [54.79]

Replacement in crawl-ref/source/l_you.cc at line 13 [56.2866]

Replacement in crawl-ref/source/l_you.cc at line 15 [56.2866]

File addition: jobs.h (----------)

File addition: jobs.cc (----------)

Insertion in crawl-ref/source/initfile.cc at line 35 [9.2957258]

Insertion in crawl-ref/source/initfile.cc at line 38 [9.2957258]

Insertion in crawl-ref/source/hiscores.cc at line 48 [9.2987663]

Insertion in crawl-ref/source/hiscores.cc at line 54 [9.2987663]

Insertion in crawl-ref/source/describe.cc at line 23 [9.3736416]

Insertion in crawl-ref/source/describe.cc at line 46 [9.3736416]

Insertion in crawl-ref/source/debug.cc at line 26 [9.4016436]

Insertion in crawl-ref/source/debug.cc at line 64 [9.4016436]

Insertion in crawl-ref/source/command.cc at line 17 [9.4082507]

Insertion in crawl-ref/source/artefact.cc at line 18 [9.893152]

Insertion in crawl-ref/source/acr.cc at line 42 [9.4397395]