X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fdarkplaces.git;a=blobdiff_plain;f=r_sky.c;h=d6bea0166b07cb9d80c29b610537e04c040f1253;hp=fa9c0df2e5dcef4de198efb8048cc46522198c2f;hb=a1f6daea42fca6b37d92ca89ae7a9a18cb77588b;hpb=c99b3f213fcc75305ff097ac9a75ce63d18f5d7a diff --git a/r_sky.c b/r_sky.c index fa9c0df2..d6bea016 100644 --- a/r_sky.c +++ b/r_sky.c @@ -84,7 +84,7 @@ void R_UnloadSkyBox(void) } } -void R_LoadSkyBox(void) +int R_LoadSkyBox(void) { int i, j, success; int indices[4] = {0,1,2,3}; @@ -95,7 +95,7 @@ void R_LoadSkyBox(void) R_UnloadSkyBox(); if (!skyname[0]) - return; + return true; for (j=0; j<3; j++) { @@ -126,7 +126,9 @@ void R_LoadSkyBox(void) } if (j == 3) - Con_Printf ("Failed to load %s as skybox\n", skyname); + return false; + + return true; } int R_SetSkyBox(const char *sky) @@ -142,11 +144,7 @@ int R_SetSkyBox(const char *sky) strcpy(skyname, sky); - R_LoadSkyBox(); - - if (!skyname[0]) - return true; - return false; + return R_LoadSkyBox(); } // LordHavoc: added LoadSky console command