fiddlerwoaroof/crawl - Change JDM5R3HYGXKQKZWY35QZ2KOB24TFZ3FW2PCNXCRCMWG72AZC5ZXQC

Make Options.race and Options.class translate correctly, no matter whether

the old or new species/classes order is used. Entails some more unborking of newgame.cc.

Also: make Esc leave the species selection screen (synonym for 'X', quit the game), and use it to jump back to species selection from all other selection possibilities (class, book, weapon, god) as a synonym for Bksp.

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

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

JDM5R3HYGXKQKZWY35QZ2KOB24TFZ3FW2PCNXCRCMWG72AZC5ZXQC

Dependencies

In channels

main

Change contents

Insertion in crawl-ref/source/view.cc at line 60 [4.16817]
[4.18142]
[4.18142]
```
#include "newgame.h"
```
Deletion in crawl-ref/source/player.h at line 398 [4.945993]
B:BD[4.961365] → [4.961365:961366]

Deletion in crawl-ref/source/player.h at line 399 [4.945993]

B:BD[4.961367] → [4.961367:961899]

/* ***********************************************************************
 * called from: newgame
 * *********************************************************************** */
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 );
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 );

Replacement in crawl-ref/source/player.cc at line 3874 [4.962854]

B:BD[5.3415] → [5.3415:4023]

        case SP_GNOME:      res = (adj ? "Gnomish" : "Gnome");       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;
        default:            res = (adj ? "Yakish" : "Yak");          break;

[5.3415]

[4.1042903]

        case SP_GNOME:      res = (adj ? "Gnomish"    : "Gnome");       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;
        default:            res = (adj ? "Yakish"     : "Yak");         break;

Deletion in crawl-ref/source/player.cc at line 4574 [4.962854]

B:BD[4.1055902] → [4.1055902:1055962]

B:BD[4.1055962] → [6.850:904]

B:BD[6.904] → [3.2504:2750]


static const char * Species_Abbrev_List[ NUM_SPECIES ] = 
    { "XX", "Hu", "HE", "GE", "DE", "SE", "MD", "Ha",
      "HO", "Ko", "Mu", "Na", "Gn", "Og", "Tr", "OM",
      // the draconians
      "Dr", "Dr", "Dr", "Dr", "Dr", "Dr", "Dr", "Dr", "Dr", "Dr",
      "Ce", "DG", "Sp", "Mi", "DS", "Gh", "Ke", "Mf", "Vp",
      // placeholders
      "HD", "El" };

Deletion in crawl-ref/source/player.cc at line 4575 [4.962854]

B:BD[4.1056219] → [4.1056219:1056286]

B:BD[4.1056286] → [7.277:336]

∅:D[7.336] → [4.1056286:1056658]

B:BD[4.1056286] → [4.1056286:1056658]

B:BD[4.1056658] → [8.1749:1801]

∅:D[8.1801] → [4.1056673:1056840]

B:BD[4.1056673] → [4.1056673:1056840]

B:BD[4.1056840] → [5.4255:4375]

∅:D[5.4375] → [8.1915:2005]

B:BD[8.1915] → [8.1915:2005]

∅:D[8.2005] → [4.1056995:1057025]

B:BD[4.1056995] → [4.1056995:1057025]

B:BD[4.1057025] → [8.2006:2060]

∅:D[8.2060] → [4.1057093:1057514]

B:BD[4.1057093] → [4.1057093:1057514]

B:BD[4.1057514] → [3.2751:2807]

∅:D[3.2807] → [4.1057576:1057928]

B:BD[4.1057576] → [4.1057576:1057928]

B:BD[4.1057928] → [3.2808:2875]

∅:D[3.2875] → [4.1058006:1058152]

B:BD[4.1058006] → [4.1058006:1058152]

B:BD[4.1058205] → [4.1058205:1058486]

B:BD[4.1058486] → [3.2876:2912]

∅:D[3.2912] → [4.1058550:1058878]

B:BD[4.1058550] → [4.1058550:1058878]

B:BD[4.1058931] → [4.1058931:1059325]

B:BD[4.1059325] → [3.2913:2949]

∅:D[3.2949] → [4.1059389:1059433]

B:BD[4.1059389] → [4.1059389:1059433]

B:BD[4.1061107] → [4.1061107:1061109]

B:BD[4.1061336] → [4.1061336:1061337]

int get_species_index_by_abbrev( const char *abbrev )
{
    int i;
    ASSERT(ARRAYSIZE(Species_Abbrev_List) == NUM_SPECIES);
    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 get_species_index_by_name( const char *name )
{
    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 = SP_HUMAN; i < NUM_SPECIES; i++)
    {
        const std::string lowered_species =
            lowercase_string(species_name(static_cast<species_type>(i),0));
        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 ]);
}
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" };
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" };
int get_class_index_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);
}
const char *get_class_abbrev( int which_job )
{
    ASSERT( which_job < NUM_JOBS );
    return (Class_Abbrev_List[ which_job ]);
}
int get_class_index_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);
}
const char *get_class_name( int which_job ) 
{
    ASSERT( which_job < NUM_JOBS );
    return (Class_Name_List[ which_job ]);
}

Insertion in crawl-ref/source/output.cc at line 37 [4.1088282]
[9.57599]
[4.1088734]
```
#include "newgame.h"
```

Replacement in crawl-ref/source/newgame.h at line 16 [4.1131725]

B:BD[4.1131998] → [4.1131998:1132030]

// last updated 12may2000 {dlb}

[4.1131998]

[4.1132030]

/* ***********************************************************************
 * 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 );
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 );

Insertion in crawl-ref/source/newgame.cc at line 254 [4.1132300]

[3.7268]

[10.7879]

}
static const char * Species_Abbrev_List[ NUM_SPECIES ] =
    { "XX", "Hu", "HE", "GE", "DE", "SE", "MD", "Ha",
      "HO", "Ko", "Mu", "Na", "Gn", "Og", "Tr", "OM",
      // the draconians
      "Dr", "Dr", "Dr", "Dr", "Dr", "Dr", "Dr", "Dr", "Dr", "Dr",
      "Ce", "DG", "Sp", "Mi", "DS", "Gh", "Ke", "Mf", "Vp",
      // placeholders
      "HD", "El" };
int get_species_index_by_abbrev( const char *abbrev )
{
    COMPILE_CHECK(ARRAYSIZE(Species_Abbrev_List) == NUM_SPECIES, c1);
    
    for (unsigned i = 0; i < ARRAYSIZE(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 < ARRAYSIZE(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);

Insertion in crawl-ref/source/newgame.cc at line 315 [4.1132300]

[10.7882]

[11.214742]

const char *get_species_abbrev( int which_species )
{
    ASSERT( which_species > 0 && which_species < NUM_SPECIES );
    return (Species_Abbrev_List[ which_species ]);
}
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" };
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" };
int get_class_index_by_abbrev( const char *abbrev )
{
    COMPILE_CHECK(ARRAYSIZE(Class_Abbrev_List) == NUM_JOBS, c1);
    COMPILE_CHECK(ARRAYSIZE(Class_Name_List)   == NUM_JOBS, c2);
    
    for (unsigned int i = 0; i < ARRAYSIZE(old_jobs_order); i++)
    {
        const job_type 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_index_by_name( const char *name )
{
    char *ptr;
    char lowered_buff[80];
    char lowered_class[80];
    strncpy( lowered_buff, name, sizeof( lowered_buff ) );
    strlwr( lowered_buff );
    int cl = -1;
    for (unsigned int i = 0; i < ARRAYSIZE(old_jobs_order); i++)
    {
        const int 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 ]);
}

Replacement in crawl-ref/source/newgame.cc at line 1788 [4.1132300]

B:BD[12.383930] → [12.383930:383994]

    book.quantity = 1;
    book.plus = 0;
    book.special = 1;

[12.383930]

[12.384018]

    book.quantity  = 1;
    book.plus      = 0;
    book.special   = 1;

Replacement in crawl-ref/source/newgame.cc at line 1840 [4.1132300]

B:BD[13.1887] → [13.1887:1997]

            if (keyin == CK_BKSP || keyin == ' ')
                return false;
            if (keyin == 'X')

[13.1887]

[13.1997]

            switch (keyin)

Insertion in crawl-ref/source/newgame.cc at line 1842 [4.1132300]
[13.2011]
[13.2011]
```
            case 'X':
```

Insertion in crawl-ref/source/newgame.cc at line 1845 [4.1132300]

[13.2076]

                break;
            case CK_BKSP:
            case ESCAPE:
            case ' ':
                return false;
            case '\r':
            case '\n':
                if ( Options.prev_book != SBT_NO_SELECTION )
                {
                    if ( Options.prev_book == SBT_RANDOM )
                        keyin = '*';
                    else
                        keyin = ('a' +  Options.prev_book - 1);
                }
            default:
                break;

Replacement in crawl-ref/source/newgame.cc at line 1862 [4.1132300]

∅:D[13.2090] → [14.1041:1075]

B:BD[15.75236] → [14.1041:1075]

∅:D[14.1075] → [15.75270:75385]

B:BD[15.75270] → [15.75270:75385]

B:BD[15.75385] → [16.76:138]

∅:D[16.138] → [12.385424:385425]

∅:D[15.75446] → [12.385424:385425]

B:BD[12.385424] → [12.385424:385425]

B:BD[12.385425] → [15.75447:75554]

B:BD[15.75554] → [14.1076:1105]

∅:D[14.1105] → [15.75583:75666]

B:BD[15.75583] → [15.75583:75666]

        } while (keyin != '*' && 
                 ((keyin != '\r' && keyin != '\n') ||
                  Options.prev_book == SBT_NO_SELECTION ) &&
                 (keyin < 'a' || keyin >= ('a' + numbooks)));
        if ( keyin == '\r' || keyin == '\n' )
        {
            if ( Options.prev_book == SBT_RANDOM )
                keyin = '*';
            else
                keyin = ('a' +  Options.prev_book - 1);
        }

[13.2090]

[12.385581]

        } while (keyin != '*' && (keyin < 'a' || keyin >= ('a' + numbooks)));

Deletion in crawl-ref/source/newgame.cc at line 1877 [4.1132300]
B:BD[4.1168182] → [4.1168182:1168183]
Deletion in crawl-ref/source/newgame.cc at line 1940 [4.1132300]
∅:D[2.256] → [13.2356:2437]
∅:D[17.444] → [13.2356:2437]
B:BD[4.1169717] → [13.2356:2437]
```
            if (keyin == CK_BKSP || keyin == ' ')
                return false;
```
Replacement in crawl-ref/source/newgame.cc at line 1941 [4.1132300]
B:BD[13.2438] → [13.2438:2468]
```
            if (keyin == 'X')
```
[13.2438]
[13.2468]
```
            switch (keyin)
```
Insertion in crawl-ref/source/newgame.cc at line 1943 [4.1132300]
[13.2482]
[13.2482]
```
            case 'X':
```

Replacement in crawl-ref/source/newgame.cc at line 1946 [4.1132300]

B:BD[13.2547] → [13.2547:2561]

[13.2547]

[4.1169717]

                break;
            case CK_BKSP:
            case CK_ESCAPE:
            case ' ':
                return false;
            case '\r':
            case '\n':
                if (Options.prev_weapon != WPN_UNKNOWN)
                {
                    if (Options.prev_weapon == WPN_RANDOM)
                        keyin = '*';
                    else
                    {
                        for (int i = 0; i < num_choices; ++i)
                             if (startwep[i] == Options.prev_weapon)
                                 keyin = 'a' + i;
                    }
                }
           }

Replacement in crawl-ref/source/newgame.cc at line 1966 [4.1132300]

B:BD[4.1169727] → [14.1267:1299]

∅:D[14.1299] → [11.217835:218011]

B:BD[11.217835] → [11.217835:218011]

        while (keyin != '*' && 
                ((keyin != '\r' && keyin != '\n') 
                    || Options.prev_weapon == WPN_UNKNOWN) &&
                (keyin < 'a' || keyin > ('a' + num_choices)));

[4.1169727]

[11.218011]

        while (keyin != '*' && (keyin < 'a' || keyin > ('a' + num_choices)));

Deletion in crawl-ref/source/newgame.cc at line 1968 [4.1132300]

B:BD[11.218012] → [11.218012:218117]

B:BD[11.218117] → [14.1300:1329]

∅:D[14.1329] → [11.218146:218356]

B:BD[11.218146] → [11.218146:218356]

        if (keyin == '\r' || keyin == '\n')
        {
            if (Options.prev_weapon == WPN_RANDOM)
                keyin = '*';
            else
            {
                for (int i = 0; i < num_choices; ++i)
                    if (startwep[i] == Options.prev_weapon)
                        keyin = 'a' + i;
            }
        }

Insertion in crawl-ref/source/newgame.cc at line 1988 [4.1132300]

[4.1170295]

        ng_weapon = WPN_RANDOM;
    }
    else
    {
        ng_weapon = startwep[keyin-'a'];

Deletion in crawl-ref/source/newgame.cc at line 1996 [4.1132300]

B:BD[4.1170349] → [3.9280:9453]

    ng_weapon = (Options.random_pick || Options.weapon == WPN_RANDOM
                 || keyin == '*') ? WPN_RANDOM
                                  : you.inv[0].sub_type;

Insertion in crawl-ref/source/newgame.cc at line 2369 [4.1132300]
[12.386845]
[18.65]
```
        {
```
Insertion in crawl-ref/source/newgame.cc at line 2374 [4.1132300]
[12.386950]
[12.386950]
```
        }
```
Insertion in crawl-ref/source/newgame.cc at line 2376 [4.1132300]
[12.386963]
[12.386963]
```
        {
```
Insertion in crawl-ref/source/newgame.cc at line 2380 [4.1132300]
[12.387101]
[12.387101]
```
        }
```
Insertion in crawl-ref/source/newgame.cc at line 3156 [4.1132300]
[3.11592]
[3.11592]
```
    case ESCAPE:
```
Deletion in crawl-ref/source/newgame.cc at line 3387 [4.1132300]
B:BD[3.14641] → [3.14641:14659]
```
     case ESCAPE:
```
Insertion in crawl-ref/source/newgame.cc at line 3388 [4.1132300]
[3.14678]
[3.14678]
```
     case ESCAPE:
```

Replacement in crawl-ref/source/newgame.cc at line 3715 [4.1132300]

B:BD[4.1223763] → [19.4868:4891]

B:BD[19.4891] → [2.257:291]

               getkey:
                keyn = c_getch();

[4.1223763]

[11.231740]

                do {
                    keyn = c_getch();

Replacement in crawl-ref/source/newgame.cc at line 3718 [4.1132300]

B:BD[11.231741] → [19.4925:5301]

                if ((keyn == '\r' || keyn == '\n')
                     && Options.prev_pr != GOD_NO_GOD)
                {
                     keyn =  Options.prev_pr == GOD_ZIN? 'a' :
                             Options.prev_pr == GOD_YREDELEMNUL? 'b' :
                             Options.prev_pr == GOD_BEOGH? 'c' :
                                                '*';

[11.231741]

[4.1223810]

                    if ((keyn == '\r' || keyn == '\n')
                         && Options.prev_pr != GOD_NO_GOD)
                    {
                         keyn =  Options.prev_pr == GOD_ZIN? 'a' :
                                 Options.prev_pr == GOD_YREDELEMNUL? 'b' :
                                 Options.prev_pr == GOD_BEOGH? 'c' :
                                                  '*';

Replacement in crawl-ref/source/newgame.cc at line 3726 [4.1132300]
B:BD[4.1223811] → [19.5302:5320]
```
                }
```
[4.1223811]
[11.232045]
```
                    }
```

Replacement in crawl-ref/source/newgame.cc at line 3728 [4.1132300]

B:BD[11.232058] → [19.5321:5351]

∅:D[19.5351] → [20.19213:19231]

B:BD[20.19213] → [20.19213:19231]

B:BD[20.19231] → [19.5352:6091]

                switch (keyn)
                {
                case CK_BKSP:
                case ' ':
                    return false;
                case 'X':
                    cprintf(EOL "Goodbye!");
                    end(0);
                    break;
                case '*':
                    you.religion = coinflip()? GOD_ZIN : GOD_YREDELEMNUL;
                    if (you.species == SP_HILL_ORC && coinflip())
                        you.religion = GOD_BEOGH;
                    break;
                case 'a':
                    you.religion = GOD_ZIN;
                    break;
                case 'b':
                    you.religion = GOD_YREDELEMNUL;
                    break;
                case 'c':
                    if (you.species == SP_HILL_ORC)

[11.232058]

[19.6091]

                    switch (keyn)

Replacement in crawl-ref/source/newgame.cc at line 3730 [4.1132300]

B:BD[19.6113] → [19.6113:6163]

                        you.religion = GOD_BEOGH;

[19.6113]

[19.6163]

                    case 'X':
                        cprintf(EOL "Goodbye!");
                        end(0);

Replacement in crawl-ref/source/newgame.cc at line 3734 [4.1132300]

B:BD[19.6194] → [19.6194:6313]

∅:D[19.6313] → [11.232175:232176]

B:BD[4.1224093] → [11.232175:232176]

B:BD[11.232176] → [19.6314:6378]

                    } // else fall through
                default:
                    goto getkey;
                }
                ng_pr = keyn == '*'? GOD_RANDOM : you.religion;

[19.6194]

[19.6378]

                    case CK_BKSP:
                    case ESCAPE:
                    case ' ':
                        return false;
                    case '\r':
                    case '\n':
                        if (Options.prev_pr == GOD_NO_GOD
                            || Options.prev_pr == GOD_BEOGH
                               && you.species != SP_HILL_ORC)
                        {
                            break;
                        }
                        if (Options.prev_pr != GOD_RANDOM)
                        {
                            Options.prev_pr
                                     = static_cast<god_type>(Options.prev_pr);
                            break;
                        }
                        keyn = '*'; // for ng_pr setting
                        // fall-through for random
                    case '*':
                        you.religion = coinflip()? GOD_ZIN : GOD_YREDELEMNUL;
                        if (you.species == SP_HILL_ORC && coinflip())
                            you.religion = GOD_BEOGH;
                        break;
                    case 'a':
                        you.religion = GOD_ZIN;
                        break;
                    case 'b':
                        you.religion = GOD_YREDELEMNUL;
                        break;
                    case 'c':
                        if (you.species == SP_HILL_ORC)
                        {
                            you.religion = GOD_BEOGH;
                            break;
                        } // else fall through
                    default:
                        break;
                    }
                } while (you.religion == GOD_NO_GOD);
                
                ng_pr = (keyn == '*'? GOD_RANDOM : you.religion);

Deletion in crawl-ref/source/newgame.cc at line 4323 [4.1132300]
∅:D[11.232763] → [4.1252337:1252357]
B:BD[4.1252337] → [4.1252337:1252357]
B:BD[4.1252357] → [2.292:322]
```
          getkey1:
            keyn = c_getch();
```

Replacement in crawl-ref/source/newgame.cc at line 4324 [4.1132300]

B:BD[4.1252387] → [11.232764:233011]

B:BD[11.233011] → [20.19487:19550]

∅:D[20.19550] → [11.233074:233088]

B:BD[11.233074] → [11.233074:233088]

            if ((keyn == '\r' || keyn == '\n')
                    && Options.prev_dk != DK_NO_SELECTION)
            {
                keyn = Options.prev_dk == DK_NECROMANCY? 'a' :
                       Options.prev_dk == DK_YREDELEMNUL? 'b' :
                                                          '*';
            }

[4.1252387]

[11.233088]

            do {
                keyn = c_getch();

Replacement in crawl-ref/source/newgame.cc at line 4327 [4.1132300]

∅:D[11.233101] → [4.1252387:1252427]

B:BD[4.1252387] → [4.1252387:1252427]

B:BD[4.1252427] → [13.3566:3760]

∅:D[13.3760] → [20.19551:19573]

B:BD[4.1252427] → [20.19551:19573]

∅:D[20.19573] → [11.233124:233216]

B:BD[11.233124] → [11.233124:233216]

∅:D[11.233216] → [4.1252427:1252706]

B:BD[4.1252427] → [4.1252427:1252706]

B:BD[4.1252706] → [11.233217:233218]

B:BD[11.233218] → [20.19574:19627]

            switch (keyn)
            {
            case CK_BKSP:
            case ' ':      
                return false;
            case 'X':
                cprintf(EOL "Goodbye!");
                end(0);
                break;
            case '*':
                choice = coinflip()? DK_NECROMANCY : DK_YREDELEMNUL;
                break;
            case 'a':
                cprintf(EOL "Very well.");
                choice = DK_NECROMANCY;
                break;
            case 'b':
                choice = DK_YREDELEMNUL;
                break;
            default:
                goto getkey1;
            }
            ng_dk = keyn == '*'? DK_RANDOM : choice;

[11.233101]

[4.1252706]

                switch (keyn)
                {
                case 'X':
                    cprintf(EOL "Goodbye!");
                    end(0);
                    break;
                case CK_BKSP:
                case ESCAPE:
                case ' ':
                    return false;
                case '\r':
                case '\n':
                    if (Options.prev_dk == DK_NO_SELECTION)
                        break;
                        
                    if (Options.prev_dk != DK_RANDOM)
                    {
                        choice = Options.prev_dk;
                        break;
                    }
                    keyn = '*'; // for ng_dk setting
                    // fall-through for random
                case '*':
                    choice = coinflip()? DK_NECROMANCY : DK_YREDELEMNUL;
                    break;
                case 'a':
                    cprintf(EOL "Very well.");
                    choice = DK_NECROMANCY;
                    break;
                case 'b':
                    choice = DK_YREDELEMNUL;
                default:
                    break;
                }
            } while (choice == DK_NO_SELECTION);
            
            ng_dk = (keyn == '*'? DK_RANDOM : choice);

Replacement in crawl-ref/source/newgame.cc at line 4445 [4.1132300]

B:BD[11.233526] → [11.233526:233717]

                        Options.prev_ck == GOD_XOM? "Xom" :
                        Options.prev_ck == GOD_MAKHLEB? "Makhleb" :
                                                    "Random");

[11.233526]

[11.233717]

                        Options.prev_ck == GOD_XOM?     "Xom" :
                        Options.prev_ck == GOD_MAKHLEB? "Makhleb"
                                                      : "Random");

Deletion in crawl-ref/source/newgame.cc at line 4449 [4.1132300]

B:BD[11.233755] → [11.233755:233769]

∅:D[11.233769] → [4.1255159:1255180]

B:BD[4.1255159] → [4.1255159:1255180]

B:BD[4.1255180] → [2.323:353]

∅:D[2.353] → [4.1255209:1255210]

B:BD[4.1255209] → [4.1255209:1255210]

B:BD[4.1255210] → [11.233770:234004]

B:BD[11.234004] → [20.19712:19769]

            }
          getkey2:
            keyn = c_getch();
            if ((keyn == '\r' || keyn == '\n') 
                    && Options.prev_ck != GOD_NO_GOD)
            {
                keyn = Options.prev_ck == GOD_XOM? 'a' :
                       Options.prev_ck == GOD_MAKHLEB? 'b' :
                                                    '*';

Replacement in crawl-ref/source/newgame.cc at line 4451 [4.1132300]
∅:D[11.234076] → [4.1255210:1255236]
B:BD[4.1255210] → [4.1255210:1255236]
```
            switch (keyn)
```
[11.234076]
[4.1255236]
```
            do
```

Replacement in crawl-ref/source/newgame.cc at line 4453 [4.1132300]

B:BD[4.1255250] → [13.3977:4165]

∅:D[13.4165] → [20.19770:19792]

B:BD[4.1255250] → [20.19770:19792]

∅:D[20.19792] → [11.234099:234188]

B:BD[11.234099] → [11.234099:234188]

∅:D[11.234188] → [4.1255250:1255489]

B:BD[4.1255250] → [4.1255250:1255489]

            case CK_BKSP:
            case ' ':
                return false;
            case 'X':
                cprintf(EOL "Goodbye!");
                end(0);
                break;
            case '*':
                you.religion = coinflip()? GOD_XOM : GOD_MAKHLEB;
                break;
            case 'a':
                you.religion = GOD_XOM;
                break;
            case 'b':
                you.religion = GOD_MAKHLEB;
                break;
            default:
                goto getkey2;
            }

[4.1255250]

[11.234189]

                keyn = c_getch();

Replacement in crawl-ref/source/newgame.cc at line 4455 [4.1132300]

B:BD[11.234190] → [20.19793:19853]

            ng_ck = keyn == '*'? GOD_RANDOM : you.religion;

[11.234190]

[4.1255489]

                switch (keyn)
                {
                case 'X':
                    cprintf(EOL "Goodbye!");
                    end(0);
                    break;
                case CK_BKSP:
                case CK_ESCAPE:
                case ' ':
                    return false;
                case '\r':
                case '\n':
                    if (Options.prev_ck == GOD_NO_GOD)
                        break;
                        
                    if (Options.prev_ck != GOD_RANDOM)
                    {
                        you.religion = static_cast<god_type>(Options.prev_ck);
                        break;
                    }
                    keyn = '*'; // for ng_ck setting
                    // fall-through for random
                case '*':
                    you.religion = (coinflip()? GOD_XOM : GOD_MAKHLEB);
                    break;
                case 'a':
                    you.religion = GOD_XOM;
                    break;
                case 'b':
                    you.religion = GOD_MAKHLEB;
                    // fall through
                default:
                    break;
                }
            } while (you.religion == GOD_NO_GOD);
            
            ng_ck = (keyn == '*'? GOD_RANDOM : you.religion);

Insertion in crawl-ref/source/monspeak.cc at line 37 [4.1558496]
[4.1559046]
[4.1559046]
```
#include "newgame.h"
```
Insertion in crawl-ref/source/libgui.cc at line 29 [22.5793336]
[21.3990]
[22.5794038]
```
#include "newgame.h"
```
Insertion in crawl-ref/source/initfile.cc at line 41 [4.2957258]
[23.3122]
[4.2957817]
```
#include "newgame.h"
```

Deletion in crawl-ref/source/initfile.cc at line 334 [4.2957258]

B:BD[4.2962906] → [4.2962906:2963038]


    // skip over the extra draconians here
    if (index > SP_RED_DRACONIAN)
        index -= (SP_CENTAUR - SP_RED_DRACONIAN - 1);

Replacement in crawl-ref/source/initfile.cc at line 335 [4.2957258]

B:BD[4.2963039] → [4.2963039:2963096]

B:BD[4.2963096] → [12.786819:786883]

    // SP_HUMAN is at 1, therefore we must subtract one.
    return ((index != -1) ? index_to_letter( index - 1 ) : 0);

[4.2963039]

[4.2963163]

    return ((index != -1) ? index_to_letter( index ) : 0);

Insertion in crawl-ref/source/hiscores.cc at line 51 [4.2987663]
[4.2988640]
[9.92474]
```
#include "newgame.h"
```
Insertion in crawl-ref/source/describe.cc at line 52 [4.3736416]
[4.3737473]
[4.3737473]
```
#include "newgame.h"
```
Insertion in crawl-ref/source/debug.cc at line 78 [4.4016436]
[4.4017388]
[24.566]
```
#include "newgame.h"
```
Insertion in crawl-ref/source/clua.cc at line 30 [11.483969]
[11.484303]
[11.484303]
```
#include "newgame.h"
```
Insertion in crawl-ref/init.txt at line 38 [4.4830895]
[25.2298]
[26.1595]
```
# use_old_selection_order = false
```
Deletion in crawl-ref/init.txt at line 46 [4.4830895]
B:BD[26.1911] → [3.18408:18442]
```
# use_old_selection_order = false
```

Replacement in crawl-ref/docs/crawl_options.txt at line 10 [26.63392]

B:BD[27.2042] → [28.3148:3252]

                name, remember_name, weapon, book,
                chaos_knight, death_knight, priest,

[27.2042]

[28.3252]

                name, remember_name, use_old_selection_order,
		weapon, book, chaos_knight, death_knight, priest,

Insertion in crawl-ref/docs/crawl_options.txt at line 172 [26.63392]

[28.6103]

[27.6593]

use_old_selection_order = false
        If set to true, the character selection screen will offer 
	species and classes in the order of version 0.3 and earlier.
	Note that this needs to be set before the "race" or "class" 
	options	(see below), or they won't be interpreted correctly.

Deletion in crawl-ref/docs/crawl_options.txt at line 207 [26.63392]

B:BD[27.7670] → [3.18461:18622]

∅:D[3.18622] → [27.7670:7671]

B:BD[27.7670] → [27.7670:7671]

use_old_selection_order = false
        If set to true, the character selection screen will offer 
	species and classes in the order of version 0.3 and earlier.

Make Options.race and Options.class translate correctly, no matter whether

Dependencies

In channels

Change contents

Insertion in crawl-ref/source/view.cc at line 60 [4.16817]

Deletion in crawl-ref/source/player.h at line 398 [4.945993]

Deletion in crawl-ref/source/player.h at line 399 [4.945993]

Replacement in crawl-ref/source/player.cc at line 3874 [4.962854]

Deletion in crawl-ref/source/player.cc at line 4574 [4.962854]

Deletion in crawl-ref/source/player.cc at line 4575 [4.962854]

Insertion in crawl-ref/source/output.cc at line 37 [4.1088282]

Replacement in crawl-ref/source/newgame.h at line 16 [4.1131725]

Insertion in crawl-ref/source/newgame.cc at line 254 [4.1132300]

Insertion in crawl-ref/source/newgame.cc at line 315 [4.1132300]

Replacement in crawl-ref/source/newgame.cc at line 1788 [4.1132300]

Replacement in crawl-ref/source/newgame.cc at line 1840 [4.1132300]

Insertion in crawl-ref/source/newgame.cc at line 1842 [4.1132300]

Insertion in crawl-ref/source/newgame.cc at line 1845 [4.1132300]

Replacement in crawl-ref/source/newgame.cc at line 1862 [4.1132300]

Deletion in crawl-ref/source/newgame.cc at line 1877 [4.1132300]

Deletion in crawl-ref/source/newgame.cc at line 1940 [4.1132300]

Replacement in crawl-ref/source/newgame.cc at line 1941 [4.1132300]

Insertion in crawl-ref/source/newgame.cc at line 1943 [4.1132300]

Replacement in crawl-ref/source/newgame.cc at line 1946 [4.1132300]

Replacement in crawl-ref/source/newgame.cc at line 1966 [4.1132300]

Deletion in crawl-ref/source/newgame.cc at line 1968 [4.1132300]

Insertion in crawl-ref/source/newgame.cc at line 1988 [4.1132300]

Deletion in crawl-ref/source/newgame.cc at line 1996 [4.1132300]

Insertion in crawl-ref/source/newgame.cc at line 2369 [4.1132300]

Insertion in crawl-ref/source/newgame.cc at line 2374 [4.1132300]

Insertion in crawl-ref/source/newgame.cc at line 2376 [4.1132300]

Insertion in crawl-ref/source/newgame.cc at line 2380 [4.1132300]

Insertion in crawl-ref/source/newgame.cc at line 3156 [4.1132300]

Deletion in crawl-ref/source/newgame.cc at line 3387 [4.1132300]

Insertion in crawl-ref/source/newgame.cc at line 3388 [4.1132300]

Replacement in crawl-ref/source/newgame.cc at line 3715 [4.1132300]

Replacement in crawl-ref/source/newgame.cc at line 3718 [4.1132300]

Replacement in crawl-ref/source/newgame.cc at line 3726 [4.1132300]

Replacement in crawl-ref/source/newgame.cc at line 3728 [4.1132300]

Replacement in crawl-ref/source/newgame.cc at line 3730 [4.1132300]

Replacement in crawl-ref/source/newgame.cc at line 3734 [4.1132300]

Deletion in crawl-ref/source/newgame.cc at line 4323 [4.1132300]

Replacement in crawl-ref/source/newgame.cc at line 4324 [4.1132300]

Replacement in crawl-ref/source/newgame.cc at line 4327 [4.1132300]

Replacement in crawl-ref/source/newgame.cc at line 4445 [4.1132300]

Deletion in crawl-ref/source/newgame.cc at line 4449 [4.1132300]

Replacement in crawl-ref/source/newgame.cc at line 4451 [4.1132300]

Replacement in crawl-ref/source/newgame.cc at line 4453 [4.1132300]

Replacement in crawl-ref/source/newgame.cc at line 4455 [4.1132300]

Insertion in crawl-ref/source/monspeak.cc at line 37 [4.1558496]

Insertion in crawl-ref/source/libgui.cc at line 29 [22.5793336]

Insertion in crawl-ref/source/initfile.cc at line 41 [4.2957258]

Deletion in crawl-ref/source/initfile.cc at line 334 [4.2957258]

Replacement in crawl-ref/source/initfile.cc at line 335 [4.2957258]

Insertion in crawl-ref/source/hiscores.cc at line 51 [4.2987663]

Insertion in crawl-ref/source/describe.cc at line 52 [4.3736416]

Insertion in crawl-ref/source/debug.cc at line 78 [4.4016436]

Insertion in crawl-ref/source/clua.cc at line 30 [11.483969]

Insertion in crawl-ref/init.txt at line 38 [4.4830895]

Deletion in crawl-ref/init.txt at line 46 [4.4830895]

Replacement in crawl-ref/docs/crawl_options.txt at line 10 [26.63392]

Insertion in crawl-ref/docs/crawl_options.txt at line 172 [26.63392]

Deletion in crawl-ref/docs/crawl_options.txt at line 207 [26.63392]