X-Git-Url: https://de.git.xonotic.org/?a=blobdiff_plain;f=r_sky.c;h=fa9c0df2e5dcef4de198efb8048cc46522198c2f;hb=f884a4dc2bac759f71ee44d5d6e8040feda71e22;hp=2c5cbd020177f32969d28bbd330756ea1b470135;hpb=7d1be6a3730dffa3f81c847f1ba1a756a90600ff;p=xonotic%2Fdarkplaces.git

diff --git a/r_sky.c b/r_sky.c
index 2c5cbd02..fa9c0df2 100644
--- a/r_sky.c
+++ b/r_sky.c
@@ -39,12 +39,12 @@ static suffixinfo_t suffix[3][6] =
 		{"negz", false, false, false}
 	},
 	{
-		{"rt",    true, false,  true},
-		{"lf",   false,  true,  true},
-		{"ft",    true,  true, false},
-		{"bk",   false, false, false},
-		{"up",    true, false,  true},
-		{"dn",    true, false,  true}
+		{"rt",   false, false,  true},
+		{"lf",    true,  true,  true},
+		{"bk",   false,  true, false},
+		{"ft",    true, false, false},
+		{"up",   false, false,  true},
+		{"dn",   false, false,  true}
 	}
 };
 
@@ -60,7 +60,7 @@ void R_SkyStartFrame(void)
 	{
 		if (skyboxside[0] || skyboxside[1] || skyboxside[2] || skyboxside[3] || skyboxside[4] || skyboxside[5])
 			skyrenderbox = true;
-		else if (cl.worldmodel->brush.solidskytexture)
+		else if (r_refdef.worldmodel->brush.solidskytexture)
 			skyrendersphere = true;
 		// for depth-masked sky, render the sky on the first sky surface encountered
 		skyrendernow = true;
@@ -102,13 +102,13 @@ void R_LoadSkyBox(void)
 		success = 0;
 		for (i=0; i<6; i++)
 		{
-			if (snprintf(name, sizeof(name), "%s_%s", skyname, suffix[j][i].suffix) >= (int)sizeof(name) || !(image_rgba = loadimagepixels(name, false, 0, 0)))
+			if (dpsnprintf(name, sizeof(name), "%s_%s", skyname, suffix[j][i].suffix) < 0 || !(image_rgba = loadimagepixels(name, false, 0, 0)))
 			{
-				if (snprintf(name, sizeof(name), "%s%s", skyname, suffix[j][i].suffix) >= (int)sizeof(name) || !(image_rgba = loadimagepixels(name, false, 0, 0)))
+				if (dpsnprintf(name, sizeof(name), "%s%s", skyname, suffix[j][i].suffix) < 0 || !(image_rgba = loadimagepixels(name, false, 0, 0)))
 				{
-					if (snprintf(name, sizeof(name), "env/%s%s", skyname, suffix[j][i].suffix) >= (int)sizeof(name) || !(image_rgba = loadimagepixels(name, false, 0, 0)))
+					if (dpsnprintf(name, sizeof(name), "env/%s%s", skyname, suffix[j][i].suffix) < 0 || !(image_rgba = loadimagepixels(name, false, 0, 0)))
 					{
-						if (snprintf(name, sizeof(name), "gfx/env/%s%s", skyname, suffix[j][i].suffix) >= (int)sizeof(name) || !(image_rgba = loadimagepixels(name, false, 0, 0)))
+						if (dpsnprintf(name, sizeof(name), "gfx/env/%s%s", skyname, suffix[j][i].suffix) < 0 || !(image_rgba = loadimagepixels(name, false, 0, 0)))
 							continue;
 					}
 				}
@@ -283,7 +283,7 @@ static void R_SkyBox(void)
 	{
 		m.tex[0] = R_GetTexture(skyboxside[i]);
 		R_Mesh_State(&m);
-		R_Mesh_Draw(6*4, 2, skyboxelements + i * 6);
+		R_Mesh_Draw(0, 6*4, 2, skyboxelements + i * 6);
 	}
 	GL_LockArrays(0, 0);
 }
@@ -361,11 +361,11 @@ static void R_SkySphere(void)
 	// wrap the scroll values just to be extra kind to float accuracy
 
 	// scroll speed for upper layer
-	speedscale = cl.time*r_skyscroll1.value*8.0/128.0;
+	speedscale = r_refdef.time*r_skyscroll1.value*8.0/128.0;
 	speedscale -= (int)speedscale;
 	Matrix4x4_CreateTranslate(&scroll1matrix, speedscale, speedscale, 0);
 	// scroll speed for lower layer (transparent layer)
-	speedscale = cl.time*r_skyscroll2.value*8.0/128.0;
+	speedscale = r_refdef.time*r_skyscroll2.value*8.0/128.0;
 	speedscale -= (int)speedscale;
 	Matrix4x4_CreateTranslate(&scroll2matrix, speedscale, speedscale, 0);
 
@@ -375,19 +375,19 @@ static void R_SkySphere(void)
 	GL_DepthTest(false); // don't modify or read zbuffer
 	memset(&m, 0, sizeof(m));
 	m.pointer_vertex = skysphere_vertex3f;
-	m.tex[0] = R_GetTexture(cl.worldmodel->brush.solidskytexture);
+	m.tex[0] = R_GetTexture(r_refdef.worldmodel->brush.solidskytexture);
 	m.pointer_texcoord[0] = skysphere_texcoord2f;
 	m.texmatrix[0] = scroll1matrix;
 	if (r_textureunits.integer >= 2)
 	{
 		// one pass using GL_DECAL or GL_INTERPOLATE_ARB for alpha layer
-		m.tex[1] = R_GetTexture(cl.worldmodel->brush.alphaskytexture);
+		m.tex[1] = R_GetTexture(r_refdef.worldmodel->brush.alphaskytexture);
 		m.texcombinergb[1] = gl_combine.integer ? GL_INTERPOLATE_ARB : GL_DECAL;
 		m.pointer_texcoord[1] = skysphere_texcoord2f;
 		m.texmatrix[1] = scroll2matrix;
 		R_Mesh_State(&m);
 		GL_LockArrays(0, skysphere_numverts);
-		R_Mesh_Draw(skysphere_numverts, skysphere_numtriangles, skysphere_element3i);
+		R_Mesh_Draw(0, skysphere_numverts, skysphere_numtriangles, skysphere_element3i);
 		GL_LockArrays(0, 0);
 	}
 	else
@@ -395,15 +395,15 @@ static void R_SkySphere(void)
 		// two pass
 		R_Mesh_State(&m);
 		GL_LockArrays(0, skysphere_numverts);
-		R_Mesh_Draw(skysphere_numverts, skysphere_numtriangles, skysphere_element3i);
+		R_Mesh_Draw(0, skysphere_numverts, skysphere_numtriangles, skysphere_element3i);
 		GL_LockArrays(0, 0);
 
 		GL_BlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
-		m.tex[0] = R_GetTexture(cl.worldmodel->brush.alphaskytexture);
+		m.tex[0] = R_GetTexture(r_refdef.worldmodel->brush.alphaskytexture);
 		m.texmatrix[0] = scroll2matrix;
 		R_Mesh_State(&m);
 		GL_LockArrays(0, skysphere_numverts);
-		R_Mesh_Draw(skysphere_numverts, skysphere_numtriangles, skysphere_element3i);
+		R_Mesh_Draw(0, skysphere_numverts, skysphere_numtriangles, skysphere_element3i);
 		GL_LockArrays(0, 0);
 	}
 }
@@ -441,7 +441,7 @@ void R_Sky(void)
 
 void R_ResetSkyBox(void)
 {
-	skyboxside[0] = skyboxside[1] = skyboxside[2] = skyboxside[3] = skyboxside[4] = skyboxside[5] = NULL;
+	R_UnloadSkyBox();
 	skyname[0] = 0;
 	R_LoadSkyBox();
 }
@@ -469,7 +469,7 @@ void R_Sky_Init(void)
 	Cvar_RegisterVariable (&r_sky);
 	Cvar_RegisterVariable (&r_skyscroll1);
 	Cvar_RegisterVariable (&r_skyscroll2);
-	skyboxside[0] = skyboxside[1] = skyboxside[2] = skyboxside[3] = skyboxside[4] = skyboxside[5] = NULL;
+	memset(&skyboxside, 0, sizeof(skyboxside));
 	skyname[0] = 0;
 	R_RegisterModule("R_Sky", r_sky_start, r_sky_shutdown, r_sky_newmap);
 }