thirdpartymirrors/RingRacers
1
0
Fork 0
mirror of https://github.com/KartKrewDev/RingRacers.git synced 2025-10-30 08:01:28 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

P_TrackRoundConditionTargetDamage, Obj_SpecialUFODamage: Fix incorrect non-g_localplayers indexing into player table

Browse source 
Destroying the UFO has now been promoted to a full deferred condition check
This commit is contained in:
toaster 2023-10-19 16:13:01 +01:00
parent a6ef8d357c
commit 5680e00deb
2 changed files with 4 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
src/objects/ufo.c
View file

@ -18,6 +18,7 @@
#include "../k_objects.h" #include "../k_objects.h"
#include "../m_random.h" #include "../m_random.h"
#include "../p_local.h" #include "../p_local.h"
#include "../m_cond.h"
#include "../r_main.h" #include "../r_main.h"
#include "../s_sound.h" #include "../s_sound.h"
#include "../g_game.h" #include "../g_game.h"
@ -923,17 +924,7 @@ boolean Obj_SpecialUFODamage(mobj_t *ufo, mobj_t *inflictor, mobj_t *source, UIN
// Destroy the UFO parts, and make the emerald collectible! // Destroy the UFO parts, and make the emerald collectible!
UFOKillPieces(ufo); UFOKillPieces(ufo);
{ gamedata->deferredconditioncheck = true; // Check Challenges!
UINT8 i;
for (i = 0; i <= splitscreen; i++)
{
if (!playeringame[g_localplayers[i]])
continue;
if (players[g_localplayers[i]].spectator)
continue;
players[i].roundconditions.checkthisframe = true;
}
}
ufo->flags = (ufo->flags & ~MF_SHOOTABLE) | (MF_SPECIAL|MF_PICKUPFROMBELOW); ufo->flags = (ufo->flags & ~MF_SHOOTABLE) | (MF_SPECIAL|MF_PICKUPFROMBELOW);
ufo->shadowscale = FRACUNIT/3; ufo->shadowscale = FRACUNIT/3;

4
src/p_inter.c
View file

@ -997,10 +997,10 @@ void P_TrackRoundConditionTargetDamage(targetdamaging_t targetdamaging)
continue; continue;
if (players[g_localplayers[i]].spectator) if (players[g_localplayers[i]].spectator)
continue; continue;
players[i].roundconditions.targetdamaging |= targetdamaging; players[g_localplayers[i]].roundconditions.targetdamaging |= targetdamaging;
/* -- the following isn't needed because we can just check for targetdamaging == UFOD_GACHABOM /* -- the following isn't needed because we can just check for targetdamaging == UFOD_GACHABOM
if (targetdamaging != UFOD_GACHABOM) if (targetdamaging != UFOD_GACHABOM)
players[i].roundconditions.gachabom_miser = 0xFF; players[g_localplayers[i]].roundconditions.gachabom_miser = 0xFF;
*/ */
} }
} }