From 79ea8213e545be3d73d926e35724007eddfdcf8d Mon Sep 17 00:00:00 2001 From: Ykkrosh Date: Wed, 17 Mar 2010 22:51:47 +0000 Subject: [PATCH] const-correctness This was SVN commit r7355. --- source/graphics/Material.cpp | 2 +- source/graphics/Material.h | 2 +- source/graphics/Model.cpp | 4 ++-- source/graphics/Model.h | 4 ++-- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/source/graphics/Material.cpp b/source/graphics/Material.cpp index da882feaa5..7b07592b90 100644 --- a/source/graphics/Material.cpp +++ b/source/graphics/Material.cpp @@ -158,7 +158,7 @@ void CMaterial::SetPlayerColor(size_t id) m_PlayerID = id; } -void CMaterial::SetPlayerColor(CColor& colour) +void CMaterial::SetPlayerColor(const CColor& colour) { m_TextureColor = SMaterialColor(colour.r, colour.g, colour.b, colour.a); } diff --git a/source/graphics/Material.h b/source/graphics/Material.h index d5a03562ca..0dc424c8e6 100644 --- a/source/graphics/Material.h +++ b/source/graphics/Material.h @@ -93,7 +93,7 @@ public: void SetPlayerColor_PerPlayer() { m_PlayerID = PLAYER_ID_COMING_SOON; } void SetPlayerColor_PerObject() { m_PlayerID = PLAYER_ID_OTHER; } void SetPlayerColor(size_t id); - void SetPlayerColor(CColor &colour); + void SetPlayerColor(const CColor &colour); void SetTexture(const CStr& texture); void SetVertexProgram(const CStr& prog); diff --git a/source/graphics/Model.cpp b/source/graphics/Model.cpp index a2f748a0a1..071b977464 100644 --- a/source/graphics/Model.cpp +++ b/source/graphics/Model.cpp @@ -509,12 +509,12 @@ void CModel::SetPlayerID(size_t id) it->m_Model->SetPlayerID(id); } -void CModel::SetPlayerColor(CColor& colour) +void CModel::SetPlayerColor(const CColor& colour) { m_Material.SetPlayerColor(colour); } -void CModel::SetShadingColor(CColor& colour) +void CModel::SetShadingColor(const CColor& colour) { m_ShadingColor = colour; for( std::vector::iterator it = m_Props.begin(); it != m_Props.end(); ++it ) diff --git a/source/graphics/Model.h b/source/graphics/Model.h index 7529510ef7..b0925d9b2b 100644 --- a/source/graphics/Model.h +++ b/source/graphics/Model.h @@ -85,9 +85,9 @@ public: // should normally be used instead. void SetPlayerID(size_t id); // set the model's player colour - void SetPlayerColor(CColor& colour); + void SetPlayerColor(const CColor& colour); // set the models mod color - void SetShadingColor(CColor& colour); + void SetShadingColor(const CColor& colour); // get the model's texture CTexture* GetTexture() { return &m_Texture; } // get the models material