scriptenv?

src/frontend/InventoryView.cpp

@@ -15,7 +15,6 @@
 #include "../items/Inventory.h"
 #include "../items/ItemDef.h"
 #include "../logic/scripting/scripting.h"
-#include "../logic/scripting/Environment.h"
 #include "../maths/voxmaths.h"
 #include "../objects/Player.h"
 #include "../util/stringutil.h"
@@ -372,7 +371,7 @@ void InventoryView::setInventory(std::shared_ptr<Inventory> inventory) {
 
 static slotcallback readSlotFunc(InventoryView* view, gui::UiXmlReader& reader, xml::xmlelement& element, const std::string& attr) {
     auto consumer = scripting::create_int_array_consumer(
-        reader.getEnvironment().getId(), 
+        reader.getEnvironment(), 
         element->attr(attr).getText()
     );
     return [=](uint slot, ItemStack& stack) {

src/frontend/UiDocument.cpp

@@ -10,8 +10,8 @@ UiDocument::UiDocument(
     std::string id, 
     uidocscript script, 
     std::shared_ptr<gui::UINode> root,
-    std::unique_ptr<scripting::Environment> env
-) : id(id), script(script), root(root), env(std::move(env)) {
+    scriptenv env
+) : id(id), script(script), root(root), env(env) {
     gui::UINode::getIndices(root, map);
 }
 
@@ -47,19 +47,19 @@ const uidocscript& UiDocument::getScript() const {
     return script;
 }
 
-int UiDocument::getEnvironment() const {
-    return env->getId();
+scriptenv UiDocument::getEnvironment() const {
+    return env;
 }
 
-std::unique_ptr<UiDocument> UiDocument::read(int penv, std::string name, fs::path file) {
+std::unique_ptr<UiDocument> UiDocument::read(scriptenv penv, std::string name, fs::path file) {
     const std::string text = files::read_string(file);
     auto xmldoc = xml::parse(file.u8string(), text);
 
-    auto env = penv == -1 
-        ? std::make_unique<scripting::Environment>(0) 
+    auto env = penv == nullptr 
+        ? scripting::get_root_environment()
         : scripting::create_doc_environment(penv, name);
 
-    gui::UiXmlReader reader(*env);
+    gui::UiXmlReader reader(env);
     InventoryView::createReaders(reader);
     auto view = reader.readXML(
         file.u8string(), xmldoc->getRoot()
@@ -68,12 +68,12 @@ std::unique_ptr<UiDocument> UiDocument::read(int penv, std::string name, fs::pat
     uidocscript script {};
     auto scriptFile = fs::path(file.u8string()+".lua");
     if (fs::is_regular_file(scriptFile)) {
-        scripting::load_layout_script(env->getId(), name, scriptFile, script);
+        scripting::load_layout_script(env, name, scriptFile, script);
     }
-    return std::make_unique<UiDocument>(name, script, view, std::move(env));
+    return std::make_unique<UiDocument>(name, script, view, env);
 }
 
 std::shared_ptr<gui::UINode> UiDocument::readElement(fs::path file) {
-    auto document = read(-1, file.filename().u8string(), file);
+    auto document = read(nullptr, file.filename().u8string(), file);
     return document->getRoot();
 }

src/frontend/UiDocument.h

@@ -1,7 +1,7 @@
 #ifndef FRONTEND_UI_DOCUMENT_H_
 #define FRONTEND_UI_DOCUMENT_H_
 
-#include "../logic/scripting/Environment.h"
+#include "../typedefs.h"
 
 #include <string>
 #include <memory>
@@ -14,12 +14,7 @@ namespace gui {
     class UINode;
 }
 
-namespace scripting {
-    class Environment;
-}
-
 struct uidocscript {
-    int environment;
     bool onopen : 1;
     bool onclose : 1;
 };
@@ -31,13 +26,13 @@ class UiDocument {
     uidocscript script;
     uinodes_map map;
     std::shared_ptr<gui::UINode> root;
-    std::unique_ptr<scripting::Environment> env;
+    scriptenv env;
 public:
     UiDocument(
         std::string id, 
         uidocscript script, 
         std::shared_ptr<gui::UINode> root, 
-        std::unique_ptr<scripting::Environment> env
+        scriptenv env
     );
 
     void rebuildIndices();
@@ -48,9 +43,9 @@ public:
     const std::shared_ptr<gui::UINode> getRoot() const;
     const std::shared_ptr<gui::UINode> get(const std::string& id) const;
     const uidocscript& getScript() const;
-    int getEnvironment() const;
+    scriptenv getEnvironment() const;
 
-    static std::unique_ptr<UiDocument> read(int env, std::string name, fs::path file);
+    static std::unique_ptr<UiDocument> read(scriptenv parent_env, std::string name, fs::path file);
     static std::shared_ptr<gui::UINode> readElement(fs::path file);
 };
 

src/frontend/menu.cpp

@@ -41,7 +41,7 @@ void menus::create_menus(Engine* engine) {
         auto file = engine->getResPaths()->find("layouts/pages/"+name+".xml");
         auto fullname = "core:pages/"+name;
 
-        auto document = UiDocument::read(0, fullname, file).release();
+        auto document = UiDocument::read(scripting::get_root_environment(), fullname, file).release();
         engine->getAssets()->store(document, fullname);
         scripting::on_ui_open(document, nullptr, glm::ivec3());
         return document->getRoot();

src/frontend/screens.cpp

@@ -16,7 +16,6 @@
 #include "../logic/LevelController.h"
 #include "../logic/scripting/scripting_hud.h"
 #include "../logic/scripting/scripting.h"
-#include "../logic/scripting/Environment.h"
 #include "../objects/Player.h"
 #include "../physics/Hitbox.h"
 #include "../util/stringutil.h"
@@ -113,7 +112,7 @@ LevelScreen::LevelScreen(Engine* engine, Level* level) : Screen(engine) {
         const ContentPack& info = pack->getInfo();
         fs::path scriptFile = info.folder/fs::path("scripts/hud.lua");
         if (fs::is_regular_file(scriptFile)) {
-            scripting::load_hud_script(pack->getEnvironment()->getId(), info.id, scriptFile);
+            scripting::load_hud_script(pack->getEnvironment(), info.id, scriptFile);
         }
     }
     scripting::on_frontend_init(hud.get());