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

Remove old checkbox

This commit is contained in:
Patrick12115 2024-03-01 20:10:54 -05:00
parent 4e12181fb8
commit 541a3ff607
2 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
soh/soh/Enhancements/mods.cpp
View File

@ -794,22 +794,26 @@ void PatchOrUnpatch(const char* resource, const char* gfx, const char* dlist1, c
if (resource == NULL || gfx == NULL || dlist1 == NULL || dlist2 == NULL)
return;
if (ResourceGetIsCustomByName(gfx) && CVarGetInteger("gAltAssets", 0)) {
if (alternateDL == NULL || ResourceGetIsCustomByName(alternateDL) || ResourceMgr_FileExists(alternateDL)) {
ResourceMgr_PatchCustomGfxByName(resource, dlist1, 0, gsSPDisplayListOTRFilePath(gfx));
if (dlist3 == NULL) {
ResourceMgr_PatchCustomGfxByName(resource, dlist2, 1, gsSPEndDisplayList());
} else {
ResourceMgr_PatchCustomGfxByName(resource, dlist2, 1, gsSPDisplayListOTRFilePath(alternateDL));
if (CVarGetInteger("gAltAssets", 0)) {
if (ResourceGetIsCustomByName(gfx)) {
if (alternateDL == NULL || ResourceGetIsCustomByName(alternateDL) || ResourceMgr_FileExists(alternateDL)) {
ResourceMgr_PatchCustomGfxByName(resource, dlist1, 0, gsSPDisplayListOTRFilePath(gfx));
if (dlist3 == NULL) {
ResourceMgr_PatchCustomGfxByName(resource, dlist2, 1, gsSPEndDisplayList());
} else {
ResourceMgr_PatchCustomGfxByName(resource, dlist2, 1, gsSPDisplayListOTRFilePath(alternateDL));
}
if (dlist3 != NULL) {
ResourceMgr_PatchCustomGfxByName(resource, dlist3, 2, gsSPEndDisplayList());
}
}
if (dlist3 != NULL)
ResourceMgr_PatchCustomGfxByName(resource, dlist3, 2, gsSPEndDisplayList());
}
} else {
ResourceMgr_UnpatchGfxByName(resource, dlist1);
ResourceMgr_UnpatchGfxByName(resource, dlist2);
if (dlist3 != NULL)
if (dlist3 != NULL) {
ResourceMgr_UnpatchGfxByName(resource, dlist3);
}
}
}

4
soh/soh/SohMenuBar.cpp
View File

@ -1074,10 +1074,6 @@ void DrawEnhancementsMenu() {
ToggleAltAssetsAtEndOfFrame = true;
}
UIWidgets::Tooltip("Toggle between standard assets and alternate assets. Usually mods will indicate if this setting has to be used or not.");
if (UIWidgets::PaddedEnhancementCheckbox("Use Custom Equipment", "gEnhancements.CustomEquipDlists", true, false)) {
UpdatePatchCustomEquipmentDlists();
}
UIWidgets::Tooltip("Toggle between standard equipment and custom equipment. Usually mods will indicate if this setting has to be used or not.");
UIWidgets::PaddedEnhancementCheckbox("Disable Bomb Billboarding", "gDisableBombBillboarding", true, false);
UIWidgets::Tooltip("Disables bombs always rotating to face the camera. To be used in conjunction with mods that want to replace bombs with 3D objects.");
UIWidgets::PaddedEnhancementCheckbox("Disable Grotto Fixed Rotation", "gDisableGrottoRotation", true, false);