From: havoc Date: Thu, 5 May 2005 14:24:24 +0000 (+0000) Subject: hush some texture loading warnings in dedicated servers (thanks to Biomass for report... X-Git-Tag: xonotic-v0.1.0preview~4951 X-Git-Url: https://git.xonotic.org/?a=commitdiff_plain;h=7d751de254f2c6e983ad2c580b81602fc6963b29;p=xonotic%2Fdarkplaces.git hush some texture loading warnings in dedicated servers (thanks to Biomass for reporting this) git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@5228 d7cf8633-e32d-0410-b094-e92efae38249 --- diff --git a/model_alias.c b/model_alias.c index c0c78562..2fb1a359 100644 --- a/model_alias.c +++ b/model_alias.c @@ -384,12 +384,14 @@ static void Mod_BuildAliasSkinsFromSkinFiles(texture_t *skin, skinfile_t *skinfi Mod_BuildAliasSkinFromSkinFrame(skin, &tempskinframe); else { - Con_Printf("mesh \"%s\": failed to load skin #%i \"%s\", falling back to mesh's internal shader name \"%s\"\n", meshname, i, skinfileitem->replacement, shadername); + if (cls.state != ca_dedicated) + Con_Printf("mesh \"%s\": failed to load skin #%i \"%s\", falling back to mesh's internal shader name \"%s\"\n", meshname, i, skinfileitem->replacement, shadername); if (Mod_LoadSkinFrame(&tempskinframe, shadername, (r_mipskins.integer ? TEXF_MIPMAP : 0) | TEXF_ALPHA | TEXF_CLAMP | TEXF_PRECACHE | TEXF_PICMIP, true, false, true)) Mod_BuildAliasSkinFromSkinFrame(skin, &tempskinframe); else { - Con_Printf("failed to load skin \"%s\"\n", shadername); + if (cls.state != ca_dedicated) + Con_Printf("failed to load skin \"%s\"\n", shadername); Mod_BuildAliasSkinFromSkinFrame(skin, NULL); } } @@ -404,7 +406,8 @@ static void Mod_BuildAliasSkinsFromSkinFiles(texture_t *skin, skinfile_t *skinfi Mod_BuildAliasSkinFromSkinFrame(skin, &tempskinframe); else { - Con_Printf("failed to load mesh \"%s\" shader \"%s\"\n", meshname, shadername); + if (cls.state != ca_dedicated) + Con_Printf("failed to load mesh \"%s\" shader \"%s\"\n", meshname, shadername); Mod_BuildAliasSkinFromSkinFrame(skin, NULL); } } diff --git a/model_brush.c b/model_brush.c index 89bae0de..f0ef9297 100644 --- a/model_brush.c +++ b/model_brush.c @@ -3920,7 +3920,8 @@ parseerror: } if (!Mod_LoadSkinFrame(&out->skin, out->name, (((out->textureflags & Q3TEXTUREFLAG_NOMIPMAPS) || (out->surfaceparms & Q3SURFACEPARM_NOMIPMAPS)) ? 0 : TEXF_MIPMAP) | TEXF_ALPHA | TEXF_PRECACHE | (out->textureflags & Q3TEXTUREFLAG_NOPICMIP ? 0 : TEXF_PICMIP), false, false, true)) if (!Mod_LoadSkinFrame(&out->skin, out->firstpasstexturename, (((out->textureflags & Q3TEXTUREFLAG_NOMIPMAPS) || (out->surfaceparms & Q3SURFACEPARM_NOMIPMAPS)) ? 0 : TEXF_MIPMAP) | TEXF_ALPHA | TEXF_PRECACHE | (out->textureflags & Q3TEXTUREFLAG_NOPICMIP ? 0 : TEXF_PICMIP), false, false, true)) - Con_Printf("%s: texture loading for shader \"%s\" failed (first layer \"%s\" not found either)\n", loadmodel->name, out->name, out->firstpasstexturename); + if (cls.state != ca_dedicated) + Con_Printf("%s: texture loading for shader \"%s\" failed (first layer \"%s\" not found either)\n", loadmodel->name, out->name, out->firstpasstexturename); // no animation out->currentframe = out; }