Blob Blame History Raw
diff -up supertuxkart-0.7.3/src/graphics/material.cpp.irrlicht supertuxkart-0.7.3/src/graphics/material.cpp
--- supertuxkart-0.7.3/src/graphics/material.cpp.irrlicht	2011-11-01 20:04:10.000000000 -0400
+++ supertuxkart-0.7.3/src/graphics/material.cpp	2012-11-15 11:20:45.894743287 -0500
@@ -512,7 +512,7 @@ void  Material::setMaterialProperties(vi
         // customizable EMT_ONETEXTURE_BLEND instead
         m->MaterialType = video::EMT_ONETEXTURE_BLEND ;
         m->MaterialTypeParam = 
-            pack_texureBlendFunc(video::EBF_SRC_ALPHA, 
+            pack_textureBlendFunc(video::EBF_SRC_ALPHA, 
                                  video::EBF_ONE_MINUS_SRC_ALPHA,
                                  video::EMFN_MODULATE_1X, 
                                  video::EAS_TEXTURE | video::EAS_VERTEX_COLOR);
@@ -539,7 +539,7 @@ void  Material::setMaterialProperties(vi
         // account, which messes up fading in/out effects. So we use the 
         // more customizable EMT_ONETEXTURE_BLEND instead
         m->MaterialType = video::EMT_ONETEXTURE_BLEND ;
-        m->MaterialTypeParam = pack_texureBlendFunc(video::EBF_SRC_ALPHA, 
+        m->MaterialTypeParam = pack_textureBlendFunc(video::EBF_SRC_ALPHA, 
                                                     video::EBF_ONE,
                                                     video::EMFN_MODULATE_1X,
                                                     video::EAS_TEXTURE | 
diff -up supertuxkart-0.7.3/src/guiengine/widgets/CGUIEditBox.cpp.irrlicht supertuxkart-0.7.3/src/guiengine/widgets/CGUIEditBox.cpp
--- supertuxkart-0.7.3/src/guiengine/widgets/CGUIEditBox.cpp.irrlicht	2012-11-15 11:22:09.678824039 -0500
+++ supertuxkart-0.7.3/src/guiengine/widgets/CGUIEditBox.cpp	2012-11-15 11:22:17.458831344 -0500
@@ -115,7 +115,7 @@ void CGUIEditBox::setOverrideColor(video
 }
 
 
-video::SColor const& CGUIEditBox::getOverrideColor() const
+video::SColor CGUIEditBox::getOverrideColor() const
 {
 	return OverrideColor;
 }
diff -up supertuxkart-0.7.3/src/guiengine/widgets/CGUIEditBox.h.irrlicht supertuxkart-0.7.3/src/guiengine/widgets/CGUIEditBox.h
--- supertuxkart-0.7.3/src/guiengine/widgets/CGUIEditBox.h.irrlicht	2011-11-01 20:04:12.000000000 -0400
+++ supertuxkart-0.7.3/src/guiengine/widgets/CGUIEditBox.h	2012-11-15 11:20:45.894743287 -0500
@@ -36,7 +36,7 @@ using namespace gui;
 		virtual void setOverrideColor(video::SColor color);
 
 		//! Gets the override color
-		virtual video::SColor const & getOverrideColor() const;
+		virtual video::SColor getOverrideColor() const;
 
 		//! Sets if the text should use the overide color or the
 		//! color in the gui skin.