[Refactor] #37353 MAX_SHORT, MAX_UCHAR, MAX_NLEN を h-type.h へ移動．

diff --git a/src/core.h b/src/core.h
index 536ed62..11fdc8e 100644 (file)
--- a/src/core.h
+++ b/src/core.h
@@ -65,6 +65,7 @@ extern const concptr copyright[5];
 #define INIT_CREATE_DUNGEON     0x08
 #define INIT_ONLY_FEATURES      0x10
 #define INIT_ONLY_BUILDINGS     0x20
+
 extern int init_flags;
 
 extern concptr ANGBAND_SYS;

diff --git a/src/defines.h b/src/defines.h
index 769cc6c..cbe3dad 100644 (file)
--- a/src/defines.h
+++ b/src/defines.h
@@ -165,21 +165,6 @@
 
 
 /*
- * Maximum value storable in a "byte" (hard-coded)
- */
-#define MAX_UCHAR       255
-
-/*
- * Maximum value storable in a "s16b" (hard-coded)
- */
-#define MAX_SHORT       32767
-
-/*
- * Maximum length of object's name
- */
-#define MAX_NLEN        160
-
-/*
  * Misc constants
  */
 #define TOWN_DAWN         10000   /*!< 1日分のターン / Number of ticks from dawn to dawn XXX */

diff --git a/src/gameoption.h b/src/gameoption.h
index cabcd7b..884da54 100644 (file)
--- a/src/gameoption.h
+++ b/src/gameoption.h
@@ -1,4 +1,5 @@
 #pragma once
+#include "h-type.h"
 
 /*** Option Definitions ***/
 

diff --git a/src/h-type.h b/src/h-type.h
index 465e4e8..d79d1bb 100644 (file)
--- a/src/h-type.h
+++ b/src/h-type.h
@@ -68,6 +68,11 @@ typedef int errr;
 #undef bool
 #define bool bool_hack /*!< C++環境で重複を避けるためのbool_hack定義 Hack -- prevent problems with C++ */
 
+#define MAX_UCHAR       255 /*!< Maximum value storable in a "byte" (hard-coded) */
+#define MAX_SHORT       32767    /*!< Maximum value storable in a "s16b" (hard-coded) */
+
+#define MAX_NLEN        160 /*!< Maximum length of object's name */
+
 
 /* Note that "signed char" is not always "defined" */
 /* So always use "s16b" to hold small signed values */
@@ -79,7 +84,6 @@ typedef char bool; /*!< bool型をcharとして定義 / Note that a bool is smal
 typedef int sint; /*!< sint型をintとして定義 / A signed, standard integer (at least 2 bytes) */
 typedef unsigned int uint; /* uint型をintとして定義 /  An unsigned, "standard" integer (often pre-defined) */
 
-
 /* The largest possible signed integer (pre-defined) */
 /* typedef long long; */