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

fix crash, spark reset set type without checking if it was a valid number. Also disable another way to create invalid elements

Browse Source
This commit is contained in:
Jacob1 2012-05-24 12:42:19 -04:00
parent 4368ded197
commit f49f4ea241
2 changed files with 15 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/luaconsole.c
View File

@ -1088,9 +1088,14 @@ int luatpt_reset_spark(lua_State* l)
for (i=0; i<NPART; i++) for (i=0; i<NPART; i++)
{ {
if (parts[i].type==PT_SPRK) if (parts[i].type==PT_SPRK)
{
if (parts[i].ctype >= 0 && parts[i].ctype < PT_NUM)
{ {
parts[i].type = parts[i].ctype; parts[i].type = parts[i].ctype;
parts[i].life = 4; parts[i].life = 0;
}
else
kill_part(i);
} }
} }
return 0; return 0;
@ -1284,7 +1289,7 @@ int luatpt_set_property(lua_State* l)
} else { } else {
t = luaL_optint(l, 2, 0); t = luaL_optint(l, 2, 0);
} }
if (format == 3 && (t<0 || t>=PT_NUM)) if (format == 3 && (t<0 || t>=PT_NUM || !ptypes[t].enabled))
return luaL_error(l, "Unrecognised element number '%d'", t); return luaL_error(l, "Unrecognised element number '%d'", t);
} else { } else {
name = luaL_optstring(l, 2, "dust"); name = luaL_optstring(l, 2, "dust");

5
src/main.c
View File

@ -1525,10 +1525,15 @@ int main(int argc, char *argv[])
{ {
for (i=0; i<NPART; i++) for (i=0; i<NPART; i++)
if (parts[i].type==PT_SPRK) if (parts[i].type==PT_SPRK)
{
if (parts[i].ctype >= 0 && parts[i].ctype < PT_NUM)
{ {
parts[i].type = parts[i].ctype; parts[i].type = parts[i].ctype;
parts[i].life = 0; parts[i].life = 0;
} }
else
kill_part(i);
}
} }
else else
{ {