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

Should re-fix freestanding ice traps

Browse Source
This commit is contained in:
Christopher Leggett 2022-08-14 21:28:54 -04:00
parent 0e2530cd49
commit f4a051fb90
No known key found for this signature in database
GPG Key ID: 7093AE5FF7037D79
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -6104,14 +6104,14 @@ s32 func_8083E5A8(Player* this, GlobalContext* globalCtx) {
this->getItemId = iREG(68); this->getItemId = iREG(68);
} }
if (this->getItemId < GI_MAX) { GetItemEntry giEntry;
GetItemEntry giEntry; if (this->getItemEntry.objectId == OBJECT_INVALID) {
if (this->getItemEntry.objectId == OBJECT_INVALID) { giEntry = ItemTable_Retrieve(this->getItemId);
giEntry = ItemTable_Retrieve(this->getItemId); } else {
} else { giEntry = this->getItemEntry;
giEntry = this->getItemEntry; }
} if ((giEntry.modIndex == MOD_NONE && this->getItemId < GI_MAX) ||
(giEntry.modIndex == MOD_RANDOMIZER && this->getItemId < RG_MAX)) {
if ((interactedActor != &this->actor) && !iREG(67)) { if ((interactedActor != &this->actor) && !iREG(67)) {
interactedActor->parent = &this->actor; interactedActor->parent = &this->actor;
} }