stjr/SRB2
0
0
Fork 0
mirror of https://git.do.srb2.org/STJr/SRB2.git synced 2024-11-17 10:11:02 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fixed compiler errors as well as a ton of tab spaces (apparently it's a common problem in this file anyway but whatever)

Browse source
This commit is contained in:
Monster Iestyn 2016-01-28 13:56:23 +00:00 committed by RedEnchilada
parent b3fbc37c94
commit f87f1b7b1a
1 changed files with 281 additions and 275 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
src/hardware/hw_main.c
View file

@ -544,6 +544,8 @@ static void HWR_RenderPlane(sector_t *shittyUnusedVariable, extrasubsector_t *xs
static FOutVector *planeVerts = NULL; static FOutVector *planeVerts = NULL;
static UINT16 numAllocedPlaneVerts = 0; static UINT16 numAllocedPlaneVerts = 0;
(void)shittyUnusedVariable; ///@TODO remove shitty unused variable
// no convex poly were generated for this subsector // no convex poly were generated for this subsector
if (!xsub->planepoly) if (!xsub->planepoly)
return; return;
@ -1096,6 +1098,9 @@ static void HWR_SplitWall(sector_t *sector, wallVert3D *wallVerts, INT32 texnum,
fixed_t v1y = FLOAT_TO_FIXED(wallVerts[0].y); fixed_t v1y = FLOAT_TO_FIXED(wallVerts[0].y);
fixed_t v2x = FLOAT_TO_FIXED(wallVerts[1].x); fixed_t v2x = FLOAT_TO_FIXED(wallVerts[1].x);
fixed_t v2y = FLOAT_TO_FIXED(wallVerts[1].y); fixed_t v2y = FLOAT_TO_FIXED(wallVerts[1].y);
// compiler complains when P_GetZAt is used in FLOAT_TO_FIXED directly
// use this as a temp var to store P_GetZAt's return value each time
fixed_t temp;
#endif #endif
INT32 solid, i; INT32 solid, i;
@ -1158,19 +1163,25 @@ static void HWR_SplitWall(sector_t *sector, wallVert3D *wallVerts, INT32 texnum,
#ifdef ESLOPE #ifdef ESLOPE
if (list[i].slope) if (list[i].slope)
{ {
height = FIXED_TO_FLOAT(P_GetZAt(list[i].slope, v1x, v1y)); temp = P_GetZAt(list[i].slope, v1x, v1y);
endheight = FIXED_TO_FLOAT(P_GetZAt(list[i].slope, v2x, v2y)); height = FIXED_TO_FLOAT(temp);
temp = P_GetZAt(list[i].slope, v2x, v2y);
endheight = FIXED_TO_FLOAT(temp);
} }
else else
height = endheight = FIXED_TO_FLOAT(list[i].height); height = endheight = FIXED_TO_FLOAT(list[i].height);
if (solid) if (solid)
{
if (*list[i].caster->b_slope) if (*list[i].caster->b_slope)
{ {
bheight = FIXED_TO_FLOAT(P_GetZAt(*list[i].caster->b_slope, v1x, v1y)); temp = P_GetZAt(*list[i].caster->b_slope, v1x, v1y);
endbheight = FIXED_TO_FLOAT(P_GetZAt(*list[i].caster->b_slope, v2x, v2y)); bheight = FIXED_TO_FLOAT(temp);
temp = P_GetZAt(*list[i].caster->b_slope, v2x, v2y);
endbheight = FIXED_TO_FLOAT(temp);
} }
else else
bheight = endbheight = FIXED_TO_FLOAT(*list[i].caster->bottomheight); bheight = endbheight = FIXED_TO_FLOAT(*list[i].caster->bottomheight);
}
#else #else
height = FIXED_TO_FLOAT(list[i].height); height = FIXED_TO_FLOAT(list[i].height);
if (solid) if (solid)
@ -2181,7 +2192,6 @@ static void HWR_StoreWallRange(double startfrac, double endfrac)
wallVerts[0].y = FIXED_TO_FLOAT(worldbottom); wallVerts[0].y = FIXED_TO_FLOAT(worldbottom);
wallVerts[2].y = FIXED_TO_FLOAT(worldtopslope); wallVerts[2].y = FIXED_TO_FLOAT(worldtopslope);
wallVerts[1].y = FIXED_TO_FLOAT(worldbottomslope); wallVerts[1].y = FIXED_TO_FLOAT(worldbottomslope);
#else #else
// set top/bottom coords // set top/bottom coords
wallVerts[2].y = wallVerts[3].y = FIXED_TO_FLOAT(worldtop); wallVerts[2].y = wallVerts[3].y = FIXED_TO_FLOAT(worldtop);
@ -2259,8 +2269,6 @@ static void HWR_StoreWallRange(double startfrac, double endfrac)
wallVerts[2].y = FIXED_TO_FLOAT(hS); wallVerts[2].y = FIXED_TO_FLOAT(hS);
wallVerts[0].y = FIXED_TO_FLOAT(l); wallVerts[0].y = FIXED_TO_FLOAT(l);
wallVerts[1].y = FIXED_TO_FLOAT(lS); wallVerts[1].y = FIXED_TO_FLOAT(lS);
#else #else
h = *rover->topheight; h = *rover->topheight;
l = *rover->bottomheight; l = *rover->bottomheight;
@ -2394,8 +2402,6 @@ static void HWR_StoreWallRange(double startfrac, double endfrac)
wallVerts[2].y = FIXED_TO_FLOAT(hS); wallVerts[2].y = FIXED_TO_FLOAT(hS);
wallVerts[0].y = FIXED_TO_FLOAT(l); wallVerts[0].y = FIXED_TO_FLOAT(l);
wallVerts[1].y = FIXED_TO_FLOAT(lS); wallVerts[1].y = FIXED_TO_FLOAT(lS);
#else #else
h = *rover->topheight; h = *rover->topheight;
l = *rover->bottomheight; l = *rover->bottomheight;