github/Shipwright
1
0
Fork 0
mirror of https://github.com/HarbourMasters/Shipwright.git synced 2025-08-22 06:13:45 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

some work

Browse source
This commit is contained in:
louist103 2022-04-28 22:16:05 -04:00
commit 1d5442edcd
2 changed files with 14 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

20
soh/soh/Enhancements/savestates.cpp
View file

@ -14,6 +14,9 @@
#include <functions.h> #include <functions.h>
#include "z64map_mark.h" #include "z64map_mark.h"
extern "C" GlobalContext* gGlobalCtx;
// FROM z_lights.c // FROM z_lights.c
// I didn't feel like moving it into a header file. // I didn't feel like moving it into a header file.
#define LIGHTS_BUFFER_SIZE 32 #define LIGHTS_BUFFER_SIZE 32
@ -130,7 +133,6 @@ void SaveState::LoadSeqScriptState(void) {
(u8*)((uintptr_t)info->seqScriptStateCopy[i].stack[2] + (uintptr_t)gAudioHeap); (u8*)((uintptr_t)info->seqScriptStateCopy[i].stack[2] + (uintptr_t)gAudioHeap);
gAudioContext.seqPlayers[i].scriptState.stack[3] = gAudioContext.seqPlayers[i].scriptState.stack[3] =
(u8*)((uintptr_t)info->seqScriptStateCopy[i].stack[3] + (uintptr_t)gAudioHeap); (u8*)((uintptr_t)info->seqScriptStateCopy[i].stack[3] + (uintptr_t)gAudioHeap);
} }
} }
@ -169,11 +171,11 @@ void SaveStateMgr::ProcessSaveStateRequests(void) {
if (this->states.contains(request.slot)) { if (this->states.contains(request.slot)) {
this->states[request.slot]->Load(); this->states[request.slot]->Load();
} else { } else {
//TODO log invalid state SPDLOG_ERROR("Invalid SaveState slot: {}", request.type);
} }
break; break;
[[unlikely]] default: [[unlikely]] default:
//TODO fix logging SPDLOG_ERROR("Invalid SaveState request type: {}", request.type);
break; break;
} }
this->requests.pop(); this->requests.pop();
@ -181,6 +183,10 @@ void SaveStateMgr::ProcessSaveStateRequests(void) {
} }
SaveStateReturn SaveStateMgr::AddRequest(const SaveStateRequest request) { SaveStateReturn SaveStateMgr::AddRequest(const SaveStateRequest request) {
if (gGlobalCtx == nullptr) {
return SaveStateReturn::FAIL_WRONG_GAMESTATE;
}
std::unique_lock<std::mutex> Lock(this->mutex); std::unique_lock<std::mutex> Lock(this->mutex);
switch (request.type) { switch (request.type) {
@ -191,11 +197,12 @@ SaveStateReturn SaveStateMgr::AddRequest(const SaveStateRequest request) {
if (states.contains(request.slot)) { if (states.contains(request.slot)) {
requests.push(request); requests.push(request);
} else { } else {
SPDLOG_ERROR("Invalid SaveState slot: {}", request.type);
return SaveStateReturn::FAIL_INVALID_SLOT; return SaveStateReturn::FAIL_INVALID_SLOT;
} }
break; break;
[[unlikely]] default: [[unlikely]] default:
//TODO fix logging SPDLOG_ERROR("Invalid SaveState request type: {}", request.type);
break; break;
} }
@ -203,8 +210,6 @@ SaveStateReturn SaveStateMgr::AddRequest(const SaveStateRequest request) {
} }
void SaveState::Save(void) { void SaveState::Save(void) {
//this->SetHeader();
memcpy(&info->sysHeapCopy, gSystemHeap, SYSTEM_HEAP_SIZE /* sizeof(gSystemHeap) */); memcpy(&info->sysHeapCopy, gSystemHeap, SYSTEM_HEAP_SIZE /* sizeof(gSystemHeap) */);
memcpy(&info->audioHeapCopy, gAudioHeap, AUDIO_HEAP_SIZE /* sizeof(gAudioContext) */); memcpy(&info->audioHeapCopy, gAudioHeap, AUDIO_HEAP_SIZE /* sizeof(gAudioContext) */);
@ -252,7 +257,6 @@ void SaveState::Load(void) {
memcpy(&sMatrixStack, &info->mtxStackCopy, sizeof(MtxF) * 20); memcpy(&sMatrixStack, &info->mtxStackCopy, sizeof(MtxF) * 20);
memcpy(&sCurrentMatrix, &info->currentMtxCopy, sizeof(MtxF)); memcpy(&sCurrentMatrix, &info->currentMtxCopy, sizeof(MtxF));
sWarpTimerTarget = info->blueWarpTimerCopy; sWarpTimerTarget = info->blueWarpTimerCopy;
//TODO RNG seed
memcpy(gActiveSounds, info->gActiveSoundsCopy, sizeof(gActiveSounds)); memcpy(gActiveSounds, info->gActiveSoundsCopy, sizeof(gActiveSounds));
memcpy(gSoundBankMuted, &info->gSoundBankMutedCopy, sizeof(info->gSoundBankMutedCopy)); memcpy(gSoundBankMuted, &info->gSoundBankMutedCopy, sizeof(info->gSoundBankMutedCopy));
@ -265,10 +269,8 @@ void SaveState::Load(void) {
sizeof(info->gAudioSfxSwapTarget_copy)); sizeof(info->gAudioSfxSwapTarget_copy));
memcpy(gAudioSfxSwapMode, &info->gAudioSfxSwapMode_copy, memcpy(gAudioSfxSwapMode, &info->gAudioSfxSwapMode_copy,
sizeof(info->gAudioSfxSwapMode_copy)); sizeof(info->gAudioSfxSwapMode_copy));
Audio_ResetSounds();
D_801755D0 = info->D_801755D0_copy; D_801755D0 = info->D_801755D0_copy;
sLoadedMarkDataTable = info->sLoadedMarkDataTableCopy; sLoadedMarkDataTable = info->sLoadedMarkDataTableCopy;
} }

1
soh/soh/Enhancements/savestates.h
View file

@ -17,6 +17,7 @@ enum class SaveStateReturn {
FAIL_FILE_NOT_OPENED, FAIL_FILE_NOT_OPENED,
FAIL_INVALID_MAGIC, FAIL_INVALID_MAGIC,
FAIL_INVALID_SIZE, FAIL_INVALID_SIZE,
FAIL_WRONG_GAMESTATE,
}; };
typedef struct SaveStateHeader { typedef struct SaveStateHeader {