| 0 | |
Description: Fix build with irrlicht 1.7.3
|
| 1 | |
This patch enables supertuxkart to be built with the latest stable release
|
| 2 | |
of irrlicht (1.7.3) rather than svn r3843.
|
| 3 | |
Forwarded: http://sourceforge.net/apps/trac/supertuxkart/ticket/628
|
| 4 | |
Author: Vincent Cheng <Vincentc1208@gmail.com>
|
| 5 | |
Last-Update: 2012-05-07
|
| 6 | |
|
| 7 | |
--- a/src/states_screens/dialogs/track_info_dialog.cpp
|
| 8 | |
+++ b/src/states_screens/dialogs/track_info_dialog.cpp
|
| 9 | |
@@ -199,7 +199,7 @@
|
| 10 | |
IGUIStaticText* hscores_header = GUIEngine::getGUIEnv()->addStaticText( text.c_str(), hiscores_title_area,
|
| 11 | |
false , true , // border, word warp
|
| 12 | |
m_irrlicht_window);
|
| 13 | |
- hscores_header->setTextRestrainedInside(false);
|
| 14 | |
+ //hscores_header->setTextRestrainedInside(false);
|
| 15 | |
hscores_header->setTextAlignment(EGUIA_CENTER, EGUIA_CENTER);
|
| 16 | |
|
| 17 | |
// fill highscore entries
|
| 18 | |
--- a/src/states_screens/dialogs/add_device_dialog.cpp
|
| 19 | |
+++ b/src/states_screens/dialogs/add_device_dialog.cpp
|
| 20 | |
@@ -65,7 +65,7 @@
|
| 21 | |
/*word wrap*/true,
|
| 22 | |
m_irrlicht_window);
|
| 23 | |
b->setTabStop(false);
|
| 24 | |
- b->setRightToLeft(translations->isRTLLanguage());
|
| 25 | |
+ //b->setRightToLeft(translations->isRTLLanguage());
|
| 26 | |
// because it looks like 'setRightToLeft' applies next time
|
| 27 | |
// setText is called only
|
| 28 | |
b->setText(msg.c_str());
|
| 29 | |
--- a/src/guiengine/skin.cpp
|
| 30 | |
+++ b/src/guiengine/skin.cpp
|
| 31 | |
@@ -853,7 +853,7 @@
|
| 32 | |
irr_driver->getVideoDriver()->getMaterial2D();
|
| 33 | |
for (unsigned int n=0; n<MATERIAL_MAX_TEXTURES; n++)
|
| 34 | |
{
|
| 35 | |
- material2D.UseMipMaps = false;
|
| 36 | |
+ //material2D.UseMipMaps = false;
|
| 37 | |
}
|
| 38 | |
|
| 39 | |
const bool mouseIn = rect.isPointInside(irr_driver->getDevice()
|
| 40 | |
@@ -892,7 +892,7 @@
|
| 41 | |
|
| 42 | |
for (unsigned int n=0; n<MATERIAL_MAX_TEXTURES; n++)
|
| 43 | |
{
|
| 44 | |
- material2D.UseMipMaps = true;
|
| 45 | |
+ //material2D.UseMipMaps = true;
|
| 46 | |
}
|
| 47 | |
}
|
| 48 | |
/* icon ribbons */
|
| 49 | |
--- a/src/guiengine/widgets/bubble_widget.cpp
|
| 50 | |
+++ b/src/guiengine/widgets/bubble_widget.cpp
|
| 51 | |
@@ -58,7 +58,7 @@
|
| 52 | |
irrwidget = GUIEngine::getGUIEnv()->addStaticText(message.c_str(), m_shrinked_size,
|
| 53 | |
false, true /* word wrap */, m_parent,
|
| 54 | |
(m_focusable ? getNewID() : getNewNoFocusID()));
|
| 55 | |
- irrwidget->setTextRestrainedInside(false);
|
| 56 | |
+ //irrwidget->setTextRestrainedInside(false);
|
| 57 | |
|
| 58 | |
#if IRRLICHT_VERSION_MAJOR > 1 || (IRRLICHT_VERSION_MAJOR == 1 && IRRLICHT_VERSION_MINOR >= 8)
|
| 59 | |
irrwidget->setRightToLeft( translations->isRTLLanguage() );
|
| 60 | |
--- a/src/graphics/irr_driver.cpp
|
| 61 | |
+++ b/src/graphics/irr_driver.cpp
|
| 62 | |
@@ -267,7 +267,7 @@
|
| 63 | |
material2D.TextureLayer[n].TextureWrapV = ETC_CLAMP_TO_EDGE;
|
| 64 | |
|
| 65 | |
//material2D.TextureLayer[n].LODBias = 16;
|
| 66 | |
- material2D.UseMipMaps = true;
|
| 67 | |
+ //material2D.UseMipMaps = true;
|
| 68 | |
}
|
| 69 | |
material2D.AntiAliasing=video::EAAM_FULL_BASIC;
|
| 70 | |
//m_video_driver->enableMaterial2D();
|
| 71 | |
--- a/src/graphics/irr_driver.hpp
|
| 72 | |
+++ b/src/graphics/irr_driver.hpp
|
| 73 | |
@@ -39,7 +39,7 @@
|
| 74 | |
namespace irr
|
| 75 | |
{
|
| 76 | |
namespace scene { class ISceneManager; class IMesh; class IAnimatedMeshSceneNode; class IAnimatedMesh;
|
| 77 | |
- class IMeshSceneNode; class IParticleSystemSceneNode; class ICameraSceneNode; class ILightSceneNode; }
|
| 78 | |
+ class IMeshSceneNode; class IParticleSystemSceneNode; class ICameraSceneNode; class ILightSceneNode; class ISceneNode; }
|
| 79 | |
namespace gui { class IGUIEnvironment; class IGUIFont; }
|
| 80 | |
}
|
| 81 | |
using namespace irr;
|
| 82 | |
--- a/src/graphics/particle_emitter.cpp
|
| 83 | |
+++ b/src/graphics/particle_emitter.cpp
|
| 84 | |
@@ -291,7 +291,7 @@
|
| 85 | |
|
| 86 | |
void ParticleEmitter::clearParticles()
|
| 87 | |
{
|
| 88 | |
- m_node->clearParticles();
|
| 89 | |
+ //m_node->clearParticles();
|
| 90 | |
}
|
| 91 | |
|
| 92 | |
//-----------------------------------------------------------------------------
|
| 93 | |
--- a/src/guiengine/widgets/CGUIEditBox.cpp
|
| 94 | |
+++ b/src/guiengine/widgets/CGUIEditBox.cpp
|
| 95 | |
@@ -755,10 +755,7 @@
|
| 96 | |
|
| 97 | |
if (Border)
|
| 98 | |
{
|
| 99 | |
- EGUI_DEFAULT_COLOR col = EGDC_GRAY_EDITABLE;
|
| 100 | |
- if ( isEnabled() )
|
| 101 | |
- col = focus ? EGDC_FOCUSED_EDITABLE : EGDC_EDITABLE;
|
| 102 | |
- skin->draw3DSunkenPane(this, skin->getColor(col),
|
| 103 | |
+ skin->draw3DSunkenPane(this, video::SColor(255, 0,0,0),
|
| 104 | |
false, true, FrameRect, &AbsoluteClippingRect);
|
| 105 | |
|
| 106 | |
FrameRect.UpperLeftCorner.X += skin->getSize(EGDS_TEXT_DISTANCE_X)+1;
|