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

Changed love.graphics.setPalette() to set to default on nil

Browse Source
This commit is contained in:
rxi
2014-06-21 00:16:01 +01:00
parent 7961091853
commit 58bacfe1d1
1 changed files with 17 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/graphics.c
View File

@@ -17,6 +17,7 @@
image_t *graphics_screen; image_t *graphics_screen;
font_t *graphics_defaultFont; font_t *graphics_defaultFont;
int graphics_defaultPalette;
image_t *graphics_canvas; image_t *graphics_canvas;
font_t *graphics_font; font_t *graphics_font;
@@ -198,6 +199,7 @@ int l_graphics_getPalette(lua_State *L) {
lua_pushinteger(L, inp(0x03c9) << 2); lua_rawseti(L, -2, i + 3); lua_pushinteger(L, inp(0x03c9) << 2); lua_rawseti(L, -2, i + 3);
} }
return 1; return 1;
} else { } else {
int idx = luaL_checkinteger(L, 1); int idx = luaL_checkinteger(L, 1);
if (idx < 0 || idx > 0xff) return 0; if (idx < 0 || idx > 0xff) return 0;
@@ -214,7 +216,14 @@ int l_graphics_getPalette(lua_State *L) {
int l_graphics_setPalette(lua_State *L) { int l_graphics_setPalette(lua_State *L) {
#define CLAMP(x, a, b) ((x) < (a) ? (a) : (x) > (b) ? (b) : (x)) #define CLAMP(x, a, b) ((x) < (a) ? (a) : (x) > (b) ? (b) : (x))
luaL_checkany(L, 1); if (lua_isnoneornil(L, 1)) {
/* Set the first argument to the default palette if no arguments were
* given */
lua_pushlightuserdata(L, &graphics_defaultPalette);
lua_gettable(L, LUA_REGISTRYINDEX);
lua_insert(L, 1);
}
if (lua_type(L, 1) == LUA_TTABLE) { if (lua_type(L, 1) == LUA_TTABLE) {
luaL_argcheck(L, lua_rawlen(L, 1) == 768, 1, luaL_argcheck(L, lua_rawlen(L, 1) == 768, 1,
"expected table with length of 768"); "expected table with length of 768");
@@ -228,6 +237,7 @@ int l_graphics_setPalette(lua_State *L) {
outp(0x03c9, CLAMP(g, 0, 0xff) >> 2); outp(0x03c9, CLAMP(g, 0, 0xff) >> 2);
outp(0x03c9, CLAMP(b, 0, 0xff) >> 2); outp(0x03c9, CLAMP(b, 0, 0xff) >> 2);
} }
} else { } else {
int idx = luaL_checkint(L, 1); int idx = luaL_checkint(L, 1);
int r = luaL_checkint(L, 2); int r = luaL_checkint(L, 2);
@@ -530,6 +540,12 @@ int luaopen_graphics(lua_State *L) {
}; };
luaL_newlib(L, reg); luaL_newlib(L, reg);
/* Get the default palette and save to the registry */
lua_pushlightuserdata(L, &graphics_defaultPalette);
lua_pushcfunction(L, l_graphics_getPalette);
lua_call(L, 0, 1);
lua_settable(L, LUA_REGISTRYINDEX);
/* Init screen canvas */ /* Init screen canvas */
lua_pushcfunction(L, l_image_newCanvas); lua_pushcfunction(L, l_image_newCanvas);
lua_pushinteger(L, VGA_WIDTH); lua_pushinteger(L, VGA_WIDTH);