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

Ensure tpt.set_wallmap is called with 3, 5, or 7 arguments

Browse Source
This commit is contained in:
jacob1 2021-06-08 22:36:26 -04:00
parent 9775527123
commit 5eb2495d61
No known key found for this signature in database
GPG Key ID: 4E58A32D510E1995
1 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/lua/LegacyLuaAPI.cpp
View File

@ -833,6 +833,8 @@ int luatpt_get_wallmap(lua_State* l)
int luatpt_set_wallmap(lua_State* l) int luatpt_set_wallmap(lua_State* l)
{ {
int args = lua_gettop(l); int args = lua_gettop(l);
if (args < 3 || args > 7 || args % 2 != 1)
return luaL_error(l, "Incorrect numbner of arguments");
int x = luaL_optint(l, 1, 0); int x = luaL_optint(l, 1, 0);
int y = luaL_optint(l, 2, 0); int y = luaL_optint(l, 2, 0);
int w = luaL_optint(l, 3, 0); int w = luaL_optint(l, 3, 0);
@ -840,16 +842,13 @@ int luatpt_set_wallmap(lua_State* l)
float fvx = float(luaL_optnumber(l, 5, 0)); float fvx = float(luaL_optnumber(l, 5, 0));
float fvy = float(luaL_optnumber(l, 6, 0)); float fvy = float(luaL_optnumber(l, 6, 0));
// * Absolute nonsense; combined with the optional arguments above, this evaluates calls
// like tpt.set_wallmap(5) to x = 5, y = 0, wallType = 5, but I dare not fix
// because Compatibility(tm). -- LBPHacker
int wallType = luaL_optint(l, args, 0); int wallType = luaL_optint(l, args, 0);
if (wallType < 0 || wallType >= UI_WALLCOUNT) if (wallType < 0 || wallType >= UI_WALLCOUNT)
{ {
return luaL_error(l, "Unrecognised wall number %d", wallType); return luaL_error(l, "Unrecognised wall number %d", wallType);
} }
bool setFv = args >= 7; bool setFv = args == 7;
if (args < 5) if (args < 5)
{ {
w = 1; w = 1;
@ -859,8 +858,6 @@ int luatpt_set_wallmap(lua_State* l)
if (y < 0 ) y = 0 ; if (y < 0 ) y = 0 ;
if (x > XRES / CELL ) x = XRES / CELL ; if (x > XRES / CELL ) x = XRES / CELL ;
if (y > YRES / CELL ) y = YRES / CELL ; if (y > YRES / CELL ) y = YRES / CELL ;
if (w < 0 ) w = 0 ;
if (h < 0 ) h = 0 ;
if (w > XRES / CELL - x) w = XRES / CELL - x; if (w > XRES / CELL - x) w = XRES / CELL - x;
if (h > YRES / CELL - y) h = YRES / CELL - y; if (h > YRES / CELL - y) h = YRES / CELL - y;
for (int yy = y; yy < y + h; ++yy) for (int yy = y; yy < y + h; ++yy)