Merge pull request #322 from alliedmodders/fix-coreconf-order

Fix CoreConfig init to happen after SMGlobalClasses from logic bin are added (r=asherkin).
This commit is contained in:
Nicholas Hastings 2015-04-05 10:43:17 -04:00
commit 8ff1a9daf3

View File

@ -172,9 +172,6 @@ bool SourceModBase::InitializeSourceMod(char *error, size_t maxlength, bool late
return false;
}
/* Initialize CoreConfig to get the SourceMod base path properly - this parses core.cfg */
g_CoreConfig.Initialize();
/* There will always be a path by this point, since it was force-set above. */
m_GotBasePath = true;
@ -256,6 +253,9 @@ void SourceModBase::StartSourceMod(bool late)
InitLogicBridge();
/* Initialize CoreConfig to get the SourceMod base path properly - this parses core.cfg */
g_CoreConfig.Initialize();
/* Notify! */
SMGlobalClass *pBase = SMGlobalClass::head;
while (pBase)