diff options
Diffstat (limited to 'crawl-ref/source/main.cc')
| -rw-r--r-- | crawl-ref/source/main.cc | 30 |
1 files changed, 17 insertions, 13 deletions
diff --git a/crawl-ref/source/main.cc b/crawl-ref/source/main.cc index 508bab53ce..86b5813784 100644 --- a/crawl-ref/source/main.cc +++ b/crawl-ref/source/main.cc @@ -312,17 +312,18 @@ int main( int argc, char *argv[] ) static void _show_commandline_options_help() { puts("Command line options:"); - puts(" -help prints this list of options"); - puts(" -name <string> character name"); - puts(" -species <arg> preselect race (by letter, abbreviation, or name)"); - puts(" -job <arg> preselect class (by letter, abbreviation, or name)"); - puts(" -plain don't use IBM extended characters"); - puts(" -dir <path> crawl directory"); - puts(" -rc <file> init file name"); - puts(" -rcdir <dir> directory that contains (included) rc files"); - puts(" -morgue <dir> directory to save character dumps"); - puts(" -macro <dir> directory to save/find macro.txt"); - puts(" -version Crawl version (and compilation info)"); + puts(" -help prints this list of options"); + puts(" -name <string> character name"); + puts(" -species <arg> preselect race (by letter, abbreviation, or name)"); + puts(" -job <arg> preselect class (by letter, abbreviation, or name)"); + puts(" -plain don't use IBM extended characters"); + puts(" -dir <path> crawl directory"); + puts(" -rc <file> init file name"); + puts(" -rcdir <dir> directory that contains (included) rc files"); + puts(" -morgue <dir> directory to save character dumps"); + puts(" -macro <dir> directory to save/find macro.txt"); + puts(" -version Crawl version (and compilation info)"); + puts(" -save-version <name> Save file version for the given player"); puts(""); puts("Command line options override init file options, which override"); puts("environment options (CRAWL_NAME, CRAWL_DIR, CRAWL_RC)."); @@ -552,7 +553,7 @@ static void _do_wizard_command(int wiz_command, bool silent_fail) break; case 's': - you.exp_available = you.exp_pool_cutoff(); + you.exp_available = FULL_EXP_POOL; you.redraw_experience = true; break; @@ -3187,7 +3188,10 @@ static bool _untrap_target(const coord_def move, bool check_confused) mpr("You can't disarm traps in your present form."); return (true); } - if (env.cgrid(target) != EMPTY_CLOUD) + + const int cloud = env.cgrid(target); + if (cloud != EMPTY_CLOUD + && is_damaging_cloud(env.cloud[ cloud ].type, true)) { mpr("You can't get to that trap right now."); return (true); |