#define MSDOS プリプロセッサを除去。 / Remove #define MSDOS preprocessor.

diff --git a/src/files.c b/src/files.c
index 789b31c..f3db609 100644 (file)
--- a/src/files.c
+++ b/src/files.c
@@ -5789,12 +5789,8 @@ void process_player_name(bool sf)
        if (character_generated) strcpy(old_player_base, player_base);
 
        /* Cannot be too long */
-#if defined(MACINTOSH) || defined(MSDOS) || defined(USE_EMX) || defined(ACORN) || defined(VM)
-#ifdef MSDOS
-       if (strlen(player_name) > 8)
-#else
+#if defined(MACINTOSH) || defined(USE_EMX) || defined(ACORN) || defined(VM)
        if (strlen(player_name) > 15)
-#endif
        {
                /* Name too long */
                quit_fmt(_("'%s'という名前は長すぎます！", "The name '%s' is too long!"), player_name);
@@ -5868,9 +5864,7 @@ void process_player_name(bool sf)
                        i += strlen(PATH_SEP);
                }
                /* Convert some characters to underscore */
-#ifdef MSDOS
-               else if (my_strchr(" \"*+,./:;<=>?[\\]|", c)) player_base[k++] = '_';
-#elif defined(WINDOWS)
+#if defined(WINDOWS)
                else if (my_strchr("\"*,/:;<>?\\|", c)) player_base[k++] = '_';
 #endif
                else if (isprint(c)) player_base[k++] = c;
@@ -5878,14 +5872,6 @@ void process_player_name(bool sf)
 
 #endif
 
-
-#if defined(MSDOS)
-
-       /* Hack -- max length */
-       if (k > 8) k = 8;
-
-#endif
-
        /* Terminate */
        player_base[k] = '\0';
 

diff --git a/src/h-config.h b/src/h-config.h
index dec2260..c002f68 100644 (file)
--- a/src/h-config.h
+++ b/src/h-config.h
@@ -51,14 +51,6 @@
 
 #ifdef USE_IBM
 
-  /*
-   * OPTION: Compile on an IBM (automatic)
-   */
-  #ifndef MSDOS
-    #define MSDOS
-  #endif
-
-
   /* Use the new SVGA code */
   #ifndef USE_IBM_SVGA
     #define USE_IBM_SVGA
@@ -165,15 +157,6 @@
 #endif
 
 /*
- * Extract the "MSDOS" flag from the compiler
- */
-#ifdef __MSDOS__
-# ifndef MSDOS
-#  define MSDOS
-# endif
-#endif
-
-/*
  * Extract the "WINDOWS" flag from the compiler
  */
 #if defined(_Windows) || defined(__WINDOWS__) || \
@@ -209,7 +192,7 @@
  * or for the "Atari" platform which is Unix-like, apparently
  */
 #if !defined(MACINTOSH) && !defined(WINDOWS) && \
-    !defined(MSDOS) && !defined(USE_EMX) && \
+    !defined(USE_EMX) && \
     !defined(ACORN) && !defined(VM)
 # define SET_UID
 #endif
@@ -251,7 +234,7 @@
 # undef PATH_SEP
 # define PATH_SEP "\\"
 #endif
-#if defined(MSDOS) || defined(OS2) || defined(USE_EMX)
+#if defined(OS2) || defined(USE_EMX)
 # undef PATH_SEP
 # define PATH_SEP "\\"
 #endif
@@ -318,11 +301,9 @@
 # elif defined(SJIS)
 #  define iskanji(x) ((0x81 <= (unsigned char)(x) && (unsigned char)(x) <= 0x9f) || (0xe0 <= (unsigned char)(x) && (unsigned char)(x) <= 0xfc))
 #  define iskana(x)  (((unsigned char)(x) >= 0xA0) && ((unsigned char)(x) <= 0xDF))
-# elif defined(MSDOS)
-#  include <jctype.h>
 # else
 #  error Oops! Please define "EUC" or "SJIS" for kanji-code of your system.
-# endif /* MSDOS */
+# endif
 #endif
 
 #endif /* INCLUDED_H_CONFIG_H */

diff --git a/src/h-system.h b/src/h-system.h
index 7dbb9a8..518f711 100644 (file)
--- a/src/h-system.h
+++ b/src/h-system.h
@@ -68,7 +68,7 @@
 #endif
 
 
-#if defined(WINDOWS) || defined(MSDOS) || defined(USE_EMX)
+#if defined(WINDOWS) || defined(USE_EMX)
 # include <io.h>
 #endif
 

diff --git a/src/h-type.h b/src/h-type.h
index cbc8ac5..55e8e5e 100644 (file)
--- a/src/h-type.h
+++ b/src/h-type.h
@@ -59,7 +59,7 @@ typedef int errr;
 #define uint uint_hack /*!< 非マッキントッシュ環境で重複を避けるためのuint_hack型定義 / Hack -- prevent problems with non-MACINTOSH */
 
 #undef huge
-#define huge huge_hack /*!< MSDOS及びWINDOWS環境で重複を避けるためのhuge_hack定義 / Hack -- prevent problems with MSDOS and WINDOWS */
+#define huge huge_hack /*!< WINDOWS環境で重複を避けるためのhuge_hack定義 / Hack -- prevent problems with WINDOWS */
 
 #undef byte
 #define byte byte_hack /*!< AMIGA環境で重複を避けるためのbyte_hack定義 / Hack -- prevent problems with AMIGA */

diff --git a/src/z-config.h b/src/z-config.h
index 34926bd..4684cd8 100644 (file)
--- a/src/z-config.h
+++ b/src/z-config.h
@@ -557,7 +557,7 @@
 /* Zangband options: */
 
 /* Allow hordes of 'similar' monsters */
-# define MONSTER_HORDES
+#define MONSTER_HORDES
 
 /*
  * OPTION: Repeat last command -- TNB
@@ -595,12 +595,5 @@
 
 
 #ifndef HAVE_CONFIG_H
-
-#ifndef MSDOS
-/*
- * Use world score server
- */
 #define WORLD_SCORE
-#endif
-
 #endif /* HAVE_CONFIG_H */