diff options
| author | LaG1924 <12997935+LaG1924@users.noreply.github.com> | 2019-05-19 12:25:03 +0200 |
|---|---|---|
| committer | LaG1924 <12997935+LaG1924@users.noreply.github.com> | 2019-05-19 12:25:03 +0200 |
| commit | 35e786c2b4632f92518c8881db650ba63beecd5c (patch) | |
| tree | 831345bd105884b65349afae04dddd88b1ec4bb8 /src/AssetManager.cpp | |
| parent | Implemented GameState lua-api (diff) | |
| download | AltCraft-35e786c2b4632f92518c8881db650ba63beecd5c.tar AltCraft-35e786c2b4632f92518c8881db650ba63beecd5c.tar.gz AltCraft-35e786c2b4632f92518c8881db650ba63beecd5c.tar.bz2 AltCraft-35e786c2b4632f92518c8881db650ba63beecd5c.tar.lz AltCraft-35e786c2b4632f92518c8881db650ba63beecd5c.tar.xz AltCraft-35e786c2b4632f92518c8881db650ba63beecd5c.tar.zst AltCraft-35e786c2b4632f92518c8881db650ba63beecd5c.zip | |
Diffstat (limited to 'src/AssetManager.cpp')
| -rw-r--r-- | src/AssetManager.cpp | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/src/AssetManager.cpp b/src/AssetManager.cpp index eb3186a..be69dd0 100644 --- a/src/AssetManager.cpp +++ b/src/AssetManager.cpp @@ -110,6 +110,9 @@ void LoadScripts() { if (child->name == "scripts") { for (auto &script : child->childs) { + if (script->name != "init") + continue; + AssetScript *asset = dynamic_cast<AssetScript *>(script->asset.get()); if (!asset) { LOG(ERROR) << "Unrecognised script file /" << it->name; @@ -118,9 +121,11 @@ void LoadScripts() { try { PluginSystem::Execute(asset->code, true); } - catch (std::exception& e) { + catch (std::exception & e) { LOG(ERROR) << "Failed loading script '" << script->name << "' in '" << it->name << "'"; } + + break; } } } @@ -171,7 +176,7 @@ void ParseAsset(AssetTreeNode &node) { return; } - if (node.name == "init") { + if (node.parent->name == "scripts") { ParseAssetScript(node); return; } |