OrdinaryMagician/vkdoom_m
OrdinaryMagician/vkdoom_m
1
Fork 0
Code Activity

- Fixed: Building with NOASM defined no longer worked, because the DrawSlab routines in a.asm conflicted with the ones in r_draw.cpp.

Browse source 
SVN r3194 (trunk)
This commit is contained in:
Randy Heit 2011-05-08 04:28:45 +00:00
commit d642c5b1b0
3 changed files with 18 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/r_draw.cpp
View file

@ -1363,12 +1363,12 @@ void R_FillSpan (void)
#ifndef X86_ASM
static const BYTE *slabcolormap;
extern "C" void R_SetupDrawSlab(const BYTE *colormap)
extern "C" void R_SetupDrawSlabC(const BYTE *colormap)
{
slabcolormap = colormap;
}
extern "C" void STACK_ARGS R_DrawSlab(int dx, fixed_t v, int dy, fixed_t vi, const BYTE *vptr, BYTE *p)
extern "C" void STACK_ARGS R_DrawSlabC(int dx, fixed_t v, int dy, fixed_t vi, const BYTE *vptr, BYTE *p)
{
int x;
const BYTE *colormap = slabcolormap;