diff options
author | j-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573> | 2009-07-19 21:58:06 +0000 |
---|---|---|
committer | j-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573> | 2009-07-19 21:58:06 +0000 |
commit | 0e60ff5ccfd3aefbfbf545dedb1d131a901e195c (patch) | |
tree | 8f60093a036984d5bc12fe401c8835ae5afbeb63 /crawl-ref | |
parent | f436d87e5f3c0a05c9ba6f44afcfc871c6beff4a (diff) | |
download | crawl-ref-0e60ff5ccfd3aefbfbf545dedb1d131a901e195c.tar.gz crawl-ref-0e60ff5ccfd3aefbfbf545dedb1d131a901e195c.zip |
Backport the rerolling prompt for unnamed random characters.
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/branches/stone_soup-0.5@10340 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref')
-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 fe3c5b336a..49068898f8 100644 --- a/crawl-ref/source/newgame.cc +++ b/crawl-ref/source/newgame.cc @@ -1218,6 +1218,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) { @@ -1249,27 +1271,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. ************ |