PulseStudio/VoxelEngine
PulseStudio/VoxelEngine
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

Minor refactor

Browse Source
This commit is contained in:
MihailRis 2023-12-20 23:22:48 +03:00
parent e0aee76f41
commit 170e6b86ea
3 changed files with 21 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/content/ContentPack.cpp
View File

@ -78,3 +78,12 @@ fs::path ContentPack::findPack(const EnginePaths* paths, std::string name) {
}
return folder;
}
void ContentPack::readPacks(const EnginePaths* paths,
std::vector<ContentPack>& packs,
const std::vector<std::string>& packnames) {
for (const auto& name : packnames) {
fs::path packfolder = ContentPack::findPack(paths, name);
packs.push_back(ContentPack::read(packfolder));
}
}

3
src/content/ContentPack.h
View File

@ -36,6 +36,9 @@ struct ContentPack {
std::vector<ContentPack>& packs);
static std::vector<std::string> worldPacksList(std::filesystem::path folder);
static std::filesystem::path findPack(const EnginePaths* paths, std::string name);
static void readPacks(const EnginePaths* paths,
std::vector<ContentPack>& packs,
const std::vector<std::string>& names);
};
#endif // CONTENT_CONTENT_PACK_H_

24
src/frontend/menu.cpp
View File

@ -147,25 +147,19 @@ void create_languages_panel(Engine* engine, PagesControl* menu) {
}
void open_world(std::string name, Engine* engine) {
// TODO: complete and move somewhere
auto paths = engine->getPaths();
auto resdir = paths->getResources();
auto folder = paths->getWorldsFolder()/fs::u8path(name);
auto& packs = engine->getContentPacks();
packs.clear();
auto packnames = ContentPack::worldPacksList(folder);
for (auto name : packnames) {
try {
fs::path packfolder = ContentPack::findPack(paths, name);
packs.push_back(ContentPack::read(packfolder));
} catch (contentpack_error& error) {
// could not to find or read pack
guiutil::alert(engine->getGUI(),
langs::get(L"error.pack-not-found")+
L": "+util::str2wstr_utf8(error.getPackId()));
return;
}
try {
auto packNames = ContentPack::worldPacksList(folder);
ContentPack::readPacks(paths, packs, packNames);
} catch (contentpack_error& error) {
// could not to find or read pack
guiutil::alert(engine->getGUI(),
langs::get(L"error.pack-not-found")+
L": "+util::str2wstr_utf8(error.getPackId()));
return;
}
engine->loadContent();