From 98b3458d02163af517ed4c95c258217f889d937f Mon Sep 17 00:00:00 2001 From: KiritoDv Date: Wed, 20 Mar 2024 21:53:00 -0600 Subject: Added missing returns --- src/factories/DisplayListFactory.cpp | 1 + src/factories/sf64/MessageFactory.cpp | 1 + src/factories/sf64/MessageLookupFactory.cpp | 1 + src/factories/sf64/ObjInitFactory.cpp | 1 + src/factories/sf64/SkeletonFactory.cpp | 2 +- src/factories/sm64/GeoLayoutFactory.cpp | 1 + 6 files changed, 6 insertions(+), 1 deletion(-) diff --git a/src/factories/DisplayListFactory.cpp b/src/factories/DisplayListFactory.cpp index 8f55f3e..88965ad 100644 --- a/src/factories/DisplayListFactory.cpp +++ b/src/factories/DisplayListFactory.cpp @@ -293,6 +293,7 @@ ExportResult DListBinaryExporter::Export(std::ostream &write, std::shared_ptr> DListFactory::parse(std::vector& raw_buffer, YAML::Node& node) { diff --git a/src/factories/sf64/MessageFactory.cpp b/src/factories/sf64/MessageFactory.cpp index 9aa2c5b..8ac966f 100644 --- a/src/factories/sf64/MessageFactory.cpp +++ b/src/factories/sf64/MessageFactory.cpp @@ -146,6 +146,7 @@ ExportResult SF64::MessageBinaryExporter::Export(std::ostream &write, std::share writer.Write(m); } writer.Finish(write); + return std::nullopt; } std::optional> SF64::MessageFactory::parse(std::vector& buffer, YAML::Node& node) { diff --git a/src/factories/sf64/MessageLookupFactory.cpp b/src/factories/sf64/MessageLookupFactory.cpp index 5e8c38a..6a7b221 100644 --- a/src/factories/sf64/MessageLookupFactory.cpp +++ b/src/factories/sf64/MessageLookupFactory.cpp @@ -66,6 +66,7 @@ ExportResult SF64::MessageLookupBinaryExporter::Export(std::ostream &write, std: writer.Write(m.ptr); } writer.Finish(write); + return std::nullopt; } std::optional> SF64::MessageLookupFactory::parse(std::vector& buffer, YAML::Node& node) { diff --git a/src/factories/sf64/ObjInitFactory.cpp b/src/factories/sf64/ObjInitFactory.cpp index 3e6694e..791535c 100644 --- a/src/factories/sf64/ObjInitFactory.cpp +++ b/src/factories/sf64/ObjInitFactory.cpp @@ -65,6 +65,7 @@ ExportResult SF64::ObjInitBinaryExporter::Export(std::ostream &write, std::share writer.Write(obj.id); } writer.Finish(write); + return std::nullopt; } std::optional> SF64::ObjInitFactory::parse(std::vector& buffer, YAML::Node& node) { diff --git a/src/factories/sf64/SkeletonFactory.cpp b/src/factories/sf64/SkeletonFactory.cpp index 3701abe..8394ef3 100644 --- a/src/factories/sf64/SkeletonFactory.cpp +++ b/src/factories/sf64/SkeletonFactory.cpp @@ -92,7 +92,7 @@ ExportResult SF64::SkeletonCodeExporter::Export(std::ostream &write, std::shared return OffsetEntry { limbs[0].mAddr, - (IS_SEGMENTED(limbs[0].mAddr) ? SEGMENT_OFFSET(limbs[0].mAddr) : limbs[0].mAddr) + skeleton->mSkeleton.size() * 0x24 + 4 + static_cast((IS_SEGMENTED(limbs[0].mAddr) ? SEGMENT_OFFSET(limbs[0].mAddr) : limbs[0].mAddr) + skeleton->mSkeleton.size() * 0x24 + 4) }; } diff --git a/src/factories/sm64/GeoLayoutFactory.cpp b/src/factories/sm64/GeoLayoutFactory.cpp index f8bbc02..5f23254 100644 --- a/src/factories/sm64/GeoLayoutFactory.cpp +++ b/src/factories/sm64/GeoLayoutFactory.cpp @@ -185,6 +185,7 @@ ExportResult SM64::GeoBinaryExporter::Export(std::ostream&write, std::shared_ptr output.Write(buffer.data(), buffer.size()); output.Finish(write); output.Close(); + return std::nullopt; } ExportResult SM64::GeoHeaderExporter::Export(std::ostream&write, std::shared_ptr data, std::string&entryName, YAML::Node&node, std::string* replacement) { -- cgit v1.2.3