PulseStudio/VoxelEngine
PulseStudio/VoxelEngine
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

fix

Browse Source
This commit is contained in:
MihailRis 2024-02-18 11:18:00 +03:00
parent d8b3920d65
commit d9dc974685
2 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/frontend/InventoryView.cpp
View File

@ -117,7 +117,8 @@ SlotView::SlotView(
void SlotView::draw(const GfxContext* pctx, Assets* assets) {
if (bound == nullptr)
throw std::runtime_error("unbound slot");
return;
ItemStack& stack = *bound;
glm::vec2 coord = calcCoord();
@ -206,7 +207,7 @@ bool SlotView::isHighlighted() const {
void SlotView::clicked(gui::GUI* gui, int button) {
if (bound == nullptr)
throw std::runtime_error("unbound slot");
return;
ItemStack& grabbed = interaction->getGrabbedItem();
ItemStack& stack = *bound;

5
src/logic/scripting/lua/libhud.cpp
View File

@ -16,6 +16,7 @@
#include "../../../items/Inventories.h"
#include "../../../engine.h"
#include "../../../frontend/UiDocument.h"
#include "../../../frontend/InventoryView.h"
namespace scripting {
extern Hud* hud;
@ -76,6 +77,10 @@ UiDocument* require_layout(lua_State* L, const char* name) {
int l_hud_open_permanent(lua_State* L) {
auto layout = require_layout(L, lua_tostring(L, 1));
auto invview = std::dynamic_pointer_cast<InventoryView>(layout->getRoot());
if (invview) {
luaL_error(L, "layout must not contain 'inventory' element");
}
scripting::hud->openPermanent(layout);
return 0;
}