contentpack removal feature + refactor

src/frontend/menu/menu_pause.cpp

@@ -9,6 +9,8 @@
 #include "../../coders/png.h"
 #include "../../util/stringutil.h"
 #include "../../files/WorldFiles.h"
+#include "../../content/ContentLUT.h"
+#include "../../logic/LevelController.h"
 
 #include <glm/glm.hpp>
 
@@ -96,14 +98,15 @@ std::shared_ptr<Panel> create_packs_panel(
 }
 
 static void reopen_world(Engine* engine, World* world) {
-    std::string wname = world->getName();
+    std::string wname = world->wfile->directory.stem().u8string();
     engine->setScreen(nullptr);
     engine->setScreen(std::make_shared<MenuScreen>(engine));
-    menus::open_world(wname, engine);
+    menus::open_world(wname, engine, true);
 }
 
 // TODO: refactor
-void create_content_panel(Engine* engine, Level* level) {
+void create_content_panel(Engine* engine, LevelController* controller) {
+    auto level = controller->getLevel();
     auto menu = engine->getGUI()->getMenu();
     auto paths = engine->getPaths();
     auto mainPanel = menus::create_page(engine, "content", 550, 0.0f, 5);
@@ -122,16 +125,18 @@ void create_content_panel(Engine* engine, Level* level) {
     auto panel = create_packs_panel(
         engine->getContentPacks(), engine, false, nullptr, 
         [=](const ContentPack& pack) {
+            auto world = level->getWorld();
             auto runtime = engine->getContent()->getPackRuntime(pack.id);
             if (runtime->getStats().hasSavingContent()) {
                 guiutil::confirm(engine->getGUI(), langs::get(L"remove-confirm", L"pack")+
                 L" ("+util::str2wstr_utf8(pack.id)+L")", [=]() {
-                    // FIXME: work in progress
+                    controller->saveWorld();
+                    world->wfile->removePack(world, pack.id);
+                    reopen_world(engine, world);
                 });
             } else {
-                auto world = level->getWorld();
+                controller->saveWorld();
                 world->wfile->removePack(world, pack.id);
-
                 reopen_world(engine, world);
             }
         }
@@ -155,6 +160,7 @@ void create_content_panel(Engine* engine, Level* level) {
                 }
             }
             world->wfile->addPack(world, pack.id);
+            controller->saveWorld();
             reopen_world(engine, world);
         }, nullptr);
         menu->addPage("content-packs", panel);
@@ -163,7 +169,7 @@ void create_content_panel(Engine* engine, Level* level) {
     mainPanel->add(guiutil::backButton(menu));
 }
 
-void menus::create_pause_panel(Engine* engine, Level* level) {
+void menus::create_pause_panel(Engine* engine, LevelController* controller) {
     auto menu = engine->getGUI()->getMenu();
     auto panel = create_page(engine, "pause", 400, 0.0f, 1);
 
@@ -171,13 +177,15 @@ void menus::create_pause_panel(Engine* engine, Level* level) {
         menu->reset();
     }));
     panel->add(create_button(L"Content", glm::vec4(10.0f), glm::vec4(1), [=](GUI*) {
-        create_content_panel(engine, level);
+        create_content_panel(engine, controller);
         menu->setPage("content");
     }));
     panel->add(guiutil::gotoButton(L"Settings", "settings", menu));
 
     panel->add(create_button(L"Save and Quit to Menu", glm::vec4(10.f), glm::vec4(1), [=](GUI*){
-        // save world and destroy LevelScreen
+        // save world
+        controller->saveWorld();
+        // destroy LevelScreen and run quit callbacks
         engine->setScreen(nullptr);
         // create and go to menu screen
         engine->setScreen(std::make_shared<MenuScreen>(engine));