mirror/Shipwright
1
0
Fork 0
mirror of https://github.com/HarbourMasters/Shipwright.git synced 2025-02-18 00:00:35 -05:00
Code Issues Projects Releases Wiki Activity

fix equip now enhancement running with non-equipment items (#2590)

Browse Source
This commit is contained in:
Adam Bird 2023-03-06 23:15:51 -05:00 committed by GitHub
parent 0a67e42f6c
commit ce115272cd
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
soh/src/overlays/actors/ovl_player_actor/z_player.c
View File

@ -12604,7 +12604,8 @@ s32 func_8084DFF4(PlayState* play, Player* this) {
} }
this->unk_84F = 1; this->unk_84F = 1;
equipItem = giEntry.itemId; equipItem = giEntry.itemId;
equipNow = CVarGetInteger("gAskToEquip", 0) && equipItem >= ITEM_SWORD_KOKIRI && equipItem <= ITEM_TUNIC_ZORA && equipNow = CVarGetInteger("gAskToEquip", 0) && giEntry.modIndex == MOD_NONE &&
equipItem >= ITEM_SWORD_KOKIRI && equipItem <= ITEM_TUNIC_ZORA &&
((gItemAgeReqs[equipItem] == 9 || gItemAgeReqs[equipItem] == gSaveContext.linkAge) || ((gItemAgeReqs[equipItem] == 9 || gItemAgeReqs[equipItem] == gSaveContext.linkAge) ||
CVarGetInteger("gTimelessEquipment", 0)); CVarGetInteger("gTimelessEquipment", 0));