LOVE/love
1
0
Fork 0
mirror of https://github.com/love2d/love.git synced 2026-08-17 19:23:38 +02:00
Code Issues Packages Projects Releases Wiki Activity

Error for invalid constants passed to love.keyboard.isDown/isScancodeDown. Resolves issue #1313.

Browse Source 
--HG--
branch : minor
This commit is contained in:
Alex Szpakowski
2017-08-10 21:06:04 -03:00
parent 01fe2c5df2
commit 92df39181d
1 changed files with 22 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/modules/keyboard/wrap_Keyboard.cpp
+22 -8
View File
@@ -58,8 +58,12 @@ int w_isDown(lua_State *L)
for (int i = 0; i < num; i++) for (int i = 0; i < num; i++)
{ {
lua_rawgeti(L, 1, i + 1); lua_rawgeti(L, 1, i + 1);
if (Keyboard::getConstant(luaL_checkstring(L, -1), k))
keylist.push_back(k); const char *name = luaL_checkstring(L, -1);
if (!Keyboard::getConstant(name, k))
return luaL_error(L, "Invalid key constant: %s", name);
keylist.push_back(k);
lua_pop(L, 1); lua_pop(L, 1);
} }
} }
@@ -67,8 +71,11 @@ int w_isDown(lua_State *L)
{ {
for (int i = 0; i < num; i++) for (int i = 0; i < num; i++)
{ {
if (Keyboard::getConstant(luaL_checkstring(L, i+1), k)) const char *name = luaL_checkstring(L, i + 1);
keylist.push_back(k); if (!Keyboard::getConstant(name, k))
return luaL_error(L, "Invalid key constant: %s", name);
keylist.push_back(k);
} }
} }
@@ -91,8 +98,12 @@ int w_isScancodeDown(lua_State *L)
for (int i = 0; i < num; i++) for (int i = 0; i < num; i++)
{ {
lua_rawgeti(L, 1, i + 1); lua_rawgeti(L, 1, i + 1);
if (Keyboard::getConstant(luaL_checkstring(L, -1), scancode))
scancodelist.push_back(scancode); const char *name = luaL_checkstring(L, -1);
if (!Keyboard::getConstant(name, scancode))
return luaL_error(L, "Invalid scancode: %s", name);
scancodelist.push_back(scancode);
lua_pop(L, 1); lua_pop(L, 1);
} }
} }
@@ -100,8 +111,11 @@ int w_isScancodeDown(lua_State *L)
{ {
for (int i = 0; i < num; i++) for (int i = 0; i < num; i++)
{ {
if (Keyboard::getConstant(luaL_checkstring(L, i+1), scancode)) const char *name = luaL_checkstring(L, i + 1);
scancodelist.push_back(scancode); if (!Keyboard::getConstant(name, scancode))
return luaL_error(L, "Invalid scancode: %s", name);
scancodelist.push_back(scancode);
} }
} }