restore compilation with g++, some whitespace tidy-up.

git-svn-id: svn+ssh://svn.code.sf.net/p/quakespasm/code/trunk@934 af15c1b1-3010-417e-b628-4374ebc0bcbd
This commit is contained in:
sezero 2014-07-12 07:50:57 +00:00
parent 0cf1b4cadd
commit 3f3ff65891
3 changed files with 51 additions and 52 deletions

View file

@ -1522,11 +1522,11 @@ void Mod_LoadLeafs (lump_t *l, int bsp2)
void *in = (void *)(mod_base + l->fileofs); void *in = (void *)(mod_base + l->fileofs);
if (bsp2 == 2) if (bsp2 == 2)
Mod_ProcessLeafs_L2 (in, l->filelen); Mod_ProcessLeafs_L2 ((dl2leaf_t *)in, l->filelen);
else if (bsp2) else if (bsp2)
Mod_ProcessLeafs_L1 (in, l->filelen); Mod_ProcessLeafs_L1 ((dl1leaf_t *)in, l->filelen);
else else
Mod_ProcessLeafs_S (in, l->filelen); Mod_ProcessLeafs_S ((dsleaf_t *) in, l->filelen);
} }
/* /*
@ -1720,7 +1720,6 @@ void Mod_LoadMarksurfaces (lump_t *l, int bsp2)
//johnfitz -- warn mappers about exceeding old limits //johnfitz -- warn mappers about exceeding old limits
if (count > 32767) if (count > 32767)
Con_Warning ("%i marksurfaces exceeds standard limit of 32767.\n", count); Con_Warning ("%i marksurfaces exceeds standard limit of 32767.\n", count);
//johnfitz //johnfitz
for (i=0 ; i<count ; i++) for (i=0 ; i<count ; i++)

View file

@ -286,7 +286,7 @@ int R_LightPoint (vec3_t p);
void GL_SubdivideSurface (msurface_t *fa); void GL_SubdivideSurface (msurface_t *fa);
void R_BuildLightMap (msurface_t *surf, byte *dest, int stride); void R_BuildLightMap (msurface_t *surf, byte *dest, int stride);
void R_RenderDynamicLightmaps (msurface_t *fa); void R_RenderDynamicLightmaps (msurface_t *fa);
void R_UploadLightmaps (); void R_UploadLightmaps (void);
void R_DrawTextureChains_ShowTris (void); void R_DrawTextureChains_ShowTris (void);
void R_DrawBrushModel_ShowTris (entity_t *e); void R_DrawBrushModel_ShowTris (entity_t *e);