OrdinaryMagician/vkdoom_m
OrdinaryMagician/vkdoom_m
1
Fork 0
Code Activity

Merge remote-tracking branch 'origin/capsky' into qzdoom

Browse source 
# Conflicts:
#	src/r_plane.cpp
#	src/r_sky.cpp
#	wadsrc/static/language.enu
#	wadsrc/static/menudef.txt
This commit is contained in:
Magnus Norddahl 2016-10-20 01:05:05 +02:00
commit aa199a91c5
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

@ -65,7 +65,7 @@
#pragma warning(disable:4244)
#endif
CVAR(Bool, r_capsky, true, CVAR_ARCHIVE | CVAR_GLOBALCONFIG);
EXTERN_CVAR(Int, r_skymode)
CVAR(Bool, r_cubesky, false, 0)
//EXTERN_CVAR (Int, tx)
@ -1268,7 +1268,7 @@ static void R_DrawSky (visplane_t *pl)
R_DrawCubeSky(pl);
return;
}
else if (r_capsky)
else 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, false, 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;