# HG changeset patch
# User John "Elwin" Edwards
# Date 1487552203 18000
# Node ID 08489644940b808bf490245ffe59b3621b1a93d6
# Parent  7fcb2f9f57e6f7dc574c655f276f8e59de2b3c88# Parent  69ffcb6b90da4e3bbe4fd3fa984141ae3345d24a
Merge the UltraRogue branch.

diff -r 7fcb2f9f57e6 -r 08489644940b arogue5/options.c
--- 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
diff -r 7fcb2f9f57e6 -r 08489644940b arogue7/options.c
--- 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
diff -r 7fcb2f9f57e6 -r 08489644940b xrogue/options.c
--- 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