LOVE/love
1
0
Fork 0
mirror of https://github.com/love2d/love.git synced 2026-08-14 01:20:56 +02:00
Code Issues Packages Projects Releases Wiki Activity

Move require path into filesystem module

Browse Source 
--HG--
branch : minor
This commit is contained in:
Bart van Strien
2014-09-05 07:57:42 +02:00
parent 97cacf1b2d
commit 5b4ef23772
3 changed files with 17 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/modules/filesystem/wrap_Filesystem.cpp
+3 -4
View File
@@ -510,13 +510,11 @@ int w_isSymlink(lua_State *L)
return 1;
}
static std::vector<std::string> requirePath = {"?.lua", "?/init.lua"};
int w_getRequirePath(lua_State *L)
{
std::stringstream path;
bool seperator = false;
for (auto &element : requirePath)
for (auto &element : instance()->getRequirePath())
{
if (seperator)
path << ";";
@@ -533,6 +531,7 @@ int w_getRequirePath(lua_State *L)
int w_setRequirePath(lua_State *L)
{
std::string element = luax_checkstring(L, 1);
auto &requirePath = instance()->getRequirePath();
requirePath.clear();
std::stringstream path;
@@ -555,7 +554,7 @@ int loader(lua_State *L)
}
auto *inst = instance();
for (std::string element : requirePath)
for (std::string element : inst->getRequirePath())
{
size_t pos = element.find('?');
if (pos == std::string::npos)