summary |
shortlog |
log |
commit | commitdiff |
tree
raw |
patch |
inline | side by side (from parent 1:
ccedf7b)
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@234
d7cf8633-e32d-0410-b094-
e92efae38249
+static char skyname[256];
*/
char *suf[6] = {"rt", "bk", "lf", "ft", "up", "dn"};
rtexture_t *skyboxside[6];
*/
char *suf[6] = {"rt", "bk", "lf", "ft", "up", "dn"};
rtexture_t *skyboxside[6];
-void R_SetSkyBox(char *sky)
+int R_SetSkyBox(char *sky)
{
int i;
char name[1024];
byte* image_rgba;
if (strcmp(sky, skyname) == 0) // no change
{
int i;
char name[1024];
byte* image_rgba;
if (strcmp(sky, skyname) == 0) // no change
if (strlen(sky) > 1000)
{
Con_Printf ("sky name too long (%i, max is 1000)\n", strlen(sky));
if (strlen(sky) > 1000)
{
Con_Printf ("sky name too long (%i, max is 1000)\n", strlen(sky));
}
skyboxside[0] = skyboxside[1] = skyboxside[2] = skyboxside[3] = skyboxside[4] = skyboxside[5] = NULL;
}
skyboxside[0] = skyboxside[1] = skyboxside[2] = skyboxside[3] = skyboxside[4] = skyboxside[5] = NULL;
skyname[0] = 0;
if (!sky[0])
skyname[0] = 0;
if (!sky[0])
{
skyavailable_box = true;
strcpy(skyname, sky);
{
skyavailable_box = true;
strcpy(skyname, sky);
}
// LordHavoc: added LoadSky console command
}
// LordHavoc: added LoadSky console command
if (skyname[0])
Con_Printf("current sky: %s\n", skyname);
else
if (skyname[0])
Con_Printf("current sky: %s\n", skyname);
else
- Con_Printf("no skybox has been set\n", skyname);
+ Con_Printf("no skybox has been set\n");
- R_SetSkyBox(Cmd_Argv(1));
- Con_Printf("skybox set to %s\n", skyname);
+ if (R_SetSkyBox(Cmd_Argv(1)))
+ {
+ if (skyname[0])
+ Con_Printf("skybox set to %s\n", skyname);
+ else
+ Con_Printf("skybox disabled\n");
+ }
+ else
+ Con_Printf("failed to load skybox %s\n", Cmd_Argv(1));
break;
default:
Con_Printf("usage: loadsky skyname\n");
break;
default:
Con_Printf("usage: loadsky skyname\n");
+extern int R_SetSkyBox(char* sky);
extern cvar_t r_skyquality;
#define TPOLYTYPE_ALPHA 0
extern cvar_t r_skyquality;
#define TPOLYTYPE_ALPHA 0
// refresh.h -- public interface to refresh functions
// refresh.h -- public interface to refresh functions
-// sky stuff
-extern void R_SetSkyBox(char* sky);
-
// far clip distance for scene
extern cvar_t r_farclip;
// far clip distance for scene
extern cvar_t r_farclip;