incidentalstoat/blankart
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Revert "Fix Bubble Shield duplicate collisions"

Browse source 
This doesn't really apply to us since we don't have hitlag and it causes problems.

This reverts commit b048467aa2.
This commit is contained in:
NepDisk 2025-03-07 17:30:53 -05:00
parent bdbfeaf1ac
commit fbb7335011
2 changed files with 1 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
src/k_collide.c
View file

@ -717,17 +717,6 @@ void K_ThunderShieldAttack(mobj_t *actor, fixed_t size)
boolean K_BubbleShieldCollide(mobj_t *t1, mobj_t *t2) boolean K_BubbleShieldCollide(mobj_t *t1, mobj_t *t2)
{ {
if (t1->type == MT_PLAYER)
{
// Bubble Shield already has a hitbox, and it gets
// teleported every tic so the Bubble itself will
// always make contact with other objects.
//
// Therefore, we don't need a second, smaller hitbox
// on the player.
return true;
}
if (t2->type == MT_PLAYER) if (t2->type == MT_PLAYER)
{ {
// Counter desyncs // Counter desyncs
@ -745,7 +734,7 @@ boolean K_BubbleShieldCollide(mobj_t *t1, mobj_t *t2)
return true; return true;
// Player Damage // Player Damage
P_DamageMobj(t2, t1->target, t1, 1, DMG_NORMAL); P_DamageMobj(t2, ((t1->type == MT_BUBBLESHIELD) ? t1->target : t1), t1, 1, DMG_NORMAL);
if (t1->target->player) if (t1->target->player)
{ {

2
src/p_mobj.c
View file

@ -7410,9 +7410,7 @@ static boolean P_MobjRegularThink(mobj_t *mobj)
mobj->extravalue2 = mobj->target->player->bubbleblowup; mobj->extravalue2 = mobj->target->player->bubbleblowup;
P_SetScale(mobj, (mobj->destscale = scale)); P_SetScale(mobj, (mobj->destscale = scale));
mobj->flags &= ~(MF_NOCLIPTHING);
P_MoveOrigin(mobj, mobj->target->x, mobj->target->y, mobj->target->z); P_MoveOrigin(mobj, mobj->target->x, mobj->target->y, mobj->target->z);
mobj->flags |= MF_NOCLIPTHING;
break; break;
} }
case MT_FLAMESHIELD: case MT_FLAMESHIELD: