Merge branch 'Movement' of github.com:teamfisk/TacticalZ into Movement

2016-03-13 18:56:04 +01:00
parent 389d27973f fc5ad2d380
commit 6bfed76e06
2 changed files with 2 additions and 2 deletions
@@ -20,7 +20,7 @@ void FadeSystem::UpdateComponent(EntityWrapper& entity, ComponentWrapper& cFade,
    }

    double fadeTime = cFade["FadeTime"];
-    Field<bool> currentTime = cFade["Time"];
+    Field<double> currentTime = cFade["Time"];
    currentTime += dTime;

    if(currentTime > fadeTime) {