diff --git a/OTRExporter/OTRExporter/AudioExporter.cpp b/OTRExporter/OTRExporter/AudioExporter.cpp index 9b1676a29..229a54792 100644 --- a/OTRExporter/OTRExporter/AudioExporter.cpp +++ b/OTRExporter/OTRExporter/AudioExporter.cpp @@ -10,13 +10,10 @@ void OTRExporter_Audio::WriteSampleEntryReference(ZAudio* audio, SampleEntry* en { writer->Write((uint8_t)(entry != nullptr ? 1 : 0)); - uint32_t addr = 0; - for (auto pair : samples) { if (pair.second == entry) { - addr = pair.first; break; } } @@ -180,7 +177,7 @@ void OTRExporter_Audio::Save(ZResource* res, const fs::path& outPath, BinaryWrit seqWriter.Write((uint8_t)audio->sequenceTable[i].cachePolicy); seqWriter.Write((uint8_t)audio->fontIndices[i].size()); - for (int k = 0; k < audio->fontIndices[i].size(); k++) + for (size_t k = 0; k < audio->fontIndices[i].size(); k++) seqWriter.Write((uint8_t)audio->fontIndices[i][k]); seqWriter.Write(seq.data(), seq.size()); diff --git a/soh/include/z64.h b/soh/include/z64.h index 5d0c893fe..efad96879 100644 --- a/soh/include/z64.h +++ b/soh/include/z64.h @@ -30,7 +30,7 @@ #include "ichain.h" #include "regs.h" -#if defined(_WIN64) || defined(__x86_64__) +#if defined(_WIN64) || defined(__x86_64__) || defined(__arm64__) #define _SOH64 #define AUDIO_HEAP_SIZE 0xF0000 #else