This commit was manufactured by cvs2svn to create tag

[hengband/hengband.git] / src / z-config.h

diff --git a/src/z-config.h b/src/z-config.h
index 5cf2f69..1737f83 100644 (file)
--- a/src/z-config.h
+++ b/src/z-config.h
@@ -1,15 +1,15 @@
 /* File: z-config.h */
 
-/* Purpose: Angband specific configuration stuff */
-
 /*
- * Copyright (c) 1989 James E. Wilson, Robert A. Koeneke
+ * Copyright (c) 1997 Ben Harrison, James E. Wilson, Robert A. Koeneke
  *
- * This software may be copied and distributed for educational, research, and
- * not for profit purposes provided that this copyright and statement are
- * included in all such copies.
+ * This software may be copied and distributed for educational, research,
+ * and not for profit purposes provided that this copyright and statement
+ * are included in all such copies.  Other copyrights may also apply.
  */
 
+/* Purpose: Angband specific configuration stuff */
+
 /* Allow debug commands */
 #define USE_DEBUG
 
@@ -17,6 +17,11 @@
 #define USE_SPECIAL
 
 #ifndef HAVE_CONFIG_H
+
+/*
+ * USE_FONTSET and/or USE_XIM can be commented out
+ * when you don't want to use it.
+ */
 #ifdef JP
 #define USE_FONTSET
 #define USE_XIM
@@ -26,9 +31,10 @@
 #define USE_LOCALE
 #endif
 
-#ifndef USE_FONTSET
+#if defined(JP) && !defined(USE_FONTSET)
 #define _JP
 #endif
+
 #endif /* HAVE_CONFIG_H */
 
 
@@ -392,27 +398,6 @@
 
 #endif /* USE_SPECIAL */
 
-/*
- * OPTION: Hack -- Macintosh stuff
- */
-#ifdef MACINTOSH
-
-/* Do not handle signals */
-# undef HANDLE_SIGNALS
-
-#endif
-
-
-/*
- * OPTION: Hack -- Windows stuff
- */
-#ifdef WINDOWS
-
-/* Do not handle signals */
-# undef HANDLE_SIGNALS
-
-#endif
-
 
 /*
  * OPTION: Hack -- EMX stuff
@@ -505,7 +490,7 @@
  * OPTION: Person to bother if something goes wrong.
  */
 /* #define MAINTAINER  "rr9@angband.org" */
-#define MAINTAINER     "echizen@s5.xrea.com"
+#define MAINTAINER     "echizen@users.sourceforge.jp"
 
 
 #ifdef JP
@@ -651,9 +636,6 @@
  #define DRS_SMART_OPTIONS
 #endif
 
-/* Do we want different characters for different races? */
-# define VARIABLE_PLAYER_GRAPH
-
 /* Allow hordes of 'similar' monsters */
 # define MONSTER_HORDES
 
@@ -709,11 +691,6 @@
 /* # define SCRIPT_OBJ_KIND */
 #endif /* USE_SCRIPT */
 
-/*
- * The Frakir can predict danger when equipped
- */
-#define USE_FRAKIR
-
 #ifndef HAVE_CONFIG_H
 #ifndef MSDOS
 #define WORLD_SCORE