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

Merge branch 'fix-broly-crash' into 'master'

Browse source 
Fix dereferncing Broly null pointer

See merge request KartKrew/Kart!1708
This commit is contained in:
Oni 2023-12-23 12:58:31 +00:00
commit 308c97c84c
2 changed files with 9 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/k_collide.cpp
View file

@ -875,8 +875,10 @@ boolean K_InstaWhipCollide(mobj_t *shield, mobj_t *victim)
attackerPlayer->flashing = 0;
// Localized broly for a local event.
mobj_t *broly = Obj_SpawnBrolyKi(victim, victimHitlag);
broly->extravalue2 = 16*mapobjectscale;
if (mobj_t *broly = Obj_SpawnBrolyKi(victim, victimHitlag))
{
broly->extravalue2 = 16*mapobjectscale;
}
P_PlayVictorySound(victim);

5
src/objects/broly.cpp
View file

@ -22,6 +22,11 @@ Obj_SpawnBrolyKi
{
Broly* x = Broly::spawn<Broly>(static_cast<Mobj*>(source), duration, {64 * mapobjectscale, 0});
if (!x)
{
return nullptr;
}
x->colorized = true;
x->color = source->color;