[Refactor] #37353 defines.h 削除．

diff --git a/Hengband_vcs2017/Hengband/Hengband.vcxproj b/Hengband_vcs2017/Hengband/Hengband.vcxproj
index 16398bd..7d50e22 100644 (file)
--- a/Hengband_vcs2017/Hengband/Hengband.vcxproj
+++ b/Hengband_vcs2017/Hengband/Hengband.vcxproj
@@ -303,7 +303,6 @@
     <ClInclude Include="..\..\src\cmd-usestaff.h" />\r
     <ClInclude Include="..\..\src\core.h" />\r
     <ClInclude Include="..\..\src\creature.h" />\r
-    <ClInclude Include="..\..\src\defines.h" />\r
     <ClInclude Include="..\..\src\dungeon-file.h" />\r
     <ClInclude Include="..\..\src\dungeon.h" />\r
     <ClInclude Include="..\..\src\externs.h" />\r

diff --git a/Hengband_vcs2017/Hengband/Hengband.vcxproj.filters b/Hengband_vcs2017/Hengband/Hengband.vcxproj.filters
index 6ef95a0..34c3826 100644 (file)
--- a/Hengband_vcs2017/Hengband/Hengband.vcxproj.filters
+++ b/Hengband_vcs2017/Hengband/Hengband.vcxproj.filters
@@ -401,7 +401,6 @@
     </ClCompile>
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="..\..\src\defines.h" />
     <ClInclude Include="..\..\src\externs.h" />
     <ClInclude Include="..\..\src\gamevalue.h" />
     <ClInclude Include="..\..\src\h-basic.h" />

diff --git a/src/angband.h b/src/angband.h
index 8f0aa3f..454a333 100644 (file)
--- a/src/angband.h
+++ b/src/angband.h
@@ -42,7 +42,6 @@
 /*
  * Now, include the define's, the type's, and the extern's
  */
-#include "defines.h"
 #include "gamevalue.h"
 #include "externs.h"
 #include "gameoption.h"

diff --git a/src/defines.h b/src/defines.h
deleted file mode 100644 (file)
index 0570811..0000000
--- a/src/defines.h
+++ /dev/null
@@ -1,41 +0,0 @@
-#pragma once
-
-/*!
- *  @file defines.h
- *  @brief 主要なマクロ定義ヘッダ / Purpose: global constants and macro definitions
- *  @date 2014/01/02
- *  @author
- * Copyright (c) 1997 Ben Harrison, James E. Wilson, Robert A. Koeneke\n
- *\n
- * This software may be copied and distributed for educational, research,\n
- * and not for profit purposes provided that this copyright and statement\n
- * are included in all such copies.  Other copyrights may also apply.\n
- *  @details
- * Do not edit this file unless you know *exactly* what you are doing.\n
- *\n
- * Some of the values in this file were chosen to preserve game balance,\n
- * while others are hard-coded based on the format of old save-files, the\n
- * definition of arrays in various places, mathematical properties, fast\n
- * computation, storage limits, or the format of external text files.\n
- *\n
- * Changing some of these values will induce crashes or memory errors or\n
- * savefile mis-reads.  Most of the comments in this file are meant as\n
- * reminders, not complete descriptions, and even a complete knowledge\n
- * of the source may not be sufficient to fully understand the effects\n
- * of changing certain definitions.\n
- *\n
- * Lastly, note that the code does not always use the symbolic constants\n
- * below, and sometimes uses various hard-coded values that may not even\n
- * be defined in this file, but which may be related to definitions here.\n
- * This is of course bad programming practice, but nobody is perfect...\n
- *\n
- * For example, there are MANY things that depend on the screen being\n
- * 80x24, with the top line used for messages, the bottom line being\n
- * used for status, and exactly 22 lines used to show the dungeon.\n
- * Just because your screen can hold 46 lines does not mean that the\n
- * game will work if you try to use 44 lines to show the dungeon.\n
- *\n
- * You have been warned.\n
- */
-
-/*** Screen Locations ***/

diff --git a/src/object-flavor.c b/src/object-flavor.c
index 508faad..599fe22 100644 (file)
--- a/src/object-flavor.c
+++ b/src/object-flavor.c
@@ -30,8 +30,7 @@
 #include "japanese.h"
 
  /*!
-  * @brief アイテムの価値記述テーブル /
-  * Table of game-generated inscriptions (indexed by the defines in defines.h). -- RG
+  * @brief アイテムの価値記述テーブル
   */
 const concptr game_inscriptions[] =
 {

diff --git a/src/object.h b/src/object.h
index 0eb74b8..7b3ac03 100644 (file)
--- a/src/object.h
+++ b/src/object.h
@@ -1,5 +1,4 @@
 #pragma once
-#include "defines.h"
 
 /*
  * Object information, for a specific object.

diff --git a/src/player-status.c b/src/player-status.c
index 1fd0998..d6fbe42 100644 (file)
--- a/src/player-status.c
+++ b/src/player-status.c
@@ -3187,7 +3187,6 @@ static void calc_torch(void)
        }
 
        /* max radius is 14 (was 5) without rewriting other code -- */
-       /* see grid.c:update_lite() and defines.h:LITE_MAX */
        if (d_info[p_ptr->dungeon_idx].flags1 & DF1_DARKNESS && p_ptr->cur_lite > 1)
                p_ptr->cur_lite = 1;
 

diff --git a/src/spells1.c b/src/spells1.c
index 1cb050a..ccba8ca 100644 (file)
--- a/src/spells1.c
+++ b/src/spells1.c
@@ -5417,7 +5417,7 @@ void breath_shape(u16b *path_g, int dist, int *pgrids, POSITION *gx, POSITION *g
  * @param x 目標X座標 / Target x location (or location to travel "towards")
  * @param dam 基本威力 / Base damage roll to apply to affected monsters (or player)
  * @param typ 効果属性 / Type of damage to apply to monsters (and objects)
- * @param flg 効果フラグ / Extra bit flags (see PROJECT_xxxx in "defines.h")
+ * @param flg 効果フラグ / Extra bit flags (see PROJECT_xxxx)
  * @param monspell 効果元のモンスター魔法ID
  * @return 何か一つでも効力があればTRUEを返す / TRUE if any "effects" of the projection were observed, else FALSE
  * @details