# HG changeset patch
# User John "Elwin" Edwards
# Date 1486735610 18000
# Node ID 69ffcb6b90da4e3bbe4fd3fa984141ae3345d24a
# Parent  e940e6c00751c9022fdbfdbeb9c3d62a5479c132# Parent  d9badb9c0179807735aee51381bcdeb6f70c2d8d
Merge the bugfix branch, which had missed an update.

diff -r d9badb9c0179 -r 69ffcb6b90da arogue5/options.c
--- 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
diff -r d9badb9c0179 -r 69ffcb6b90da arogue7/options.c
--- 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
diff -r d9badb9c0179 -r 69ffcb6b90da xrogue/options.c
--- 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