LOVE/love
1
0
Fork 0
mirror of https://github.com/love2d/love.git synced 2026-08-12 16:40:57 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge default into minor

Browse Source 
--HG--
branch : minor
This commit is contained in:
Bart van Strien
2016-04-02 17:19:20 +02:00
parent cc1b9bc619 62c97381e9
commit db8e7a7670
23 changed files with 831 additions and 441 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/modules/filesystem/wrap_Filesystem.cpp
+11 -2
View File
@@ -111,11 +111,20 @@ int w_getSource(lua_State *L)
int w_mount(lua_State *L)
{
const char *archive = luaL_checkstring(L, 1);
std::string archive;
if (luax_istype(L, 1, FILESYSTEM_DROPPED_FILE_ID))
{
DroppedFile *file = luax_totype<DroppedFile>(L, 1, FILESYSTEM_DROPPED_FILE_ID);
archive = file->getFilename();
}
else
archive = luax_checkstring(L, 1);
const char *mountpoint = luaL_checkstring(L, 2);
bool append = luax_optboolean(L, 3, false);
luax_pushboolean(L, instance()->mount(archive, mountpoint, append));
luax_pushboolean(L, instance()->mount(archive.c_str(), mountpoint, append));
return 1;
}