X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fshared%2Fshared.cpp;h=06f622211389a1dd105eef7bebe36005064284e6;hb=20d0a76d2519c71009c3b3babec0df27529f8142;hp=9541c951ccd77ddbf15e4cca050ac9d7c32353b8;hpb=9c5308ba4108bd842af6d9d2e893ea575a7e6ca8;p=blank.git diff --git a/src/shared/shared.cpp b/src/shared/shared.cpp index 9541c95..06f6222 100644 --- a/src/shared/shared.cpp +++ b/src/shared/shared.cpp @@ -26,14 +26,15 @@ WorldResources::WorldResources() : shapes() , block_types() , models() +, snd_index() , tex_index() { } -void WorldResources::Load(const AssetLoader &loader, const std::string &set) { - loader.LoadShapes("default", shapes); - loader.LoadBlockTypes("default", block_types, tex_index, shapes); - loader.LoadModels("default", models, tex_index, shapes); +void WorldResources::Load(const AssetLoader &loader, const std::string &set_name) { + loader.LoadShapes(set_name, shapes); + loader.LoadBlockTypes(set_name, block_types, snd_index, tex_index, shapes); + loader.LoadModels(set_name, models, tex_index, shapes); } }