From d1436e698aeb269e6f024bae5d78307d5258b00b Mon Sep 17 00:00:00 2001 From: Luca Bruno Date: Sat, 18 Apr 2015 10:48:31 +0200 Subject: luaengine: accept any LUA number type as coordinate This commit fixes a type confusion bug in all draw_*() API methods. When decimal (ie. subpixels) values were passed by user scripts, they were incorrectly casted from float to plain integers, resulting in incorrect graphical artifacts. As this may happen quite often within scripts manipulating numerical values in LUA, we now also accept decimal values as coordinates. Signed-off-by: Luca Bruno --- src/emu/luaengine.c | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) (limited to 'src/emu/luaengine.c') diff --git a/src/emu/luaengine.c b/src/emu/luaengine.c index 12be9947cae..98a0f1a86c9 100644 --- a/src/emu/luaengine.c +++ b/src/emu/luaengine.c @@ -642,10 +642,10 @@ int lua_engine::lua_screen::l_draw_box(lua_State *L) int sc_width = sc->visible_area().width(); int sc_height = sc->visible_area().height(); float x1, y1, x2, y2; - x1 = MIN(MAX(0, lua_tointeger(L, 2)), sc_width-1) / static_cast(sc_width); - y1 = MIN(MAX(0, lua_tointeger(L, 3)), sc_height-1) / static_cast(sc_height); - x2 = MIN(MAX(0, lua_tointeger(L, 4)), sc_width-1) / static_cast(sc_width); - y2 = MIN(MAX(0, lua_tointeger(L, 5)), sc_height-1) / static_cast(sc_height); + x1 = MIN(MAX(0, lua_tonumber(L, 2)), sc_width-1) / static_cast(sc_width); + y1 = MIN(MAX(0, lua_tonumber(L, 3)), sc_height-1) / static_cast(sc_height); + x2 = MIN(MAX(0, lua_tonumber(L, 4)), sc_width-1) / static_cast(sc_width); + y2 = MIN(MAX(0, lua_tonumber(L, 5)), sc_height-1) / static_cast(sc_height); UINT32 bgcolor = lua_tounsigned(L, 6); UINT32 fgcolor = lua_tounsigned(L, 7); @@ -680,10 +680,10 @@ int lua_engine::lua_screen::l_draw_line(lua_State *L) int sc_width = sc->visible_area().width(); int sc_height = sc->visible_area().height(); float x1, y1, x2, y2; - x1 = MIN(MAX(0, lua_tointeger(L, 2)), sc_width-1) / static_cast(sc_width); - y1 = MIN(MAX(0, lua_tointeger(L, 3)), sc_height-1) / static_cast(sc_height); - x2 = MIN(MAX(0, lua_tointeger(L, 4)), sc_width-1) / static_cast(sc_width); - y2 = MIN(MAX(0, lua_tointeger(L, 5)), sc_height-1) / static_cast(sc_height); + x1 = MIN(MAX(0, lua_tonumber(L, 2)), sc_width-1) / static_cast(sc_width); + y1 = MIN(MAX(0, lua_tonumber(L, 3)), sc_height-1) / static_cast(sc_height); + x2 = MIN(MAX(0, lua_tonumber(L, 4)), sc_width-1) / static_cast(sc_width); + y2 = MIN(MAX(0, lua_tonumber(L, 5)), sc_height-1) / static_cast(sc_height); UINT32 color = lua_tounsigned(L, 6); // draw the line @@ -711,8 +711,8 @@ int lua_engine::lua_screen::l_draw_text(lua_State *L) // retrieve all parameters int sc_width = sc->visible_area().width(); int sc_height = sc->visible_area().height(); - float x = MIN(MAX(0, lua_tointeger(L, 2)), sc_width-1) / static_cast(sc_width); - float y = MIN(MAX(0, lua_tointeger(L, 3)), sc_height-1) / static_cast(sc_height); + float x = MIN(MAX(0, lua_tonumber(L, 2)), sc_width-1) / static_cast(sc_width); + float y = MIN(MAX(0, lua_tonumber(L, 3)), sc_height-1) / static_cast(sc_height); const char *msg = luaL_checkstring(L,4); // TODO: add optional parameters (colors, etc.) -- cgit v1.2.3-70-g09d2