Browse Source

love.graphics.drawq's x,y parameters are now optional, to match love.graphics.draw

Alex Szpakowski 12 years ago
parent
commit
7e658861d7

+ 1 - 1
src/modules/graphics/opengl/wrap_Canvas.cpp

@@ -185,7 +185,7 @@ int w_Canvas_clear(lua_State *L)
 		c.r = (unsigned char)luaL_checkint(L, -4);
 		c.r = (unsigned char)luaL_checkint(L, -4);
 		c.g = (unsigned char)luaL_checkint(L, -3);
 		c.g = (unsigned char)luaL_checkint(L, -3);
 		c.b = (unsigned char)luaL_checkint(L, -2);
 		c.b = (unsigned char)luaL_checkint(L, -2);
-		c.g = (unsigned char)luaL_optint(L, -1, 255);
+		c.a = (unsigned char)luaL_optint(L, -1, 255);
 
 
 		lua_pop(L, 4);
 		lua_pop(L, 4);
 	}
 	}

+ 2 - 2
src/modules/graphics/opengl/wrap_Graphics.cpp

@@ -1168,8 +1168,8 @@ int w_drawq(lua_State *L)
 {
 {
 	DrawQable *dq = luax_checktype<DrawQable>(L, 1, "DrawQable", GRAPHICS_DRAWQABLE_T);
 	DrawQable *dq = luax_checktype<DrawQable>(L, 1, "DrawQable", GRAPHICS_DRAWQABLE_T);
 	Quad *q = luax_checkquad(L, 2);
 	Quad *q = luax_checkquad(L, 2);
-	float x = (float)luaL_checknumber(L, 3);
-	float y = (float)luaL_checknumber(L, 4);
+	float x = (float)luaL_optnumber(L, 3, 0.0f);
+	float y = (float)luaL_optnumber(L, 4, 0.0f);
 	float angle = (float)luaL_optnumber(L, 5, 0);
 	float angle = (float)luaL_optnumber(L, 5, 0);
 	float sx = (float)luaL_optnumber(L, 6, 1);
 	float sx = (float)luaL_optnumber(L, 6, 1);
 	float sy = (float)luaL_optnumber(L, 7, sx);
 	float sy = (float)luaL_optnumber(L, 7, sx);