git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@2686
d7cf8633-e32d-0410-b094-
e92efae38249
Con_Printf ("%c%s\n", 2, str);
}
Con_Printf ("%c%s\n", 2, str);
}
-//
-// first we go through and touch all of the precache data that still
-// happens to be in the cache, so precaching something else doesn't
-// needlessly purge it
-//
-
+ // check memory integrity
Mem_CheckSentinelsGlobal();
Mem_CheckSentinelsGlobal();
// disable until we get textures for it
R_ResetSkyBox();
// disable until we get textures for it
R_ResetSkyBox();
memset (cl.model_precache, 0, sizeof(cl.model_precache));
memset (cl.model_precache, 0, sizeof(cl.model_precache));
+ memset (cl.sound_precache, 0, sizeof(cl.sound_precache));
+
+ // touch all of the precached models that are still loaded so we can free
+ // anything that isn't needed
+ Mod_ClearUsed();
for (nummodels=1 ; ; nummodels++)
{
for (nummodels=1 ; ; nummodels++)
{
+ CL_KeepaliveMessage ();
str = MSG_ReadString ();
if (!str[0])
break;
if (nummodels==MAX_MODELS)
str = MSG_ReadString ();
if (!str[0])
break;
if (nummodels==MAX_MODELS)
Host_Error ("Server sent too many model precaches\n");
Host_Error ("Server sent too many model precaches\n");
if (strlen(str) >= MAX_QPATH)
Host_Error ("Server sent a precache name of %i characters (max %i)", strlen(str), MAX_QPATH - 1);
strcpy (model_precache[nummodels], str);
Mod_TouchModel (str);
}
if (strlen(str) >= MAX_QPATH)
Host_Error ("Server sent a precache name of %i characters (max %i)", strlen(str), MAX_QPATH - 1);
strcpy (model_precache[nummodels], str);
Mod_TouchModel (str);
}
-// precache sounds
- memset (cl.sound_precache, 0, sizeof(cl.sound_precache));
+ // do the same for sounds
for (numsounds=1 ; ; numsounds++)
{
for (numsounds=1 ; ; numsounds++)
{
+ CL_KeepaliveMessage ();
str = MSG_ReadString ();
if (!str[0])
break;
if (numsounds==MAX_SOUNDS)
str = MSG_ReadString ();
if (!str[0])
break;
if (numsounds==MAX_SOUNDS)
Host_Error ("Server sent too many sound precaches\n");
Host_Error ("Server sent too many sound precaches\n");
if (strlen(str) >= MAX_QPATH)
Host_Error ("Server sent a precache name of %i characters (max %i)", strlen(str), MAX_QPATH - 1);
strcpy (sound_precache[numsounds], str);
S_TouchSound (str);
}
if (strlen(str) >= MAX_QPATH)
Host_Error ("Server sent a precache name of %i characters (max %i)", strlen(str), MAX_QPATH - 1);
strcpy (sound_precache[numsounds], str);
S_TouchSound (str);
}
+ // purge anything that was not touched
-//
-// now we try to load everything else until a cache allocation fails
-//
+ // now we try to load everything that is new
+
+ // world model
+ CL_KeepaliveMessage ();
+ cl.model_precache[1] = Mod_ForName (model_precache[1], false, false, true);
+ if (cl.model_precache[1] == NULL)
+ Con_Printf("Map %s not found\n", model_precache[1]);
- for (i=1 ; i<nummodels ; i++)
+ // normal models
+ for (i=2 ; i<nummodels ; i++)
- // LordHavoc: i == 1 means the first model is the world model
- cl.model_precache[i] = Mod_ForName (model_precache[i], false, false, i == 1);
- if (cl.model_precache[i] == NULL)
- {
- Con_Printf("Model %s not found\n", model_precache[i]);
- //return;
- }
+ if ((cl.model_precache[i] = Mod_ForName (model_precache[i], false, false, false)) == NULL)
+ Con_Printf("Model %s not found\n", model_precache[i]);
S_BeginPrecaching ();
for (i=1 ; i<numsounds ; i++)
{
S_BeginPrecaching ();
for (i=1 ; i<numsounds ; i++)
{
- cl.sound_precache[i] = S_PrecacheSound (sound_precache[i], true);
+ cl.sound_precache[i] = S_PrecacheSound (sound_precache[i], true);
ent = &cl_entities[0];
// entire entity array was cleared, so just fill in a few fields
ent->state_current.active = true;
ent = &cl_entities[0];
// entire entity array was cleared, so just fill in a few fields
ent->state_current.active = true;
R_NewMap ();
CL_CGVM_Start();
R_NewMap ();
CL_CGVM_Start();
- noclip_anglehack = false; // noclip is turned off at start
+ // noclip is turned off at start
+ noclip_anglehack = false;
+ // check memory integrity
Mem_CheckSentinelsGlobal();
Mem_CheckSentinelsGlobal();
}
void CL_ValidateState(entity_state_t *s)
}
void CL_ValidateState(entity_state_t *s)