X-Git-Url: http://git.osdn.net/view?a=blobdiff_plain;f=src%2Fz-config.h;h=2689941981145c949e06a9ee6006f09c6c7b60a8;hb=214cab5f3f64a0501f4ec4d6fe6609729e0d5023;hp=6359e0564b9018ddf8cbffe7e7a5f6165076287b;hpb=054a3e263549454286dcaabef8536b81795ec5bd;p=hengband%2Fhengband.git

diff --git a/src/z-config.h b/src/z-config.h
index 6359e0564..268994198 100644
--- a/src/z-config.h
+++ b/src/z-config.h
@@ -22,8 +22,9 @@
  * USE_FONTSET and/or USE_XIM can be commented out
  * when you don't want to use it.
  */
-#ifdef JP
 #define USE_FONTSET
+
+#ifdef JP
 #define USE_XIM
 #endif
 
@@ -32,7 +33,7 @@
 #endif
 
 #if defined(JP) && !defined(USE_FONTSET)
-#define _JP
+#define USE_JP_FONTSTRUCT
 #endif
 
 #endif /* HAVE_CONFIG_H */
@@ -264,51 +265,6 @@
 
 
 /*
- * OPTION: Delay the loading of the "f_text" array until it is actually
- * needed, saving ~1K, since "feature" descriptions are unused.
- */
-#define DELAY_LOAD_F_TEXT
-
-/*
- * OPTION: Delay the loading of the "k_text" array until it is actually
- * needed, saving ~1K, since "object" descriptions are unused.
- */
-#define DELAY_LOAD_K_TEXT
-
-/*
- * OPTION: Delay the loading of the "a_text" array until it is actually
- * needed, saving ~1K, since "artifact" descriptions are unused.
- */
-#ifndef JP
-#define DELAY_LOAD_A_TEXT
-#endif
-
-/*
- * OPTION: Delay the loading of the "e_text" array until it is actually
- * needed, saving ~1K, since "ego-item" descriptions are unused.
- */
-#define DELAY_LOAD_E_TEXT
-
-/*
- * OPTION: Delay the loading of the "r_text" array until it is actually
- * needed, saving ~60K, but "simplifying" the "monster" descriptions.
- */
-/* #define DELAY_LOAD_R_TEXT */
-
-/*
- * OPTION: Delay the loading of the "d_text" array until it is actually
- * needed, saving ~1K, since "dungeon" descriptions are unused.
- */
-/* #define DELAY_LOAD_D_TEXT */
-
-/*
- * OPTION: Delay the loading of the "v_text" array until it is actually
- * needed, saving ~1K, but "destroying" the "vault" generation.
- */
-/* #define DELAY_LOAD_V_TEXT */
-
-
-/*
  * OPTION: Handle signals
  */
 #define HANDLE_SIGNALS
@@ -356,27 +312,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
@@ -558,6 +493,19 @@
 #define SUPPORT_GAMMA
 
 /*
+ * Hack -- Mach-O (native binary format of OS X) is basically a Un*x
+ * but has Mac OS/Windows-like user interface
+ */
+#ifdef MACH_O_CARBON
+# ifdef PRIVATE_USER_PATH
+#  undef PRIVATE_USER_PATH
+# endif
+# ifdef SAVEFILE_USE_UID
+#  undef SAVEFILE_USE_UID
+# endif
+#endif
+
+/*
  * Hack -- Special "ancient machine" versions
  */
 #if defined(USE_286) || defined(ANGBAND_LITE_MAC)
@@ -611,11 +559,6 @@
 /* Allow hordes of 'similar' monsters */
 # define MONSTER_HORDES
 
-/* Wizard mode testing options: */
-
-/* Testing upkeep */
-/* # define TRACK_FRIENDS */
-
 /*
  * OPTION: Repeat last command -- TNB
  */
@@ -650,21 +593,14 @@
  */
 #define SORT_R_INFO
 
-/*
- * Use a scripting language
- */
-/* #define USE_SCRIPT */
-
-#ifdef USE_SCRIPT
-/*
- * Python is statically linked into ZAngband
- */
-# define STATIC_PYTHON
-/* # define SCRIPT_OBJ_KIND */
-#endif /* USE_SCRIPT */
 
 #ifndef HAVE_CONFIG_H
+
 #ifndef MSDOS
+/*
+ * Use world score server
+ */
 #define WORLD_SCORE
 #endif
+
 #endif /* HAVE_CONFIG_H */