changed svc_setangle to cause interpolated turning when spectating (two or more conse...

[xonotic/darkplaces.git] / model_alias.c

diff --git a/model_alias.c b/model_alias.c
index d8ebba5b2bfaa01a0913c202eb66199b981e6de3..4a9cf0530cd6b3d8e24060eb63432b5578257ed6 100644 (file)
--- a/model_alias.c
+++ b/model_alias.c
@@ -399,7 +399,7 @@ static void Mod_BuildAliasSkinFromSkinFrame(texture_t *skin, skinframe_t *skinfr
        skin->currentframe = skin;
        skin->basematerialflags = MATERIALFLAG_WALL;
        if (skin->skin.fog)
-               skin->basematerialflags |= MATERIALFLAG_ALPHA | MATERIALFLAG_TRANSPARENT;
+               skin->basematerialflags |= MATERIALFLAG_ALPHA | MATERIALFLAG_BLENDED | MATERIALFLAG_TRANSPARENT;
        skin->currentmaterialflags = skin->basematerialflags;
 }
 
@@ -1524,15 +1524,14 @@ void Mod_DARKPLACESMODEL_Load(model_t *mod, void *buffer, void *bufferend)
        meshtriangles = 0;
        numvertexboneweights = 0;
 
-       // load the meshes now
+       // gather combined statistics from the meshes
        dpmmesh = (dpmmesh_t *) (pbase + pheader->ofs_meshs);
-       for (i = 0;i < loadmodel->num_surfaces;i++)
+       for (i = 0;i < (int)pheader->num_meshs;i++)
        {
                int numverts = BigLong(dpmmesh->num_verts);
                meshvertices += numverts;;
                meshtriangles += BigLong(dpmmesh->num_tris);
 
-               // to find out how many weights exist we two a two-stage load...
                data = (unsigned char *) (pbase + BigLong(dpmmesh->ofs_verts));
                for (j = 0;j < numverts;j++)
                {