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

tpt.parts: only prevent writing to dead particles, not reading

Browse Source
This commit is contained in:
jacob1 2017-07-16 11:43:50 -04:00
parent b8ce522779
commit ad5a2a0972
1 changed files with 2 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/lua/LegacyLuaAPI.cpp
View File

@ -32,8 +32,6 @@ int luacon_partread(lua_State* l)
if (i < 0 || i >= NPART) if (i < 0 || i >= NPART)
return luaL_error(l, "Out of range"); return luaL_error(l, "Out of range");
if (!luacon_sim->parts[i].type)
return luaL_error(l, "dead particle");
if (offset == -1) if (offset == -1)
{ {
if (!key.compare("id")) if (!key.compare("id"))
@ -71,7 +69,7 @@ int luacon_partwrite(lua_State* l)
if (i < 0 || i >= NPART) if (i < 0 || i >= NPART)
return luaL_error(l, "Out of range"); return luaL_error(l, "Out of range");
if (!luacon_sim->parts[i].type) if (!luacon_sim->parts[i].type)
return luaL_error(l, "dead particle"); return luaL_error(l, "Dead particle");
if (offset == -1) if (offset == -1)
return luaL_error(l, "Invalid property"); return luaL_error(l, "Invalid property");
@ -94,16 +92,8 @@ int luacon_partwrite(lua_State* l)
int luacon_partsread(lua_State* l) int luacon_partsread(lua_State* l)
{ {
int i = luaL_optinteger(l, 2, 0); int i = luaL_optinteger(l, 2, 0);
if (i < 0 || i >= NPART)
if (i<0 || i>=NPART)
{
return luaL_error(l, "array index out of bounds"); return luaL_error(l, "array index out of bounds");
}
if (!luacon_sim->parts[i].type)
{
return luaL_error(l, "dead particle");
}
lua_rawgeti(l, LUA_REGISTRYINDEX, tptPart); lua_rawgeti(l, LUA_REGISTRYINDEX, tptPart);
cIndex = i; cIndex = i;