• R/O
  • HTTP
  • SSH
  • HTTPS

hengband: Commit

変愚蛮怒のメインリポジトリです


Commit MetaInfo

Revision83b3ae214244ae919dd58b1867e45b1f04c1f6e5 (tree)
Time2019-05-02 23:37:54
Authordeskull <deskull@user...>
Commiterdeskull

Log Message

[Refactor] #37353 types.h 削除。

Change Summary

Incremental Difference

--- a/Hengband_vcs2017/Hengband/Hengband.vcxproj
+++ b/Hengband_vcs2017/Hengband/Hengband.vcxproj
@@ -387,7 +387,6 @@
387387 <ClInclude Include="..\..\src\store.h" />
388388 <ClInclude Include="..\..\src\term.h" />
389389 <ClInclude Include="..\..\src\trap.h" />
390- <ClInclude Include="..\..\src\types.h" />
391390 <ClInclude Include="..\..\src\util.h" />
392391 <ClInclude Include="..\..\src\view-mainwindow.h" />
393392 <ClInclude Include="..\..\src\warning.h" />
--- a/Hengband_vcs2017/Hengband/Hengband.vcxproj.filters
+++ b/Hengband_vcs2017/Hengband/Hengband.vcxproj.filters
@@ -366,7 +366,6 @@
366366 <ClInclude Include="..\..\src\sort.h" />
367367 <ClInclude Include="..\..\src\term.h" />
368368 <ClInclude Include="..\..\src\trap.h" />
369- <ClInclude Include="..\..\src\types.h" />
370369 <ClInclude Include="..\..\src\wild.h" />
371370 <ClInclude Include="..\..\src\world.h" />
372371 <ClInclude Include="..\..\src\z-config.h" />
--- a/src/angband.h
+++ b/src/angband.h
@@ -44,7 +44,6 @@
4444 */
4545 #include "defines.h"
4646 #include "gamevalue.h"
47-#include "types.h"
4847 #include "externs.h"
4948 #include "gameoption.h"
5049
--- a/src/object-flavor.h
+++ b/src/object-flavor.h
@@ -1,7 +1,7 @@
11 #pragma once
22
3-#include "types.h"
43 #include "h-type.h"
4+#include "object.h"
55
66 /* flavor.c */
77 extern void get_table_name_aux(char *out_string);
--- a/src/object.h
+++ b/src/object.h
@@ -1,4 +1,5 @@
11 #pragma once
2+#include "defines.h"
23
34 /*
45 * Object information, for a specific object.
--- a/src/types.h
+++ /dev/null
@@ -1,53 +0,0 @@
1-#pragma once
2-
3-/*!
4- * @file types.h
5- * @brief グローバルな構造体の定義 / global type declarations
6- * @date 2014/08/10
7- * @author
8- * <pre>
9- * Copyright (c) 1997 Ben Harrison, James E. Wilson, Robert A. Koeneke
10- * This software may be copied and distributed for educational, research,
11- * and not for profit purposes provided that this copyright and statement
12- * are included in all such copies. Other copyrights may also apply.
13- * </pre>
14- * @details
15- * <pre>
16- * このファイルはangband.hでのみインクルードすること。
17- * This file should ONLY be included by "angband.h"
18- *
19- * Note that "char" may or may not be signed, and that "signed char"
20- * may or may not work on all machines. So always use "s16b" or "s32b"
21- * for signed values. Also, note that unsigned values cause math problems
22- * in many cases, so try to only use "u16b" and "u32b" for "bit flags",
23- * unless you really need the extra bit of information, or you really
24- * need to restrict yourself to a single byte for storage reasons.
25- *
26- * Also, if possible, attempt to restrict yourself to sub-fields of
27- * known size (use "s16b" or "s32b" instead of "int", and "byte" instead
28- * of "bool"), and attempt to align all fields along four-byte words, to
29- * optimize storage issues on 32-bit machines. Also, avoid "bit flags"
30- * since these increase the code size and slow down execution. When
31- * you need to store bit flags, use one byte per flag, or, where space
32- * is an issue, use a "byte" or "u16b" or "u32b", and add special code
33- * to access the various bit flags.
34- *
35- * Many of these structures were developed to reduce the number of global
36- * variables, facilitate structured program design, allow the use of ascii
37- * template files, simplify access to indexed data, or facilitate efficient
38- * clearing of many variables at once.
39- *
40- * Certain data is saved in multiple places for efficient access, currently,
41- * this includes the tval/sval/weight fields in "object_type", various fields
42- * in "header_type", and the "m_idx" and "o_idx" fields in "grid_type". All
43- * of these could be removed, but this would, in general, slow down the game
44- * and increase the complexity of the code.
45- * </pre>
46- */
47-
48-#include "h-type.h"
49-#include "defines.h"
50-#include "object.h"
51-
52-//#include "player-skill.h"
53-
Show on old repository browser