[Refactor] #2666 AngbandSystem クラスを作成した

diff --git a/Hengband/Hengband/Hengband.vcxproj b/Hengband/Hengband/Hengband.vcxproj
index 257a008..6f97753 100644 (file)
--- a/Hengband/Hengband/Hengband.vcxproj
+++ b/Hengband/Hengband/Hengband.vcxproj
@@ -317,6 +317,7 @@
     <ClCompile Include="..\..\src\save\player-class-specific-data-writer.cpp" />\r
     <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\redrawing-flags-updater.cpp" />\r
     <ClCompile Include="..\..\src\system\floor-type-definition.cpp" />\r
     <ClCompile Include="..\..\src\system\grid-type-definition.cpp" />\r
@@ -1405,6 +1406,7 @@
     <ClInclude Include="..\..\src\store\service-checker.h" />\r
     <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\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 d25e4fa..30de6d2 100644 (file)
--- a/Hengband/Hengband/Hengband.vcxproj.filters
+++ b/Hengband/Hengband/Hengband.vcxproj.filters
@@ -2493,6 +2493,9 @@
     <ClCompile Include="..\..\src\util\candidate-selector.cpp">\r
       <Filter>util</Filter>\r
     </ClCompile>\r
+    <ClCompile Include="..\..\src\system\angband-system.cpp">\r
+      <Filter>system</Filter>\r
+    </ClCompile>\r
   </ItemGroup>\r
   <ItemGroup>\r
     <ClInclude Include="..\..\src\combat\shoot.h">\r
@@ -5403,6 +5406,9 @@
     <ClInclude Include="..\..\src\util\candidate-selector.h">\r
       <Filter>util</Filter>\r
     </ClInclude>\r
+    <ClInclude Include="..\..\src\system\angband-system.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 56a17f3..7ba0646 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -915,6 +915,7 @@ hengband_SOURCES = \
        system/alloc-entries.cpp system/alloc-entries.h \
        system/angband.h \
        system/angband-exceptions.h \
+       system/angband-system.h system/angband-system.cpp \
        system/angband-version.cpp system/angband-version.h \
        system/artifact-type-definition.cpp system/artifact-type-definition.h \
        system/baseitem-info.cpp system/baseitem-info.h \

diff --git a/src/system/angband-system.cpp b/src/system/angband-system.cpp
new file mode 100644 (file)
index 0000000..ef12cc2
--- /dev/null
+++ b/src/system/angband-system.cpp
@@ -0,0 +1,8 @@
+#include "system/angband-system.h"
+
+AngbandSystem AngbandSystem::instance{};
+
+AngbandSystem &AngbandSystem::get_instance()
+{
+    return instance;
+}

diff --git a/src/system/angband-system.h b/src/system/angband-system.h
new file mode 100644 (file)
index 0000000..234beca
--- /dev/null
+++ b/src/system/angband-system.h
@@ -0,0 +1,16 @@
+#pragma once
+
+class AngbandSystem {
+public:
+    AngbandSystem(const AngbandSystem &) = delete;
+    AngbandSystem(AngbandSystem &&) = delete;
+    AngbandSystem &operator=(const AngbandSystem &) = delete;
+    AngbandSystem &operator=(AngbandSystem &&) = delete;
+
+    static AngbandSystem &get_instance();
+
+private:
+    AngbandSystem() = default;
+
+    static AngbandSystem instance;
+};