summaryrefslogtreecommitdiff
path: root/soh/src/code/z_actor.c
diff options
context:
space:
mode:
Diffstat (limited to 'soh/src/code/z_actor.c')
-rw-r--r--soh/src/code/z_actor.c4
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;