(Round 3) Break up host_cmd.c

[xonotic/darkplaces.git] / r_sky.c

diff --git a/r_sky.c b/r_sky.c
index 2a12b8f0d89af98d8cc0948b4b2db795f7dfbff8..38a974f498e0adb714f9e4ebc2058ea8d836742a 100644 (file)
--- a/r_sky.c
+++ b/r_sky.c
@@ -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;
@@ -182,7 +182,7 @@ static void LoadSky_f(cmd_state_t *cmd)
                                Con_Print("skybox disabled\n");
                }
                else
-                       Con_Printf("failed to load skybox %s\n", Cmd_Argv(cmd, 1));
+                       Con_Errorf("failed to load skybox %s\n", Cmd_Argv(cmd, 1));
                break;
        default:
                Con_Print("usage: loadsky skyname\n");
@@ -432,7 +432,7 @@ void R_Sky(void)
                //GL_Clear(GL_DEPTH_BUFFER_BIT);
        }
        */
-       GL_Scissor(0, 0, vid.width, vid.height);
+       GL_Scissor(0, 0, r_fb.screentexturewidth, r_fb.screentextureheight);
 }
 
 //===============================================================
@@ -440,7 +440,7 @@ void R_Sky(void)
 void R_ResetSkyBox(void)
 {
        R_UnloadSkyBox();
-       skyname[0] = 0;
+       memset(skyname,0,MAX_QPATH);
        R_LoadSkyBox();
 }
 
@@ -463,7 +463,7 @@ static void r_sky_newmap(void)
 
 void R_Sky_Init(void)
 {
-       Cmd_AddCommand(&cmd_client, "loadsky", &LoadSky_f, "load a skybox by basename (for example loadsky mtnsun_ loads mtnsun_ft.tga and so on)");
+       Cmd_AddCommand(CMD_CLIENT, "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);