Browse Source

Fix for mixing packages

Josh Engebretson 10 years ago
parent
commit
84d30cd560
1 changed files with 9 additions and 3 deletions
  1. 9 3
      Source/AtomicJS/Javascript/JSVM.cpp

+ 9 - 3
Source/AtomicJS/Javascript/JSVM.cpp

@@ -261,10 +261,16 @@ void JSVM::InitComponents()
 {
     ResourceCache* cache = GetSubsystem<ResourceCache>();
 
-    if (cache->GetPackageFiles().Size())
+    // TODO: better way to detect player?
+    const Vector<SharedPtr<PackageFile> >& packageFiles = cache->GetPackageFiles();
+    for (unsigned i = 0; i < packageFiles.Size(); i++)
     {
-        InitPackageComponents();
-        return;
+        String packageName = packageFiles[i]->GetName();
+        if (packageName.Find("AtomicResources") != String::NPOS)
+        {
+            InitPackageComponents();
+            return;
+        }
     }
 
     FileSystem* fileSystem = GetSubsystem<FileSystem>();