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

Allow both BrE and AmE spellings of colour with Lua

Browse Source
This commit is contained in:
Simon Robertshaw 2011-12-10 15:50:55 +00:00
parent ffb4c1c5a8
commit 799091f004
1 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/luaconsole.c
View File

@ -330,6 +330,9 @@ int luacon_particle_getproperty(char * key, int * format)
} else if (strcmp(key, "dcolour")==0){
offset = offsetof(particle, dcolour);
*format = 0;
} else if (strcmp(key, "dcolor")==0){
offset = offsetof(particle, dcolour);
*format = 0;
} else {
offset = -1;
}
@ -440,6 +443,10 @@ int luacon_element_getproperty(char * key, int * format)
offset = offsetof(part_type, pcolors);
*format = 0;
}
if (strcmp(key, "colour")==0){
offset = offsetof(part_type, pcolors);
*format = 0;
}
else if (strcmp(key, "advection")==0){
offset = offsetof(part_type, advection);
*format = 1;
@ -1036,6 +1043,7 @@ int luatpt_set_property(lua_State* l)
h = abs(luaL_optint(l, 6, -1));
else
h = -1;
//TODO: Use particle_getproperty
if (strcmp(prop,"type")==0){
offset = offsetof(particle, type);
format = 3;
@ -1177,6 +1185,7 @@ int luatpt_get_property(lua_State* l)
return luaL_error(l, "Invalid particle ID '%d'", i);
if (parts[i].type)
{
//TODO: Use particle_getproperty
if (strcmp(prop,"type")==0){
lua_pushinteger(l, parts[i].type);
return 1;