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

Restore 0-argument love.graphics.newFont/love.font.newRasterizer

Browse Source 
Fix subtle bug in luax_convobj in the process, it couldn't deal with 0 arguments
before.
This commit is contained in:
Bart van Strien
2015-06-07 23:10:48 +02:00
parent 8c1bc543b9
commit 6ef6f85d0c
2 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/common/runtime.cpp
+2 -1
View File
@@ -489,7 +489,8 @@ int luax_convobj(lua_State *L, int idxs[], int n, const char *mod, const char *f
lua_call(L, n, 2); // Call the function, n args, one return value (plus optional errstring.) lua_call(L, n, 2); // Call the function, n args, one return value (plus optional errstring.)
luax_assert_nilerror(L, -2); // Make sure the function returned something. luax_assert_nilerror(L, -2); // Make sure the function returned something.
lua_pop(L, 1); // Pop the second return value now that we don't need it. lua_pop(L, 1); // Pop the second return value now that we don't need it.
lua_replace(L, idxs[0]); // Replace the initial argument with the new object. if (n > 0)
lua_replace(L, idxs[0]); // Replace the initial argument with the new object.
return 0; return 0;
} }
src/modules/font/wrap_Font.cpp
+3 -3
View File
@@ -37,7 +37,7 @@ namespace font
int w_newRasterizer(lua_State *L) int w_newRasterizer(lua_State *L)
{ {
if (lua_type(L, 1) == LUA_TNUMBER || lua_type(L, 2) == LUA_TNUMBER) if (lua_type(L, 1) == LUA_TNUMBER || lua_type(L, 2) == LUA_TNUMBER || lua_isnone(L, 1))
{ {
// First or second argument is a number: call newTrueTypeRasterizer. // First or second argument is a number: call newTrueTypeRasterizer.
return w_newTrueTypeRasterizer(L); return w_newTrueTypeRasterizer(L);
@@ -69,10 +69,10 @@ int w_newTrueTypeRasterizer(lua_State *L)
Rasterizer *t = nullptr; Rasterizer *t = nullptr;
TrueTypeRasterizer::Hinting hinting = TrueTypeRasterizer::HINTING_NORMAL; TrueTypeRasterizer::Hinting hinting = TrueTypeRasterizer::HINTING_NORMAL;
if (lua_type(L, 1) == LUA_TNUMBER) if (lua_type(L, 1) == LUA_TNUMBER || lua_isnone(L, 1))
{ {
// First argument is a number: use the default TrueType font. // First argument is a number: use the default TrueType font.
int size = luaL_checkint(L, 1); int size = luaL_optint(L, 1, 12);
const char *hintstr = lua_isnoneornil(L, 2) ? nullptr : luaL_checkstring(L, 2); const char *hintstr = lua_isnoneornil(L, 2) ? nullptr : luaL_checkstring(L, 2);
if (hintstr && !TrueTypeRasterizer::getConstant(hintstr, hinting)) if (hintstr && !TrueTypeRasterizer::getConstant(hintstr, hinting))