[Refactor] #3177 get_artifact() がnullptrを返す可能性がなくなったので参照を返すように修正した

diff --git a/src/store/rumor.cpp b/src/store/rumor.cpp
index 05c6de4..a82ca48 100644 (file)
--- a/src/store/rumor.cpp
+++ b/src/store/rumor.cpp
@@ -81,13 +81,9 @@ static std::pair<FixedArtifactId, const ArtifactType *> get_artifact_definition(
     const auto max_idx = enum2i(artifacts_info.rbegin()->first);
     while (true) {
         const auto a_idx = i2enum<FixedArtifactId>(get_rumor_num(artifact_name.data(), max_idx));
-        const auto *a_ptr = ArtifactsInfo::get_instance().get_artifact(a_idx);
-        if (a_ptr == nullptr) {
-            continue;
-        }
-
-        if (!a_ptr->name.empty()) {
-            return { a_idx, a_ptr };
+        const auto &artifact = ArtifactsInfo::get_instance().get_artifact(a_idx);
+        if (!artifact.name.empty()) {
+            return { a_idx, &artifact };
         }
     }
 }

diff --git a/src/system/artifact-type-definition.cpp b/src/system/artifact-type-definition.cpp
index 13b3c3b..2b5f12a 100644 (file)
--- a/src/system/artifact-type-definition.cpp
+++ b/src/system/artifact-type-definition.cpp
@@ -16,7 +16,7 @@ ArtifactsInfo &ArtifactsInfo::get_instance()
     return instance;
 }
 
-ArtifactType *ArtifactsInfo::get_artifact(const FixedArtifactId id) const
+ArtifactType &ArtifactsInfo::get_artifact(const FixedArtifactId id) const
 {
-    return &artifacts_info.at(id);
+    return artifacts_info.at(id);
 }

diff --git a/src/system/artifact-type-definition.h b/src/system/artifact-type-definition.h
index e4b223a..b7ffe7c 100644 (file)
--- a/src/system/artifact-type-definition.h
+++ b/src/system/artifact-type-definition.h
@@ -51,7 +51,7 @@ public:
     ~ArtifactsInfo() = default;
 
     static ArtifactsInfo &get_instance();
-    ArtifactType *get_artifact(const FixedArtifactId id) const;
+    ArtifactType &get_artifact(const FixedArtifactId id) const;
 
 private:
     ArtifactsInfo() = default;