implemented QW skin support, it's broken on skins that are not the same

[xonotic/darkplaces.git] / model_sprite.c

diff --git a/model_sprite.c b/model_sprite.c
index 8ef4357c8f20526711ab58e3393a612a239dedcc..6e4bf4509a096c853296220699187eb13b9394a5 100644 (file)
--- a/model_sprite.c
+++ b/model_sprite.c
@@ -177,7 +177,7 @@ static void Mod_Sprite_SharedSetup(const unsigned char *datapointer, int version
                                        sprintf (name, "%s_%i_%i", loadmodel->name, i, j);
                                else
                                        sprintf (name, "%s_%i", loadmodel->name, i);
                                        sprintf (name, "%s_%i_%i", loadmodel->name, i, j);
                                else
                                        sprintf (name, "%s_%i", loadmodel->name, i);

-                               if (!(skinframe = R_SkinFrame_LoadExternal(name, texflags)))
+                               if (!(skinframe = R_SkinFrame_LoadExternal(name, texflags, false)))

                                {
                                        if (groupframes > 1)
                                                sprintf (fogname, "%s_%i_%ifog", loadmodel->name, i, j);
                                {
                                        if (groupframes > 1)
                                                sprintf (fogname, "%s_%i_%ifog", loadmodel->name, i, j);


@@ -405,7 +405,7 @@ void Mod_IDS2_Load(model_t *mod, void *buffer, void *bufferend)
                {
                        const dsprite2frame_t *pinframe;
                        pinframe = &pinqsprite->frames[i];
                {
                        const dsprite2frame_t *pinframe;
                        pinframe = &pinqsprite->frames[i];

-                       if (!(skinframe = R_SkinFrame_LoadExternal(pinframe->name, texflags)))
+                       if (!(skinframe = R_SkinFrame_LoadExternal(pinframe->name, texflags, false)))

                        {
                                Con_Printf("Mod_IDS2_Load: failed to load %s", pinframe->name);
                                skinframe = R_SkinFrame_LoadMissing();
                        {
                                Con_Printf("Mod_IDS2_Load: failed to load %s", pinframe->name);
                                skinframe = R_SkinFrame_LoadMissing();