mirror/Shipwright
1
0
Fork 0
mirror of https://github.com/HarbourMasters/Shipwright.git synced 2025-01-10 13:38:08 -05:00
Code Issues Projects Releases Wiki Activity

fix shopsanity spawning objects for actors (#2247)

Browse Source
This commit is contained in:
Adam Bird 2022-12-23 22:26:01 -05:00 committed by GitHub
parent 07bae6b84c
commit d215c76eba
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -422,10 +422,10 @@ void EnGirlA_InitItem(EnGirlA* this, PlayState* play) {
objectId = getItemEntry.objectId; objectId = getItemEntry.objectId;
} }
// Weird edge case here, sold out object reports as loaded for Kokiri shop but doesn't render so we force it to load here this->objBankIndex = Object_GetIndex(&play->objectCtx, objectId);
if (Object_IsLoaded(&play->objectCtx, objectId) && (params != SI_SOLD_OUT && play->sceneNum == SCENE_KOKIRI_SHOP)) {
this->objBankIndex = Object_GetIndex(&play->objectCtx, objectId); // If the object isn't normally spawned by the shop scene, then spawn it now
} else { if (this->objBankIndex < 0) {
this->objBankIndex = Object_Spawn(&play->objectCtx, objectId); this->objBankIndex = Object_Spawn(&play->objectCtx, objectId);
} }
} }