Downgrade back to 17, we don't need std::atomic_ref

3 files changed, 12 insertions, 23 deletions

diff --git a/src/factories/naudio/v0/SampleFactory.h b/src/factories/naudio/v0/SampleFactory.h
index ed292fe..50161b6 100644
--- a/src/factories/naudio/v0/SampleFactory.h
+++ b/src/factories/naudio/v0/SampleFactory.h
@@ -26,7 +26,7 @@ public:
     std::optional<std::shared_ptr<IParsedData>> parse(std::vector<uint8_t>& buffer, YAML::Node& data) override;
     std::unordered_map<ExportType, std::shared_ptr<BaseExporter>> GetExporters() override {
         return {
-            REGISTER(Modding, SampleModdingExporter)
+            // REGISTER(Modding, SampleModdingExporter)
             REGISTER(Binary, SampleBinaryExporter)
         };
     }
diff --git a/src/factories/sm64/MacroFactory.cpp b/src/factories/sm64/MacroFactory.cpp
index 950d276..f5073d4 100644
--- a/src/factories/sm64/MacroFactory.cpp
+++ b/src/factories/sm64/MacroFactory.cpp
@@ -22,28 +22,17 @@ ExportResult SM64::MacroCodeExporter::Export(std::ostream &write, std::shared_pt
     const auto symbol = GetSafeNode(node, "symbol", entryName);
     const auto offset = GetSafeNode<uint32_t>(node, "offset");
 
-    auto macro = std::static_pointer_cast<SM64::MacroData>(raw);
+    auto macro = std::static_pointer_cast<SM64::MacroDataAlt>(raw);
 
     write << "const MacroObject " << symbol << "[] = {\n";
 
-    for (auto &object : macro->mMacroData) {
-        write << fourSpaceTab;
-
-        if (object.behParam == 0) {
-            write << "MACRO_OBJECT(";
-        } else {
-            write << "MACRO_OBJECT_WITH_BEH_PARAM(";
-        }
-
-        write << object.preset << ", ";
-        write << (object.yaw / 1.41) << ", ";
-        write << object.posX << ", ";
-        write << object.posY << ", ";
-        write << object.posZ;
-
-        if (object.behParam != 0) {
-            write << ", " << object.behParam;
-        }
+    for (size_t i = 0; i < macro->mMacroData.size() - 1; i += 5) {
+        write << fourSpaceTab << (macro->mMacroData[i + 5] == 0 ? "MACRO_OBJECT(" : "MACRO_OBJECT_WITH_BEH_PARAM(");
+        write << "/* preset */ " << static_cast<MacroPresets>(macro->mMacroData[i]) << ", ";
+        write << "/* yaw */ " << macro->mMacroData[i + 1] << ", ";
+        write << "/* posX */ " << macro->mMacroData[i + 2] << ", ";
+        write << "/* posY */ " << macro->mMacroData[i + 3] << ", ";
+        write << "/* posZ */ " << macro->mMacroData[i + 4];
         write << "),\n";
     }
 
diff --git a/src/factories/sm64/MacroFactory.h b/src/factories/sm64/MacroFactory.h
index cab9a80..c158f10 100644
--- a/src/factories/sm64/MacroFactory.h
+++ b/src/factories/sm64/MacroFactory.h
@@ -20,14 +20,14 @@ class MacroData : public IParsedData {
 public:
     std::vector<MacroObject> mMacroData;
 
-    MacroData(std::vector<MacroObject> macroData) : mMacroData(std::move(macroData)) {}
+    MacroData(std::vector<MacroObject> macroData) : mMacroData(macroData) {}
 };
 
 class MacroDataAlt : public IParsedData {
 public:
     std::vector<int16_t> mMacroData;
 
-    MacroDataAlt(std::vector<int16_t> macroData) : mMacroData(std::move(macroData)) {}
+    MacroDataAlt(std::vector<int16_t> macroData) : mMacroData(macroData) {}
 };
 
 class MacroHeaderExporter : public BaseExporter {
@@ -47,7 +47,7 @@ public:
     std::optional<std::shared_ptr<IParsedData>> parse(std::vector<uint8_t>& buffer, YAML::Node& data) override;
     inline std::unordered_map<ExportType, std::shared_ptr<BaseExporter>> GetExporters() override {
         return {
-//          REGISTER(Code, MacroCodeExporter)
+            REGISTER(Code, MacroCodeExporter)
             REGISTER(Header, MacroHeaderExporter)
             REGISTER(Binary, MacroBinaryExporter)
         };