mirror/The-Powder-Toy
1
0
Fork 0
mirror of https://github.com/The-Powder-Toy/The-Powder-Toy.git synced 2025-08-28 18:29:49 +02:00
Code Issues Projects Releases Wiki Activity

Fix Lua API sim.partNeighbours with 4 arguments

Browse Source
This commit is contained in:
jacksonmj
2014-03-03 20:09:35 +00:00
parent 4158581b21
commit 224b25fae5
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/lua/LuaScriptInterface.cpp
View File

@@ -571,9 +571,10 @@ int LuaScriptInterface::simulation_partNeighbours(lua_State * l)
{ {
lua_newtable(l); lua_newtable(l);
int id = 0; int id = 0;
if(lua_gettop(l) == 4) int x = lua_tointeger(l, 1), y = lua_tointeger(l, 2), r = lua_tointeger(l, 3), rx, ry, n;
if(lua_gettop(l) == 5) // this is one more than the number of arguments because a table has just been pushed onto the stack with lua_newtable(l);
{ {
int x = lua_tointeger(l, 1), y = lua_tointeger(l, 2), r = lua_tointeger(l, 3), t = lua_tointeger(l, 4), rx, ry, n; int t = lua_tointeger(l, 4);
for (rx = -r; rx <= r; rx++) for (rx = -r; rx <= r; rx++)
for (ry = -r; ry <= r; ry++) for (ry = -r; ry <= r; ry++)
if (x+rx >= 0 && y+ry >= 0 && x+rx < XRES && y+ry < YRES && (rx || ry)) if (x+rx >= 0 && y+ry >= 0 && x+rx < XRES && y+ry < YRES && (rx || ry))
@@ -589,7 +590,6 @@ int LuaScriptInterface::simulation_partNeighbours(lua_State * l)
} }
else else
{ {
int x = lua_tointeger(l, 1), y = lua_tointeger(l, 2), r = lua_tointeger(l, 3), rx, ry, n;
for (rx = -r; rx <= r; rx++) for (rx = -r; rx <= r; rx++)
for (ry = -r; ry <= r; ry++) for (ry = -r; ry <= r; ry++)
if (x+rx >= 0 && y+ry >= 0 && x+rx < XRES && y+ry < YRES && (rx || ry)) if (x+rx >= 0 && y+ry >= 0 && x+rx < XRES && y+ry < YRES && (rx || ry))