X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Flibgame%2Fmisc.c;h=ed4bd5d62c991d7e94f72cb150ab904ee8c2935f;hb=681df696173f472fe28e49b9e8e01b34dc34629b;hp=c953e1b0ee0045e868a8c8950d73bd1793c3cb6c;hpb=929b071507a0fc9dfd5b667ca563137f65062dd7;p=rocksndiamonds.git diff --git a/src/libgame/misc.c b/src/libgame/misc.c index c953e1b0..ed4bd5d6 100644 --- a/src/libgame/misc.c +++ b/src/libgame/misc.c @@ -1704,6 +1704,7 @@ void GetOptions(int argc, char *argv[], options.player_name = NULL; options.identifier = NULL; options.level_nr = NULL; + options.drop_file = NULL; options.display_nr = 0; @@ -1870,6 +1871,15 @@ void GetOptions(int argc, char *argv[], if (option_arg == next_option) options_left++; } + else if (strncmp(option, "-drop-file", option_len) == 0) + { + if (option_arg == NULL) + FailWithHelp("option '%s' requires an argument", option_str); + + options.drop_file = getStringCopy(option_arg); + if (option_arg == next_option) + options_left++; + } else if (strncmp(option, "-verbose", option_len) == 0) { options.verbose = TRUE; @@ -2955,7 +2965,7 @@ boolean get_boolean_from_string(char *s) return result; } -int get_switch3_from_string(char *s) +int get_switch_3_state_from_string(char *s) { char *s_lower = getStringToLower(s); int result = FALSE; @@ -2966,7 +2976,9 @@ int get_switch3_from_string(char *s) get_integer_from_string(s) == 1) result = TRUE; else if (strEqual(s_lower, "auto")) - result = MODE_AUTO; + result = STATE_AUTO; + else if (strEqual(s_lower, "ask")) + result = STATE_ASK; free(s_lower);