voxelcoreprojects/voxelcore
1
0
Fork 0
mirror of https://github.com/MihailRis/voxelcore.git synced 2026-10-04 18:41:51 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

text-wrapping + fix

Browse source
This commit is contained in:
MihailRis 2024-04-25 02:19:50 +03:00
parent 37e089169e
commit 56a8226028
9 changed files with 135 additions and 54 deletions
Download patch file Download diff file Expand all files Collapse all files

11
src/logic/EngineController.cpp
View file

@ -85,9 +85,10 @@ static void show_content_missing(
menus::show(engine, "reports/missing_content", std::move(args));
}
static void loadWorldContent(Engine* engine, fs::path folder) {
static bool loadWorldContent(Engine* engine, fs::path folder) {
try {
engine->loadWorldContent(folder);
return true;
} catch (const contentpack_error& error) {
engine->setScreen(std::make_shared<MenuScreen>(engine));
// could not to find or read pack
@ -95,14 +96,14 @@ static void loadWorldContent(Engine* engine, fs::path folder) {
engine->getGUI(), langs::get(L"error.pack-not-found")+L": "+
util::str2wstr_utf8(error.getPackId())
);
return;
return false;
} catch (const std::runtime_error& error) {
engine->setScreen(std::make_shared<MenuScreen>(engine));
guiutil::alert(
engine->getGUI(), langs::get(L"Content Error", L"menu")+L": "+
util::str2wstr_utf8(error.what())
);
return;
return false;
}
}
@ -126,7 +127,9 @@ static void loadWorld(Engine* engine, fs::path folder) {
void EngineController::openWorld(std::string name, bool confirmConvert) {
auto paths = engine->getPaths();
auto folder = paths->getWorldsFolder()/fs::u8path(name);
loadWorldContent(engine, folder);
if (!loadWorldContent(engine, folder)) {
return;
}
auto* content = engine->getContent();