Mercurial > hg > early-roguelike

changeset 159:44a0fce4b168

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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.
author John "Elwin" Edwards
date Fri, 05 Jun 2015 13:57:38 -0400
parents 2515e03b2f09
children 2d221d574280
files arogue7/mach_dep.h xrogue/mach_dep.h
diffstat 2 files changed, 17 insertions(+), 8 deletions(-) [+]
line wrap: on
line diff
--- a/arogue7/mach_dep.h	Thu Jun 04 17:08:40 2015 -0400
+++ b/arogue7/mach_dep.h	Fri Jun 05 13:57:38 2015 -0400
@@ -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
 
 
 /*
--- a/xrogue/mach_dep.h	Thu Jun 04 17:08:40 2015 -0400
+++ b/xrogue/mach_dep.h	Fri Jun 05 13:57:38 2015 -0400
@@ -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 @@
  * 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 @@
 #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