renamed mod->needload to mod->loaded as a minor cleanup (safer default)

removed now unused Mod_TouchModel

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@4759 d7cf8633-e32d-0410-b094-e92efae38249

diff --git a/model_shared.c b/model_shared.c
index 20dc64f7453c87761ed3cf77d9a87d36a05506d5..6addcf6250fc095045d866b9b2cb15e4cf70aa2c 100644 (file)
--- a/model_shared.c
+++ b/model_shared.c
@@ -265,7 +265,7 @@ void Mod_UnloadModel (model_t *mod)
        Mod_FreeModel(mod);
        strcpy(mod->name, name);
        mod->isworldmodel = isworldmodel;
        Mod_FreeModel(mod);
        strcpy(mod->name, name);
        mod->isworldmodel = isworldmodel;

-       mod->needload = true;
+       mod->loaded = false;

 }
 
 /*
 }
 
 /*


@@ -289,31 +289,32 @@ static model_t *Mod_LoadModel(model_t *mod, qboolean crash, qboolean checkdisk,
        crc = 0;
        buf = NULL;
        if (mod->isworldmodel != isworldmodel)
        crc = 0;
        buf = NULL;
        if (mod->isworldmodel != isworldmodel)

-               mod->needload = true;
-       if (mod->needload || checkdisk)
+               mod->loaded = false;
+       if (!mod->loaded || checkdisk)

        {
        {

-               if (checkdisk && !mod->needload)
+               if (checkdisk && mod->loaded)

                        Con_DPrintf("checking model %s\n", mod->name);
                buf = FS_LoadFile (mod->name, tempmempool, false);
                if (buf)
                {
                        crc = CRC_Block(buf, fs_filesize);
                        if (mod->crc != crc)
                        Con_DPrintf("checking model %s\n", mod->name);
                buf = FS_LoadFile (mod->name, tempmempool, false);
                if (buf)
                {
                        crc = CRC_Block(buf, fs_filesize);
                        if (mod->crc != crc)

-                               mod->needload = true;
+                               mod->loaded = false;

                }
        }
                }
        }

-       if (!mod->needload)
+       if (mod->loaded)

                return mod; // already loaded
 
        Con_DPrintf("loading model %s\n", mod->name);
        // LordHavoc: unload the existing model in this slot (if there is one)
        Mod_UnloadModel(mod);
                return mod; // already loaded
 
        Con_DPrintf("loading model %s\n", mod->name);
        // LordHavoc: unload the existing model in this slot (if there is one)
        Mod_UnloadModel(mod);

+

        // load the model
        mod->isworldmodel = isworldmodel;
        mod->used = true;
        mod->crc = crc;
        // load the model
        mod->isworldmodel = isworldmodel;
        mod->used = true;
        mod->crc = crc;

-       // errors can prevent the corresponding mod->needload = false;
-       mod->needload = true;
+       // errors can prevent the corresponding mod->loaded = true;
+       mod->loaded = false;

 
        // default model radius and bounding box (mainly for missing models)
        mod->radius = 16;
 
        // default model radius and bounding box (mainly for missing models)
        mod->radius = 16;


@@ -353,7 +354,7 @@ static model_t *Mod_LoadModel(model_t *mod, qboolean crash, qboolean checkdisk,
        }
 
        // no errors occurred
        }
 
        // no errors occurred

-       mod->needload = false;
+       mod->loaded = true;

        return mod;
 }
 
        return mod;
 }
 


@@ -361,7 +362,7 @@ void Mod_CheckLoaded(model_t *mod)
 {
        if (mod)
        {
 {
        if (mod)
        {

-               if (mod->needload)
+               if (!mod->loaded)

                        Mod_LoadModel(mod, true, true, mod->isworldmodel);
                else
                {
                        Mod_LoadModel(mod, true, true, mod->isworldmodel);
                else
                {


@@ -448,7 +449,7 @@ model_t *Mod_FindName(const char *name)
        {
                mod = freemod;
                strcpy (mod->name, name);
        {
                mod = freemod;
                strcpy (mod->name, name);

-               mod->needload = true;
+               mod->loaded = false;

                mod->used = true;
                return mod;
        }
                mod->used = true;
                return mod;
        }


@@ -457,20 +458,6 @@ model_t *Mod_FindName(const char *name)
        return NULL;
 }
 
        return NULL;
 }
 

-/*
-==================
-Mod_TouchModel
-
-==================
-*/
-void Mod_TouchModel(const char *name)
-{
-       model_t *mod;
-
-       mod = Mod_FindName(name);
-       mod->used = true;
-}
-

 /*
 ==================
 Mod_ForName
 /*
 ==================
 Mod_ForName

diff --git a/model_shared.h b/model_shared.h
index 67fc4ff1429e85406551b04022b5a921b8580fb1..c7472b1165a115fa6eb94afbf463df8e33aa977b 100644 (file)
--- a/model_shared.h
+++ b/model_shared.h
@@ -547,8 +547,8 @@ typedef struct model_s
 {
        // name and path of model, for example "progs/player.mdl"
        char                    name[MAX_QPATH];
 {
        // name and path of model, for example "progs/player.mdl"
        char                    name[MAX_QPATH];

-       // model needs to be loaded if this is true
-       qboolean                needload;
+       // model needs to be loaded if this is false
+       qboolean                loaded;

        // set if the model is used in current map, models which are not, are purged
        qboolean                used;
        // true if this is the world model (I.E. defines what sky to use, and may contain submodels)
        // set if the model is used in current map, models which are not, are purged
        qboolean                used;
        // true if this is the world model (I.E. defines what sky to use, and may contain submodels)


@@ -642,7 +642,6 @@ void Mod_CheckLoaded (model_t *mod);
 void Mod_ClearAll (void);
 model_t *Mod_FindName (const char *name);
 model_t *Mod_ForName (const char *name, qboolean crash, qboolean checkdisk, qboolean isworldmodel);
 void Mod_ClearAll (void);
 model_t *Mod_FindName (const char *name);
 model_t *Mod_ForName (const char *name, qboolean crash, qboolean checkdisk, qboolean isworldmodel);

-void Mod_TouchModel (const char *name);

 void Mod_UnloadModel (model_t *mod);
 
 void Mod_ClearUsed(void);
 void Mod_UnloadModel (model_t *mod);
 
 void Mod_ClearUsed(void);