type change for HassamVars x18

wyatt-avilla · Mar 27, 2024 · 75a8b46 · 75a8b46
1 parent e2a7d14
commit 75a8b46
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/src/melee/it/itCommonItems.h b/src/melee/it/itCommonItems.h
@@ -225,7 +225,7 @@ typedef struct HassamVars {
     f32 xC;
     f32 x10;
     f32 x14;
-    f32 x18_padding;
+    s32 x18;
     s32 x1C;
     s32 x20;
     u8 padding[0x5C - 0x20];

diff --git a/src/melee/it/items/ithassam.c b/src/melee/it/items/ithassam.c
@@ -196,7 +196,7 @@ void it_802CE008(Item_GObj* gobj)
     ip->entered_hitlag = efLib_PauseAll;
     ip->exited_hitlag = efLib_ResumeAll;
     it_8027A160(ip->xBBC_dynamicBoneTable->bones[2], ip);
-    ip->xD44_lifeTimer = M2C_FIELD(attr, s32*, 0x18);
+    ip->xD44_lifeTimer = attr->x18;
     ip->x40_vel.x = attr->x4 * ip->facing_dir;
     ip->xDD4_itemVar.hassam.x5C.x = attr->x4 * ip->facing_dir;
     ip->xDD4_itemVar.hassam.x5C.z = ip->xDD4_itemVar.hassam.x5C.y = 0.0F;