mirror/Shipwright
1
0
Fork 0
mirror of https://github.com/HarbourMasters/Shipwright synced 2026-08-12 04:07:43 -04:00
Code Issues Packages Projects Releases Wiki Activity

cleanup redundant code + fix waist dl (#6928)

Browse Source
This commit is contained in:
Jameriquiah
2026-07-18 14:08:39 -04:00
committed by GitHub
parent 033613a6cf
commit 8e810fb963
2 changed files with 7 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
soh/soh/resource/type/Skeleton.cpp
+6 -17
View File
@@ -108,7 +108,7 @@ void SkeletonPatcher::ClearSkeletons() {
void SkeletonPatcher::UpdateSkeletons() {
auto resourceMgr = Ship::Context::GetRawInstance()->GetResourceManager();
bool isAlt = resourceMgr->IsAltAssetsEnabled();
for (auto skel : skeletons) {
for (auto& skel : skeletons) {
Skeleton* newSkel =
(Skeleton*)resourceMgr
->LoadResource((isAlt ? Ship::IResource::gAltAssetPrefix : "") + skel.vanillaSkeletonPath, true)
@@ -124,7 +124,7 @@ void SkeletonPatcher::UpdateSkeletons() {
}
void SkeletonPatcher::UpdateCustomSkeletons() {
for (auto skel : skeletons) {
for (auto& skel : skeletons) {
if (!skel.isLocalPlayer) {
continue;
}
@@ -152,48 +152,36 @@ void SkeletonPatcher::UpdateTunicSkeletons(SkeletonPatchInfo& skel) {
// Check if we even need updating
s32 skelID = ageID << 4 | tunicID;
if (skelID == skel.lastSkeletonId)
if (skelID == skel.lastSkeletonId) {
return;
skel.lastSkeletonId = skelID;
}
// Check if this is one of Link's skeletons
if (ageID == 2) {
// Check what Link's current tunic is
switch (tunicID) {
case PLAYER_TUNIC_KOKIRI:
if (skel.lastSkeletonId == (ageID << 4 | PLAYER_TUNIC_KOKIRI))
return;
skeletonPath = std::string(gLinkAdultKokiriTunicSkel).substr(sOtr.length());
break;
case PLAYER_TUNIC_GORON:
if (skel.lastSkeletonId == (ageID << 4 | PLAYER_TUNIC_GORON))
return;
skeletonPath = std::string(gLinkAdultGoronTunicSkel).substr(sOtr.length());
break;
case PLAYER_TUNIC_ZORA:
if (skel.lastSkeletonId == (ageID << 4 | PLAYER_TUNIC_ZORA))
return;
skeletonPath = std::string(gLinkAdultZoraTunicSkel).substr(sOtr.length());
break;
default:
return;
}
} else if (skelID == 1) {
} else if (ageID == 1) {
// Check what Link's current tunic is
switch (tunicID) {
case PLAYER_TUNIC_KOKIRI:
if (skel.lastSkeletonId == (ageID << 4 | PLAYER_TUNIC_KOKIRI))
return;
skeletonPath = std::string(gLinkChildKokiriTunicSkel).substr(sOtr.length());
break;
case PLAYER_TUNIC_GORON:
if (skel.lastSkeletonId == (ageID << 4 | PLAYER_TUNIC_GORON))
return;
skeletonPath = std::string(gLinkChildGoronTunicSkel).substr(sOtr.length());
break;
case PLAYER_TUNIC_ZORA:
if (skel.lastSkeletonId == (ageID << 4 | PLAYER_TUNIC_ZORA))
return;
skeletonPath = std::string(gLinkChildZoraTunicSkel).substr(sOtr.length());
break;
default:
@@ -202,6 +190,7 @@ void SkeletonPatcher::UpdateTunicSkeletons(SkeletonPatchInfo& skel) {
}
UpdateCustomSkeletonFromPath(skeletonPath, skel);
skel.lastSkeletonId = skelID;
}
void SkeletonPatcher::UpdateCustomSkeletonFromPath(const std::string& skeletonPath, SkeletonPatchInfo& skel) {
soh/soh/resource/type/Skeleton.h
+1 -1
View File
@@ -79,7 +79,7 @@ struct SkeletonPatchInfo {
SkelAnime* skelAnime;
std::string vanillaSkeletonPath;
u8 lastSkeletonId;
u8 lastSkeletonId = 0xFF;
bool isLocalPlayer;
};