lifning
/
SRB2
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'acz-hardcode' into new-acz-minecarts

This commit is contained in:
MascaraSnake 2019-06-13 21:52:08 +02:00
parent ba9c7d9310 43f28b8f56
commit db66f58f2b
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/p_enemy.c
View File

@ -5167,7 +5167,7 @@ static boolean PIT_MinusCarry(mobj_t *thing)
if (abs(thing->z - minus->z) > minus->height) if (abs(thing->z - minus->z) > minus->height)
return true; return true;
minus->tracer = thing; P_SetTarget(&minus->tracer, thing);
minus->tracer->flags &= ~MF_PUSHABLE; minus->tracer->flags &= ~MF_PUSHABLE;
return true; return true;
@ -5253,7 +5253,7 @@ void A_MinusDigging(mobj_t *actor)
if (P_TryMove(actor->tracer, actor->x, actor->y, false)) if (P_TryMove(actor->tracer, actor->x, actor->y, false))
actor->tracer->z = mz; actor->tracer->z = mz;
else else
actor->tracer = NULL; P_SetTarget(&actor->tracer, NULL);
} }
} }
@ -12936,8 +12936,8 @@ void A_DustDevilThink(mobj_t *actor)
layer->extravalue1 = TICRATE * 3; layer->extravalue1 = TICRATE * 3;
//Chain them //Chain them
layer->tracer = actor->tracer; P_SetTarget(&layer->tracer, actor->tracer);
actor->tracer = layer; P_SetTarget(&actor->tracer, layer);
} }
} }
@ -13314,14 +13314,14 @@ void A_SnapperSpawn(mobj_t *actor)
// It spawns 1 head. // It spawns 1 head.
seg = P_SpawnMobj(actor->x, actor->y, actor->z, headtype); seg = P_SpawnMobj(actor->x, actor->y, actor->z, headtype);
ptr->tracer = seg; P_SetTarget(&ptr->tracer, seg);
ptr = seg; ptr = seg;
// It spawns 4 legs which will be handled in the thinker function. // It spawns 4 legs which will be handled in the thinker function.
for (i = 1; i <= 4; i++) for (i = 1; i <= 4; i++)
{ {
seg = P_SpawnMobj(actor->x, actor->y, actor->z, legtype); seg = P_SpawnMobj(actor->x, actor->y, actor->z, legtype);
ptr->tracer = seg; P_SetTarget(&ptr->tracer, seg);
ptr = seg; ptr = seg;
// The legs' base offsets are stored as extravalues, as relative coordinates in xy space. // The legs' base offsets are stored as extravalues, as relative coordinates in xy space.