From a883e922a004c532341687d24746e72f62c846cf Mon Sep 17 00:00:00 2001
From: deskull <deskull@users.sourceforge.jp>
Date: Tue, 11 Jun 2019 20:30:45 +0900
Subject: [PATCH] =?utf8?q?[Refactor]=20#37353=20externs.h=20=E3=81=A8=20va?=
 =?utf8?q?riable.c=20=E3=82=92=E5=89=8A=E9=99=A4=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

---
 Hengband_vcs2017/Hengband/Hengband.vcxproj         |  2 --
 Hengband_vcs2017/Hengband/Hengband.vcxproj.filters |  2 --
 src/angband.h                                      | 17 +++++++++++------
 src/externs.h                                      | 22 ----------------------
 src/variable.c                                     | 15 ---------------
 5 files changed, 11 insertions(+), 47 deletions(-)
 delete mode 100644 src/externs.h
 delete mode 100644 src/variable.c

diff --git a/Hengband_vcs2017/Hengband/Hengband.vcxproj b/Hengband_vcs2017/Hengband/Hengband.vcxproj
index 194467cd1..aab36ebe8 100644
--- a/Hengband_vcs2017/Hengband/Hengband.vcxproj
+++ b/Hengband_vcs2017/Hengband/Hengband.vcxproj
@@ -279,7 +279,6 @@
     <ClCompile Include="..\..\src\term.c" />
     <ClCompile Include="..\..\src\trap.c" />
     <ClCompile Include="..\..\src\util.c" />
-    <ClCompile Include="..\..\src\variable.c" />
     <ClCompile Include="..\..\src\view-mainwindow.c" />
     <ClCompile Include="..\..\src\warning.c" />
     <ClCompile Include="..\..\src\wild.c" />
@@ -304,7 +303,6 @@
     <ClInclude Include="..\..\src\creature.h" />
     <ClInclude Include="..\..\src\dungeon-file.h" />
     <ClInclude Include="..\..\src\dungeon.h" />
-    <ClInclude Include="..\..\src\externs.h" />
     <ClInclude Include="..\..\src\feature.h" />
     <ClInclude Include="..\..\src\files.h" />
     <ClInclude Include="..\..\src\floor-events.h" />
diff --git a/Hengband_vcs2017/Hengband/Hengband.vcxproj.filters b/Hengband_vcs2017/Hengband/Hengband.vcxproj.filters
index f58541384..ec03a9de0 100644
--- 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 454a3332a..b94134922 100644
--- 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
index b6bdcc12b..000000000
--- 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
index 4cefb7283..000000000
--- 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"
-
-- 
2.11.0