diff options
Diffstat (limited to 'crawl-ref/source/newgame.cc')
| -rw-r--r-- | crawl-ref/source/newgame.cc | 43 |
1 files changed, 22 insertions, 21 deletions
diff --git a/crawl-ref/source/newgame.cc b/crawl-ref/source/newgame.cc index 34c122a86a..2c3b334527 100644 --- a/crawl-ref/source/newgame.cc +++ b/crawl-ref/source/newgame.cc @@ -1219,6 +1219,28 @@ game_start: strcpy( you.class_name, get_class_name(you.char_class) ); + if (Options.random_pick) + { + // For completely random combinations (!, #, or Options.random_pick) + // reroll characters until the player accepts one of them or quits. + clrscr(); + + std::string specs = species_name(you.species, you.experience_level); + if (specs.length() > 79) + specs = specs.substr(0, 79); + + cprintf( "You are a%s %s %s." EOL, + (is_vowel( specs[0] )) ? "n" : "", specs.c_str(), + you.class_name ); + + cprintf(EOL "Do you want to play this combination? (ynq) [y]"); + char c = getch(); + if (c == ESCAPE || tolower(c) == 'q') + end(0); + if (tolower(c) == 'n') + goto game_start; + } + // New: pick name _after_ race and class choices. if (you.your_name[0] == 0) { @@ -1250,27 +1272,6 @@ game_start: } } } - else if (Options.random_pick) - { - // For completely random combinations (!, #, or Options.random_pick) - // reroll characters until the player accepts one of them or quits. - clrscr(); - - std::string specs = species_name(you.species, you.experience_level); - if (specs.length() > 79) - specs = specs.substr(0, 79); - - cprintf( "You are a%s %s %s." EOL, - (is_vowel( specs[0] )) ? "n" : "", specs.c_str(), - you.class_name ); - - cprintf(EOL "Do you want to play this combination? (ynq) [y]"); - char c = getch(); - if (c == ESCAPE || tolower(c) == 'q') - end(0); - if (tolower(c) == 'n') - goto game_start; - } // ************ Round-out character statistics and such. ************ |