diff options
| author | briaguya <70942617+briaguya-ai@users.noreply.github.com> | 2022-12-21 03:46:12 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-12-21 03:46:12 -0500 |
| commit | 5ce4e75bd2e3ec6a7003c6b33a07487aafcdc78e (patch) | |
| tree | a9beb83e8985eb0624b6b865f163bea4b0007d53 /soh/src/code/z_actor.c | |
| parent | 4d8c70fb1f9bd1cfba0b65fb3e38e2aac39a65a2 (diff) | |
| parent | 0e7a89d1174a9080d1d88e9556e6b11e4ab8726e (diff) | |
Merge pull request #2227 from HarbourMasters/develop-bradley
bradley -> dev
Diffstat (limited to 'soh/src/code/z_actor.c')
| -rw-r--r-- | soh/src/code/z_actor.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/soh/src/code/z_actor.c b/soh/src/code/z_actor.c index 74dd031b2..c4e89adf7 100644 --- a/soh/src/code/z_actor.c +++ b/soh/src/code/z_actor.c @@ -78,6 +78,9 @@ static CollisionPoly* sCurCeilingPoly; static s32 sCurCeilingBgId; +// Used for animating the ice trap on the "Get Item" model. +f32 iceTrapScale; + void ActorShape_Init(ActorShape* shape, f32 yOffset, ActorShadowFunc shadowDraw, f32 shadowScale) { shape->yOffset = yOffset; shape->shadowDraw = shadowDraw; @@ -2030,6 +2033,7 @@ s32 GiveItemEntryFromActor(Actor* actor, PlayState* play, GetItemEntry getItemEn s32 absYawDiff = ABS(yawDiff); if ((getItemEntry.getItemId != GI_NONE) || (player->getItemDirection < absYawDiff)) { + iceTrapScale = 0.0f; player->getItemEntry = getItemEntry; player->getItemId = getItemEntry.getItemId; player->interactRangeActor = actor; |