peisongxiao/cc3k
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

added safety check

Browse Source
This commit is contained in:
Peisong Xiao
2024-07-21 00:48:31 -04:00
parent 176578aeff
commit 0a6190ee34
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/arguments.cc
View File

@ -60,12 +60,16 @@ feature proc_args(int argc, char **argv,
} else if (str == "-e") { } else if (str == "-e") {
result |= FEATURE_EXTRA_STUFF; result |= FEATURE_EXTRA_STUFF;
} else if (str == "-E") { } else if (str == "-E") {
if (result & FEATURE_READ_MAP)
return FEATURE_CONFLICT | i;
result |= FEATURE_EXTRA_LEVELS; result |= FEATURE_EXTRA_LEVELS;
} else if (str == "-o") { } else if (str == "-o") {
result |= FEATURE_WALK_OVER; result |= FEATURE_WALK_OVER;
} else if (str == "-m") { } else if (str == "-m") {
if ((result & FEATURE_RAND_MAP) || if ((result & FEATURE_RAND_MAP) ||
(result & FEATURE_REVISIT) || (result & FEATURE_REVISIT) ||
(result & FEATURE_EXTRA_LEVELS) ||
(result & FEATURE_READ_MAP)) (result & FEATURE_READ_MAP))
return FEATURE_CONFLICT | i; return FEATURE_CONFLICT | i;
@ -197,9 +201,9 @@ const char *ARGS_LIST = "\
-t : Enable throw (will turn on -i)\n\ -t : Enable throw (will turn on -i)\n\
-R : Enable revisiting levels. CANNOT BE USED WITH -m.\n\ -R : Enable revisiting levels. CANNOT BE USED WITH -m.\n\
-e : Enable extra potions and races\n\ -e : Enable extra potions and races\n\
-E : Enable extra levels\n\ -E : Enable extra levels. CANNOT BE USED WITH -m.\n\
-o : Allows characters to go over gold and potions\n\ -o : Allows characters to go over gold and potions\n\
-m [file] : Reads map data from file. CANNOT BE USED WITH -r or -R.\n\ -m [file] : Reads map data from file. CANNOT BE USED WITH -r or -R or -E.\n\
-s [seed] : Sets initial seed to seed\n\ -s [seed] : Sets initial seed to seed\n\
-I [file] : Reads commands from file. CANNOT BE USED WITH -n.\n\ -I [file] : Reads commands from file. CANNOT BE USED WITH -n.\n\
-O [file] : Outputs to file. CANNOT BE USED WITH -n.\n\ -O [file] : Outputs to file. CANNOT BE USED WITH -n.\n\