diff --git a/src/v_video.c b/src/v_video.c index 6e7d2eee8..dfc25cf70 100644 --- a/src/v_video.c +++ b/src/v_video.c @@ -1739,8 +1739,7 @@ void V_DrawHorizontallyScaledFullScreenPatch(patch_t *patch) void V_DrawVhsEffect(boolean rewind) { - fixed_t uby, dby; - static fixed_t upbary = 100*FRACUNIT, downbary = 150*FRACUNIT; + static fixed_t upbary = 100, downbary = 150; UINT8 barsize, updistort, downdistort; @@ -1765,21 +1764,19 @@ void V_DrawVhsEffect(boolean rewind) if (rewind) V_DrawVhsEffect(false); // experimentation - upbary -= renderdeltatics * (vid.dup * (rewind ? 3 : 1.8f)); - downbary += renderdeltatics * (vid.dup * (rewind ? 2 : 1)); + upbary -= FixedMul(vid.dup * (rewind ? 3 : 1.8f), renderdeltatics); + downbary += FixedMul(vid.dup * (rewind ? 2 : 1), renderdeltatics); - if (upbary < -barsize*FRACUNIT) - upbary = vid.height << FRACBITS; - if (downbary > vid.height << FRACBITS) - downbary = -barsize*FRACUNIT; + if (upbary < -barsize) + upbary = vid.height; - uby = upbary >> FRACBITS; - dby = downbary >> FRACBITS; + if (downbary > vid.height) + downbary = -barsize; #ifdef HWRENDER if (rendermode == render_opengl) { - HWR_RenderVhsEffect(uby, dby, updistort, downdistort, barsize); + HWR_RenderVhsEffect(upbary, downbary, updistort, downdistort, barsize); return; } #endif @@ -1799,16 +1796,16 @@ void V_DrawVhsEffect(boolean rewind) thismapstart = normalmapstart; offs = 0; - if (y >= uby && y < uby+barsize) + if (y >= upbary && y < upbary+barsize) { thismapstart -= (2<= dby && y < dby+barsize) + if (y >= downbary && y < downbary+barsize) { thismapstart -= (2<