From 398001b6cb350a9881bb9860366b858158ae5af2 Mon Sep 17 00:00:00 2001 From: Magnus Norddahl Date: Tue, 27 Dec 2016 07:45:10 +0100 Subject: [PATCH] Move code into R_UpdateFuzzPos --- src/swrenderer/drawers/r_draw.cpp | 17 +++++++++++------ src/swrenderer/drawers/r_draw.h | 4 +++- 2 files changed, 14 insertions(+), 7 deletions(-) diff --git a/src/swrenderer/drawers/r_draw.cpp b/src/swrenderer/drawers/r_draw.cpp index 56a99754c6..1519c465db 100644 --- a/src/swrenderer/drawers/r_draw.cpp +++ b/src/swrenderer/drawers/r_draw.cpp @@ -736,21 +736,26 @@ namespace swrenderer DrawerCommandQueue::QueueCommand(); } - void R_DrawFuzzColumn() + void R_UpdateFuzzPos() { using namespace drawerargs; - if (r_swtruecolor) - DrawerCommandQueue::QueueCommand(); - else - DrawerCommandQueue::QueueCommand(); - dc_yl = MAX(dc_yl, 1); dc_yh = MIN(dc_yh, fuzzviewheight); if (dc_yl <= dc_yh) fuzzpos = (fuzzpos + dc_yh - dc_yl + 1) % FUZZTABLE; } + void R_DrawFuzzColumn() + { + if (r_swtruecolor) + DrawerCommandQueue::QueueCommand(); + else + DrawerCommandQueue::QueueCommand(); + + R_UpdateFuzzPos(); + } + void R_DrawAddColumn() { if (r_swtruecolor) diff --git a/src/swrenderer/drawers/r_draw.h b/src/swrenderer/drawers/r_draw.h index c2d09cebd5..d24551f7a8 100644 --- a/src/swrenderer/drawers/r_draw.h +++ b/src/swrenderer/drawers/r_draw.h @@ -133,7 +133,9 @@ namespace swrenderer bool R_GetTransMaskDrawers(void(**drawColumn)()); const uint8_t *R_GetColumn(FTexture *tex, int col); - + + void R_UpdateFuzzPos(); + void R_DrawColumn(); void R_DrawFuzzColumn(); void R_DrawTranslatedColumn();