[Refactor] #37353 externs.h と variable.c を削除。

diff --git a/Hengband_vcs2017/Hengband/Hengband.vcxproj b/Hengband_vcs2017/Hengband/Hengband.vcxproj
index 194467c..aab36eb 100644 (file)
--- a/Hengband_vcs2017/Hengband/Hengband.vcxproj
+++ b/Hengband_vcs2017/Hengband/Hengband.vcxproj
@@ -279,7 +279,6 @@
     <ClCompile Include="..\..\src\term.c" />\r
     <ClCompile Include="..\..\src\trap.c" />\r
     <ClCompile Include="..\..\src\util.c" />\r
-    <ClCompile Include="..\..\src\variable.c" />\r
     <ClCompile Include="..\..\src\view-mainwindow.c" />\r
     <ClCompile Include="..\..\src\warning.c" />\r
     <ClCompile Include="..\..\src\wild.c" />\r
@@ -304,7 +303,6 @@
     <ClInclude Include="..\..\src\creature.h" />\r
     <ClInclude Include="..\..\src\dungeon-file.h" />\r
     <ClInclude Include="..\..\src\dungeon.h" />\r
-    <ClInclude Include="..\..\src\externs.h" />\r
     <ClInclude Include="..\..\src\feature.h" />\r
     <ClInclude Include="..\..\src\files.h" />\r
     <ClInclude Include="..\..\src\floor-events.h" />\r

diff --git a/Hengband_vcs2017/Hengband/Hengband.vcxproj.filters b/Hengband_vcs2017/Hengband/Hengband.vcxproj.filters
index f585413..ec03a9d 100644 (file)
--- a/Hengband_vcs2017/Hengband/Hengband.vcxproj.filters
+++ b/Hengband_vcs2017/Hengband/Hengband.vcxproj.filters
@@ -3,7 +3,6 @@
   <ItemGroup>
     <ClCompile Include="..\..\src\main-win.c" />
     <ClCompile Include="..\..\src\readdib.c" />
-    <ClCompile Include="..\..\src\variable.c" />
     <ClCompile Include="..\..\src\z-form.c" />
     <ClCompile Include="..\..\src\z-term.c" />
     <ClCompile Include="..\..\src\warning.c" />
@@ -400,7 +399,6 @@
     </ClCompile>
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="..\..\src\externs.h" />
     <ClInclude Include="..\..\src\gamevalue.h" />
     <ClInclude Include="..\..\src\h-basic.h" />
     <ClInclude Include="..\..\src\h-config.h" />

diff --git a/src/angband.h b/src/angband.h
index 454a333..b941349 100644 (file)
--- a/src/angband.h
+++ b/src/angband.h
@@ -1,4 +1,5 @@
-/*!
+#pragma once
+/*!
  * @file angband.h
  * @brief Angband(変愚蛮怒)メインヘッダファイル
  * Main "Angband" header file
@@ -38,14 +39,18 @@
  */
 #include "z-config.h"
 
-
-/*
- * Now, include the define's, the type's, and the extern's
- */
 #include "gamevalue.h"
-#include "externs.h"
 #include "gameoption.h"
 
+#include "geometry.h"
+#include "grid.h"
+#include "floor-save.h"
+#include "monster.h"
+#include "monsterrace.h"
+#include "object.h"
+#include "player-status.h"
+
+
 /***** Some copyright messages follow below *****/
 
 /*

diff --git a/src/externs.h b/src/externs.h
deleted file mode 100644 (file)
index b6bdcc1..0000000
--- a/src/externs.h
+++ /dev/null
@@ -1,22 +0,0 @@
-/*!
- * @file externs.h
- * @brief Angband(変愚蛮怒)基本関数、グローバル変数ヘッダファイル / 
- * extern declarations (variables and functions)
- * @date 2014/08/08
- * @author
- * Copyright (c) 1997 Ben Harrison
- * @details
- * 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.
- * Note that some files have their own header files
- * (z-virt.h, z-util.h, z-form.h, term.h, random.h)
- */
-#include "geometry.h"
-#include "grid.h"
-#include "floor-save.h"
-#include "monster.h"
-#include "monsterrace.h"
-#include "object.h"
-#include "player-status.h"
-

diff --git a/src/variable.c b/src/variable.c
deleted file mode 100644 (file)
index 4cefb72..0000000
--- a/src/variable.c
+++ /dev/null
@@ -1,15 +0,0 @@
-/*!
- * @file variable.c
- * @brief グローバル変数定義 / Angband variables
- * @date 2014/10/05
- * @author
- * Copyright (c) 1997 Ben Harrison, James E. Wilson, Robert A. Koeneke<br>
- * <br>
- * This software may be copied and distributed for educational, research,<br>
- * and not for profit purposes provided that this copyright and statement<br>
- * are included in all such copies.  Other copyrights may also apply.<br>
- */
-
-#include "angband.h"
-#include "geometry.h"
-