diff --git a/language.version b/language.version index da4f6d996..7edd1f04d 100644 --- a/language.version +++ b/language.version @@ -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-"; diff --git a/zscript/swwm_handler.zsc b/zscript/swwm_handler.zsc index 359fab5ee..09b5a7c6a 100644 --- a/zscript/swwm_handler.zsc +++ b/zscript/swwm_handler.zsc @@ -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 diff --git a/zscript/swwm_hud.zsc b/zscript/swwm_hud.zsc index 2ac6dd19d..b9a8ae974 100644 --- a/zscript/swwm_hud.zsc +++ b/zscript/swwm_hud.zsc @@ -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;