From: <hik...@us...> - 2010-02-04 22:37:39
|
Revision: 4634 http://supertuxkart.svn.sourceforge.net/supertuxkart/?rev=4634&view=rev Author: hikerstk Date: 2010-02-04 22:37:33 +0000 (Thu, 04 Feb 2010) Log Message: ----------- Removed compiler warnings. Modified Paths: -------------- main/trunk/src/graphics/material.cpp Modified: main/trunk/src/graphics/material.cpp =================================================================== --- main/trunk/src/graphics/material.cpp 2010-02-04 22:35:43 UTC (rev 4633) +++ main/trunk/src/graphics/material.cpp 2010-02-04 22:37:33 UTC (rev 4634) @@ -137,10 +137,10 @@ 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 @@ #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 @@ 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++) { This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |