mirror/The-Powder-Toy
1
0
Fork 0
mirror of https://github.com/The-Powder-Toy/The-Powder-Toy.git synced 2025-08-12 11:24:04 +02:00
Code Issues Projects Releases Wiki Activity

TPT: fix lua console freeze/bugs

Browse Source
This commit is contained in:
Simon Robertshaw
2012-06-12 19:40:07 +01:00
parent d68110c351
commit b8f2a2dcd5
1 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/cat/LuaScriptInterface.cpp
View File

@@ -1485,9 +1485,9 @@ int luatpt_drawrect(lua_State* l)
if (x<0 || y<0 || x>=XRES+BARSIZE || y>=YRES+MENUSIZE) if (x<0 || y<0 || x>=XRES+BARSIZE || y>=YRES+MENUSIZE)
return luaL_error(l, "Screen coordinates out of range (%d,%d)", x, y); return luaL_error(l, "Screen coordinates out of range (%d,%d)", x, y);
if(x+w > XRES+BARSIZE) if(x+w > XRES+BARSIZE)
w = XRES-x; w = XRES+BARSIZE-x;
if(y+h > YRES+MENUSIZE) if(y+h > YRES+MENUSIZE)
h = YRES-y; h = YRES+MENUSIZE-y;
if (r<0) r = 0; if (r<0) r = 0;
if (r>255) r = 255; if (r>255) r = 255;
if (g<0) g = 0; if (g<0) g = 0;
@@ -1515,9 +1515,9 @@ int luatpt_fillrect(lua_State* l)
if (x<0 || y<0 || x>=XRES+BARSIZE || y>=YRES+MENUSIZE) if (x<0 || y<0 || x>=XRES+BARSIZE || y>=YRES+MENUSIZE)
return luaL_error(l, "Screen coordinates out of range (%d,%d)", x, y); return luaL_error(l, "Screen coordinates out of range (%d,%d)", x, y);
if(x+w > XRES+BARSIZE) if(x+w > XRES+BARSIZE)
w = XRES-x; w = XRES+BARSIZE-x;
if(y+h > YRES+MENUSIZE) if(y+h > YRES+MENUSIZE)
h = YRES-y; h = YRES+MENUSIZE-y;
if (r<0) r = 0; if (r<0) r = 0;
if (r>255) r = 255; if (r>255) r = 255;
if (g<0) g = 0; if (g<0) g = 0;
@@ -1916,6 +1916,8 @@ int luatpt_setdebug(lua_State* l)
int luatpt_setfpscap(lua_State* l) int luatpt_setfpscap(lua_State* l)
{ {
int fpscap = luaL_optint(l, 1, 0); int fpscap = luaL_optint(l, 1, 0);
if (fpscap < 2)
return luaL_error(l, "fps cap too small");
ui::Engine::Ref().FpsLimit = fpscap; ui::Engine::Ref().FpsLimit = fpscap;
return 0; return 0;
} }