From f10abf48d7f3eddd91db264f30d0bfa581c921f4 Mon Sep 17 00:00:00 2001 From: couriersud Date: Wed, 20 May 2015 21:24:59 +0200 Subject: Another round of -Wextra -Wdouble-promotion fixes. (nw) --- 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 25d3b25d7e7..588c8334eff 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_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); + x1 = MIN(MAX(0, (float) lua_tonumber(L, 2)), sc_width-1) / static_cast(sc_width); + y1 = MIN(MAX(0, (float) lua_tonumber(L, 3)), sc_height-1) / static_cast(sc_height); + x2 = MIN(MAX(0, (float) lua_tonumber(L, 4)), sc_width-1) / static_cast(sc_width); + y2 = MIN(MAX(0, (float) 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_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); + x1 = MIN(MAX(0, (float) lua_tonumber(L, 2)), sc_width-1) / static_cast(sc_width); + y1 = MIN(MAX(0, (float) lua_tonumber(L, 3)), sc_height-1) / static_cast(sc_height); + x2 = MIN(MAX(0, (float) lua_tonumber(L, 4)), sc_width-1) / static_cast(sc_width); + y2 = MIN(MAX(0, (float) lua_tonumber(L, 5)), sc_height-1) / static_cast(sc_height); UINT32 color = lua_tounsigned(L, 6); // draw the line @@ -712,8 +712,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_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); + float x = MIN(MAX(0, (float) lua_tonumber(L, 2)), sc_width-1) / static_cast(sc_width); + float y = MIN(MAX(0, (float) lua_tonumber(L, 3)), sc_height-1) / static_cast(sc_height); const char *msg = luaL_checkstring(L,4); rgb_t textcolor = UI_TEXT_COLOR; if (!lua_isnone(L, 5)) { -- cgit v1.2.3-70-g09d2