fte/quakespasm
2
0
Fork 0
mirror of https://github.com/Shpoike/Quakespasm.git synced 2025-02-15 16:41:22 +00:00
Code Issues Projects Releases Packages Wiki Activity

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

Browse source 
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
Show stats Download patch file Download diff file Expand all files Collapse all files

41
quakespasm/Quake/gl_model.c
View file

@ -782,7 +782,7 @@ void Mod_LoadVertexes (lump_t *l)
loadmodel->vertexes = out;
loadmodel->numvertexes = count;
for ( i=0 ; i<count ; i++, in++, out++)
for (i=0 ; i<count ; i++, in++, out++)
{
out->position[0] = LittleFloat (in->point[0]);
out->position[1] = LittleFloat (in->point[1]);
@ -813,7 +813,7 @@ void Mod_LoadEdges (lump_t *l, int bsp2)
loadmodel->edges = out;
loadmodel->numedges = count;
for ( i=0 ; i<count ; i++, in++, out++)
for (i=0 ; i<count ; i++, in++, out++)
{
out->v[0] = LittleLong(in->v[0]);
out->v[1] = LittleLong(in->v[1]);
@ -832,7 +832,7 @@ void Mod_LoadEdges (lump_t *l, int bsp2)
loadmodel->edges = out;
loadmodel->numedges = count;
for ( i=0 ; i<count ; i++, in++, out++)
for (i=0 ; i<count ; i++, in++, out++)
{
out->v[0] = (unsigned short)LittleShort(in->v[0]);
out->v[1] = (unsigned short)LittleShort(in->v[1]);
@ -862,7 +862,7 @@ void Mod_LoadTexinfo (lump_t *l)
loadmodel->texinfo = out;
loadmodel->numtexinfo = count;
for ( i=0 ; i<count ; i++, in++, out++)
for (i=0 ; i<count ; i++, in++, out++)
{
for (j=0 ; j<4 ; j++)
{
@ -884,7 +884,7 @@ void Mod_LoadTexinfo (lump_t *l)
if (len1 + len2 < 0.001)
out->mipadjust = 1; // don't crash
else
out->mipadjust = 1 / floor( (len1+len2)/2 + 0.1 );
out->mipadjust = 1 / floor((len1+len2)/2 + 0.1);
#endif
miptex = LittleLong (in->miptex);
@ -1106,7 +1106,7 @@ void Mod_LoadFaces (lump_t *l, qboolean bsp2)
loadmodel->surfaces = out;
loadmodel->numsurfaces = count;
for ( surfnum=0 ; surfnum<count ; surfnum++, out++)
for (surfnum=0 ; surfnum<count ; surfnum++, out++)
{
if (bsp2)
{
@ -1220,7 +1220,7 @@ void Mod_LoadNodes_S (lump_t *l)
loadmodel->nodes = out;
loadmodel->numnodes = count;
for ( i=0 ; i<count ; i++, in++, out++)
for (i=0 ; i<count ; i++, in++, out++)
{
for (j=0 ; j<3 ; j++)
{
@ -1272,7 +1272,7 @@ void Mod_LoadNodes_L1 (lump_t *l)
loadmodel->nodes = out;
loadmodel->numnodes = count;
for ( i=0 ; i<count ; i++, in++, out++)
for (i=0 ; i<count ; i++, in++, out++)
{
for (j=0 ; j<3 ; j++)
{
@ -1324,7 +1324,7 @@ void Mod_LoadNodes_L2 (lump_t *l)
loadmodel->nodes = out;
loadmodel->numnodes = count;
for ( i=0 ; i<count ; i++, in++, out++)
for (i=0 ; i<count ; i++, in++, out++)
{
for (j=0 ; j<3 ; j++)
{
@ -1390,7 +1390,7 @@ void Mod_ProcessLeafs_S (dsleaf_t *in, int filelen)
loadmodel->leafs = out;
loadmodel->numleafs = count;
for ( i=0 ; i<count ; i++, in++, out++)
for (i=0 ; i<count ; i++, in++, out++)
{
for (j=0 ; j<3 ; j++)
{
@ -1437,7 +1437,7 @@ void Mod_ProcessLeafs_L1 (dl1leaf_t *in, int filelen)
loadmodel->leafs = out;
loadmodel->numleafs = count;
for ( i=0 ; i<count ; i++, in++, out++)
for (i=0 ; i<count ; i++, in++, out++)
{
for (j=0 ; j<3 ; j++)
{
@ -1484,7 +1484,7 @@ void Mod_ProcessLeafs_L2 (dl2leaf_t *in, int filelen)
loadmodel->leafs = out;
loadmodel->numleafs = count;
for ( i=0 ; i<count ; i++, in++, out++)
for (i=0 ; i<count ; i++, in++, out++)
{
for (j=0 ; j<3 ; j++)
{
@ -1522,11 +1522,11 @@ void Mod_LoadLeafs (lump_t *l, int bsp2)
void *in = (void *)(mod_base + l->fileofs);
if (bsp2 == 2)
Mod_ProcessLeafs_L2 (in, l->filelen);
Mod_ProcessLeafs_L2 ((dl2leaf_t *)in, l->filelen);
else if (bsp2)
Mod_ProcessLeafs_L1 (in, l->filelen);
Mod_ProcessLeafs_L1 ((dl1leaf_t *)in, l->filelen);
else
Mod_ProcessLeafs_S (in, l->filelen);
Mod_ProcessLeafs_S ((dsleaf_t *) in, l->filelen);
}
/*
@ -1696,7 +1696,7 @@ void Mod_LoadMarksurfaces (lump_t *l, int bsp2)
loadmodel->marksurfaces = out;
loadmodel->nummarksurfaces = count;
for ( i=0 ; i<count ; i++)
for (i=0 ; i<count ; i++)
{
j = LittleLong(in[i]);
if (j >= loadmodel->numsurfaces)
@ -1720,10 +1720,9 @@ void Mod_LoadMarksurfaces (lump_t *l, int bsp2)
//johnfitz -- warn mappers about exceeding old limits
if (count > 32767)
Con_Warning ("%i marksurfaces exceeds standard limit of 32767.\n", count);
//johnfitz
for ( i=0 ; i<count ; i++)
for (i=0 ; i<count ; i++)
{
j = (unsigned short)LittleShort(in[i]); //johnfitz -- explicit cast as unsigned short
if (j >= loadmodel->numsurfaces)
@ -1752,7 +1751,7 @@ void Mod_LoadSurfedges (lump_t *l)
loadmodel->surfedges = out;
loadmodel->numsurfedges = count;
for ( i=0 ; i<count ; i++)
for (i=0 ; i<count ; i++)
out[i] = LittleLong (in[i]);
}
@ -1779,7 +1778,7 @@ void Mod_LoadPlanes (lump_t *l)
loadmodel->planes = out;
loadmodel->numplanes = count;
for ( i=0 ; i<count ; i++, in++, out++)
for (i=0 ; i<count ; i++, in++, out++)
{
bits = 0;
for (j=0 ; j<3 ; j++)
@ -1833,7 +1832,7 @@ void Mod_LoadSubmodels (lump_t *l)
loadmodel->submodels = out;
loadmodel->numsubmodels = count;
for ( i=0 ; i<count ; i++, in++, out++)
for (i=0 ; i<count ; i++, in++, out++)
{
for (j=0 ; j<3 ; j++)
{ // spread the mins / maxs by a pixel

2
quakespasm/Quake/glquake.h
View file

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