diff --git a/src/melee/it/itCharItems.h b/src/melee/it/itCharItems.h index 8cf61eb725..a2af37934a 100644 --- a/src/melee/it/itCharItems.h +++ b/src/melee/it/itCharItems.h @@ -5,6 +5,7 @@ #include +#include #include #include #include @@ -146,14 +147,12 @@ typedef struct { // ____but not yet invisible) // 0: when xDD8 <= 0 or xDD8 >= 5 // 1: when cmd_var3 = 1 (when gun shooting sfx starts) - /* xC */ bool xDE0; // false when not shot yet; true after shot (in this - // spawn instance of the blaster - not put away) - /* x10 */ s32 xDE4[6]; // group 1; gets set to 0 in func (it_802ADF10) - // that sets item joint locations from - // corresponding fighter joint locations - /* x28 */ s32 xDFC[6]; // group 2; gets set to 0 in func (it_802ADF10) - // that sets item joint locations from - // corresponding fighter joint locations + /* xC */ bool xDE0; // false when not shot yet; true after shot (in this + // spawn instance of the blaster - not put away) + /* x10 */ EF_Effect* xDE4[6]; // group 1; shot effect history + /* x28 */ s32 xDFC[6]; // group 2; gets set to 0 in func (it_802ADF10) + // that sets item joint locations from + // corresponding fighter joint locations /* x40 */ Vec3 xE14[6]; // group 3; gets set as the vector from fighter's // current position to the joint holding the // blaster on the frame blaster its shot diff --git a/src/melee/it/kinds/itfoxblaster.c b/src/melee/it/kinds/itfoxblaster.c index c8bf638b49..0796204fbf 100644 --- a/src/melee/it/kinds/itfoxblaster.c +++ b/src/melee/it/kinds/itfoxblaster.c @@ -180,8 +180,8 @@ void it_802ADF10(HSD_GObj* item_gobj) itFoxBlaster_SetShotAngle(item, &ft_hold_joint_pos, &it_hold_joint_pos); item->xDD4_itemVar.foxblaster.xDE4[0] = - (s32) efSync_Spawn(1166, item_gobj, &ft_hold_joint_pos, - &item->xDD4_itemVar.foxblaster.angle[0]); + efSync_Spawn(1166, item_gobj, &ft_hold_joint_pos, + &item->xDD4_itemVar.foxblaster.angle[0]); break; case It_Kind_Kirby_FoxBlaster: case It_Kind_Kirby_FalcoBlaster: @@ -193,8 +193,8 @@ void it_802ADF10(HSD_GObj* item_gobj) itFoxBlaster_SetShotAngle(item, &ft_hold_joint_pos, &it_hold_joint_pos); item->xDD4_itemVar.foxblaster.xDE4[0] = - (s32) efSync_Spawn(1196, item_gobj, &ft_hold_joint_pos, - &item->xDD4_itemVar.foxblaster.angle[0]); + efSync_Spawn(1196, item_gobj, &ft_hold_joint_pos, + &item->xDD4_itemVar.foxblaster.angle[0]); break; default: break; @@ -215,7 +215,7 @@ void it_802ADF10(HSD_GObj* item_gobj) } item = GET_ITEM(item_gobj); - item->xDD4_itemVar.foxblaster.xDE4[0] = 0; + item->xDD4_itemVar.foxblaster.xDE4[0] = NULL; item->xDD4_itemVar.foxblaster.xDFC[0] = 0; item->xDD4_itemVar.foxblaster.angle[0] = item->xDD4_itemVar.foxblaster.xE14[0].x = @@ -434,7 +434,7 @@ static inline void itFoxBlaster_ClearShot(Item_GObj* item_gobj, int index) { Item* item = GET_ITEM(item_gobj); - item->xDD4_itemVar.foxblaster.xDE4[index] = 0; + item->xDD4_itemVar.foxblaster.xDE4[index] = NULL; item->xDD4_itemVar.foxblaster.xDFC[index] = 0; item->xDD4_itemVar.foxblaster.xE14[index].z = 0.0F; item->xDD4_itemVar.foxblaster.xE14[index].y = 0.0F;