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

I think this fixes the compile errors

Browse source
This commit is contained in:
fickleheart 2020-01-17 21:55:16 -06:00
parent 64c4a4c02c
commit 7bd9344dd0
2 changed files with 20 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
src/hardware/hw_main.c
View file

@ -5969,8 +5969,12 @@ static void HWR_DrawSkyBackground(player_t *player)
dometransform.scalez = 1; dometransform.scalez = 1;
dometransform.fovxangle = fpov; // Tails dometransform.fovxangle = fpov; // Tails
dometransform.fovyangle = fpov; // Tails dometransform.fovyangle = fpov; // Tails
dometransform.roll = (player->viewrollangle != 0); if (player->viewrollangle != 0)
dometransform.rollangle = FIXED_TO_FLOAT(AngleFixed(player->viewrollangle)); {
fixed_t rol = AngleFixed(player->viewrollangle);
dometransform.rollangle = FIXED_TO_FLOAT(rol);
dometransform.roll = true;
}
dometransform.splitscreen = splitscreen; dometransform.splitscreen = splitscreen;
HWR_GetTexture(texturetranslation[skytexture]); HWR_GetTexture(texturetranslation[skytexture]);
@ -6194,8 +6198,12 @@ void HWR_RenderSkyboxView(INT32 viewnumber, player_t *player)
atransform.scalez = 1; atransform.scalez = 1;
atransform.fovxangle = fpov; // Tails atransform.fovxangle = fpov; // Tails
atransform.fovyangle = fpov; // Tails atransform.fovyangle = fpov; // Tails
atransform.roll = (player->viewrollangle != 0); if (player->viewrollangle != 0)
atransform.rollangle = FIXED_TO_FLOAT(AngleFixed(player->viewrollangle)); {
fixed_t rol = AngleFixed(player->viewrollangle);
atransform.rollangle = FIXED_TO_FLOAT(rol);
atransform.roll = true;
}
atransform.splitscreen = splitscreen; atransform.splitscreen = splitscreen;
gr_fovlud = (float)(1.0l/tan((double)(fpov*M_PIl/360l))); gr_fovlud = (float)(1.0l/tan((double)(fpov*M_PIl/360l)));
@ -6416,8 +6424,12 @@ void HWR_RenderPlayerView(INT32 viewnumber, player_t *player)
atransform.scalez = 1; atransform.scalez = 1;
atransform.fovxangle = fpov; // Tails atransform.fovxangle = fpov; // Tails
atransform.fovyangle = fpov; // Tails atransform.fovyangle = fpov; // Tails
atransform.roll = (player->viewrollangle != 0); if (player->viewrollangle != 0)
atransform.rollangle = FIXED_TO_FLOAT(AngleFixed(player->viewrollangle)); {
fixed_t rol = AngleFixed(player->viewrollangle);
atransform.rollangle = FIXED_TO_FLOAT(rol);
atransform.roll = true;
}
atransform.splitscreen = splitscreen; atransform.splitscreen = splitscreen;
gr_fovlud = (float)(1.0l/tan((double)(fpov*M_PIl/360l))); gr_fovlud = (float)(1.0l/tan((double)(fpov*M_PIl/360l)));

4
src/r_main.c
View file

@ -560,7 +560,7 @@ static struct {
fixed_t zoomneeded; fixed_t zoomneeded;
INT32 *scrmap; INT32 *scrmap;
size_t scrmapsize; INT32 scrmapsize;
boolean use; boolean use;
} viewmorph = { } viewmorph = {
0, 0,
@ -578,7 +578,7 @@ void R_CheckViewMorph(void)
float zoomfactor, rollcos, rollsin; float zoomfactor, rollcos, rollsin;
float x1, y1, x2, y2; float x1, y1, x2, y2;
fixed_t temp; fixed_t temp;
size_t end, vx, vy, pos, usedpos; INT32 end, vx, vy, pos, usedpos;
INT32 usedx, usedy, halfwidth = vid.width/2, halfheight = vid.height/2; INT32 usedx, usedy, halfwidth = vid.width/2, halfheight = vid.height/2;
#ifdef WOUGHMP_WOUGHMP #ifdef WOUGHMP_WOUGHMP
float fisheyemap[MAXVIDWIDTH/2 + 1]; float fisheyemap[MAXVIDWIDTH/2 + 1];