stjr/SRB2
0
0
Fork 0
mirror of https://git.do.srb2.org/STJr/SRB2.git synced 2025-03-23 03:12:38 +00:00
Code Issues Projects Releases Packages Wiki Activity

Added minecart support to A_MixUp

Browse source
This commit is contained in:
MascaraSnake 2019-06-16 16:49:18 +02:00
parent 622a44f551
commit c5a2d33d4e
1 changed files with 6 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/p_enemy.c
View file

@ -6300,6 +6300,10 @@ void A_MixUp(mobj_t *actor)
}
//get this done first!
if (players[one].powers[pw_carry] == CR_MINECART && players[one].mo->tracer && !(P_MobjWasRemoved(players[one].mo->tracer)))
P_SetTarget(&players[one].mo->tracer->target, players[two].mo);
if (players[two].powers[pw_carry] == CR_MINECART && players[two].mo->tracer && !(P_MobjWasRemoved(players[two].mo->tracer)))
P_SetTarget(&players[two].mo->tracer->target, players[one].mo);
tempthing = players[one].mo->tracer;
P_SetTarget(&players[one].mo->tracer, players[two].mo->tracer);
P_SetTarget(&players[two].mo->tracer, tempthing);
@ -6441,6 +6445,8 @@ void A_MixUp(mobj_t *actor)
//...carry after. same reasoning.
players[i].powers[pw_carry] = transcarry[teleportfrom];
if (transcarry[teleportfrom] == CR_MINECART && transtracer[teleportfrom] && !(P_MobjWasRemoved(transtracer[teleportfrom])))
P_SetTarget(&transtracer[teleportfrom]->target, players[i].mo);
teleported[i] = true;
counter++;