From ef7c382225d325eed45ff5ad9916fa3b63dcfb3d Mon Sep 17 00:00:00 2001 From: Marisa Kirisame Date: Wed, 15 Jul 2020 23:06:43 +0200 Subject: [PATCH] Tiny oopsiefix. --- language.version | 2 +- zscript/swwm_common.zsc | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/language.version b/language.version index 211594942..7673ba233 100644 --- a/language.version +++ b/language.version @@ -1,2 +1,2 @@ [default] -SWWM_MODVER="\chSWWM \cwGZ\c- r426 (Wed 15 Jul 16:02:41 CEST 2020)"; +SWWM_MODVER="\chSWWM \cwGZ\c- r427 (Wed 15 Jul 23:06:43 CEST 2020)"; diff --git a/zscript/swwm_common.zsc b/zscript/swwm_common.zsc index 628900b45..c712fbef9 100644 --- a/zscript/swwm_common.zsc +++ b/zscript/swwm_common.zsc @@ -977,7 +977,7 @@ Class SWWMCombatTracker : Thinker String mytag; int updated, lasthealth, maxhealth; DynamicValueInterpolator intp; - Vector3 pos, prevpos, oldpos; + Vector3 pos, prevpos, oldpos, oldprev; PlayerInfo myplayer; SWWMCombatTracker prev, next; bool legged; @@ -1015,6 +1015,7 @@ Class SWWMCombatTracker : Thinker t.pos = level.Vec3Offset(target.pos,(0,0,t.height)); t.prevpos = level.Vec3Offset(target.prev,(0,0,t.height)); t.oldpos = target.pos; + t.oldprev = target.prev; t.intp = DynamicValueInterpolator.Create(t.lasthealth,.5,1,100); t.myplayer = target.player; let hnd = SWWMHandler(EventHandler.Find("SWWMHandler")); @@ -1056,9 +1057,10 @@ Class SWWMCombatTracker : Thinker return; } // update - if ( mytarget && (mytarget.pos != oldpos) ) + if ( mytarget && ((mytarget.pos != oldpos) || (mytarget.prev != oldprev)) ) { oldpos = mytarget.pos; + oldprev = mytarget.prev; pos = level.Vec3Offset(mytarget.pos,(0,0,height)); prevpos = level.Vec3Offset(mytarget.prev,(0,0,height)); }