OrdinaryMagician/swwmgz_m
OrdinaryMagician/swwmgz_m
1
Fork 0
Code Activity

Fix item markers on minimap lingering after pickup when Omnisight is active.

Browse source
This commit is contained in:
Mari the Deer 2021-02-21 18:01:02 +01:00
commit 8f2b9881f4
3 changed files with 4 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

4
language.version
View file

@ -1,3 +1,3 @@
[default]
SWWM_MODVER="\chSWWM \czGZ\c- \cw0.9.11b-pre r292 \cu(Sun 21 Feb 17:43:11 CET 2021)\c-";
SWWM_SHORTVER="\cw0.9.11b-pre r292 \cu(2021-02-21 17:43:11)\c-";
SWWM_MODVER="\chSWWM \czGZ\c- \cw0.9.11b-pre r293 \cu(Sun 21 Feb 18:01:02 CET 2021)\c-";
SWWM_SHORTVER="\cw0.9.11b-pre r293 \cu(2021-02-21 18:01:02)\c-";

11
zscript/swwm_handler.zsc
View file

@ -1436,15 +1436,7 @@ Class SWWMHandler : EventHandler
if ( (a is 'Inventory') && (!a.bSPECIAL || Inventory(a).Owner) )
continue;
if ( (a is 'Chancebox') && (a.CurState != a.SpawnState) )
{
// "last breath" update
for ( SWWMSimpleTracker t=strackers; t; t=t.next )
{
if ( t.target != a ) continue;
if ( !t.expired ) t.Update();
}
continue;
}
SWWMSimpleTracker.Track(a);
}
// prune expired trackers
@ -1453,8 +1445,7 @@ Class SWWMHandler : EventHandler
{
SWWMSimpleTracker next = trk.next;
// minimize lifespan of destroyed targets
if ( !trk.target )
trk.lastupdate = min(trk.lastupdate,level.maptime);
if ( !trk.target ) trk.lastupdate = min(trk.lastupdate,level.maptime);
else if ( !trk.expired )
{
// "last breath" update

2
zscript/swwm_hud.zsc
View file

@ -1000,7 +1000,7 @@ Class SWWMStatusBar : BaseStatusBar
else if ( t.ismonster ) col = am_thingcolor_ncmonster;
}
int mtime = 35;
if ( thesight && !t.expired ) mtime += 105;
if ( thesight && !t.expired && t.target ) mtime += 105;
double alph = clamp(((t.lastupdate+mtime)-level.maptime)/35.,0.,1.);
if ( alph <= 0. ) continue;
Vector2 rv = pos-cpos;