[Refactor] #37353 types.h 削除。

diff --git a/Hengband_vcs2017/Hengband/Hengband.vcxproj b/Hengband_vcs2017/Hengband/Hengband.vcxproj
index fa4556e..84f264a 100644 (file)
--- a/Hengband_vcs2017/Hengband/Hengband.vcxproj
+++ b/Hengband_vcs2017/Hengband/Hengband.vcxproj
@@ -387,7 +387,6 @@
     <ClInclude Include="..\..\src\store.h" />\r
     <ClInclude Include="..\..\src\term.h" />\r
     <ClInclude Include="..\..\src\trap.h" />\r
-    <ClInclude Include="..\..\src\types.h" />\r
     <ClInclude Include="..\..\src\util.h" />\r
     <ClInclude Include="..\..\src\view-mainwindow.h" />\r
     <ClInclude Include="..\..\src\warning.h" />\r

diff --git a/Hengband_vcs2017/Hengband/Hengband.vcxproj.filters b/Hengband_vcs2017/Hengband/Hengband.vcxproj.filters
index 6f4f881..a638c0e 100644 (file)
--- a/Hengband_vcs2017/Hengband/Hengband.vcxproj.filters
+++ b/Hengband_vcs2017/Hengband/Hengband.vcxproj.filters
@@ -366,7 +366,6 @@
     <ClInclude Include="..\..\src\sort.h" />
     <ClInclude Include="..\..\src\term.h" />
     <ClInclude Include="..\..\src\trap.h" />
-    <ClInclude Include="..\..\src\types.h" />
     <ClInclude Include="..\..\src\wild.h" />
     <ClInclude Include="..\..\src\world.h" />
     <ClInclude Include="..\..\src\z-config.h" />

diff --git a/src/angband.h b/src/angband.h
index 74cd401..8f0aa3f 100644 (file)
--- a/src/angband.h
+++ b/src/angband.h
@@ -44,7 +44,6 @@
  */
 #include "defines.h"
 #include "gamevalue.h"
-#include "types.h"
 #include "externs.h"
 #include "gameoption.h"
 

diff --git a/src/object-flavor.h b/src/object-flavor.h
index 4d86a99..3aec6ac 100644 (file)
--- a/src/object-flavor.h
+++ b/src/object-flavor.h
@@ -1,7 +1,7 @@
 #pragma once
 
-#include "types.h"
 #include "h-type.h"
+#include "object.h"
 
 /* flavor.c */
 extern void get_table_name_aux(char *out_string);

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

diff --git a/src/types.h b/src/types.h
deleted file mode 100644 (file)
index f51f7e4..0000000
--- a/src/types.h
+++ /dev/null
@@ -1,53 +0,0 @@
-#pragma once
-
-/*!
- * @file types.h
- * @brief グローバルな構造体の定義 / global type declarations
- * @date 2014/08/10
- * @author
- * <pre>
- * Copyright (c) 1997 Ben Harrison, James E. Wilson, Robert A. Koeneke
- * 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.  Other copyrights may also apply.
- * </pre>
- * @details
- * <pre>
- * このファイルはangband.hでのみインクルードすること。
- * This file should ONLY be included by "angband.h"
- *
- * Note that "char" may or may not be signed, and that "signed char"
- * may or may not work on all machines.  So always use "s16b" or "s32b"
- * for signed values.  Also, note that unsigned values cause math problems
- * in many cases, so try to only use "u16b" and "u32b" for "bit flags",
- * unless you really need the extra bit of information, or you really
- * need to restrict yourself to a single byte for storage reasons.
- *
- * Also, if possible, attempt to restrict yourself to sub-fields of
- * known size (use "s16b" or "s32b" instead of "int", and "byte" instead
- * of "bool"), and attempt to align all fields along four-byte words, to
- * optimize storage issues on 32-bit machines.  Also, avoid "bit flags"
- * since these increase the code size and slow down execution.  When
- * you need to store bit flags, use one byte per flag, or, where space
- * is an issue, use a "byte" or "u16b" or "u32b", and add special code
- * to access the various bit flags.
- *
- * Many of these structures were developed to reduce the number of global
- * variables, facilitate structured program design, allow the use of ascii
- * template files, simplify access to indexed data, or facilitate efficient
- * clearing of many variables at once.
- *
- * Certain data is saved in multiple places for efficient access, currently,
- * this includes the tval/sval/weight fields in "object_type", various fields
- * in "header_type", and the "m_idx" and "o_idx" fields in "grid_type".  All
- * of these could be removed, but this would, in general, slow down the game
- * and increase the complexity of the code.
- * </pre>
- */
-
-#include "h-type.h"
-#include "defines.h"
-#include "object.h"
-
-//#include "player-skill.h"
-