mirrors/0ad
1
0 Fork 2
mirror of https://gitea.wildfiregames.com/0ad/0ad.git synced 2026-11-09 06:00:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixes inconsistencies in spelling of colour/color by preferring "color" (only wxWidgets remains with some API that requires "colour"), fixes #1029.

Browse Source 
NOTE: requires update-workspaces and may require correction of some
modded actors/scenarios

This was SVN commit r16438.
This commit is contained in:
historic_bruno committed 2015-03-15 23:59:48 +00:00
1 parent 7334f76af6
commit b1c4e29ac8
415 files changed
+1483 -1483
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

source/graphics/ObjectEntry.cpp
+1 -1
View File
@@ -73,7 +73,7 @@ bool CObjectEntry::BuildVariation(const std::vector<std::set<CStr> >& selections
str << variation.color;
int r, g, b;
if (! (str >> r >> g >> b)) // Any trailing data is ignored
LOGERROR("Actor '%s' has invalid RGB colour '%s'", utf8_from_wstring(m_Base->m_ShortName), variation.color);
LOGERROR("Actor '%s' has invalid RGB color '%s'", utf8_from_wstring(m_Base->m_ShortName), variation.color);
else
m_Color = CColor(r/255.0f, g/255.0f, b/255.0f, 1.0f);
}