From 7142faf41d8cd250a19cd86af9becd0ae2d79e32 Mon Sep 17 00:00:00 2001 From: Magnus Norddahl Date: Thu, 2 Jun 2016 21:39:44 +0200 Subject: [PATCH] Minor compile error fixes when X86_ASM is defined --- src/r_draw.cpp | 6 +++--- src/r_draw.h | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/r_draw.cpp b/src/r_draw.cpp index c190c1e73e..2c2c67ad6c 100644 --- a/src/r_draw.cpp +++ b/src/r_draw.cpp @@ -3025,9 +3025,11 @@ extern "C" void R_DrawSlabC(int dx, fixed_t v, int dy, fixed_t vi, const BYTE *v // wallscan stuff, in C +static int vlinebits; +static int mvlinebits; + #ifndef X86_ASM static DWORD vlinec1 (); -static int vlinebits; DWORD (*dovline1)() = vlinec1; DWORD (*doprevline1)() = vlinec1; @@ -3043,7 +3045,6 @@ void (*dovline4)() = vlinec4; static DWORD mvlinec1(); static void mvlinec4(); -static int mvlinebits; DWORD (*domvline1)() = mvlinec1; void (*domvline4)() = mvlinec4; @@ -4532,7 +4533,6 @@ void R_InitColumnDrawers () rt_tlateaddclamp1col = rt_tlateaddclamp1col_c; rt_tlatesubclamp1col = rt_tlatesubclamp1col_c; rt_tlaterevsubclamp1col = rt_tlaterevsubclamp1col_c; - rt_map4cols = rt_map4cols_c; rt_subclamp4cols = rt_subclamp4cols_c; rt_revsubclamp4cols = rt_revsubclamp4cols_c; rt_tlate4cols = rt_tlate4cols_c; diff --git a/src/r_draw.h b/src/r_draw.h index f60b2299eb..fcaedff478 100644 --- a/src/r_draw.h +++ b/src/r_draw.h @@ -265,6 +265,8 @@ void R_DrawShadedColumnP_C (void); void R_DrawSpanP_C (void); void R_DrawSpanMaskedP_C (void); +#endif + void R_DrawColumnHorizP_RGBA_C (void); void R_DrawColumnP_RGBA_C (void); void R_DrawFuzzColumnP_RGBA_C (void); @@ -274,8 +276,6 @@ void R_DrawSpanP_RGBA_C (void); void R_DrawSpanP_RGBA_SSE (void); void R_DrawSpanMaskedP_RGBA_C (void); -#endif - void R_DrawSpanTranslucentP_C (void); void R_DrawSpanMaskedTranslucentP_C (void);