OrdinaryMagician/vkdoom_m
OrdinaryMagician/vkdoom_m
1
Fork 0
Code Activity

Merge r_stretchsky and r_capsky into r_skymode

Browse source
This commit is contained in:
Magnus Norddahl 2016-10-20 00:59:51 +02:00
commit 2fe545a4fd
4 changed files with 17 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/r_plane.cpp
View file

@ -63,7 +63,7 @@
#pragma warning(disable:4244)
#endif
CVAR(Bool, r_capsky, true, CVAR_ARCHIVE | CVAR_GLOBALCONFIG);
EXTERN_CVAR(Int, r_skymode)
//EXTERN_CVAR (Int, tx)
//EXTERN_CVAR (Int, ty)
@ -1059,7 +1059,7 @@ static void R_DrawCapSky(visplane_t *pl)
static void R_DrawSky (visplane_t *pl)
{
if (r_capsky)
if (r_skymode == 2)
{
R_DrawCapSky(pl);
return;

5
src/r_sky.cpp
View file

@ -49,7 +49,8 @@ fixed_t sky1cyl, sky2cyl;
double sky1pos, sky2pos;
// [RH] Stretch sky texture if not taller than 128 pixels?
CUSTOM_CVAR (Bool, r_stretchsky, true, CVAR_ARCHIVE)
// Also now controls capped skies. 0 = normal, 1 = stretched, 2 = capped
CUSTOM_CVAR (Int, r_skymode, 2, CVAR_ARCHIVE)
{
R_InitSkyMap ();
}
@ -99,7 +100,7 @@ void R_InitSkyMap ()
skytexturemid = 0;
if (skyheight >= 128 && skyheight < 200)
{
skystretch = (r_stretchsky
skystretch = (r_skymode == 1
&& skyheight >= 128
&& level.IsFreelookAllowed()
&& !(level.flags & LEVEL_FORCENOSKYSTRETCH)) ? 1 : 0;