voxelcoreprojects/voxelcore
1
0
Fork 0
mirror of https://github.com/MihailRis/voxelcore.git synced 2026-10-10 21:41:50 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 5

Merge branch 'main' into devtools

Browse source
This commit is contained in:
MihailRis 2024-05-09 17:08:53 +03:00
commit 033f12d8e9
2 changed files with 6 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/data/dynamic.hpp
View file

@ -21,8 +21,12 @@ namespace dynamic {
using Map_sptr = std::shared_ptr<Map>; using Map_sptr = std::shared_ptr<Map>;
using List_sptr = std::shared_ptr<List>; using List_sptr = std::shared_ptr<List>;
struct none {};
inline constexpr none NONE = {};
using Value = std::variant< using Value = std::variant<
std::monostate, none,
Map_sptr, Map_sptr,
List_sptr, List_sptr,
std::string, std::string,

2
src/logic/scripting/lua/LuaState.cpp
View file

@ -309,7 +309,7 @@ dynamic::Value lua::LuaState::tovalue(int idx) {
switch (type) { switch (type) {
case LUA_TNIL: case LUA_TNIL:
case LUA_TNONE: case LUA_TNONE:
return std::monostate(); return dynamic::NONE;
case LUA_TBOOLEAN: case LUA_TBOOLEAN:
return lua_toboolean(L, idx) == 1; return lua_toboolean(L, idx) == 1;
case LUA_TNUMBER: { case LUA_TNUMBER: {