From 5669b10036aa80f3a5bbf7687025ad6ade6d3daa Mon Sep 17 00:00:00 2001 From: MihailRis Date: Mon, 29 Apr 2024 15:30:52 +0300 Subject: [PATCH] small fix --- src/graphics/ui/GUI.hpp | 5 ++--- src/logic/scripting/lua/libgui.cpp | 6 +++++- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/src/graphics/ui/GUI.hpp b/src/graphics/ui/GUI.hpp index 9eb08da0..6e8b4c07 100644 --- a/src/graphics/ui/GUI.hpp +++ b/src/graphics/ui/GUI.hpp @@ -1,16 +1,15 @@ #ifndef FRONTEND_GUI_GUI_HPP_ #define FRONTEND_GUI_GUI_HPP_ +#include "../../delegates.h" + #include #include #include #include #include -#include #include -#include "../../delegates.h" - class Viewport; class GfxContext; class Assets; diff --git a/src/logic/scripting/lua/libgui.cpp b/src/logic/scripting/lua/libgui.cpp index 955a8ae4..b00ba80d 100644 --- a/src/logic/scripting/lua/libgui.cpp +++ b/src/logic/scripting/lua/libgui.cpp @@ -236,7 +236,11 @@ static bool setattr(lua_State* L, Menu* menu, const std::string& attr) { static bool setattr(lua_State* L, InventoryView* inventory, const std::string& attr) { if (attr == "inventory") { auto inv = scripting::level->inventories->get(lua_tointeger(L, 1)); - inventory->bind(inv, scripting::content); + if (inv == nullptr) { + inventory->unbind(); + } else { + inventory->bind(inv, scripting::content); + } } return false; }