Mercurial > hg > early-roguelike

changeset 255:69ffcb6b90da

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge the bugfix branch, which had missed an update.
author John "Elwin" Edwards
date Fri, 10 Feb 2017 09:06:50 -0500
parents e940e6c00751 (diff) d9badb9c0179 (current diff)
children 08489644940b
files
diffstat 3 files changed, 6 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- a/arogue5/options.c	Tue Jan 31 18:59:38 2017 -0500
+++ b/arogue5/options.c	Fri Feb 10 09:06:50 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	Tue Jan 31 18:59:38 2017 -0500
+++ b/arogue7/options.c	Fri Feb 10 09:06:50 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	Tue Jan 31 18:59:38 2017 -0500
+++ b/xrogue/options.c	Fri Feb 10 09:06:50 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