stjr/SRB2
0
0
Fork 0
mirror of https://git.do.srb2.org/STJr/SRB2.git synced 2024-11-15 17:22:12 +00:00
Code Issues Projects Releases Packages Wiki Activity

* Fix Minus being intangible after launch.

Browse source 
* Implement MS's temp bodge-fix for the TNT getting stuck on the player.
This commit is contained in:
toaster 2019-10-06 16:15:13 +01:00
parent df172ee33f
commit d19aebb01a
2 changed files with 0 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/p_enemy.c
View file

@ -5359,11 +5359,6 @@ static boolean PIT_MinusCarry(mobj_t *thing)
return true;
P_SetTarget(&minus->tracer, thing);
if (thing->flags & MF_PUSHABLE)
{
minus->flags2 |= MF2_STRONGBOX;
thing->flags &= ~MF_PUSHABLE;
}
return true;
}
@ -5452,14 +5447,7 @@ void A_MinusDigging(mobj_t *actor)
if (P_TryMove(actor->tracer, actor->x, actor->y, false))
actor->tracer->z = mz;
else
{
if (actor->flags2 & MF2_STRONGBOX)
{
actor->flags2 &= ~MF2_STRONGBOX;
actor->tracer->flags |= MF_PUSHABLE;
}
P_SetTarget(&actor->tracer, NULL);
}
}
}

12
src/p_inter.c
View file

@ -2681,18 +2681,6 @@ void P_KillMobj(mobj_t *target, mobj_t *inflictor, mobj_t *source, UINT8 damaget
P_KillMobj(target->target, target, source, 0);
break;
case MT_MINUS:
if (target->tracer)
{
if (target->flags2 & MF2_STRONGBOX)
{
target->flags2 &= ~MF2_STRONGBOX;
target->tracer->flags |= MF_PUSHABLE;
}
P_SetTarget(&target->tracer, NULL);
}
break;
case MT_PLAYER:
{
target->fuse = TICRATE*3; // timer before mobj disappears from view (even if not an actual player)