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

Respect custom draw functions

Browse Source
This commit is contained in:
Garrett Cox 2022-09-07 09:56:30 -05:00
parent 5b4ce49688
commit d928335dd2
1 changed files with 15 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
soh/src/overlays/actors/ovl_En_GirlA/z_en_girla.c
View File

@ -1261,5 +1261,20 @@ void EnGirlA_Draw(Actor* thisx, GlobalContext* globalCtx) {
if (this->hiliteFunc != NULL) { if (this->hiliteFunc != NULL) {
this->hiliteFunc(thisx, globalCtx, 0); this->hiliteFunc(thisx, globalCtx, 0);
} }
if (gSaveContext.n64ddFlag && Randomizer_GetSettingValue(RSK_SHOPSANITY) && this->actor.params != SI_SOLD_OUT) {
ShopItemIdentity shopItemIdentity = Randomizer_IdentifyShopItem(globalCtx->sceneNum, this->randoSlotIndex);
if (shopItemIdentity.randomizerCheck != RC_UNKNOWN_CHECK) {
if (shopItemIdentity.enGirlAShopItem == -1) {
GetItemEntry getItemEntry = Randomizer_GetItemFromKnownCheckWithoutObtainabilityCheck(shopItemIdentity.randomizerCheck, shopItemIdentity.ogItemId);
if (getItemEntry.drawFunc != NULL &&
(CVar_GetS32("gRandoMatchKeyColors", 0) || getItemEntry.getItemId == RG_DOUBLE_DEFENSE)) {
getItemEntry.drawFunc(globalCtx, &getItemEntry);
return;
}
}
}
}
GetItem_Draw(globalCtx, this->giDrawId); GetItem_Draw(globalCtx, this->giDrawId);
} }