WallyHackenslacker/lovedos
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Made filename argument optional in love.graphics.newFont()

Browse Source
This commit is contained in:
rxi
2014-06-14 14:20:04 +01:00
parent 664ffe979c
commit 2d48b5eae1
2 changed files with 10 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
doc/api.md
View File

@@ -137,10 +137,11 @@ dimensions as the screen.
##### love.graphics.newQuad(x, y, width, height) ##### love.graphics.newQuad(x, y, width, height)
Creates and returns a new quad. Creates and returns a new quad.
##### love.graphics.newFont(filename) ##### love.graphics.newFont([filename])
Creates and returns a new font. `filename` should be the name of a black and Creates and returns a new font. `filename` should be the name of a black and
white 8bit .pcx image file representing all 256 characters in a 16 x 16 white 8bit .pcx image file representing all 256 characters in a 16 x 16
character grid. character grid. If no `filename` is given then the default embedded font image
is used.
##### love.graphics.present() ##### love.graphics.present()
Flips the current screen buffer with the displayed screen buffer. This is Flips the current screen buffer with the displayed screen buffer. This is

10
src/font.c
View File

@@ -85,11 +85,15 @@ void font_blit(font_t *self, pixel_t *buf, int bufw, int bufh,
int l_font_new(lua_State *L) { int l_font_new(lua_State *L) {
const char *filename = luaL_checkstring(L, 1); const char *filename = lua_isnoneornil(L, 1) ? NULL : luaL_checkstring(L, 1);
font_t *self = luaobj_newudata(L, sizeof(*self)); font_t *self = luaobj_newudata(L, sizeof(*self));
luaobj_setclass(L, CLASS_TYPE, CLASS_NAME); luaobj_setclass(L, CLASS_TYPE, CLASS_NAME);
const char *err = font_init(self, filename); if (filename) {
if (err) luaL_error(L, err); const char *err = font_init(self, filename);
if (err) luaL_error(L, err);
} else {
font_initEmbedded(self);
}
return 1; return 1;
} }