diff options
| author | j-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573> | 2009-03-12 17:35:45 +0000 |
|---|---|---|
| committer | j-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573> | 2009-03-12 17:35:45 +0000 |
| commit | 2ad1fa9b0f50c91442995b715d0261138be1f167 (patch) | |
| tree | a89abd6f1425af85e26d2a8f00c67fbd44360cf7 /crawl-ref/source/initfile.cc | |
| parent | 84f487691c1387775ce6195c0bd89e327a19828c (diff) | |
| download | crawl-ref-2ad1fa9b0f50c91442995b715d0261138be1f167.tar.gz crawl-ref-2ad1fa9b0f50c91442995b715d0261138be1f167.zip | |
Various documentation tweaks. Among others, replace all references to
"class" with "job", and "race" with "species" because that comes much
closer to what they actually are.
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@9425 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref/source/initfile.cc')
| -rw-r--r-- | crawl-ref/source/initfile.cc | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/crawl-ref/source/initfile.cc b/crawl-ref/source/initfile.cc index 5ac5dfe6d0..4bee7a894b 100644 --- a/crawl-ref/source/initfile.cc +++ b/crawl-ref/source/initfile.cc @@ -385,7 +385,7 @@ static char _str_to_race( const std::string &str ) index = get_species_index_by_name( str.c_str() ); if (index == -1) - fprintf( stderr, "Unknown race choice: %s\n", str.c_str() ); + fprintf( stderr, "Unknown species choice: %s\n", str.c_str() ); return ((index != -1) ? index_to_letter( index ) : 0); } @@ -407,7 +407,7 @@ static int _str_to_class( const std::string &str ) index = get_class_index_by_name( str.c_str() ); if (index == -1) - fprintf( stderr, "Unknown class choice: %s\n", str.c_str() ); + fprintf( stderr, "Unknown job choice: %s\n", str.c_str() ); return ((index != -1) ? index_to_letter( index ) : 0); } @@ -1309,9 +1309,9 @@ static void write_newgame_options(FILE *f) // Race selection if (Options.prev_race) - fprintf(f, "race = %c\n", Options.prev_race); + fprintf(f, "species = %c\n", Options.prev_race); if (Options.prev_cls) - fprintf(f, "class = %c\n", Options.prev_cls); + fprintf(f, "job = %c\n", Options.prev_cls); if (Options.prev_weapon != WPN_UNKNOWN) fprintf(f, "weapon = %s\n", _weapon_to_str(Options.prev_weapon).c_str()); @@ -1987,7 +1987,7 @@ void game_options::read_option_line(const std::string &str, bool runscript) const std::string orig_field = field; if (key != "name" && key != "crawl_dir" && key != "macro_dir" - && key != "race" && key != "class" && key != "ban_pickup" + && key != "species" && key != "job" && key != "ban_pickup" && key != "autopickup_exceptions" && key != "stop_travel" && key != "sound" && key != "travel_stop_message" && key != "force_more_message" @@ -2373,11 +2373,11 @@ void game_options::read_option_line(const std::string &str, bool runscript) macro_dir = field; } #endif - else if (key == "race") + else if (key == "species" || key == "race") { race = _str_to_race( field ); } - else if (key == "class") + else if (key == "job" || key == "class") { cls = _str_to_class( field ); } @@ -3380,7 +3380,7 @@ enum commandline_option_type { }; static const char *cmd_ops[] = { - "scores", "name", "race", "class", "plain", "dir", "rc", + "scores", "name", "species", "job", "plain", "dir", "rc", "rcdir", "tscores", "vscores", "scorefile", "morgue", "macro", "mapstat", "arena" }; |