thijn/SqMod
1
0
Fork 0
mirror of https://github.com/VCMP-SqMod/SqMod.git synced 2025-01-31 18:07:14 +01:00
Code Releases Activity

Implement script bundles in the script loading process.

Browse Source
This commit is contained in:
Sandu Liviu Catalin 2016-06-17 01:40:10 +03:00
parent 02aa2667a6
commit b3f0e98758
1 changed files with 35 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
source/Core.cpp
View File

@ -192,28 +192,52 @@ bool Core::Initialize()
return false; // Can't execute scripts without a valid API! return false; // Can't execute scripts without a valid API!
} }
// Used to obtain collections of script paths
CSimpleIniA::TNamesDepend bundles, scripts;
// Attempt to retrieve the list of scripts specified in the configuration file // Attempt to retrieve the list of scripts specified in the configuration file
CSimpleIniA::TNamesDepend scripts; if (conf.GetAllValues("Scripts", "Source", scripts) && scripts.size() > 0)
conf.GetAllValues("Scripts", "Source", scripts);
// See if any script was specified
if (scripts.size() <= 0 && !conf.GetBoolValue("Squirrel", "EmptyInit", false))
{
LogWrn("No scripts specified in the configuration file");
// No point in loading the plug-in
return false;
}
else
{ {
LogDbg("Found (%u) scripts in the configuration file", scripts.size()); LogDbg("Found (%u) scripts in the configuration file", scripts.size());
// Sort the list in it's original order // Sort the list in it's original order
scripts.sort(CSimpleIniA::Entry::LoadOrder()); scripts.sort(CSimpleIniA::Entry::LoadOrder());
// Process each specified script paths // Process each specified script path
for (const auto & script : scripts) for (const auto & script : scripts)
{ {
// Attempt to queue the specified script path for loading // Attempt to queue the specified script path for loading
LoadScript(script.pItem); LoadScript(script.pItem);
} }
} }
// Attempt to retrieve the list of bundles specified in the configuration file
if (conf.GetAllValues("Scripts", "Bundle", bundles) && bundles.size() > 0)
{
LogDbg("Found (%u) bundles in the configuration file", bundles.size());
// Sort the list in it's original order
bundles.sort(CSimpleIniA::Entry::LoadOrder());
// Process each specified script bundle
for (const auto & bundle : bundles)
{
// Attempt to retrieve the list of scripts specified in the current bundle
if (!conf.GetAllValues(bundle.pItem, "Source", scripts))
{
LogWrn("Unable to locate script bundle (%s)", bundle.pItem);
}
else if (scripts.size() > 0)
{
LogDbg("Found (%u) scripts in bundle (%s)", scripts.size(), bundle.pItem);
// Sort the list in it's original order
scripts.sort(CSimpleIniA::Entry::LoadOrder());
// Process each specified script path
for (const auto & script : scripts)
{
// Attempt to queue the specified script path for loading
LoadScript(script.pItem);
}
}
}
}
// See if any script could be queued for loading // See if any script could be queued for loading
if (m_Scripts.empty() && !conf.GetBoolValue("Squirrel", "EmptyInit", false)) if (m_Scripts.empty() && !conf.GetBoolValue("Squirrel", "EmptyInit", false))
{ {