Fixups for Solaris port.

[xonotic/darkplaces.git] / model_shared.c

diff --git a/model_shared.c b/model_shared.c
index da90f78505d49fdb39e8bb207962c5e3e7680356..18f5ae07a6e8091191c6f46de61d2ec636d27a93 100644 (file)
--- a/model_shared.c
+++ b/model_shared.c
@@ -131,7 +131,7 @@ Mod_LoadModel
 Loads a model
 ==================
 */
-static model_t *Mod_LoadModel(model_t *mod, qboolean crash, qboolean checkdisk, qboolean isworldmodel)
+model_t *Mod_LoadModel(model_t *mod, qboolean crash, qboolean checkdisk, qboolean isworldmodel)
 {
        int num;
        unsigned int crc;
@@ -201,7 +201,7 @@ static model_t *Mod_LoadModel(model_t *mod, qboolean crash, qboolean checkdisk,
                else if (!memcmp(buf, "ZYMOTICMODEL", 12)) Mod_ZYMOTICMODEL_Load(mod, buf);
                else if (strlen(mod->name) >= 4 && !strcmp(mod->name - 4, ".map")) Mod_MAP_Load(mod, buf);
                else if (num == BSPVERSION || num == 30) Mod_Q1BSP_Load(mod, buf);
-               else Host_Error("Mod_LoadModel: model \"%s\" is of unknown/unsupported type\n", mod->name);
+               else Con_Printf("Mod_LoadModel: model \"%s\" is of unknown/unsupported type\n", mod->name);
                Mem_Free(buf);
        }
        else if (crash)
@@ -215,22 +215,6 @@ static model_t *Mod_LoadModel(model_t *mod, qboolean crash, qboolean checkdisk,
        return mod;
 }
 
-void Mod_CheckLoaded(model_t *mod)
-{
-       if (mod)
-       {
-               if (!mod->loaded)
-                       Mod_LoadModel(mod, true, true, mod->isworldmodel);
-               else
-               {
-                       //if (mod->type == mod_invalid)
-                       //      Host_Error("Mod_CheckLoaded: invalid model\n");
-                       mod->used = true;
-                       return;
-               }
-       }
-}
-
 /*
 ===================
 Mod_ClearAll
@@ -386,7 +370,7 @@ int Mod_BuildVertexRemapTableFromElements(int numelements, const int *elements,
 
 #if 1
 // fast way, using an edge hash
-#define TRIANGLEEDGEHASH 16384
+#define TRIANGLEEDGEHASH 8192
 void Mod_BuildTriangleNeighbors(int *neighbors, const int *elements, int numtriangles)
 {
        int i, j, p, e1, e2, *n, hashindex, count, match;