• R/O
  • HTTP
  • SSH
  • HTTPS

hengbandosx: 提交

The master and develop branches track hengband.

OS X development happens on the macos-1-6-2, macos-2-2-1, and macos-develop branches.


Commit MetaInfo

修订版d62d351b496419ec3a09eddd4f26cdf179d438ba (tree)
时间2022-09-16 22:05:04
作者Hourier <66951241+Hourier@user...>
CommiterGitHub

Log Message

Merge pull request #2643 from Hourier/Prepare-ObjectKind-To-Class

object_kind 構造体をクラス化するための準備として、まずはヘッダ依存性を減らした

更改概述

差异

--- a/src/flavor/flavor-describer.cpp
+++ b/src/flavor/flavor-describer.cpp
@@ -22,6 +22,7 @@
2222 #include "object-hook/hook-quest.h"
2323 #include "object/object-flags.h"
2424 #include "object/object-kind.h"
25+#include "object/tval-types.h"
2526 #include "perception/object-perception.h"
2627 #include "player-base/player-class.h"
2728 #include "player/player-status-table.h"
--- a/src/flavor/flavor-util.cpp
+++ b/src/flavor/flavor-util.cpp
@@ -4,6 +4,7 @@
44 #include "object-enchant/tr-types.h"
55 #include "object/object-flags.h"
66 #include "object/object-kind.h"
7+#include "object/tval-types.h"
78 #include "perception/object-perception.h"
89 #include "sv-definition/sv-food-types.h"
910 #include "system/artifact-type-definition.h"
--- a/src/flavor/tval-description-switcher.cpp
+++ b/src/flavor/tval-description-switcher.cpp
@@ -10,6 +10,7 @@
1010 #include "monster-race/monster-race.h"
1111 #include "object-enchant/trg-types.h"
1212 #include "object/object-kind.h"
13+#include "object/tval-types.h"
1314 #include "system/monster-race-definition.h"
1415 #include "system/object-type-definition.h"
1516 #include "util/enum-converter.h"
--- a/src/floor/floor-events.cpp
+++ b/src/floor/floor-events.cpp
@@ -28,6 +28,7 @@
2828 #include "object/object-kind.h"
2929 #include "object/object-mark-types.h"
3030 #include "object/object-value.h"
31+#include "object/tval-types.h"
3132 #include "perception/object-perception.h"
3233 #include "player/special-defense-types.h"
3334 #include "sv-definition/sv-amulet-types.h"
--- a/src/inventory/recharge-processor.cpp
+++ b/src/inventory/recharge-processor.cpp
@@ -6,6 +6,7 @@
66 #include "hpmp/hp-mp-regenerator.h"
77 #include "inventory/inventory-slot-types.h"
88 #include "object/object-kind.h"
9+#include "object/tval-types.h"
910 #include "system/floor-type-definition.h"
1011 #include "system/object-type-definition.h"
1112 #include "system/player-type-definition.h"
--- a/src/load/old/item-loader-savefile50.cpp
+++ b/src/load/old/item-loader-savefile50.cpp
@@ -10,6 +10,7 @@
1010 #include "object-enchant/tr-types.h"
1111 #include "object/object-flags.h"
1212 #include "object/object-kind.h"
13+#include "object/tval-types.h"
1314 #include "sv-definition/sv-lite-types.h"
1415 #include "system/angband.h"
1516 #include "system/object-type-definition.h"
--- a/src/object-enchant/others/apply-magic-others.cpp
+++ b/src/object-enchant/others/apply-magic-others.cpp
@@ -18,6 +18,7 @@
1818 #include "object-enchant/tr-types.h"
1919 #include "object-enchant/trc-types.h"
2020 #include "object/object-kind.h"
21+#include "object/tval-types.h"
2122 #include "perception/object-perception.h"
2223 #include "sv-definition/sv-lite-types.h"
2324 #include "sv-definition/sv-other-types.h"
--- a/src/object-hook/hook-expendable.cpp
+++ b/src/object-hook/hook-expendable.cpp
@@ -6,6 +6,7 @@
66 #include "object-enchant/item-feeling.h"
77 #include "object-enchant/special-object-flags.h"
88 #include "object/object-kind.h"
9+#include "object/tval-types.h"
910 #include "perception/object-perception.h"
1011 #include "player-base/player-race.h"
1112 #include "player-info/mimic-info-table.h"
--- a/src/object/object-broken.cpp
+++ b/src/object/object-broken.cpp
@@ -11,6 +11,7 @@
1111 #include "object-enchant/tr-types.h"
1212 #include "object/object-flags.h"
1313 #include "object/object-kind.h"
14+#include "object/tval-types.h"
1415 #include "sv-definition/sv-potion-types.h"
1516 #include "system/object-type-definition.h"
1617 #include "system/player-type-definition.h"
--- a/src/object/object-kind.h
+++ b/src/object/object-kind.h
@@ -1,16 +1,13 @@
11 #pragma once
22
3-#include "system/angband.h"
4-
53 #include "object-enchant/tr-flags.h"
64 #include "object-enchant/trg-types.h"
7-#include "object/tval-types.h"
8-#include "system/system-variables.h"
5+#include "system/angband.h"
96 #include "util/flag-group.h"
10-
117 #include <string>
128 #include <vector>
139
10+enum class ItemKindType : short;
1411 enum class RandomArtActType : short;
1512 struct object_kind {
1613 KIND_OBJECT_IDX idx{};
--- a/src/object/object-stack.cpp
+++ b/src/object/object-stack.cpp
@@ -11,6 +11,7 @@
1111 #include "object-enchant/trc-types.h"
1212 #include "object/object-kind.h"
1313 #include "object/object-value.h"
14+#include "object/tval-types.h"
1415 #include "perception/object-perception.h"
1516 #include "smith/object-smith.h"
1617 #include "sv-definition/sv-other-types.h"
--- a/src/object/object-value.cpp
+++ b/src/object/object-value.cpp
@@ -8,6 +8,7 @@
88 #include "object/object-flags.h"
99 #include "object/object-kind.h"
1010 #include "object/object-value-calc.h"
11+#include "object/tval-types.h"
1112 #include "perception/object-perception.h"
1213 #include "system/artifact-type-definition.h"
1314 #include "system/monster-race-definition.h"
--- a/src/racial/racial-android.cpp
+++ b/src/racial/racial-android.cpp
@@ -7,6 +7,7 @@
77 #include "object/object-kind.h"
88 #include "object/object-value-calc.h"
99 #include "object/object-value.h"
10+#include "object/tval-types.h"
1011 #include "player-base/player-race.h"
1112 #include "player-info/equipment-info.h"
1213 #include "player/player-status.h"
--- a/src/store/store-util.cpp
+++ b/src/store/store-util.cpp
@@ -9,6 +9,7 @@
99 #include "object-enchant/special-object-flags.h"
1010 #include "object/object-kind.h"
1111 #include "object/object-value.h"
12+#include "object/tval-types.h"
1213 #include "system/object-type-definition.h"
1314
1415 store_type *st_ptr = nullptr;
--- a/src/system/object-type-definition.cpp
+++ b/src/system/object-type-definition.cpp
@@ -16,6 +16,7 @@
1616 #include "object-enchant/trg-types.h"
1717 #include "object/object-flags.h"
1818 #include "object/object-kind.h"
19+#include "object/tval-types.h"
1920 #include "smith/object-smith.h"
2021 #include "sv-definition/sv-armor-types.h"
2122 #include "sv-definition/sv-lite-types.h"
@@ -27,7 +28,6 @@
2728 #include "term/term-color-types.h"
2829 #include "util/bit-flags-calculator.h"
2930 #include "util/string-processor.h"
30-
3131 #include <set>
3232 #include <unordered_map>
3333
Show on old repository browser