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

Some fixes for non-existent particles in Lua

Browse Source 
Return 0 for get_property("type", ...) instead of erroring, to make checking for
particles easier. Also stop x coordinate being used as a particle index if
no particle exists at that location.
This commit is contained in:
jacksonmj 2011-07-02 20:40:29 +08:00 committed by Simon Robertshaw
parent 25a2b52b64
commit 80fd7edd7f
1 changed files with 15 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/luaconsole.c
View File

@ -455,6 +455,8 @@ int luatpt_set_property(lua_State* l)
r = pmap[y][i]; r = pmap[y][i];
if (!r || (r>>8)>=NPART || (partsel && partsel != parts[r>>8].type)) if (!r || (r>>8)>=NPART || (partsel && partsel != parts[r>>8].type))
r = photons[y][i]; r = photons[y][i];
if (!r || (r>>8)>=NPART || (partsel && partsel != parts[r>>8].type))
return 0;
i = r>>8; i = r>>8;
} }
if (i < 0 || i >= NPART) if (i < 0 || i >= NPART)
@ -483,6 +485,14 @@ int luatpt_get_property(lua_State* l)
r = pmap[y][i]; r = pmap[y][i];
if (!r || (r>>8)>=NPART) if (!r || (r>>8)>=NPART)
r = photons[y][i]; r = photons[y][i];
if (!r || (r>>8)>=NPART)
{
if (strcmp(prop,"type")==0){
lua_pushinteger(l, 0);
return 1;
}
return luaL_error(l, "Particle does not exist");
}
i = r>>8; i = r>>8;
} }
else if (y!=-1) else if (y!=-1)
@ -528,7 +538,11 @@ int luatpt_get_property(lua_State* l)
return 1; return 1;
} }
} }
return luaL_error(l, "Particle does not exist", i); else if (strcmp(prop,"type")==0){
lua_pushinteger(l, 0);
return 1;
}
return luaL_error(l, "Particle does not exist");
} }
int luatpt_drawpixel(lua_State* l) int luatpt_drawpixel(lua_State* l)