|
@@ -38,6 +38,8 @@
|
|
|
#include "console/consoleTypes.h"
|
|
|
#endif
|
|
|
|
|
|
+#include "cinterface/cinterface.h"
|
|
|
+
|
|
|
#ifndef _MODULE_DEFINITION_H
|
|
|
#include "module/moduleDefinition.h"
|
|
|
#endif
|
|
@@ -837,16 +839,7 @@ bool ModuleManager::loadModuleExplicit( const char* pModuleId, const U32 version
|
|
|
const bool scriptFileExecuted = dAtob( Con::executef("exec", pLoadReadyModuleDefinition->getModuleScriptFilePath() ) );
|
|
|
|
|
|
// Did we execute the script file?
|
|
|
- if ( scriptFileExecuted )
|
|
|
- {
|
|
|
- // Yes, so is the create method available?
|
|
|
- if ( pScopeSet->isMethod( pLoadReadyModuleDefinition->getCreateFunction() ) )
|
|
|
- {
|
|
|
- // Yes, so call the create method.
|
|
|
- Con::executef( pScopeSet, pLoadReadyModuleDefinition->getCreateFunction() );
|
|
|
- }
|
|
|
- }
|
|
|
- else
|
|
|
+ if ( !scriptFileExecuted )
|
|
|
{
|
|
|
// No, so warn.
|
|
|
Con::errorf( "Module Manager: Cannot load explicit module Id '%s' at version Id '%d' as it failed to have the script file '%s' loaded.",
|
|
@@ -854,6 +847,13 @@ bool ModuleManager::loadModuleExplicit( const char* pModuleId, const U32 version
|
|
|
}
|
|
|
}
|
|
|
|
|
|
+ // Is the create method available?
|
|
|
+ if (pScopeSet->isMethod(pLoadReadyModuleDefinition->getCreateFunction()))
|
|
|
+ {
|
|
|
+ // Yes, so call the create method.
|
|
|
+ Con::executef(pScopeSet, pLoadReadyModuleDefinition->getCreateFunction());
|
|
|
+ }
|
|
|
+
|
|
|
// Raise notifications.
|
|
|
raiseModulePostLoadNotifications( pLoadReadyModuleDefinition );
|
|
|
}
|