Mercurial > hg > early-roguelike
changeset 266:08489644940b
Merge the UltraRogue branch.
author | John "Elwin" Edwards |
---|---|
date | Sun, 19 Feb 2017 19:56:43 -0500 |
parents | 7fcb2f9f57e6 (current diff) 69ffcb6b90da (diff) |
children | 911f0aa6e758 |
files | |
diffstat | 3 files changed, 6 insertions(+), 0 deletions(-) [+] |
line wrap: on
line diff
--- a/arogue5/options.c Sun Feb 19 19:54:17 2017 -0500 +++ b/arogue5/options.c Sun Feb 19 19:56:43 2017 -0500 @@ -377,6 +377,7 @@ * 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 @@ *(bool *)op->o_opt = FALSE; break; } + } /* * skip to start of next option name
--- a/arogue7/options.c Sun Feb 19 19:54:17 2017 -0500 +++ b/arogue7/options.c Sun Feb 19 19:56:43 2017 -0500 @@ -350,6 +350,7 @@ * 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 @@ *(bool *)op->o_opt = FALSE; break; } + } /* * skip to start of next option name
--- a/xrogue/options.c Sun Feb 19 19:54:17 2017 -0500 +++ b/xrogue/options.c Sun Feb 19 19:56:43 2017 -0500 @@ -374,6 +374,7 @@ * 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 @@ *(bool *)op->o_opt = FALSE; break; } + } /* * skip to start of next option name