ilikecats/stk-code_catmod
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Removed compiler warnings.

Browse Source 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@4634 178a84e3-b1eb-0310-8ba1-8eac791a3b58
This commit is contained in:
hikerstk 2010-02-04 22:37:33 +00:00
parent c2f3841de4
commit 192fc34572
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/graphics/material.cpp
View File

@ -137,10 +137,10 @@ void Material::setMaterialProperties(video::SMaterial *m) const
m->MaterialType = video::EMT_TRANSPARENT_ALPHA_CHANNEL_REF;
else if (m_alpha_blending)
m->MaterialType = video::EMT_TRANSPARENT_ALPHA_CHANNEL;
if (m_sphere_map) m->MaterialType = video::EMT_SPHERE_MAP;
if (m_lightmap) m->MaterialType = video::EMT_LIGHTMAP;
else if (m_sphere_map)
m->MaterialType = video::EMT_SPHERE_MAP;
else if (m_lightmap)
m->MaterialType = video::EMT_LIGHTMAP;
if (!m_lighting)
{
@ -153,7 +153,7 @@ void Material::setMaterialProperties(video::SMaterial *m) const
#if (IRRLICHT_VERSION_MAJOR == 1) && (IRRLICHT_VERSION_MINOR >= 7)
if (m_clamp_tex & UCLAMP != 0)
if ( (m_clamp_tex & UCLAMP) != 0)
{
// m->setFlag();
// n1->getMaterial(0).TextureLayer[0].TextureWrap = video::ETC_CLAMP;
@ -170,7 +170,7 @@ void Material::setMaterialProperties(video::SMaterial *m) const
m->TextureLayer[n].TextureWrapU = video::ETC_CLAMP_TO_EDGE;
}
}
if (m_clamp_tex & VCLAMP != 0)
if ( (m_clamp_tex & VCLAMP) != 0)
{
for (unsigned int n=0; n<video::MATERIAL_MAX_TEXTURES; n++)
{