mirror
/
Shipwright
mirror of https://github.com/HarbourMasters/Shipwright.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fix audio, boot commands, and save staes.

This commit is contained in:
louist103 2022-06-27 20:48:40 -04:00 committed by Kenix3
parent 668f9bee10
commit e7c2aff97e
3 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
soh/soh/Enhancements/bootcommands.c
View File

@ -65,7 +65,7 @@ void BootCommands_ParseBootArgs(s32 argc, char** argv)
for (i = 0; i < argc; i++)
DebugArena_Free(argv[i]);
DebugArena_Free(argv);
//DebugArena_Free(argv);
}
/*

8
soh/soh/Enhancements/savestates.cpp
View File

@ -914,8 +914,8 @@ void SaveState::Save(void) {
memcpy(&info->saveContextCopy, &gSaveContext, sizeof(gSaveContext));
memcpy(&info->gameInfoCopy, gGameInfo, sizeof(*gGameInfo));
memcpy(&info->lightBufferCopy, &sLightsBuffer, sizeof(sLightsBuffer));
memcpy(&info->mtxStackCopy, &sMatrixStack, sizeof(MtxF) * 20);
memcpy(&info->currentMtxCopy, &sCurrentMatrix, sizeof(MtxF));
memcpy(&info->mtxStackCopy, sMatrixStack, sizeof(MtxF) * 20);
memcpy(&info->currentMtxCopy, sCurrentMatrix, sizeof(MtxF));
//Various static data
info->blueWarpTimerCopy = sWarpTimerTarget;
@ -938,8 +938,8 @@ void SaveState::Load(void) {
memcpy(&gSaveContext, &info->saveContextCopy, sizeof(gSaveContext));
memcpy(gGameInfo, &info->gameInfoCopy, sizeof(*gGameInfo));
memcpy(&sLightsBuffer, &info->lightBufferCopy, sizeof(sLightsBuffer));
memcpy(&sMatrixStack, &info->mtxStackCopy, sizeof(MtxF) * 20);
memcpy(&sCurrentMatrix, &info->currentMtxCopy, sizeof(MtxF));
memcpy(sMatrixStack, &info->mtxStackCopy, sizeof(MtxF) * 20);
memcpy(sCurrentMatrix, &info->currentMtxCopy, sizeof(MtxF));
sWarpTimerTarget = info->blueWarpTimerCopy;
memcpy(gActiveSounds, info->gActiveSoundsCopy, sizeof(gActiveSounds));

4
soh/src/code/audio_load.c
View File

@ -773,7 +773,7 @@ uintptr_t AudioLoad_SyncLoad(u32 tableType, u32 id, s32* didAllocate) {
{
table = AudioLoad_GetLoadTable(tableType);
size = table->entries[realId].size;
size = ALIGN16(size);
//size = ALIGN16(size);
medium = table->entries[id].medium;
cachePolicy = table->entries[id].cachePolicy;
romAddr = table->entries[realId].romAddr;
@ -1031,7 +1031,7 @@ void AudioLoad_RelocateFont(s32 fontId, SoundFontData* mem, RelocInfo* relocInfo
void AudioLoad_SyncDma(uintptr_t devAddr, u8* addr, size_t size, s32 medium) {
OSMesgQueue* msgQueue = &gAudioContext.syncDmaQueue;
OSIoMesg* ioMesg = &gAudioContext.syncDmaIoMesg;
size = ALIGN16(size);
//size = ALIGN16(size);
Audio_InvalDCache(addr, size);