Content packs structure update
This commit is contained in:
+2
-2
@@ -51,7 +51,7 @@ Engine::Engine(EngineSettings& settings, EnginePaths* paths)
|
||||
}
|
||||
|
||||
auto resdir = paths->getResources();
|
||||
contentPacks.push_back({"base", resdir/path("content/base")});
|
||||
contentPacks.push_back(ContentPack::read(resdir/path("content/base")));
|
||||
loadContent();
|
||||
|
||||
Audio::initialize();
|
||||
@@ -160,7 +160,7 @@ void Engine::loadContent() {
|
||||
|
||||
vector<path> resRoots;
|
||||
for (auto& pack : contentPacks) {
|
||||
ContentLoader loader(pack.folder);
|
||||
ContentLoader loader(&pack);
|
||||
loader.load(&contentBuilder);
|
||||
resRoots.push_back(pack.folder);
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user