renamed snd_reload to snd_unloadallsounds to clarify its purpose

[xonotic/darkplaces.git] / model_alias.c

diff --git a/model_alias.c b/model_alias.c
index e13ed98eab5b065821aeaabec86faee64f531101..15e85d068b53c7147bc643238909eadcc09dbcc8 100644 (file)
--- a/model_alias.c
+++ b/model_alias.c
@@ -679,11 +679,20 @@ static void Mod_BuildAliasSkinFromSkinFrame(texture_t *texture, skinframe_t *ski
        // hack
        if (!skinframe)
                skinframe = R_SkinFrame_LoadMissing();
+       memset(texture, 0, sizeof(*texture));
        texture->currentframe = texture;
+       //texture->animated = false;
        texture->numskinframes = 1;
        texture->skinframerate = 1;
        texture->skinframes[0] = skinframe;
        texture->currentskinframe = skinframe;
+       //texture->backgroundnumskinframes = 0;
+       //texture->customblendfunc[0] = 0;
+       //texture->customblendfunc[1] = 0;
+       //texture->surfaceflags = 0;
+       //texture->supercontents = 0;
+       //texture->surfaceparms = 0;
+       //texture->textureflags = 0;
 
        texture->basematerialflags = MATERIALFLAG_WALL;
        if (texture->currentskinframe->fog)
@@ -702,32 +711,41 @@ static void Mod_BuildAliasSkinsFromSkinFiles(texture_t *skin, skinfile_t *skinfi
                for (i = 0;skinfile;skinfile = skinfile->next, i++, skin += loadmodel->num_surfaces)
                {
                        memset(skin, 0, sizeof(*skin));
-                       Mod_BuildAliasSkinFromSkinFrame(skin, NULL);
-                       // don't render unmentioned meshes
-                       skin->basematerialflags = skin->currentmaterialflags = 0;
                        // see if a mesh
                        for (skinfileitem = skinfile->items;skinfileitem;skinfileitem = skinfileitem->next)
                        {
                                // leave the skin unitialized (nodraw) if the replacement is "common/nodraw" or "textures/common/nodraw"
                                if (!strcmp(skinfileitem->name, meshname) && strcmp(skinfileitem->replacement, "common/nodraw") && strcmp(skinfileitem->replacement, "textures/common/nodraw"))
                                {
-                                       tempskinframe = R_SkinFrame_LoadExternal(skinfileitem->replacement, (r_mipskins.integer ? TEXF_MIPMAP : 0) | TEXF_ALPHA | TEXF_PRECACHE | TEXF_PICMIP, false);
-                                       if (!tempskinframe)
-                                               if (cls.state != ca_dedicated)
-                                                       Con_DPrintf("mesh \"%s\": failed to load skin #%i \"%s\"\n", meshname, i, skinfileitem->replacement);
-                                       Mod_BuildAliasSkinFromSkinFrame(skin, tempskinframe);
+                                       if (!Mod_LoadTextureFromQ3Shader(skin, skinfileitem->replacement, false, false, true))
+                                       {
+                                               tempskinframe = R_SkinFrame_LoadExternal(skinfileitem->replacement, (r_mipskins.integer ? TEXF_MIPMAP : 0) | TEXF_ALPHA | TEXF_PRECACHE | TEXF_PICMIP, false);
+                                               if (!tempskinframe)
+                                                       if (cls.state != ca_dedicated)
+                                                               Con_DPrintf("mesh \"%s\": failed to load skin #%i \"%s\"\n", meshname, i, skinfileitem->replacement);
+                                               Mod_BuildAliasSkinFromSkinFrame(skin, tempskinframe);
+                                       }
                                        break;
                                }
                        }
+                       if (!skinfileitem)
+                       {
+                               // don't render unmentioned meshes
+                               Mod_BuildAliasSkinFromSkinFrame(skin, NULL);
+                               skin->basematerialflags = skin->currentmaterialflags = 0;
+                       }
                }
        }
        else
        {
-               tempskinframe = R_SkinFrame_LoadExternal(shadername, (r_mipskins.integer ? TEXF_MIPMAP : 0) | TEXF_ALPHA | TEXF_PRECACHE | TEXF_PICMIP, false);
-               if (!tempskinframe)
-                       if (cls.state != ca_dedicated)
-                               Con_Printf("Can't find texture \"%s\" for mesh \"%s\", using grey checkerboard\n", shadername, meshname);
-               Mod_BuildAliasSkinFromSkinFrame(skin, tempskinframe);
+               if (!Mod_LoadTextureFromQ3Shader(skin, shadername, false, false, true))
+               {
+                       tempskinframe = R_SkinFrame_LoadExternal(shadername, (r_mipskins.integer ? TEXF_MIPMAP : 0) | TEXF_ALPHA | TEXF_PRECACHE | TEXF_PICMIP, false);
+                       if (!tempskinframe)
+                               if (cls.state != ca_dedicated)
+                                       Con_Printf("Can't find texture \"%s\" for mesh \"%s\", using grey checkerboard\n", shadername, meshname);
+                       Mod_BuildAliasSkinFromSkinFrame(skin, tempskinframe);
+               }
        }
 }
 
@@ -996,16 +1014,20 @@ void Mod_IDP0_Load(model_t *mod, void *buffer, void *bufferend)
                                        sprintf (name, "%s_%i_%i", loadmodel->name, i, j);
                                else
                                        sprintf (name, "%s_%i", loadmodel->name, i);
-                               tempskinframe = R_SkinFrame_LoadExternal(name, (r_mipskins.integer ? TEXF_MIPMAP : 0) | TEXF_ALPHA | TEXF_PICMIP, false);
-                               if (!tempskinframe)
-                                       tempskinframe = R_SkinFrame_LoadInternal(name, (r_mipskins.integer ? TEXF_MIPMAP : 0) | TEXF_PICMIP, true, r_fullbrights.integer, (unsigned char *)datapointer, skinwidth, skinheight, 8, NULL, NULL);
-                               Mod_BuildAliasSkinFromSkinFrame(loadmodel->data_textures + totalskins * loadmodel->num_surfaces, tempskinframe);
+                               if (!Mod_LoadTextureFromQ3Shader(loadmodel->data_textures + totalskins * loadmodel->num_surfaces, name, false, false, true))
+                               {
+                                       tempskinframe = R_SkinFrame_LoadExternal(name, (r_mipskins.integer ? TEXF_MIPMAP : 0) | TEXF_ALPHA | TEXF_PICMIP, false);
+                                       if (!tempskinframe)
+                                               tempskinframe = R_SkinFrame_LoadInternal(name, (r_mipskins.integer ? TEXF_MIPMAP : 0) | TEXF_PICMIP, true, r_fullbrights.integer, (unsigned char *)datapointer, skinwidth, skinheight, 8, NULL, NULL);
+                                       Mod_BuildAliasSkinFromSkinFrame(loadmodel->data_textures + totalskins * loadmodel->num_surfaces, tempskinframe);
+                               }
                                datapointer += skinwidth * skinheight;
                                totalskins++;
                        }
                }
                // check for skins that don't exist in the model, but do exist as external images
                // (this was added because yummyluv kept pestering me about support for it)
+               // TODO: support shaders here?
                while ((tempskinframe = R_SkinFrame_LoadExternal(va("%s_%i", loadmodel->name, loadmodel->numskins), (r_mipskins.integer ? TEXF_MIPMAP : 0) | TEXF_ALPHA | TEXF_PICMIP, false)))
                {
                        // expand the arrays to make room
@@ -1151,10 +1173,13 @@ void Mod_IDP2_Load(model_t *mod, void *buffer, void *bufferend)
                loadmodel->data_textures = (texture_t *)Mem_Alloc(loadmodel->mempool, loadmodel->num_surfaces * loadmodel->numskins * sizeof(texture_t));
                for (i = 0;i < loadmodel->numskins;i++, inskin += MD2_SKINNAME)
                {
-                       tempskinframe = R_SkinFrame_LoadExternal(inskin, (r_mipskins.integer ? TEXF_MIPMAP : 0) | TEXF_ALPHA | TEXF_PRECACHE | TEXF_PICMIP, false);
-                       if (!tempskinframe)
-                               Con_Printf("%s is missing skin \"%s\"\n", loadmodel->name, inskin);
-                       Mod_BuildAliasSkinFromSkinFrame(loadmodel->data_textures + i * loadmodel->num_surfaces, tempskinframe);
+                       if (!Mod_LoadTextureFromQ3Shader(loadmodel->data_textures + i * loadmodel->num_surfaces, inskin, false, false, true))
+                       {
+                               tempskinframe = R_SkinFrame_LoadExternal(inskin, (r_mipskins.integer ? TEXF_MIPMAP : 0) | TEXF_ALPHA | TEXF_PRECACHE | TEXF_PICMIP, false);
+                               if (!tempskinframe)
+                                       Con_Printf("%s is missing skin \"%s\"\n", loadmodel->name, inskin);
+                               Mod_BuildAliasSkinFromSkinFrame(loadmodel->data_textures + i * loadmodel->num_surfaces, tempskinframe);
+                       }
                }
        }
        else