matthew/The-Powder-Toy
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix (hopefully) most of the R/W errors inside the new Lua API

Browse Source
This commit is contained in:
nucular 2014-02-09 17:32:30 +01:00 committed by jacob1
parent 71f90b5d59
commit 8561976121
2 changed files with 30 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/lua/LuaScriptInterface.cpp
View File

@ -419,6 +419,7 @@ int LuaScriptInterface::interface_removeComponent(lua_State * l)
int LuaScriptInterface::interface_showWindow(lua_State * l) int LuaScriptInterface::interface_showWindow(lua_State * l)
{ {
LuaWindow * window = Luna<LuaWindow>::check(l, 1); LuaWindow * window = Luna<LuaWindow>::check(l, 1);
if(window && ui::Engine::Ref().GetWindow()!=window->GetWindow()) if(window && ui::Engine::Ref().GetWindow()!=window->GetWindow())
ui::Engine::Ref().ShowWindow(window->GetWindow()); ui::Engine::Ref().ShowWindow(window->GetWindow());
return 0; return 0;
@ -2378,7 +2379,7 @@ int LuaScriptInterface::graphics_textSize(lua_State * l)
{ {
char * text; char * text;
int width, height; int width, height;
text = (char*)lua_tostring(l, 1); text = (char*)luaL_optstring(l, 1, "");
Graphics::textsize(text, width, height); Graphics::textsize(text, width, height);
lua_pushinteger(l, width); lua_pushinteger(l, width);

32
src/lua/LuaWindow.cpp
View File

@ -61,11 +61,21 @@ LuaWindow::LuaWindow(lua_State * l) :
onKeyReleaseFunction(0) onKeyReleaseFunction(0)
{ {
this->l = l; this->l = l;
int posX = luaL_optinteger(l, 1, 0); int posX = luaL_optinteger(l, 1, 1);
int posY = luaL_optinteger(l, 2, 0); int posY = luaL_optinteger(l, 2, 1);
int sizeX = luaL_optinteger(l, 3, 10); int sizeX = luaL_optinteger(l, 3, 10);
int sizeY = luaL_optinteger(l, 4, 10); int sizeY = luaL_optinteger(l, 4, 10);
// We should replace this with errors
if (posX < 1)
posX = 1;
if (posY < 1)
posY = 1;
if (sizeX < 10)
sizeX = 10;
if (sizeY < 10)
sizeY = 10;
lua_pushstring(l, "Luacon_ci"); lua_pushstring(l, "Luacon_ci");
lua_gettable(l, LUA_REGISTRYINDEX); lua_gettable(l, LUA_REGISTRYINDEX);
ci = (LuaScriptInterface*)lua_touserdata(l, -1); ci = (LuaScriptInterface*)lua_touserdata(l, -1);
@ -154,7 +164,14 @@ int LuaWindow::position(lua_State * l)
{ {
luaL_checktype(l, 1, LUA_TNUMBER); luaL_checktype(l, 1, LUA_TNUMBER);
luaL_checktype(l, 2, LUA_TNUMBER); luaL_checktype(l, 2, LUA_TNUMBER);
window->Position = ui::Point(lua_tointeger(l, 1), lua_tointeger(l, 2)); int posX = lua_tointeger(l, 1);
int posY = lua_tointeger(l, 2);
if (posX < 1 || posY < 1)
{
return luaL_error(l, "Invalid position: '%d,%d'", posX, posY);
}
window->Position = ui::Point(posX, posY);
return 0; return 0;
} }
else else
@ -172,7 +189,14 @@ int LuaWindow::size(lua_State * l)
{ {
luaL_checktype(l, 1, LUA_TNUMBER); luaL_checktype(l, 1, LUA_TNUMBER);
luaL_checktype(l, 2, LUA_TNUMBER); luaL_checktype(l, 2, LUA_TNUMBER);
window->Size = ui::Point(lua_tointeger(l, 1), lua_tointeger(l, 2)); int sizeX = lua_tointeger(l, 1);
int sizeY = lua_tointeger(l, 2);
if (sizeX < 10 || sizeY < 10)
{
return luaL_error(l, "Invalid size: '%d,%d'", sizeX, sizeY);
}
window->Size = ui::Point(sizeX, sizeY);
return 0; return 0;
} }
else else