Restrict cl_netfps between values of 30 and 120 (hardcoded) to reduce the amount...

[xonotic/darkplaces.git] / r_sky.c

diff --git a/r_sky.c b/r_sky.c
index d1af1078cabc502b0100e4914ebd3d95acfb3cd4..84b916e5575971d59af297666641ac4fba759c31 100644 (file)
--- a/r_sky.c
+++ b/r_sky.c
@@ -3,10 +3,10 @@
 #include "image.h"
 
 // FIXME: fix skybox after vid_restart
-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"};
-cvar_t r_sky_scissor = {0, "r_sky_scissor", "1", "limit rendering of sky to approximately the area of the sky surfaces"};
+cvar_t r_sky = {CVAR_CLIENT | CVAR_SAVE, "r_sky", "1", "enables sky rendering (black otherwise)"};
+cvar_t r_skyscroll1 = {CVAR_CLIENT | CVAR_SAVE, "r_skyscroll1", "1", "speed at which upper clouds layer scrolls in quake sky"};
+cvar_t r_skyscroll2 = {CVAR_CLIENT | CVAR_SAVE, "r_skyscroll2", "2", "speed at which lower clouds layer scrolls in quake sky"};
+cvar_t r_sky_scissor = {CVAR_CLIENT, "r_sky_scissor", "1", "limit rendering of sky to approximately the area of the sky surfaces"};
 int skyrenderlater;
 int skyrendermasked;
 int skyscissor[4];
@@ -86,7 +86,7 @@ static void R_UnloadSkyBox(void)
        {
                if (skyboxskinframe[i])
                {
-                       // TODO: make a R_SkinFrame_Purge for single skins...
+                       R_SkinFrame_PurgeSkinFrame(skyboxskinframe[i]);
                        c++;
                }
                skyboxskinframe[i] = NULL;
@@ -440,7 +440,7 @@ void R_Sky(void)
 void R_ResetSkyBox(void)
 {
        R_UnloadSkyBox();
-       skyname[0] = 0;
+       memset(skyname,0,MAX_QPATH);
        R_LoadSkyBox();
 }