X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;f=model_shared.c;h=5c000bfa7ba0e53bc4d4433456c80aa9739fafbc;hb=fa561c1a0e1f754cab309168853a0e3b253081c8;hp=ea41b8ad4f650adaa1f6a052ff1b6676e536595e;hpb=4e917c714cb66459bc448d983a45d57b616bb154;p=xonotic%2Fdarkplaces.git

diff --git a/model_shared.c b/model_shared.c
index ea41b8ad..5c000bfa 100644
--- a/model_shared.c
+++ b/model_shared.c
@@ -507,7 +507,7 @@ dp_model_t *Mod_LoadModel(dp_model_t *mod, qboolean crash, qboolean checkdisk)
 		else if (!memcmp(buf, "ACTRHEAD", 8)) Mod_PSKMODEL_Load(mod, buf, bufend);
 		else if (!memcmp(buf, "INTERQUAKEMODEL", 16)) Mod_INTERQUAKEMODEL_Load(mod, buf, bufend);
 		else if (strlen(mod->name) >= 4 && !strcmp(mod->name + strlen(mod->name) - 4, ".map")) Mod_MAP_Load(mod, buf, bufend);
-		else if (num == BSPVERSION || num == 30) Mod_Q1BSP_Load(mod, buf, bufend);
+		else if (num == BSPVERSION || num == 30 || !memcmp(buf, "BSP2", 4)) Mod_Q1BSP_Load(mod, buf, bufend);
 		else Con_Printf("Mod_LoadModel: model \"%s\" is of unknown/unsupported type\n", mod->name);
 		Mem_Free(buf);
 
@@ -1391,7 +1391,7 @@ void Mod_CreateCollisionMesh(dp_model_t *mod)
 	for (k = 0;k < mod->nummodelsurfaces;k++)
 	{
 		surface = mod->data_surfaces + mod->firstmodelsurface + k;
-		if (!strcmp(surface->texture->name, "collision")) // found collision mesh
+		if (!strcmp(surface->texture->name, "collision") || !strcmp(surface->texture->name, "collisionconvex")) // found collision mesh
 		{
 			usesinglecollisionmesh = true;
 			numcollisionmeshtriangles = surface->num_triangles;