Allow both BrE and AmE spellings of colour with Lua

This commit is contained in:
Simon Robertshaw
2011-12-10 15:50:55 +00:00
parent ffb4c1c5a8
commit 799091f004

View File

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