diff --git a/.gitignore b/.gitignore index 4e831c2b..f5597dad 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,3 @@ -/modules/.project build* CMakeCache.txt CMakeFiles @@ -39,3 +38,4 @@ tags Thumbs.db .directory src/framework/graphics/dx/ +modules/.project/modules.sublime-workspace diff --git a/modules/.project/modules.sublime-project b/modules/.project/modules.sublime-project new file mode 100644 index 00000000..b3167a2c --- /dev/null +++ b/modules/.project/modules.sublime-project @@ -0,0 +1,10 @@ +{ + "folders": + [ + { + "path": "..", + "folder_exclude_patterns": [".*", "*.*~"], + "file_exclude_patterns": [".*", "*.*~"] + } + ] +} diff --git a/src/framework/luaengine/luainterface.cpp b/src/framework/luaengine/luainterface.cpp index bb214e7f..37544287 100644 --- a/src/framework/luaengine/luainterface.cpp +++ b/src/framework/luaengine/luainterface.cpp @@ -577,18 +577,18 @@ int LuaInterface::lua_dofile(lua_State* L) int LuaInterface::lua_dofiles(lua_State* L) { - bool recursive = false; + std::string contains = ""; if(g_lua.getTop() > 2) { - recursive = g_lua.popBoolean(); + contains = g_lua.popString(); } - std::string contains = ""; + bool recursive = false; if(g_lua.getTop() > 1) { - contains = g_lua.popString(); + recursive = g_lua.popBoolean(); } std::string directory = g_lua.popString(); - g_lua.loadFiles(directory, contains, recursive); + g_lua.loadFiles(directory, recursive, contains); return 0; } @@ -1247,13 +1247,13 @@ int LuaInterface::getTop() return lua_gettop(L); } -void LuaInterface::loadFiles(std::string directory, std::string contains, bool recursive) +void LuaInterface::loadFiles(std::string directory, bool recursive, std::string contains) { for(const std::string& fileName : g_resources.listDirectoryFiles(directory)) { std::string fullPath = directory + "/" + fileName; if(recursive && g_resources.directoryExists(fullPath)) { - loadFiles(fullPath, contains, true); + loadFiles(fullPath, true, contains); continue; } diff --git a/src/framework/luaengine/luainterface.h b/src/framework/luaengine/luainterface.h index 165cd787..d6cbbac3 100644 --- a/src/framework/luaengine/luainterface.h +++ b/src/framework/luaengine/luainterface.h @@ -321,7 +321,7 @@ public: void clearStack() { pop(stackSize()); } bool hasIndex(int index) { return (stackSize() >= (index < 0 ? -index : index) && index != 0); } - void loadFiles(std::string directory, std::string contains, bool recursive = false); + void loadFiles(std::string directory, bool recursive = false, std::string contains = ""); /// Pushes any type onto the stack template