Merge remote-tracking branch 'upstream/develop' into internal_scripts

2020-07-24 20:47:24 -07:00 · 2020-07-24 20:47:24 -07:00 · da11932d6b
parent 86e9f69d42 fcb14623a7
commit da11932d6b
4 changed files with 6 additions and 5 deletions
--- a/docs/Authors.rst
+++ b/docs/Authors.rst
@ -43,6 +43,7 @@ Deon
 DoctorVanGogh           DoctorVanGogh
 Donald Ruegsegger       hashaash
 doomchild               doomchild
+ElMendukol              ElMendukol
 enjia2000
 Eric Wald               eswald
 Erik Youngren           Artanis
--- a/library/LuaApi.cpp
+++ b/library/LuaApi.cpp
@ -2404,10 +2404,10 @@ static int filesystem_listdir_recursive(lua_State *L)
    luaL_checktype(L,1,LUA_TSTRING);
    std::string dir=lua_tostring(L,1);
    int depth = 10;
-    if (lua_type(L, 2) == LUA_TNUMBER)
-        depth = lua_tounsigned(L, 2);
+    if (lua_gettop(L) >= 2)
+        depth = luaL_checkint(L, 2);
    bool include_prefix = true;
-    if (lua_type(L, 3) == LUA_TBOOLEAN)
+    if (lua_gettop(L) >= 3)
        include_prefix = lua_toboolean(L, 3);
    std::map<std::string, bool> files;
    int err = DFHack::Filesystem::listdir_recursive(dir, files, depth, include_prefix);
--- a/library/xml
+++ b/library/xml
@ -1 +1 @@
-Subproject commit 7822df15ed44ca9e68d7270329ffd54dd7744977
+Subproject commit bada2199d16bd8e97d15efee7cbe05e5eb6ee6ee
--- a/2
+++ b/2
@ -1 +1 @@
-Subproject commit a5e385bb2a3c72f878be614cb0cc004aafa17f79
+Subproject commit f028d38e4ee9d60b9295a07d23ddb8dcc5197699