Fix level export includes dups

Lilaa3 · Oct 1, 2024 · b71a701 · b71a701
1 parent 879bb97
commit b71a701
Showing 1 changed file with 13 additions and 8 deletions.
diff --git a/fast64_internal/sm64/sm64_level_writer.py b/fast64_internal/sm64/sm64_level_writer.py
@@ -13,10 +13,10 @@
 from .sm64_geolayout_writer import setRooms, convertObjectToGeolayout
 from .sm64_f3d_writer import modifyTexScrollFiles, modifyTexScrollHeadersGroup
 from .sm64_utility import (
+    END_IF_FOOTER,
     cameraWarning,
     starSelectWarning,
     to_include_descriptor,
-    write_includes,
     write_or_delete_if_found,
     write_material_headers,
 )
@@ -941,6 +941,14 @@ def include_proto(file_name, new_line_first=False):
             include += "\n"
         return include
 
+    def write_include(path: Path, include: Path, before_endif=False):
+        return write_or_delete_if_found(
+            path,
+            [to_include_descriptor(include, Path("levels") / level_name / include)],
+            path_must_exist=True,
+            footer=END_IF_FOOTER if before_endif else None,
+        )
+
     gfxFormatter = SM64GfxFormatter(ScrollMethod.Vertex)
     exportData = fModel.to_c(TextureExportSettings(savePNG, savePNG, f"levels/{level_name}", level_dir), gfxFormatter)
     staticData = exportData.staticData
@@ -1079,9 +1087,9 @@ def include_proto(file_name, new_line_first=False):
             createHeaderFile(level_name, headerPath)
 
         # Write level data
-        write_includes(Path(geoPath), [Path("geo.inc.c")])
-        write_includes(Path(levelDataPath), [Path("leveldata.inc.c")])
-        write_includes(Path(headerPath), [Path("header.inc.h")], before_endif=True)
+        write_include(Path(geoPath), Path("geo.inc.c"))
+        write_include(Path(levelDataPath), Path("leveldata.inc.c"))
+        write_include(Path(headerPath), Path("header.inc.h"), before_endif=True)
 
         old_include = to_include_descriptor(Path("levels") / level_name / "texture_include.inc.c")
         if fModel.texturesSavedLastExport == 0:
@@ -1095,10 +1103,7 @@ def include_proto(file_name, new_line_first=False):
             )
 
         # This one is for backwards compatibility purposes
-        write_or_delete_if_found(
-            Path(levelDataPath),
-            to_remove=[old_include],
-        )
+        write_or_delete_if_found(Path(levelDataPath), to_remove=[old_include])
 
         texscrollIncludeC = include_proto("texscroll.inc.c")
         texscrollIncludeH = include_proto("texscroll.inc.h")