Index: darkplaces/model_brush.c
diff -u darkplaces/model_brush.c:1.193 darkplaces/model_brush.c:1.194
--- darkplaces/model_brush.c:1.193	Sun Oct 17 07:51:38 2004
+++ darkplaces/model_brush.c	Wed Oct 20 07:58:58 2004
@@ -904,6 +904,69 @@
 	}
 }
 
+/*
+=============
+R_Q1BSP_LoadSplitSky
+
+A sky texture is 256*128, with the right side being a masked overlay
+==============
+*/
+void R_Q1BSP_LoadSplitSky (qbyte *src, int bytesperpixel)
+{
+	int i, j;
+	unsigned solidpixels[128*128], alphapixels[128*128];
+
+	if (bytesperpixel == 4)
+	{
+		for (i = 0;i < 128;i++)
+		{
+			for (j = 0;j < 128;j++)
+			{
+				solidpixels[(i*128) + j] = ((unsigned *)src)[i*256+j+128];
+				alphapixels[(i*128) + j] = ((unsigned *)src)[i*256+j];
+			}
+		}
+	}
+	else
+	{
+		// make an average value for the back to avoid
+		// a fringe on the top level
+		int p, r, g, b;
+		union
+		{
+			unsigned int i;
+			unsigned char b[4];
+		}
+		rgba;
+		r = g = b = 0;
+		for (i = 0;i < 128;i++)
+		{
+			for (j = 0;j < 128;j++)
+			{
+				rgba.i = palette_complete[src[i*256 + j + 128]];
+				r += rgba.b[0];
+				g += rgba.b[1];
+				b += rgba.b[2];
+			}
+		}
+		rgba.b[0] = r/(128*128);
+		rgba.b[1] = g/(128*128);
+		rgba.b[2] = b/(128*128);
+		rgba.b[3] = 0;
+		for (i = 0;i < 128;i++)
+		{
+			for (j = 0;j < 128;j++)
+			{
+				solidpixels[(i*128) + j] = palette_complete[src[i*256 + j + 128]];
+				alphapixels[(i*128) + j] = (p = src[i*256 + j]) ? palette_complete[p] : rgba.i;
+			}
+		}
+	}
+
+	loadmodel->brush.solidskytexture = R_LoadTexture2D(loadmodel->texturepool, "sky_solidtexture", 128, 128, (qbyte *) solidpixels, TEXTYPE_RGBA, TEXF_PRECACHE, NULL);
+	loadmodel->brush.alphaskytexture = R_LoadTexture2D(loadmodel->texturepool, "sky_alphatexture", 128, 128, (qbyte *) alphapixels, TEXTYPE_RGBA, TEXF_ALPHA | TEXF_PRECACHE, NULL);
+}
+
 static void Mod_Q1BSP_LoadTextures(lump_t *l)
 {
 	int i, j, k, num, max, altmax, mtwidth, mtheight, *dofs, incomplete;
@@ -1007,7 +1070,7 @@
 				{
 					if (image_width == 256 && image_height == 128)
 					{
-						R_InitSky(data, 4);
+						R_Q1BSP_LoadSplitSky(data, 4);
 						Mem_Free(data);
 					}
 					else
@@ -1015,11 +1078,11 @@
 						Mem_Free(data);
 						Con_Printf("Invalid replacement texture for sky \"%s\" in %\"%s\", must be 256x128 pixels\n", tx->name, loadmodel->name);
 						if (mtdata != NULL)
-							R_InitSky(mtdata, 1);
+							R_Q1BSP_LoadSplitSky(mtdata, 1);
 					}
 				}
 				else if (mtdata != NULL)
-					R_InitSky(mtdata, 1);
+					R_Q1BSP_LoadSplitSky(mtdata, 1);
 			}
 		}
 		else
@@ -2913,11 +2976,7 @@
 	mod->brushq1.BuildPVSTextureChains = Mod_Q1BSP_BuildPVSTextureChains;
 
 	if (loadmodel->isworldmodel)
-	{
 		Cvar_SetValue("halflifebsp", mod->brush.ishlbsp);
-		// until we get a texture for it...
-		R_ResetQuakeSky();
-	}
 
 // swap all the lumps
 	mod_base = (qbyte *)header;
@@ -3509,11 +3568,7 @@
 		Host_Error("Mod_Q2BSP_Load: %s has wrong version number (%i, should be %i)", mod->name, i, Q2BSPVERSION);
 	mod->brush.ishlbsp = false;
 	if (loadmodel->isworldmodel)
-	{
 		Cvar_SetValue("halflifebsp", mod->brush.ishlbsp);
-		// until we get a texture for it...
-		R_ResetQuakeSky();
-	}
 
 	mod_base = (qbyte *)header;
 
@@ -5634,11 +5689,7 @@
 	if (i != Q3BSPVERSION)
 		Host_Error("Mod_Q3BSP_Load: %s has wrong version number (%i, should be %i)", mod->name, i, Q3BSPVERSION);
 	if (mod->isworldmodel)
-	{
 		Cvar_SetValue("halflifebsp", false);
-		// until we get a texture for it...
-		R_ResetQuakeSky();
-	}
 
 	mod->soundfromcenter = true;
 	mod->TraceBox = Mod_Q3BSP_TraceBox;
Index: darkplaces/model_shared.h
diff -u darkplaces/model_shared.h:1.104 darkplaces/model_shared.h:1.105
--- darkplaces/model_shared.h:1.104	Sun Oct 17 07:51:38 2004
+++ darkplaces/model_shared.h	Wed Oct 20 07:58:58 2004
@@ -179,6 +179,9 @@
 	void (*RoundUpToHullSize)(struct model_s *cmodel, const vec3_t inmins, const vec3_t inmaxs, vec3_t outmins, vec3_t outmaxs);
 
 	char skybox[64];
+
+	rtexture_t *solidskytexture;
+	rtexture_t *alphaskytexture;
 }
 model_brush_t;
 
Index: darkplaces/r_sky.c
diff -u darkplaces/r_sky.c:1.57 darkplaces/r_sky.c:1.58
--- darkplaces/r_sky.c:1.57	Thu May 20 20:49:52 2004
+++ darkplaces/r_sky.c	Wed Oct 20 07:58:58 2004
@@ -6,13 +6,9 @@
 cvar_t r_sky = {CVAR_SAVE, "r_sky", "1"};
 cvar_t r_skyscroll1 = {CVAR_SAVE, "r_skyscroll1", "1"};
 cvar_t r_skyscroll2 = {CVAR_SAVE, "r_skyscroll2", "2"};
-qboolean skyavailable_quake;
-qboolean skyavailable_box;
 int skyrendernow;
 int skyrendermasked;
 
-static rtexture_t *solidskytexture;
-static rtexture_t *alphaskytexture;
 static int skyrendersphere;
 static int skyrenderbox;
 static rtexturepool_t *skytexturepool;
@@ -62,9 +58,9 @@
 	skyrendermasked = false;
 	if (r_sky.integer && !fogenabled)
 	{
-		if (skyavailable_box)
+		if (skyboxside[0] || skyboxside[1] || skyboxside[2] || skyboxside[3] || skyboxside[4] || skyboxside[5])
 			skyrenderbox = true;
-		else if (skyavailable_quake)
+		else if (cl.worldmodel->brush.solidskytexture)
 			skyrendersphere = true;
 		// for depth-masked sky, render the sky on the first sky surface encountered
 		skyrendernow = true;
@@ -90,17 +86,20 @@
 
 void R_LoadSkyBox(void)
 {
-	int i, j;
+	int i, j, success;
 	int indices[4] = {0,1,2,3};
 	char name[1024];
 	qbyte *image_rgba;
 	qbyte *temp;
+
 	R_UnloadSkyBox();
+
 	if (!skyname[0])
 		return;
 
 	for (j=0; j<3; j++)
 	{
+		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)))
@@ -119,22 +118,15 @@
 			skyboxside[i] = R_LoadTexture2D(skytexturepool, va("skyboxside%d", i), image_width, image_height, temp, TEXTYPE_RGBA, TEXF_CLAMP | TEXF_PRECACHE, NULL);
 			Mem_Free(image_rgba);
 			Mem_Free(temp);
+			success++;
 		}
 
-		for (i=0; i<6; i++)
-		{
-			if (skyboxside[i] == NULL)
-			{
-				R_UnloadSkyBox();
-				break;
-			}
-		}
-
-		if (skyboxside[0] != NULL)
-			return;
+		if (success)
+			break;
 	}
 
-	Con_Printf ("Failed to load %s as skybox\n", skyname);
+	if (j == 3)
+		Con_Printf ("Failed to load %s as skybox\n", skyname);
 }
 
 int R_SetSkyBox(const char *sky)
@@ -148,20 +140,12 @@
 		return false;
 	}
 
-	skyavailable_box = false;
 	strcpy(skyname, sky);
 
-	R_UnloadSkyBox();
 	R_LoadSkyBox();
 
 	if (!skyname[0])
 		return true;
-
-	if (skyboxside[0] || skyboxside[1] || skyboxside[2] || skyboxside[3] || skyboxside[4] || skyboxside[5])
-	{
-		skyavailable_box = true;
-		return true;
-	}
 	return false;
 }
 
@@ -290,7 +274,7 @@
 	GL_Color(1, 1, 1, 1);
 	memset(&m, 0, sizeof(m));
 	GL_BlendFunc(GL_ONE, GL_ZERO);
-	GL_DepthMask(true);
+	GL_DepthMask(false);
 	GL_DepthTest(false); // don't modify or read zbuffer
 	m.pointer_vertex = skyboxvertex3f;
 	m.pointer_texcoord[0] = skyboxtexcoord2f;
@@ -391,13 +375,13 @@
 	GL_DepthTest(false); // don't modify or read zbuffer
 	memset(&m, 0, sizeof(m));
 	m.pointer_vertex = skysphere_vertex3f;
-	m.tex[0] = R_GetTexture(solidskytexture);
+	m.tex[0] = R_GetTexture(cl.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(alphaskytexture);
+		m.tex[1] = R_GetTexture(cl.worldmodel->brush.alphaskytexture);
 		m.texcombinergb[1] = gl_combine.integer ? GL_INTERPOLATE_ARB : GL_DECAL;
 		m.pointer_texcoord[1] = skysphere_texcoord2f;
 		m.texmatrix[1] = scroll2matrix;
@@ -415,7 +399,7 @@
 		GL_LockArrays(0, 0);
 
 		GL_BlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
-		m.tex[0] = R_GetTexture(alphaskytexture);
+		m.tex[0] = R_GetTexture(cl.worldmodel->brush.alphaskytexture);
 		m.texmatrix[0] = scroll2matrix;
 		R_Mesh_State(&m);
 		GL_LockArrays(0, skysphere_numverts);
@@ -455,94 +439,16 @@
 
 //===============================================================
 
-/*
-=============
-R_InitSky
-
-A sky texture is 256*128, with the right side being a masked overlay
-==============
-*/
-void R_InitSky (qbyte *src, int bytesperpixel)
-{
-	int i, j;
-	unsigned solidpixels[128*128], alphapixels[128*128];
-
-	skyavailable_quake = true;
-
-	// flush skytexturepool so we won't build up a leak from uploading textures multiple times
-	R_FreeTexturePool(&skytexturepool);
-	skytexturepool = R_AllocTexturePool();
-	solidskytexture = NULL;
-	alphaskytexture = NULL;
-
-	if (bytesperpixel == 4)
-	{
-		for (i = 0;i < 128;i++)
-		{
-			for (j = 0;j < 128;j++)
-			{
-				solidpixels[(i*128) + j] = ((unsigned *)src)[i*256+j+128];
-				alphapixels[(i*128) + j] = ((unsigned *)src)[i*256+j];
-			}
-		}
-	}
-	else
-	{
-		// make an average value for the back to avoid
-		// a fringe on the top level
-		int p, r, g, b;
-		union
-		{
-			unsigned int i;
-			unsigned char b[4];
-		}
-		rgba;
-		r = g = b = 0;
-		for (i = 0;i < 128;i++)
-		{
-			for (j = 0;j < 128;j++)
-			{
-				rgba.i = palette_complete[src[i*256 + j + 128]];
-				r += rgba.b[0];
-				g += rgba.b[1];
-				b += rgba.b[2];
-			}
-		}
-		rgba.b[0] = r/(128*128);
-		rgba.b[1] = g/(128*128);
-		rgba.b[2] = b/(128*128);
-		rgba.b[3] = 0;
-		for (i = 0;i < 128;i++)
-		{
-			for (j = 0;j < 128;j++)
-			{
-				solidpixels[(i*128) + j] = palette_complete[src[i*256 + j + 128]];
-				alphapixels[(i*128) + j] = (p = src[i*256 + j]) ? palette_complete[p] : rgba.i;
-			}
-		}
-	}
-
-	solidskytexture = R_LoadTexture2D(skytexturepool, "sky_solidtexture", 128, 128, (qbyte *) solidpixels, TEXTYPE_RGBA, TEXF_PRECACHE, NULL);
-	alphaskytexture = R_LoadTexture2D(skytexturepool, "sky_alphatexture", 128, 128, (qbyte *) alphapixels, TEXTYPE_RGBA, TEXF_ALPHA | TEXF_PRECACHE, NULL);
-}
-
-void R_ResetQuakeSky(void)
-{
-	skyavailable_quake = false;
-}
-
 void R_ResetSkyBox(void)
 {
 	skyboxside[0] = skyboxside[1] = skyboxside[2] = skyboxside[3] = skyboxside[4] = skyboxside[5] = NULL;
 	skyname[0] = 0;
-	skyavailable_box = false;
+	R_LoadSkyBox();
 }
 
 static void r_sky_start(void)
 {
 	skytexturepool = R_AllocTexturePool();
-	solidskytexture = NULL;
-	alphaskytexture = NULL;
 	R_LoadSkyBox();
 }
 
@@ -550,22 +456,21 @@
 {
 	R_UnloadSkyBox();
 	R_FreeTexturePool(&skytexturepool);
-	solidskytexture = NULL;
-	alphaskytexture = NULL;
 }
 
 static void r_sky_newmap(void)
 {
 }
 
+
 void R_Sky_Init(void)
 {
 	Cmd_AddCommand ("loadsky", &LoadSky_f);
 	Cvar_RegisterVariable (&r_sky);
 	Cvar_RegisterVariable (&r_skyscroll1);
 	Cvar_RegisterVariable (&r_skyscroll2);
-	R_ResetSkyBox();
-	R_ResetQuakeSky();
+	skyboxside[0] = skyboxside[1] = skyboxside[2] = skyboxside[3] = skyboxside[4] = skyboxside[5] = NULL;
+	skyname[0] = 0;
 	R_RegisterModule("R_Sky", r_sky_start, r_sky_shutdown, r_sky_newmap);
 }
 
Index: darkplaces/render.h
diff -u darkplaces/render.h:1.82 darkplaces/render.h:1.83
--- darkplaces/render.h:1.82	Sun Sep 26 08:46:40 2004
+++ darkplaces/render.h	Wed Oct 20 07:58:58 2004
@@ -43,7 +43,6 @@
 extern int R_SetSkyBox(const char *sky);
 extern void R_SkyStartFrame(void);
 extern void R_Sky(void);
-extern void R_ResetQuakeSky(void);
 extern void R_ResetSkyBox(void);
 
 // SHOWLMP stuff (Nehahra)