mirror/Shipwright
1
0
Fork 0
mirror of https://github.com/HarbourMasters/Shipwright.git synced 2024-10-31 15:45:06 -04:00
Code Issues Projects Releases Wiki Activity

Merge b57a6ecdec into 73194eee14

Browse Source
This commit is contained in:
starburst 2022-04-28 12:59:12 +08:00 committed by GitHub
commit b9297bab7b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 36 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
libultraship/libultraship/GameSettings.cpp
View File

@ -84,6 +84,9 @@ namespace Game {
Settings.enhancements.newdrops = stob(Conf[EnhancementSection]["newdrops"]);
CVar_SetS32("gNewDrops", Settings.enhancements.newdrops);
Settings.enhancements.save_entrance = stob(Conf[EnhancementSection]["save_entrance"]);
CVar_SetS32("gSaveEntrance", Settings.enhancements.save_entrance);
// Audio
Settings.audio.master = Ship::stof(Conf[AudioSection]["master"]);
CVar_SetFloat("gGameMasterVolume", Settings.audio.master);

9
libultraship/libultraship/GameSettings.cpp.rej Normal file
View File

@ -0,0 +1,9 @@
diff a/libultraship/libultraship/GameSettings.cpp b/libultraship/libultraship/GameSettings.cpp (rejected hunks)
@@ -184,6 +187,7 @@ namespace Game {
Conf[EnhancementSection]["newdrops"] = std::to_string(Settings.enhancements.newdrops);
Conf[EnhancementSection]["visualagony"] = std::to_string(Settings.enhancements.visualagony);
Conf[EnhancementSection]["mm_bunny_hood"] = std::to_string(Settings.enhancements.mm_bunny_hood);
+ Conf[EnhancementSection]["save_entrance"] = std::to_string(Settings.enhancements.save_entrance);
// Controllers

9
libultraship/libultraship/GameSettings.h.rej Normal file
View File

@ -0,0 +1,9 @@
diff a/libultraship/libultraship/GameSettings.h b/libultraship/libultraship/GameSettings.h (rejected hunks)
@@ -29,6 +29,7 @@ struct SoHConfigType {
bool newdrops = false;
bool visualagony = false;
bool mm_bunny_hood = false;
+ bool save_entrance = true;
} enhancements;

5
libultraship/libultraship/SohImGuiImpl.cpp
View File

@ -508,6 +508,11 @@ namespace SohImGui {
needs_save = true;
}
if (ImGui::Checkbox("Save Last Entrance", &Game::Settings.enhancements.save_entrance)) {
CVar_SetS32("gSaveEntrance", Game::Settings.enhancements.save_entrance);
needs_save = true;
}
ImGui::Text("Graphics");
ImGui::Separator();

12
soh/src/code/z_sram.c
View File

@ -362,14 +362,22 @@ void Sram_OpenSave(SramContext* sramCtx) {
case SCENE_GANON_DEMO:
gSaveContext.entranceIndex = 0x41B;
break;
default:
case SCENE_KAKUSIANA:
if (gSaveContext.savedSceneNum != SCENE_LINK_HOME) {
gSaveContext.entranceIndex = (LINK_AGE_IN_YEARS == YEARS_CHILD) ? 0xBB : 0x5F4;
} else {
gSaveContext.entranceIndex = 0xBB;
}
break;
default:
if (!CVar_GetS32("gSaveEntrance", 0)) {
if (gSaveContext.savedSceneNum != SCENE_LINK_HOME) {
gSaveContext.entranceIndex = (LINK_AGE_IN_YEARS == YEARS_CHILD) ? 0xBB : 0x5F4;
} else {
gSaveContext.entranceIndex = 0xBB;
}
break;
}
}
osSyncPrintf("scene_no = %d\n", gSaveContext.entranceIndex);