mirror/Shipwright
1
0
Fork 0
mirror of https://github.com/HarbourMasters/Shipwright.git synced 2025-01-30 23:10:14 -05:00
Code Issues Projects Releases Wiki Activity

Fix detection of arm64, fix warnings

Browse Source
This commit is contained in:
David Chavez 2022-06-13 21:16:43 +02:00 committed by KiritoDev
parent a8a3516e59
commit 1225a381ab
2 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
OTRExporter/OTRExporter/AudioExporter.cpp
View File

@ -10,13 +10,10 @@ void OTRExporter_Audio::WriteSampleEntryReference(ZAudio* audio, SampleEntry* en
{ {
writer->Write((uint8_t)(entry != nullptr ? 1 : 0)); writer->Write((uint8_t)(entry != nullptr ? 1 : 0));
uint32_t addr = 0;
for (auto pair : samples) for (auto pair : samples)
{ {
if (pair.second == entry) if (pair.second == entry)
{ {
addr = pair.first;
break; 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->sequenceTable[i].cachePolicy);
seqWriter.Write((uint8_t)audio->fontIndices[i].size()); 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((uint8_t)audio->fontIndices[i][k]);
seqWriter.Write(seq.data(), seq.size()); seqWriter.Write(seq.data(), seq.size());

2
soh/include/z64.h
View File

@ -30,7 +30,7 @@
#include "ichain.h" #include "ichain.h"
#include "regs.h" #include "regs.h"
#if defined(_WIN64) || defined(__x86_64__) #if defined(_WIN64) || defined(__x86_64__) || defined(__arm64__)
#define _SOH64 #define _SOH64
#define AUDIO_HEAP_SIZE 0xF0000 #define AUDIO_HEAP_SIZE 0xF0000
#else #else