mirror of
https://github.com/HarbourMasters/Shipwright
synced 2026-07-12 23:54:44 -04:00
fix master sword in sheath custom equip not loading (#6909)
LoadCustomGfx's check being gated by OR condition broke gCustomMasterSwordInSheathDL, i can only assume this is because the sheathed sword DL is the "default" state called by link's skeleton. that condition in customequipment.cpp is not the cause of the log spam that #6862 aimed to fix so it was unneeded
This commit is contained in:
@@ -55,7 +55,7 @@ static Gfx* LoadCustomGfx(const char* path) {
|
||||
if (!path)
|
||||
return nullptr;
|
||||
path = ResolveCustomFPSHand(path);
|
||||
if (!ResourceMgr_FileAltExists(path) || !ResourceGetIsCustomByName(path))
|
||||
if (!ResourceMgr_FileAltExists(path) && !ResourceGetIsCustomByName(path))
|
||||
return nullptr;
|
||||
return ResourceMgr_LoadGfxByName(path);
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user