#include "quakedef.h"
-model_t *loadmodel;
+model_t *loadmodel;
// LordHavoc: increased from 512 to 2048
#define MAX_MOD_KNOWN 2048
{
int crc;
void *buf;
- char tempname[MAX_QPATH];
mod->used = true;
if (mod->name[0] == '*') // submodel
return mod;
- if (checkdisk)
+ crc = 0;
+ buf = NULL;
+ if (!mod->needload)
{
- // load the file
- buf = COM_LoadFile (mod->name, false);
- if (!buf)
+ if (checkdisk)
{
- if (crash)
- Host_Error ("Mod_LoadModel: %s not found", mod->name); // LordHavoc: Sys_Error was *ANNOYING*
- return NULL;
- }
+ buf = COM_LoadFile (mod->name, false);
+ if (!buf)
+ {
+ if (crash)
+ Host_Error ("Mod_LoadModel: %s not found", mod->name); // LordHavoc: Sys_Error was *ANNOYING*
+ return NULL;
+ }
- crc = CRC_Block(buf, com_filesize);
+ crc = CRC_Block(buf, com_filesize);
+ }
+ else
+ crc = mod->crc;
- if (!mod->needload && mod->crc == crc && mod->isworldmodel == isworldmodel)
+ if (mod->crc == crc && mod->isworldmodel == isworldmodel)
{
- Mem_Free(buf);
+ if (buf)
+ Mem_Free(buf);
return mod; // already loaded
}
-
- Con_DPrintf("loading model %s\n", mod->name);
}
- else
- {
- if (!mod->needload && mod->isworldmodel == isworldmodel)
- return mod; // already loaded
- Con_DPrintf("loading model %s\n", mod->name);
+ Con_DPrintf("loading model %s\n", mod->name);
+ if (!buf)
+ {
buf = COM_LoadFile (mod->name, false);
if (!buf)
{
if (crash)
- Host_Error ("Mod_LoadModel: %s not found", mod->name); // LordHavoc: Sys_Error was *ANNOYING*
+ Host_Error ("Mod_LoadModel: %s not found", mod->name);
return NULL;
}
crc = CRC_Block(buf, com_filesize);
}
- // make sure nothing got trashed
- Mem_CheckSentinelsGlobal();
-
// allocate a new model
loadmodel = mod;
- // LordHavoc: clear the model struct
- strcpy(tempname, mod->name);
- Mod_FreeModel(mod);
-
- strcpy(mod->name, tempname);
+ // LordHavoc: unload the existing model in this slot (if there is one)
+ Mod_UnloadModel(mod);
mod->isworldmodel = isworldmodel;
mod->needload = false;
mod->used = true;
// all models use memory, so allocate a memory pool
mod->mempool = Mem_AllocPool(mod->name);
// all models load textures, so allocate a texture pool
- mod->texturepool = R_AllocTexturePool();
+ if (cls.state != ca_dedicated)
+ mod->texturepool = R_AllocTexturePool();
// call the apropriate loader
if (!memcmp(buf, "IDPO" , 4)) Mod_LoadAliasModel (mod, buf);
Mem_Free(buf);
- // make sure nothing got trashed
- Mem_CheckSentinelsGlobal();
-
return mod;
}
{
if (mod)
{
- if (!mod->needload)
+ if (mod->needload)
+ 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_LoadModel(mod, true, true, mod->isworldmodel);
}
}
*/
void Mod_ClearAll (void)
{
- /*
- int i;
- model_t *mod;
-
- for (i = 0, mod = mod_known;i < MAX_MOD_KNOWN;i++, mod++)
- if (mod->name[0])
- if (mod->usesheap)
- Mod_FreeModel(mod);
- */
}
void Mod_ClearUsed(void)
*/
model_t *Mod_ForName (char *name, qboolean crash, qboolean checkdisk, qboolean isworldmodel)
{
- model_t *mod;
-
- mod = Mod_FindName (name);
- mod->used = true;
-
- return Mod_LoadModel (mod, crash, checkdisk, isworldmodel);
+ return Mod_LoadModel (Mod_FindName (name), crash, checkdisk, isworldmodel);
}
-byte *mod_base;
+qbyte *mod_base;
-/*
-=================
-RadiusFromBounds
-=================
-*/
-/*
-float RadiusFromBounds (vec3_t mins, vec3_t maxs)
-{
- int i;
- vec3_t corner;
-
- for (i=0 ; i<3 ; i++)
- corner[i] = fabs(mins[i]) > fabs(maxs[i]) ? fabs(mins[i]) : fabs(maxs[i]);
-
- return Length (corner);
-}
-*/
//=============================================================================