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

love.graphics.draw(image, quad, x, y, ...) now errors instead of shifting parameters if the quad argument is nil

Browse Source
This commit is contained in:
Alex Szpakowski
2013-10-14 03:38:07 -03:00
parent 43b3629e01
commit b556dde3cb
2 changed files with 8 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/modules/graphics/opengl/wrap_Graphics.cpp
+4
View File
@@ -1017,6 +1017,10 @@ int w_draw(lua_State *L)
quad = luax_totype<Quad>(L, 2, "Quad", GRAPHICS_QUAD_T);
startidx = 3;
}
else if (lua_isnil(L, 2) && !lua_isnoneornil(L, 3))
{
return luax_typerror(L, 2, "Quad");
}
else
{
drawable = luax_checktype<Drawable>(L, 1, "Drawable", GRAPHICS_DRAWABLE_T);
src/modules/graphics/opengl/wrap_SpriteBatch.cpp
+4
View File
@@ -44,6 +44,8 @@ int w_SpriteBatch_add(lua_State *L)
quad = luax_totype<Quad>(L, 2, "Quad", GRAPHICS_QUAD_T);
startidx = 3;
}
else if (lua_isnil(L, 2) && !lua_isnoneornil(L, 3))
return luax_typerror(L, 2, "Quad");
float x = (float) luaL_optnumber(L, startidx + 0, 0.0);
float y = (float) luaL_optnumber(L, startidx + 1, 0.0);
@@ -80,6 +82,8 @@ int w_SpriteBatch_set(lua_State *L)
quad = luax_totype<Quad>(L, 3, "Quad", GRAPHICS_QUAD_T);
startidx = 4;
}
else if (lua_isnil(L, 3) && !lua_isnoneornil(L, 4))
return luax_typerror(L, 3, "Quad");
float x = (float) luaL_optnumber(L, startidx + 0, 0.0);
float y = (float) luaL_optnumber(L, startidx + 1, 0.0);