Fixed some sm64 bugs

HarbourMasters · Oct 3, 2024 · b2f3d9d · b2f3d9d
1 parent 2985786
commit b2f3d9d
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 3 deletions.
diff --git a/src/factories/sm64/PaintingFactory.cpp b/src/factories/sm64/PaintingFactory.cpp
@@ -165,6 +165,7 @@ ExportResult SM64::PaintingBinaryExporter::Export(std::ostream &write, std::shar
             writer.Write(hash);
         } else {
             SPDLOG_WARN("Could not find DisplayList at 0x{:X}", ptr);
+            writer.Write((uint64_t) 0);
         }
     }
 
@@ -177,6 +178,7 @@ ExportResult SM64::PaintingBinaryExporter::Export(std::ostream &write, std::shar
             writer.Write(hash);
         } else {
             SPDLOG_WARN("Could not find Texture Maps at 0x{:X}", ptr);
+            writer.Write((uint64_t) 0);
         }
     }
 
@@ -189,6 +191,7 @@ ExportResult SM64::PaintingBinaryExporter::Export(std::ostream &write, std::shar
             writer.Write(hash);
         } else {
             SPDLOG_WARN("Could not find Texture Arrays at 0x{:X}", ptr);
+            writer.Write((uint64_t) 0);
         }
     }
 
@@ -204,6 +207,7 @@ ExportResult SM64::PaintingBinaryExporter::Export(std::ostream &write, std::shar
             writer.Write(hash);
         } else {
             SPDLOG_WARN("Could not find DisplayList at 0x{:X}", ptr);
+            writer.Write((uint64_t) 0);
         }
     }
 

diff --git a/src/factories/sm64/PaintingMapFactory.cpp b/src/factories/sm64/PaintingMapFactory.cpp
@@ -55,15 +55,17 @@ ExportResult SM64::PaintingMapBinaryExporter::Export(std::ostream &write, std::s
 
     WriteHeader(writer, Torch::ResourceType::PaintingData, 0);
 
-    writer.Write((int16_t)paintingData->mPaintingMappings.size());
+    writer.Write((uint32_t) (paintingData->mPaintingMappings.size() + paintingData->mPaintingGroups.size()) + 2 );
+
+    writer.Write((int16_t) paintingData->mPaintingMappings.size());
 
     for (auto &mapping : paintingData->mPaintingMappings) {
         writer.Write(mapping.vtxId);
         writer.Write(mapping.texX);
         writer.Write(mapping.texY);
     }
 
-    writer.Write((int16_t)paintingData->mPaintingGroups.size());
+    writer.Write((int16_t) paintingData->mPaintingGroups.size());
 
     for (auto &group : paintingData->mPaintingGroups) {
         writer.Write(group.x);

diff --git a/src/factories/sm64/geo/GeoUtils.cpp b/src/factories/sm64/geo/GeoUtils.cpp
@@ -1,6 +1,6 @@
 #include "GeoUtils.h"
 
-#define next_s16_in_geo_script(src) BSWAP16((*(*src)++))
+#define next_s16_in_geo_script(src) (int16_t) BSWAP16((*(*src)++))
 
 int16_t* read_vec3s_to_vec3f(Vec3f& dst, int16_t *src) {
     dst.x = next_s16_in_geo_script(&src);