diff --git a/src/d_main.c b/src/d_main.c index 124e11994..4d7717e69 100644 --- a/src/d_main.c +++ b/src/d_main.c @@ -883,7 +883,7 @@ void D_SRB2Loop(void) if (interp) { - renderdeltatics = DoubleToFixed(deltatics); + renderdeltatics = FloatToFixed(deltatics); if (!(paused || P_AutoPause()) && deltatics < 1.0 && !hu_stopped) { diff --git a/src/i_time.c b/src/i_time.c index ab7187dfb..2d136f27e 100644 --- a/src/i_time.c +++ b/src/i_time.c @@ -58,7 +58,7 @@ void I_UpdateTime(fixed_t timescale) tic_t realtics; // get real tics - ticratescaled = (double)TICRATE * FixedToDouble(timescale); + ticratescaled = (double)TICRATE * FixedToFloat(timescale); enterprecise = I_GetPreciseTime(); elapsedseconds = (double)((INT64)enterprecise - oldenterprecise) / I_GetPrecisePrecision(); @@ -77,6 +77,6 @@ void I_UpdateTime(fixed_t timescale) { double fractional, integral; fractional = modf(tictimer * ticratescaled, &integral); - g_time.timefrac = DoubleToFixed(fractional); + g_time.timefrac = FloatToFixed(fractional); } } diff --git a/src/m_fixed.h b/src/m_fixed.h index f9d76944f..3f1acd7ae 100644 --- a/src/m_fixed.h +++ b/src/m_fixed.h @@ -49,16 +49,6 @@ FUNCMATH FUNCINLINE static ATTRINLINE fixed_t FloatToFixed(float f) return (fixed_t)(f * FRACUNIT); } -FUNCMATH FUNCINLINE static ATTRINLINE double FixedToDouble(fixed_t x) -{ - return x / (double)FRACUNIT; -} - -FUNCMATH FUNCINLINE static ATTRINLINE fixed_t DoubleToFixed(double f) -{ - return (fixed_t)(f * FRACUNIT); -} - // for backwards compat #define FIXED_TO_FLOAT(x) FixedToFloat(x) // (((float)(x)) / ((float)FRACUNIT)) #define FLOAT_TO_FIXED(f) FloatToFixed(f) // (fixed_t)((f) * ((float)FRACUNIT))