OrdinaryMagician/swwmgz_m
OrdinaryMagician/swwmgz_m
1
Fork 0
Code Activity

Fix null pointer access in SWWMFlyTracker.

Browse source
This commit is contained in:
Mari the Deer 2021-03-24 17:46:46 +01:00
commit 0ed72dfe34
2 changed files with 6 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

7
zscript/swwm_thinkers.zsc
View file

@ -400,7 +400,7 @@ Class SWWMCorpseCleaner : Thinker
Class SWWMFlyTracker : Thinker
{
Actor tracked, instigator;
Vector3 startpos;
Vector3 startpos, curpos;
int gracepd;
static void Track( Actor b, Actor whomst )
@ -418,7 +418,7 @@ Class SWWMFlyTracker : Thinker
ffd.ChangeStatNum(STAT_USER);
ffd.tracked = b;
ffd.instigator = whomst;
ffd.startpos = b.pos;
ffd.curpos = ffd.startpos = b.pos;
}
override void Tick()
@ -427,11 +427,12 @@ Class SWWMFlyTracker : Thinker
{
gracepd++;
if ( gracepd < 10 ) return;
if ( instigator ) SWWMUtility.AchievementProgress('swwm_progress_flight',int(level.Vec3Diff(startpos,tracked.pos).length()),instigator.player);
if ( instigator ) SWWMUtility.AchievementProgress('swwm_progress_flight',int(level.Vec3Diff(startpos,curpos).length()),instigator.player);
Destroy();
return;
}
gracepd = 0;
curpos = tracked.pos;
}
}