mirror of
https://github.com/love2d/love.git
synced 2026-08-16 00:02:12 +02:00
Font can now be omitted from setFont/newFont to use the default font.
This commit is contained in:
@@ -195,7 +195,7 @@ namespace opengl
|
||||
return 1;
|
||||
}
|
||||
|
||||
int w_newFont(lua_State * L)
|
||||
int w_newFont1(lua_State * L)
|
||||
{
|
||||
Data * d = 0;
|
||||
|
||||
@@ -320,7 +320,7 @@ namespace opengl
|
||||
return 4;
|
||||
}
|
||||
|
||||
int w_setFont(lua_State * L)
|
||||
int w_setFont1(lua_State * L)
|
||||
{
|
||||
// The second parameter is an optional int.
|
||||
int size = luaL_optint(L, 2, 12);
|
||||
@@ -787,7 +787,7 @@ namespace opengl
|
||||
{ "newImage", w_newImage },
|
||||
{ "newGlyph", w_newGlyph },
|
||||
{ "newQuad", w_newQuad },
|
||||
{ "newFont", w_newFont },
|
||||
{ "newFont1", w_newFont1 },
|
||||
{ "newImageFont", w_newImageFont },
|
||||
{ "newSpriteBatch", w_newSpriteBatch },
|
||||
{ "newParticleSystem", w_newParticleSystem },
|
||||
@@ -797,7 +797,7 @@ namespace opengl
|
||||
{ "setBackgroundColor", w_setBackgroundColor },
|
||||
{ "getBackgroundColor", w_getBackgroundColor },
|
||||
|
||||
{ "setFont", w_setFont },
|
||||
{ "setFont1", w_setFont1 },
|
||||
{ "getFont", w_getFont },
|
||||
|
||||
{ "setBlendMode", w_setBlendMode },
|
||||
|
||||
@@ -52,7 +52,7 @@ namespace opengl
|
||||
int w_newImage(lua_State * L);
|
||||
int w_newGlyph(lua_State * L);
|
||||
int w_newFrame(lua_State * L);
|
||||
int w_newFont(lua_State * L);
|
||||
int w_newFont1(lua_State * L);
|
||||
int w_newImageFont(lua_State * L);
|
||||
int w_newSpriteBatch(lua_State * L);
|
||||
int w_newParticleSystem(lua_State * L);
|
||||
@@ -60,7 +60,7 @@ namespace opengl
|
||||
int w_getColor(lua_State * L);
|
||||
int w_setBackgroundColor(lua_State * L);
|
||||
int w_getBackgroundColor(lua_State * L);
|
||||
int w_setFont(lua_State * L);
|
||||
int w_setFont1(lua_State * L);
|
||||
int w_getFont(lua_State * L);
|
||||
int w_setBlendMode(lua_State * L);
|
||||
int w_setColorMode(lua_State * L);
|
||||
|
||||
Reference in New Issue
Block a user