diff options
| -rw-r--r-- | crawl-ref/source/initfile.cc | 12 | ||||
| -rw-r--r-- | crawl-ref/source/newgame.cc | 3 |
2 files changed, 7 insertions, 8 deletions
diff --git a/crawl-ref/source/initfile.cc b/crawl-ref/source/initfile.cc index 70730c3e08..ee3c194956 100644 --- a/crawl-ref/source/initfile.cc +++ b/crawl-ref/source/initfile.cc @@ -238,14 +238,14 @@ std::string channel_to_str( int channel ) static int _str_to_book( const std::string& str ) { - if (str == "fire" || str == "flame") - return SBT_FIRE; + if (str == "flame" || str == "fire") + return (SBT_FIRE); if (str == "cold" || str == "ice") - return SBT_COLD; + return (SBT_COLD); if (str == "summ" || str == "summoning") - return SBT_SUMM; + return (SBT_SUMM); if (str == "random") - return SBT_RANDOM; + return (SBT_RANDOM); return (SBT_NO_SELECTION); } @@ -1286,7 +1286,7 @@ static void write_newgame_options(FILE *f) lowercase_string(god_name(Options.prev_pr)).c_str()); } - if (Options.prev_book != SBT_NO_SELECTION ) + if (Options.prev_book != SBT_NO_SELECTION) { fprintf(f, "book = %s\n", Options.prev_book == SBT_FIRE ? "fire" : diff --git a/crawl-ref/source/newgame.cc b/crawl-ref/source/newgame.cc index 0bb41a2220..f829c904c7 100644 --- a/crawl-ref/source/newgame.cc +++ b/crawl-ref/source/newgame.cc @@ -81,7 +81,6 @@ static char_choice_restriction _class_allowed(species_type speci, static bool _is_good_combination( species_type spc, job_type cls, bool good = false); static bool _validate_player_name(bool verbose); -static bool _choose_weapon(void); static void _enter_player_name(bool blankOK); static void _give_basic_knowledge(job_type which_job); static void _give_basic_spells(job_type which_job); @@ -2358,7 +2357,7 @@ static bool _choose_weapon() "Bksp - Back to species and class selection; " "X - Quit" EOL); - if (Options.prev_weapon == WPN_RANDOM || prevmatch) + if (prevmatch || Options.prev_weapon == WPN_RANDOM) { cprintf("; Enter - %s", Options.prev_weapon == WPN_RANDOM ? "Random" : |