Merge the UltraRogue branch.
This commit is contained in:
commit
bde89e33f7
3 changed files with 6 additions and 0 deletions
|
|
@ -377,6 +377,7 @@ parse_opts(char *str)
|
|||
* Look it up and deal with it
|
||||
*/
|
||||
for (op = optlist; op <= &optlist[NUM_OPTS-1]; op++)
|
||||
{
|
||||
/* None of these can be changed if using system savefiles. */
|
||||
if (use_savedir && (!strcmp(op->o_name, "name") ||
|
||||
!strcmp(op->o_name, "file") ||
|
||||
|
|
@ -442,6 +443,7 @@ parse_opts(char *str)
|
|||
*(bool *)op->o_opt = FALSE;
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
/*
|
||||
* skip to start of next option name
|
||||
|
|
|
|||
|
|
@ -350,6 +350,7 @@ parse_opts(char *str)
|
|||
* Look it up and deal with it
|
||||
*/
|
||||
for (op = optlist; op <= &optlist[NUM_OPTS-1]; op++)
|
||||
{
|
||||
if (EQSTR(str, op->o_name, len))
|
||||
{
|
||||
if (op->o_putfunc == put_bool) /* if option is a boolean */
|
||||
|
|
@ -412,6 +413,7 @@ parse_opts(char *str)
|
|||
*(bool *)op->o_opt = FALSE;
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
/*
|
||||
* skip to start of next option name
|
||||
|
|
|
|||
|
|
@ -374,6 +374,7 @@ parse_opts(char *str)
|
|||
* Look it up and deal with it
|
||||
*/
|
||||
for (op = optlist; op < &optlist[NUM_OPTS]; op++)
|
||||
{
|
||||
if (EQSTR(str, op->o_name, len))
|
||||
{
|
||||
if (op->o_putfunc == put_bool) /* if option is a boolean */
|
||||
|
|
@ -435,6 +436,7 @@ parse_opts(char *str)
|
|||
*(bool *)op->o_opt = FALSE;
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
/*
|
||||
* skip to start of next option name
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue