From ec3e34544a92e568fbee32e3914577e3b62cfcd7 Mon Sep 17 00:00:00 2001
From: "John \"Elwin\" Edwards" <elwin@rlgallery.org>
Date: Fri, 5 Jun 2015 13:57:38 -0400
Subject: [PATCH] arogue7, xrogue: fix configure's wizardmode and limitscore
 options.

WIZARD and LIMITSCORE, when set by options to './configure', are no
longer overridden in mach_dep.h.
---
 arogue7/mach_dep.h | 14 +++++++++-----
 xrogue/mach_dep.h  | 11 ++++++++---
 2 files changed, 17 insertions(+), 8 deletions(-)

diff --git a/arogue7/mach_dep.h b/arogue7/mach_dep.h
index 24d2acc..e98b6d6 100644
--- a/arogue7/mach_dep.h
+++ b/arogue7/mach_dep.h
@@ -12,16 +12,20 @@
  * See the file LICENSE.TXT for full copyright and licensing information.
  */
 
+/* Set these options, if not using config.h */
+#ifndef HAVE_CONFIG_H
 /*
  * define that the wizard commands exist
  */
-#define	WIZARD	0
+#undef	WIZARD /* 0 */
 
 /*
  * define if you want to limit scores to one per class per userid
  */
 #undef LIMITSCORE /* 1 */
 
+#endif
+
 /* 
  * define that rogue should "nice()" itself
  */
@@ -40,10 +44,10 @@
 /*
  * where scorefile should live
  */
-/* Uncomment if you are not using config.h */
-/*#define SCOREFILE	"arogue7.scr"*/
-
-/*#define LOGFILE "arogue7.log"*/
+#ifndef HAVE_CONFIG_H
+#define SCOREFILE	"arogue7.scr"
+#define LOGFILE "arogue7.log"
+#endif
 
 
 /*
diff --git a/xrogue/mach_dep.h b/xrogue/mach_dep.h
index 38435e8..cab1f51 100644
--- a/xrogue/mach_dep.h
+++ b/xrogue/mach_dep.h
@@ -19,7 +19,9 @@
 /*
  * define/undefine that the wizard commands exist
  */
+#ifndef HAVE_CONFIG_H
 #undef WIZARD
+#endif
 
 #if defined(_WIN32)
 #define fstat _fstat
@@ -49,8 +51,10 @@ extern char *xcrypt();
  * define if you want to limit scores to one per class per userid
  */
 
+#ifndef HAVE_CONFIG_H
 /* #define LIMITSCORE 1*/
 #undef LIMITSCORE
+#endif
 
 /* 
  * fudge factor allowed in time for saved game
@@ -59,6 +63,7 @@ extern char *xcrypt();
 #define FUDGE_TIME      200
 
 /* file locations */
-/* uncomment if not using config.h */
-/*#define SCOREFILE "xrogue.scr"*/
-/*#define LOGFILE "xrogue.log"*/
+#ifndef HAVE_CONFIG_H
+#define SCOREFILE "xrogue.scr"
+#define LOGFILE "xrogue.log"
+#endif