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

Merge default into minor

Browse Source 
--HG--
branch : minor
This commit is contained in:
Alex Szpakowski
2016-03-12 22:04:07 -04:00
parent 140faf0cae d0c0240e09
commit 293bc79b97
6 changed files with 48 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/modules/thread/wrap_Channel.cpp
+4 -4
View File
@@ -33,8 +33,8 @@ Channel *luax_checkchannel(lua_State *L, int idx)
int w_Channel_push(lua_State *L)
{
Channel *c = luax_checkchannel(L, 1);
Variant var;
if (!Variant::fromLua(L, 2, &var))
Variant var = Variant::fromLua(L, 2);
if (var.getType() == Variant::UNKNOWN)
return luaL_argerror(L, 2, "boolean, number, string, love type, or flat table expected");
uint64 id = c->push(var);
lua_pushnumber(L, (lua_Number) id);
@@ -44,8 +44,8 @@ int w_Channel_push(lua_State *L)
int w_Channel_supply(lua_State *L)
{
Channel *c = luax_checkchannel(L, 1);
Variant var;
if (!Variant::fromLua(L, 2, &var))
Variant var = Variant::fromLua(L, 2);
if (var.getType() == Variant::UNKNOWN)
return luaL_argerror(L, 2, "boolean, number, string, love type, or flat table expected");
c->supply(var);
return 0;
src/modules/thread/wrap_LuaThread.cpp
+3 -4
View File
@@ -36,16 +36,15 @@ int w_Thread_start(lua_State *L)
std::vector<Variant> args;
int nargs = lua_gettop(L) - 1;
Variant v;
for (int i = 0; i < nargs; ++i)
{
if (!Variant::fromLua(L, i+2, &v))
args.push_back(Variant::fromLua(L, i+2));
if (args.back().getType() == Variant::UNKNOWN)
{
args.clear();
return luaL_argerror(L, i+2, "boolean, number, string, love type, or flat table expected");
}
args.push_back(v);
}
luax_pushboolean(L, t->start(args));