Remove use of static variable in en_box #3536
Conversation
| @@ -628,7 +627,7 @@ void EnBox_Update(Actor* thisx, PlayState* play) { | |||
| } | |||
|
|
|||
| if (((!IS_RANDO && ((this->dyna.actor.params >> 5 & 0x7F) == 0x7C)) || | |||
| (IS_RANDO && ABS(sItem.getItemId) == RG_ICE_TRAP)) && | |||
| (IS_RANDO && this->getItemEntry.getItemId == RG_ICE_TRAP)) && | |||
There was a problem hiding this comment.
do you know why we used to have ABS here?
There was a problem hiding this comment.
the static sItem was what was handed off to player, with the getItemId negated (which allows the player to interact with the chest)
Now this just uses the this->getItemEntry I added later on for Chest Style Matches Contents.
There was a problem hiding this comment.
See
Shipwright/soh/src/overlays/actors/ovl_En_Box/z_en_box.c
Lines 507 to 512 in bb6fef6
There was a problem hiding this comment.
In case you're wondering, we should be able to just replace what's left of sItem with this->getItemEntry, but this is all going away anyway so I erred on the side of safety and just left most of it untouched.
garrettjoecox
merged commit ef910a0
into
HarbourMasters:develop-macready
I'm basically removing all of this rando specific code in rando v3, so for now a bandaid that touches the least amount possible.
This was probably the source of #1565
Build Artifacts