fix

louist103 · Nov 28, 2024 · 158ac71 · 158ac71
1 parent 746f329
commit 158ac71
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/soh/include/z64audio.h b/soh/include/z64audio.h
@@ -119,8 +119,8 @@ typedef struct {
 } AdsrEnvelope; // size = 0x4
 
 typedef struct AdpcmLoop {
-    /* 0x00 */ uintptr_t start;
-    /* 0x04 */ uintptr_t loopEnd;   // numSamples position into the sample where the loop ends
+    /* 0x00 */ u32 start;
+    /* 0x04 */ u32 loopEnd;   // numSamples position into the sample where the loop ends
     /* 0x08 */ u32 count;     // The number of times the loop is played before the sound completes. Setting count to -1
                               // indicates that the loop should play indefinitely.
     /* 0x0C */ u32 sampleEnd; // total number of s16-samples in the sample audio clip

diff --git a/soh/soh/resource/importer/AudioSampleFactory.cpp b/soh/soh/resource/importer/AudioSampleFactory.cpp
@@ -210,7 +210,7 @@ std::shared_ptr<Ship::IResource> ResourceFactoryXMLAudioSampleV0::ReadResource(s
         size_t numBooks = audioSample->book.npredictors * audioSample->book.order * 8;
         audioSample->book.book = new int16_t[numBooks];
         while (book != nullptr) {
-            audioSample->book.book[i] = book->IntAttribute("Page");
+            audioSample->book.book[i++] = book->IntAttribute("Page");
             book = book->NextSiblingElement();
         }
         audioSample->sample.book = &audioSample->book;

diff --git a/soh/soh/resource/type/AudioSample.cpp b/soh/soh/resource/type/AudioSample.cpp
@@ -2,7 +2,7 @@
 
 namespace SOH {
 AudioSample::~AudioSample() {
-    if (sample.book->book != nullptr) {
+    if (sample.book != nullptr && sample.book->book != nullptr) {
         delete[] sample.book->book;
     }
     if (sample.sampleAddr != nullptr) {