Use ArxDuration

arx · Aug 16, 2016 · 7e046e2 · 7e046e2
1 parent c68a85e
commit 7e046e2
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/src/animation/AnimationRender.cpp b/src/animation/AnimationRender.cpp
@@ -1132,7 +1132,7 @@ static void Cedric_RenderObject(EERIE_3DOBJ * eobj, Skeleton * obj, Entity * io,
 	if(io && (io->sfx_flag & SFX_TYPE_YLSIDE_DEATH) && io->show != SHOW_FLAG_TELEPORTING) {
 		const ArxDuration elapsed = arxtime.now() - io->sfx_time;
 		if(elapsed >= ArxDurationMs(3000) && elapsed < ArxDurationMs(6000)) {
-			float ratio = (elapsed - 3000) * (1.0f / 3000);
+			float ratio = toMs(elapsed - ArxDurationMs(3000)) * (1.0f / 3000);
 			glowColor = Color::gray(ratio).toRGB();
 			glow = true;
 		}

diff --git a/src/core/TimeTypes.h b/src/core/TimeTypes.h
@@ -140,12 +140,14 @@ inline ArxInstant operator -(ArxInstant a, ArxDuration b) {
 	return ArxInstant(a.t - b.t);
 }
 
+#ifndef ARX_REFACTOR_TIMETYPES
 inline ArxDuration operator +(ArxDuration a, ArxDuration b) {
 	return ArxDuration(a.t + b.t);
 }
 inline ArxDuration operator -(ArxDuration a, ArxDuration b) {
 	return ArxDuration(a.t - b.t);
 }
+#endif
 
 // FIXME copy-paste