vanilla merge 12/7

OpenGOAL-Mods · Dec 7, 2024 · 4ff1a0a · 4ff1a0a
1 parent 92c5397
commit 4ff1a0a
Show file tree

Hide file tree

Showing 5 changed files with 2 additions and 1 deletion.
diff --git a/decompiler/level_extractor/extract_level.cpp b/decompiler/level_extractor/extract_level.cpp
@@ -300,7 +300,8 @@ void extract_common(const ObjectFileDB& db,
             lg::info("Art group {} was requested to be made common, we found it in {}!", file.name,
                      lvl_dgo_name);
             const auto& ag_file = db.lookup_record(file);
-            extract_merc(ag_file, tex_db, db.dts, tex_remap, tfrag_level, false, db.version());
+            MercSwapInfo swapped_info;
+            extract_merc(ag_file, tex_db, db.dts, tex_remap, tfrag_level, false, db.version(), swapped_info);
             extract_joint_group(ag_file, db.dts, db.version(), art_group_data);
             // track found art groups so we don't borther re-processing in a later level
             art_groups_made_common.insert(file.name);

diff --git a/out/build/Release/bin/decompiler.exe b/out/build/Release/bin/decompiler.exe
diff --git a/out/build/Release/bin/extractor.exe b/out/build/Release/bin/extractor.exe
diff --git a/out/build/Release/bin/gk.exe b/out/build/Release/bin/gk.exe
diff --git a/out/build/Release/bin/goalc.exe b/out/build/Release/bin/goalc.exe