[Refactor] #3783 InnerGameData クラスを作った

diff --git a/Hengband/Hengband/Hengband.vcxproj b/Hengband/Hengband/Hengband.vcxproj
index 60be8b6..ebd0132 100644 (file)
--- a/Hengband/Hengband/Hengband.vcxproj
+++ b/Hengband/Hengband/Hengband.vcxproj
@@ -319,6 +319,7 @@
     <ClCompile Include="..\..\src\specific-object\stone-of-lore.cpp" />\r
     <ClCompile Include="..\..\src\spell-class\spells-mirror-master.cpp" />\r
     <ClCompile Include="..\..\src\system\angband-system.cpp" />\r
+    <ClCompile Include="..\..\src\system\inner-game-data.cpp" />\r
     <ClCompile Include="..\..\src\system\redrawing-flags-updater.cpp" />\r
     <ClCompile Include="..\..\src\system\floor-type-definition.cpp" />\r
     <ClCompile Include="..\..\src\system\grid-type-definition.cpp" />\r
@@ -1412,6 +1413,7 @@
     <ClInclude Include="..\..\src\system\alloc-entries.h" />\r
     <ClInclude Include="..\..\src\system\angband-exceptions.h" />\r
     <ClInclude Include="..\..\src\system\angband-system.h" />\r
+    <ClInclude Include="..\..\src\system\inner-game-data.h" />\r
     <ClInclude Include="..\..\src\system\redrawing-flags-updater.h" />\r
     <ClInclude Include="..\..\src\system\dungeon-data-definition.h" />\r
     <ClInclude Include="..\..\src\system\floor-type-definition.h" />\r

diff --git a/Hengband/Hengband/Hengband.vcxproj.filters b/Hengband/Hengband/Hengband.vcxproj.filters
index eed2cda..31cd457 100644 (file)
--- a/Hengband/Hengband/Hengband.vcxproj.filters
+++ b/Hengband/Hengband/Hengband.vcxproj.filters
@@ -2502,6 +2502,9 @@
     <ClCompile Include="..\..\src\room\rooms-nest.cpp">\r
       <Filter>room</Filter>\r
     </ClCompile>\r
+    <ClCompile Include="..\..\src\system\inner-game-data.cpp">\r
+      <Filter>system</Filter>\r
+    </ClCompile>\r
   </ItemGroup>\r
   <ItemGroup>\r
     <ClInclude Include="..\..\src\combat\shoot.h">\r
@@ -5415,6 +5418,9 @@
     <ClInclude Include="..\..\src\room\rooms-nest.h">\r
       <Filter>room</Filter>\r
     </ClInclude>\r
+    <ClInclude Include="..\..\src\system\inner-game-data.h">\r
+      <Filter>system</Filter>\r
+    </ClInclude>\r
   </ItemGroup>\r
   <ItemGroup>\r
     <None Include="..\..\src\wall.bmp" />\r

diff --git a/src/Makefile.am b/src/Makefile.am
index def656d..03fa8ac 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -928,6 +928,7 @@ hengband_SOURCES = \
        system/game-option-types.h \
        system/h-basic.h system/h-config.h \
        system/h-system.h system/h-type.h \
+       system/inner-game-data.cpp system/inner-game-data.h \
        system/item-entity.cpp system/item-entity.h \
        system/monster-entity.cpp system/monster-entity.h \
        system/monster-race-info.cpp system/monster-race-info.h \

diff --git a/src/system/inner-game-data.cpp b/src/system/inner-game-data.cpp
new file mode 100644 (file)
index 0000000..755e91a
--- /dev/null
+++ b/src/system/inner-game-data.cpp
@@ -0,0 +1,14 @@
+/*!
+ * @brief 内部ゲームデータ定義
+ * @author Hourier
+ * @date 2024/06/01
+ */
+
+#include "system/inner-game-data.h"
+
+InnerGameData InnerGameData::instance{};
+
+InnerGameData &InnerGameData::get_instance()
+{
+    return instance;
+}

diff --git a/src/system/inner-game-data.h b/src/system/inner-game-data.h
new file mode 100644 (file)
index 0000000..574926b
--- /dev/null
+++ b/src/system/inner-game-data.h
@@ -0,0 +1,15 @@
+#pragma once
+
+class InnerGameData {
+public:
+    InnerGameData(InnerGameData &&) = delete;
+    InnerGameData(const InnerGameData &) = delete;
+    InnerGameData &operator=(const InnerGameData &) = delete;
+    InnerGameData &operator=(InnerGameData &&) = delete;
+    ~InnerGameData() = default;
+    static InnerGameData &get_instance();
+
+private:
+    InnerGameData() = default;
+    static InnerGameData instance;
+};