mirror/Shipwright
1
0
Fork 0
mirror of https://github.com/HarbourMasters/Shipwright synced 2026-10-21 10:51:32 -04:00
Code Issues Packages Projects Releases Wiki Activity

Add Function to custom equipment to guard against cutscene shenanigans (#7409)

Browse Source
This commit is contained in:
Reppan
2026-10-17 18:33:13 +02:00
committed by GitHub
parent 9ffa4c8617
commit 2064618b0f
1 changed files with 12 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
soh/soh/Enhancements/customequipment.cpp
+12
View File
@@ -71,6 +71,16 @@ static bool UsesBowModel(Player* player) {
return LINK_IS_ADULT;
}
// Detects cutscenes that swap the left hand DL without updating leftHandType.
static bool IsLeftHandSwappedByCutscene(Player* player) {
Gfx** dLists = player->leftHandDLists;
if (dLists == &gPlayerLeftHandOpenDLs[0] || dLists == &gPlayerLeftHandOpenDLs[1] ||
dLists == &gPlayerLeftHandClosedDLs[0] || dLists == &gPlayerLeftHandClosedDLs[1]) {
return true;
}
return dLists == &gPlayerLeftHandBgsDLs[1] && player->leftHandType != PLAYER_MODELTYPE_LH_BGS;
}
static u8 sLastValidSwordEquip = EQUIP_VALUE_SWORD_NONE;
static u8 GetEquippedSwordValue(PlayState* play) {
@@ -260,6 +270,8 @@ static void RegisterCustomEquipment() {
}
break;
}
if (IsLeftHandSwappedByCutscene(player))
break;
switch ((u8)player->leftHandType) {
case PLAYER_MODELTYPE_LH_SWORD: {
if (player == GET_PLAYER(play)) {