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

Merge branch 'main' into devtools

Browse source
This commit is contained in:
MihailRis 2024-05-09 20:31:18 +03:00
commit 5e9d00f737
6 changed files with 27 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/logic/EngineController.cpp
View file

@ -72,7 +72,7 @@ static void show_content_missing(
std::shared_ptr<ContentLUT> lut
) {
using namespace dynamic;
auto root = std::make_shared<Map>();
auto root = create_map();
auto& contentEntries = root->putList("content");
for (auto& entry : lut->getMissingContent()) {
std::string contentName = contenttype_name(entry.type);

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

@ -327,7 +327,7 @@ dynamic::Value lua::LuaState::tovalue(int idx) {
int len = lua_objlen(L, idx);
if (len) {
// array
auto list = std::make_shared<List>();
auto list = create_list();
for (int i = 1; i <= len; i++) {
lua_rawgeti(L, idx, i);
list->put(tovalue(-1));
@ -336,7 +336,7 @@ dynamic::Value lua::LuaState::tovalue(int idx) {
return list;
} else {
// table
auto map = std::make_shared<Map>();
auto map = create_map();
lua_pushvalue(L, idx);
lua_pushnil(L);
while (lua_next(L, -2)) {