mirrors/0ad
1
0
Fork 2
mirror of https://gitea.wildfiregames.com/0ad/0ad.git synced 2026-09-21 20:06:40 +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
2015-03-15 23:59:48 +00:00
parent 7334f76af6
commit b1c4e29ac8
415 changed files with 1483 additions and 1483 deletions
Download Patch File Download Diff File Expand all files Collapse all files
source/graphics/TextureManager.cpp
+5 -5
View File
@@ -199,8 +199,8 @@ public:
size_t flags = 0;
(void)ogl_tex_get_format(h, &flags, NULL);
// Initialise base colour from the texture
(void)ogl_tex_get_average_colour(h, &texture->m_BaseColour);
// Initialise base color from the texture
(void)ogl_tex_get_average_color(h, &texture->m_BaseColor);
// Set GL upload properties
(void)ogl_tex_set_wrap(h, texture->m_Properties.m_WrapS, texture->m_Properties.m_WrapT);
@@ -526,7 +526,7 @@ private:
};
CTexture::CTexture(Handle handle, const CTextureProperties& props, CTextureManagerImpl* textureManager) :
m_Handle(handle), m_BaseColour(0), m_State(UNLOADED), m_Properties(props), m_TextureManager(textureManager)
m_Handle(handle), m_BaseColor(0), m_State(UNLOADED), m_Properties(props), m_TextureManager(textureManager)
{
// Add a reference to the handle (it might be shared by multiple CTextures
// so we can't take ownership of it)
@@ -623,9 +623,9 @@ bool CTexture::HasAlpha() const
return (flags & TEX_ALPHA) != 0;
}
u32 CTexture::GetBaseColour() const
u32 CTexture::GetBaseColor() const
{
return m_BaseColour;
return m_BaseColor;
}
size_t CTexture::GetUploadedSize() const