Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Spock -> develop #2906

Merged
merged 12 commits into from
May 23, 2023
Merged

Spock -> develop #2906

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
099d9cd
Threaded save was causing issues for old `oot-save.sav` conversion. A…
Malkierian May 17, 2023
b361d5e
Use UTF-8 for MSVC and enable visual styles for Windows (#2888)
xoascf May 18, 2023
30cc61a
fix search rom extension oversight (#2891)
Alto1772 May 18, 2023
4d02d89
Fixes buying songs crash on Switch (#2899)
leggettc18 May 20, 2023
0b47a19
Mask Sale Fix (#2900)
Malkierian May 20, 2023
cf42057
Fix: seed srand on launch and fix spoiler log for seed testing genera…
Archez May 20, 2023
cf711d9
Initialize `gSlotAgeReqs[SLOT_TRADE_CHILD]` and `gItemAgeReqs[ITEM_MA…
Malkierian May 21, 2023
7962e0e
Add Scene Specific Checks to Dirt Path Fixes (#2907)
Patrick12115 May 21, 2023
f005bd3
add skeleton unregistration to actors that manage their own skeletons…
Rozelette May 22, 2023
f34df2f
remove what i assume to be accidentally copied stuff from a diff (#2909)
briaguya-ai May 22, 2023
dddd3b1
Add back missing Greg timestamp (#2911)
aMannus May 22, 2023
e88adbe
Version Bump (#2916)
leggettc18 May 23, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Next Next commit
Threaded save was causing issues for old oot-save.sav conversion. A… 
…dded an option just for that instance to run `SaveManager::SaveFileThreaded` outside of a thread. Everything else still runs threaded. (#2894)
  • Loading branch information
@Malkierian
Malkierian authored May 17, 2023
commit 099d9cd0fdb095b5e7e023b460c675d8992ae840
12 changes: 8 additions & 4 deletions soh/soh/SaveManager.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -754,14 +754,18 @@ void SaveManager::SaveFileThreaded(int fileNum, SaveContext* saveContext) {
GameInteractor::Instance->ExecuteHooks<GameInteractor::OnSaveFile>(fileNum);
}

void SaveManager::SaveFile(int fileNum) {
void SaveManager::SaveFile(int fileNum, bool threaded) {
if (fileNum == 0xFF) {
return;
}
// Can't think of any time the promise would be needed, so use push_task instead of submit
auto saveContext = new SaveContext;
memcpy(saveContext, &gSaveContext, sizeof(gSaveContext));
smThreadPool->push_task_back(&SaveManager::SaveFileThreaded, this, fileNum, saveContext);
if (threaded) {
smThreadPool->push_task_back(&SaveManager::SaveFileThreaded, this, fileNum, saveContext);
} else {
SaveFileThreaded(fileNum, saveContext);
}
}

void SaveManager::SaveGlobal() {
Expand Down Expand Up @@ -2135,7 +2139,7 @@ void SaveManager::ConvertFromUnversioned() {
static SaveContext saveContextSave = gSaveContext;
InitFile(false);
CopyV0Save(*file, gSaveContext);
SaveFile(fileNum);
SaveFile(fileNum, false);
InitMeta(fileNum);
gSaveContext = saveContextSave;
}
Expand All @@ -2156,7 +2160,7 @@ extern "C" void Save_InitFile(int isDebug) {
}

extern "C" void Save_SaveFile(void) {
SaveManager::Instance->SaveFile(gSaveContext.fileNum);
SaveManager::Instance->SaveFile(gSaveContext.fileNum, true);
}

extern "C" void Save_SaveGlobal(void) {
Expand Down
2 changes: 1 addition & 1 deletion soh/soh/SaveManager.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ class SaveManager {

void Init();
void InitFile(bool isDebug);
void SaveFile(int fileNum);
void SaveFile(int fileNum, bool threaded);
void SaveGlobal();
void LoadFile(int fileNum);
bool SaveFile_Exist(int fileNum);
Expand Down