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

Fixes receiving the wrong item when picking up ammo drops near a chest. (#2183)

Browse Source 
* Fixes receiving the wrong item when picking up ammo drops near a chest.

Still shows the wrong model above links head but does give the right
item and shows the right text.

* Fixes get item model during first time pickup anim near chest.
This commit is contained in:
Christopher Leggett 2022-12-13 23:27:51 -05:00 committed by GitHub
parent e71583d47c
commit 8a69f1f020
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1710,7 +1710,7 @@ s32 func_808332E4(Player* this) {
void func_808332F4(Player* this, PlayState* play) { void func_808332F4(Player* this, PlayState* play) {
GetItemEntry giEntry; GetItemEntry giEntry;
if (this->getItemEntry.objectId == OBJECT_INVALID) { if (this->getItemEntry.objectId == OBJECT_INVALID || (this->getItemId != this->getItemEntry.getItemId)) {
giEntry = ItemTable_Retrieve(this->getItemId); giEntry = ItemTable_Retrieve(this->getItemId);
} else { } else {
giEntry = this->getItemEntry; giEntry = this->getItemEntry;
@ -12576,7 +12576,7 @@ s32 func_8084DFF4(PlayState* play, Player* this) {
} }
if (this->unk_84F == 0) { if (this->unk_84F == 0) {
if (this->getItemEntry.objectId == OBJECT_INVALID) { if (this->getItemEntry.objectId == OBJECT_INVALID || (this->getItemId != this->getItemEntry.getItemId)) {
giEntry = ItemTable_Retrieve(this->getItemId); giEntry = ItemTable_Retrieve(this->getItemId);
} else { } else {
giEntry = this->getItemEntry; giEntry = this->getItemEntry;