Merge branch 'fix-gachatarget-hitbox' into 'master'

Fix gachatarget hitbox size

See merge request KartKrew/Kart!1839
This commit is contained in:
James R. 2024-01-16 03:52:05 +00:00
commit 6259c30a2e
2 changed files with 20 additions and 21 deletions

View file

@ -34120,8 +34120,8 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] =
S_NULL, // xdeathstate S_NULL, // xdeathstate
sfx_None, // deathsound sfx_None, // deathsound
0, // speed 0, // speed
32*4*FRACUNIT,// radius 32*FRACUNIT,// radius
64*4*FRACUNIT,// height 64*FRACUNIT,// height
0, // dispoffset 0, // dispoffset
0, // mass 0, // mass
0, // damage 0, // damage

View file

@ -613,8 +613,7 @@ void Obj_SSChainMobjThink(mobj_t* mo)
void Obj_SSGachaTargetMobjSpawn(mobj_t* mo) void Obj_SSGachaTargetMobjSpawn(mobj_t* mo)
{ {
mo->scale *= 4; P_InstaScale(mo, 4*mo->scale);
mo->destscale = mo->scale;
} }
void Obj_SSCabotronMobjSpawn(mobj_t* mo) void Obj_SSCabotronMobjSpawn(mobj_t* mo)