Cleaned up model precaching.

This commit is contained in:
richard 2009-12-04 00:44:46 +01:00
parent 849d8cd81b
commit 9d5448e162

View File

@ -207,11 +207,7 @@ ModelsLoad()
strcopy(buffer, sizeof(buffer), path); strcopy(buffer, sizeof(buffer), path);
Format(buffer, sizeof(buffer), "%s%s", buffer, file); Format(buffer, sizeof(buffer), "%s%s", buffer, file);
// Precache model file and add to downloads table.
PrecacheModel(buffer, true);
AddFileToDownloadsTable(buffer); AddFileToDownloadsTable(buffer);
// Increment file counter for the current model.
downloadCount++; downloadCount++;
} }
@ -224,7 +220,6 @@ ModelsLoad()
} }
else else
{ {
// Increment model counter.
ModelCount++; ModelCount++;
} }
} while (KvGotoNextKey(kvModels)); } while (KvGotoNextKey(kvModels));
@ -237,6 +232,9 @@ ModelsLoad()
LogEvent(false, LogType_Fatal, LOG_CORE_EVENTS, LogModule_Models, "Config Validation", "Missing public model in \"%s\". There must be at least one public model.", modelPath); LogEvent(false, LogType_Fatal, LOG_CORE_EVENTS, LogModule_Models, "Config Validation", "Missing public model in \"%s\". There must be at least one public model.", modelPath);
} }
// Precache models.
ModelsPrecache();
// Log model validation info. // Log model validation info.
LogEvent(false, LogType_Normal, LOG_CORE_EVENTS, LogModule_Models, "Config Validation", "Successful: %d | Unsuccessful: %d", ModelCount, failedCount); LogEvent(false, LogType_Normal, LOG_CORE_EVENTS, LogModule_Models, "Config Validation", "Successful: %d | Unsuccessful: %d", ModelCount, failedCount);
@ -254,6 +252,21 @@ public ModelsOnConfigReload(ConfigFile:config)
ModelsLoad(); ModelsLoad();
} }
/**
* Precaches all models.
*/
ModelsPrecache()
{
decl String:file[PLATFORM_MAX_PATH];
// Loop through all models, build full path and cache them.
for (new model = 0; model < ModelCount; model++)
{
ModelsGetFullPath(model, file, sizeof(file));
PrecacheModel(file);
}
}
/** /**
* Returns a random model index according to the specified filter settings. * Returns a random model index according to the specified filter settings.
* *