src/UESaveFile/PropertySerialiser.cpp

@@ -134,7 +134,7 @@ auto PropertySerialiser::readSet(BinaryReader& reader, const std::string& item_t
     }
     else {
         for(UnsignedInt i = 0; i < count; i++) {
-            auto item = readItem(reader, item_type, UnsignedLong(-1), "");
+            auto item = readItem(reader, item_type, -1, "");
             arrayAppend(array, std::move(item));
         }
     }

src/UESaveFile/Types/GenericStructProperty.h

@@ -26,8 +26,7 @@ struct GenericStructProperty : public StructProperty {
     using ptr = Containers::Pointer<GenericStructProperty>;
 
     template<typename T>
-    std::enable_if_t<std::is_base_of<UnrealPropertyBase, T>::value, T*>
+    auto at(const std::string& name) -> T* {
-    at(const std::string& name) {
         for(auto& item : properties) {
             if(item->name == name) {
                 return static_cast<T*>(item.get());

src/UESaveFile/UESaveFile.cpp

@@ -43,6 +43,15 @@ auto UESaveFile::reloadData() -> bool {
     return valid();
 }
 
+auto UESaveFile::at(const std::string& name) -> UnrealPropertyBase* {
+    for(auto& prop : _properties) {
+        if(*(prop->name) == name) {
+            return prop.get();
+        }
+    }
+    return nullptr;
+}
+
 auto UESaveFile::props() -> Containers::ArrayView<UnrealPropertyBase::ptr> {
     return _properties;
 }
@@ -54,13 +63,13 @@ auto UESaveFile::saveToFile() -> bool {
         return false;
     }
 
-    if(!writer.writeArray(arrayView(_magicBytes))       ||
+    if(!writer.writeStaticArray(staticArrayView(_magicBytes)) ||
-       !writer.writeUnsignedInt(_saveVersion)           ||
+       !writer.writeUnsignedInt(_saveVersion)                 ||
-       !writer.writeUnsignedInt(_packageVersion)        ||
+       !writer.writeUnsignedInt(_packageVersion)              ||
-       !writer.writeUnsignedShort(_engineVersion.major) ||
+       !writer.writeUnsignedShort(_engineVersion.major)       ||
-       !writer.writeUnsignedShort(_engineVersion.minor) ||
+       !writer.writeUnsignedShort(_engineVersion.minor)       ||
-       !writer.writeUnsignedShort(_engineVersion.patch) ||
+       !writer.writeUnsignedShort(_engineVersion.patch)       ||
-       !writer.writeUnsignedInt(_engineVersion.build)   ||
+       !writer.writeUnsignedInt(_engineVersion.build)         ||
        !writer.writeUEString(_engineVersion.buildId))
     {
         return false;

src/UESaveFile/UESaveFile.h

@@ -40,16 +40,7 @@ class UESaveFile {
 
         auto reloadData() -> bool;
 
-        template<typename T>
+        auto at(const std::string& name) -> UnrealPropertyBase*;
-        std::enable_if_t<std::is_base_of<UnrealPropertyBase, T>::value, T*>
-        at(const std::string& name) {
-            for(auto& prop : _properties) {
-                if(prop->name == name) {
-                    return static_cast<T*>(prop.get());
-                }
-            }
-            return nullptr;
-        }
 
         auto props() -> Containers::ArrayView<UnrealPropertyBase::ptr>;
 
@@ -63,7 +54,7 @@ class UESaveFile {
 
         std::string _filepath;
 
-        Containers::StaticArray<4, char> _magicBytes{'G', 'V', 'A', 'S'};
+        const Containers::StaticArray<4, char> _magicBytes{'G', 'V', 'A', 'S'};
 
         UnsignedInt _saveVersion = 0;
         UnsignedInt _packageVersion = 0;