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

main commit (#2918)

This commit is contained in:
MoriyaFaith 2023-06-01 21:38:43 -04:00 committed by GitHub
parent b25e4d4f26
commit 26d934541a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
soh/soh/Enhancements/presets.h
View File

@ -203,6 +203,7 @@ const std::vector<const char*> enhancementsCvars = {
"gLowResMode",
"gDrawLineupTick",
"gQuickBongoKill",
"gFPSGauntlets",
"gDirtPathFix",
"gAuthenticLogo",
"gPauseLiveLinkRotationSpeed",

4
soh/soh/GameMenuBar.cpp
View File

@ -829,6 +829,8 @@ namespace GameMenuBar {
UIWidgets::Tooltip("Changes the rupee in the wallet icon to match the wallet size you currently have");
UIWidgets::PaddedEnhancementCheckbox("Always show dungeon entrances", "gAlwaysShowDungeonMinimapIcon", true, false);
UIWidgets::Tooltip("Always shows dungeon entrance icons on the minimap");
UIWidgets::PaddedEnhancementCheckbox("Show Gauntlets in First Person", "gFPSGauntlets", true, false);
UIWidgets::Tooltip("Renders Gauntlets when using the Bow and Hookshot like in OOT3D");
UIWidgets::Spacer(0);
if (ImGui::BeginMenu("Animated Link in Pause Menu")) {
ImGui::Text("Rotation");
@ -870,7 +872,7 @@ namespace GameMenuBar {
if (CVarGetInteger("gPauseLiveLink", 0) >= 16) {
UIWidgets::EnhancementSliderInt("Frame to wait: %d", "##MinFrameCount", "gMinFrameCount", 1, 1000, "", 0);
}
ImGui::EndMenu();
}
UIWidgets::PaddedText("Fix Vanishing Paths", true, false);

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

@ -803,7 +803,9 @@ void func_8008F470(PlayState* play, void** skeleton, Vec3s* jointTable, s32 dLis
SkelAnime_DrawFlexLod(play, skeleton, jointTable, dListCount, overrideLimbDraw, postLimbDraw, data, lod);
if ((overrideLimbDraw != func_800902F0) && (overrideLimbDraw != func_80090440) && (gSaveContext.gameMode != 3)) {
if (((CVarGetInteger("gFPSGauntlets", 0) && LINK_IS_ADULT) || (overrideLimbDraw != func_800902F0)) &&
(overrideLimbDraw != func_80090440) &&
(gSaveContext.gameMode != 3)) {
if (LINK_IS_ADULT) {
s32 strengthUpgrade = CUR_UPG_VALUE(UPG_STRENGTH);