Remove Con_Warnf and Errorf. Use macros to change color and identify the message

[xonotic/darkplaces.git] / r_sky.c

diff --git a/r_sky.c b/r_sky.c
index f0647f086409439f1e4a7a26542c07e8c9ed1074..43d60a372dac24bcd7707944716f5ef8c059999a 100644 (file)
--- a/r_sky.c
+++ b/r_sky.c
@@ -182,7 +182,7 @@ static void LoadSky_f(cmd_state_t *cmd)
                                Con_Print("skybox disabled\n");
                }
                else
-                       Con_Errorf("failed to load skybox %s\n", Cmd_Argv(cmd, 1));
+                       Con_Printf(CON_ERROR "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);
 }
 
 //===============================================================
@@ -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);