X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fdarkplaces.git;a=blobdiff_plain;f=r_sky.c;h=8ed9da7b5f6d4bb9176fd068f6c80478290e0261;hp=d6bea0166b07cb9d80c29b610537e04c040f1253;hb=1e72302958b4771d8dc043fa3274a10e8a14e9d8;hpb=a1f6daea42fca6b37d92ca89ae7a9a18cb77588b

diff --git a/r_sky.c b/r_sky.c
index d6bea016..8ed9da7b 100644
--- a/r_sky.c
+++ b/r_sky.c
@@ -3,16 +3,16 @@
 #include "image.h"
 
 // FIXME: fix skybox after vid_restart
-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"};
+cvar_t r_sky = {CVAR_SAVE, "r_sky", "1", "enables sky rendering (black otherwise)"};
+cvar_t r_skyscroll1 = {CVAR_SAVE, "r_skyscroll1", "1", "speed at which upper clouds layer scrolls in quake sky"};
+cvar_t r_skyscroll2 = {CVAR_SAVE, "r_skyscroll2", "2", "speed at which lower clouds layer scrolls in quake sky"};
 int skyrendernow;
 int skyrendermasked;
 
 static int skyrendersphere;
 static int skyrenderbox;
 static rtexturepool_t *skytexturepool;
-static char skyname[256];
+static char skyname[MAX_QPATH];
 
 typedef struct suffixinfo_s
 {
@@ -88,9 +88,9 @@ int R_LoadSkyBox(void)
 {
 	int i, j, success;
 	int indices[4] = {0,1,2,3};
-	char name[1024];
-	qbyte *image_rgba;
-	qbyte *temp;
+	char name[MAX_INPUTLINE];
+	unsigned char *image_rgba;
+	unsigned char *temp;
 
 	R_UnloadSkyBox();
 
@@ -113,7 +113,7 @@ int R_LoadSkyBox(void)
 					}
 				}
 			}
-			temp = Mem_Alloc(tempmempool, image_width*image_height*4);
+			temp = (unsigned char *)Mem_Alloc(tempmempool, image_width*image_height*4);
 			Image_CopyMux (temp, image_rgba, image_width, image_height, suffix[j][i].flipx, suffix[j][i].flipy, suffix[j][i].flipdiagonal, 4, 4, indices);
 			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);
@@ -432,6 +432,7 @@ void R_Sky(void)
 			//GL_Clear(GL_DEPTH_BUFFER_BIT);
 		}
 		*/
+		GL_DepthTest(true);
 	}
 }
 
@@ -463,7 +464,7 @@ static void r_sky_newmap(void)
 
 void R_Sky_Init(void)
 {
-	Cmd_AddCommand ("loadsky", &LoadSky_f);
+	Cmd_AddCommand ("loadsky", &LoadSky_f, "load a skybox by basename (for example loadsky mtnsun_ loads mtnsun_ft.tga and so on)");
 	Cvar_RegisterVariable (&r_sky);
 	Cvar_RegisterVariable (&r_skyscroll1);
 	Cvar_RegisterVariable (&r_skyscroll2);