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

Fixed love.joystick.loadGamepadMappings to work properly if a FileData object is passed to it.

Browse Source
This commit is contained in:
Alex Szpakowski
2014-11-03 16:24:28 -04:00
parent b9271ed25a
commit 0d28135465
1 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/modules/joystick/wrap_JoystickModule.cpp
+9 -5
View File
@@ -179,13 +179,17 @@ int w_getGamepadMapping(lua_State *L)
int w_loadGamepadMappings(lua_State *L) int w_loadGamepadMappings(lua_State *L)
{ {
lua_pushvalue(L, 1); bool isfile = true;
luax_convobj(L, -1, "filesystem", "isFile");
bool isfile = luax_toboolean(L, -1);
lua_pop(L, 1);
std::string mappings; std::string mappings;
if (lua_isstring(L, 1))
{
lua_pushvalue(L, 1);
luax_convobj(L, -1, "filesystem", "isFile");
isfile = luax_toboolean(L, -1);
lua_pop(L, 1);
}
if (isfile) if (isfile)
{ {
love::filesystem::FileData *fd = love::filesystem::luax_getfiledata(L, 1); love::filesystem::FileData *fd = love::filesystem::luax_getfiledata(L, 1);