voxelcoreprojects/voxelcore
1
0
Fork 0
mirror of https://github.com/MihailRis/voxelcore.git synced 2026-10-05 11:01:49 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

wip

Browse source
This commit is contained in:
MihailRis 2024-03-13 13:18:40 +03:00
parent 5bc79c8a77
commit 793fd82b90
3 changed files with 31 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

10
src/frontend/menu/menu_pause.cpp
View file

@ -16,9 +16,7 @@
using namespace gui;
using packconsumer = std::function<void(const ContentPack& pack)>;
std::shared_ptr<Panel> create_packs_panel(
std::shared_ptr<Panel> menus::create_packs_panel(
const std::vector<ContentPack>& packs,
Engine* engine,
bool backbutton,
@ -39,7 +37,7 @@ std::shared_ptr<Panel> create_packs_panel(
callback(pack);
});
}
auto runtime = engine->getContent()->getPackRuntime(pack.id);
auto runtime = engine->getContent() ? engine->getContent()->getPackRuntime(pack.id) : nullptr;
auto idlabel = std::make_shared<Label>(
(runtime && runtime->getStats().hasSavingContent())
? "*["+pack.id+"]"
@ -121,7 +119,7 @@ void create_content_panel(Engine* engine, LevelController* controller) {
}
}
auto panel = create_packs_panel(
auto panel = menus::create_packs_panel(
engine->getContentPacks(), engine, false, nullptr,
[=](const ContentPack& pack) {
auto world = level->getWorld();
@ -143,7 +141,7 @@ void create_content_panel(Engine* engine, LevelController* controller) {
mainPanel->add(panel);
mainPanel->add(menus::create_button(
langs::get(L"Add", L"content"), glm::vec4(10.0f), glm::vec4(1), [=](GUI* gui) {
auto panel = create_packs_panel(scanned, engine, true,
auto panel = menus::create_packs_panel(scanned, engine, true,
[=](const ContentPack& pack) {
auto world = level->getWorld();
auto worldFolder = paths->getWorldFolder();