mirror of
https://gitea.wildfiregames.com/0ad/0ad.git
synced 2026-11-09 02:11:47 +00:00
Fixes inconsistencies in spelling of colour/color by preferring "color" (only wxWidgets remains with some API that requires "colour"), fixes #1029.
NOTE: requires update-workspaces and may require correction of some modded actors/scenarios This was SVN commit r16438.
This commit is contained in:
1 parent
7334f76af6
commit
b1c4e29ac8
415 files changed
+1483
-1483
No files matched your search
@@ -63,7 +63,7 @@ bool CObjectBase::Load(const VfsPath& pathname)
|
||||
EL(mesh);
|
||||
EL(texture);
|
||||
EL(textures);
|
||||
EL(colour);
|
||||
EL(color);
|
||||
EL(decal);
|
||||
EL(particles);
|
||||
AT(file);
|
||||
@@ -190,7 +190,7 @@ bool CObjectBase::Load(const VfsPath& pathname)
|
||||
// so remember the relevant particle file as a dependency for this actor
|
||||
m_UsedFiles.insert(file);
|
||||
}
|
||||
else if (option_name == el_colour)
|
||||
else if (option_name == el_color)
|
||||
{
|
||||
currentVariant->m_Color = option.GetText();
|
||||
}
|
||||
|
||||
Reference in new issue
Block a user