Merge branch 'sstailscarry-fix' into 'next'
Fix MP Special Stages crashing if a player is being carried when it ends See merge request STJr/SRB2!615
This commit is contained in:
commit
69dd8acf7f
|
@ -347,6 +347,11 @@ void P_GiveEmerald(boolean spawnObj)
|
||||||
continue;
|
continue;
|
||||||
P_SetTarget(&emmo->target, players[i].mo);
|
P_SetTarget(&emmo->target, players[i].mo);
|
||||||
P_SetMobjState(emmo, mobjinfo[MT_GOTEMERALD].meleestate + em);
|
P_SetMobjState(emmo, mobjinfo[MT_GOTEMERALD].meleestate + em);
|
||||||
|
|
||||||
|
// Make sure we're not being carried before our tracer is changed
|
||||||
|
if (players[i].powers[pw_carry] != CR_NIGHTSMODE)
|
||||||
|
players[i].powers[pw_carry] = CR_NONE;
|
||||||
|
|
||||||
P_SetTarget(&players[i].mo->tracer, emmo);
|
P_SetTarget(&players[i].mo->tracer, emmo);
|
||||||
|
|
||||||
if (pnum == 255)
|
if (pnum == 255)
|
||||||
|
|
Loading…
Reference in New Issue