nethack-gwaa-kiwi/nethack
1
0
Fork 0
Code Pull Requests Activity

action after parse_role_opts() returns FALSE

Browse Source 
The old parseoptions() would get a FALSE return from parse_role_opts() and
then exit FALSE.

The new parseoptions() was printing an error message due to the FALSE return
value, and then exiting FALSE.

Have it behave the original way following parse_role_opts().
This commit is contained in:
nhmall
2020-03-02 01:11:51 -05:00
parent ffcd471ef7
commit ee2821e7e8
1 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/options.c
View File

@@ -87,7 +87,7 @@ enum window_option_types {
TEXT_OPTION
};
enum {optn_err = 0, optn_ok};
enum {optn_silenterr = -1, optn_err = 0, optn_ok};
enum requests {do_nothing, do_init, do_set, do_handler, get_val};
static struct allopt_t allopt[SIZE(allopt_init)];
@@ -463,6 +463,8 @@ boolean tinitial, tfrom_file;
}
}
if (optresult == optn_silenterr)
return FALSE;
if (optresult == optn_ok)
return retval;
@@ -514,7 +516,7 @@ char *op;
return optn_err;
}
} else
return optn_err;
return optn_silenterr;
return optn_ok;
}
if (req == get_val) {
@@ -1321,7 +1323,7 @@ char *op;
} else
flags.female = flags.initgend;
} else
return optn_err;
return optn_silenterr;
return optn_ok;
}
if (req == get_val) {
@@ -3041,7 +3043,7 @@ char *op;
} else /* Backwards compatibility */
g.pl_race = *op;
} else
return optn_err;
return optn_silenterr;
return optn_ok;
}
if (req == get_val) {
@@ -3116,7 +3118,7 @@ char *op;
} else /* Backwards compatibility */
nmcpy(g.pl_character, op, PL_NSIZ);
} else
return optn_err;
return optn_silenterr;
return optn_ok;
}
if (req == get_val) {