From 57808f0815f44f6fb85566eeccd859e45b4956fc Mon Sep 17 00:00:00 2001
From: Vincent Lejeune <vljn@ovi.com>
Date: Sat, 25 Jan 2014 22:03:27 +0100
Subject: [PATCH] Disable water, bgnodes and textbillboards.

---
 src/graphics/render.cpp |  4 ++--
 src/karts/kart.cpp      |  7 ++++---
 src/tracks/track.cpp    | 11 ++++++-----
 3 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/src/graphics/render.cpp b/src/graphics/render.cpp
index 6ddbfde7e..cc7ea1611 100644
--- a/src/graphics/render.cpp
+++ b/src/graphics/render.cpp
@@ -165,7 +165,7 @@ void IrrDriver::renderGLSL(float dt)
         rg->preRenderCallback(camera);   // adjusts start referee
 
         const u32 bgnodes = m_background.size();
-        if (bgnodes)
+/*        if (bgnodes)
         {
             // If there are background nodes (3d skybox), draw them now.
             m_video_driver->setRenderTarget(m_rtts->getRTT(RTT_COLOR), false, false);
@@ -187,7 +187,7 @@ void IrrDriver::renderGLSL(float dt)
 
             overridemat = prev;
             m_video_driver->setRenderTarget(m_rtts->getRTT(RTT_COLOR), false, true);
-        }
+        }*/
 
         // Fire up the MRT
         m_video_driver->setRenderTarget(m_mrt, false, false);
diff --git a/src/karts/kart.cpp b/src/karts/kart.cpp
index 771d903a7..6c8438e04 100644
--- a/src/karts/kart.cpp
+++ b/src/karts/kart.cpp
@@ -2565,16 +2565,17 @@ void Kart::setOnScreenText(const wchar_t *text)
     // FIXME: Titlefont is the only font guaranteed to be loaded if STK
     // is started without splash screen (since "Loading" is shown even in this
     // case). A smaller font would be better
-    sm->addBillboardTextSceneNode(GUIEngine::getFont() ? GUIEngine::getFont()
+	// TODO: Add support in the engine for BillboardText or find a replacement
+    /*sm->addBillboardTextSceneNode(GUIEngine::getFont() ? GUIEngine::getFont()
                                                   : GUIEngine::getTitleFont(),
                                   text,
                                   getNode(),
                                   core::dimension2df(textsize.Width/55.0f,
                                                      textsize.Height/55.0f),
                                   core::vector3df(0.0f, 1.5f, 0.0f),
-                                  -1 /* id */,
+                                  -1, // id
                                   video::SColor(255, 255, 225, 0),
-                                  video::SColor(255, 255, 89, 0));
+                                  video::SColor(255, 255, 89, 0));*/
     // No need to store the reference to the billboard scene node:
     // It has one reference to the parent, and will get deleted
     // when the parent is deleted.
diff --git a/src/tracks/track.cpp b/src/tracks/track.cpp
index a9f4df00c..1d893051f 100644
--- a/src/tracks/track.cpp
+++ b/src/tracks/track.cpp
@@ -945,17 +945,18 @@ bool Track::loadMainTrack(const XMLNode &root)
 
             assert(GUIEngine::getHighresDigitFont() != NULL);
 
-            scene::ISceneNode* sn =
+			// TODO: Add support in the engine for BillboardText or find a replacement
+/*            scene::ISceneNode* sn =
                 sm->addBillboardTextSceneNode(GUIEngine::getHighresDigitFont(),
                                               msg.c_str(),
                                               NULL,
                                               core::dimension2df(textsize.Width/45.0f,
                                                                  textsize.Height/45.0f),
                                               xyz,
-                                              -1 /* id */,
+                                              -1, // id 
                                               video::SColor(255, 255, 225, 0),
                                               video::SColor(255, 255, 89, 0));
-            m_all_nodes.push_back(sn);
+            m_all_nodes.push_back(sn);*/
             if (!shown) continue;
         }
         else if (condition == "allchallenges")
@@ -1341,7 +1342,7 @@ void Track::createWater(const XMLNode &node)
 
     if (UserConfigParams::m_graphical_effects)
     {
-        scene::IMesh *welded;
+        /*scene::IMesh *welded;
         scene_node = irr_driver->addWaterNode(mesh, &welded,
                                               wave_height,
                                               wave_speed,
@@ -1351,7 +1352,7 @@ void Track::createWater(const XMLNode &node)
         irr_driver->grabAllTextures(mesh);
         m_all_cached_meshes.push_back(mesh);
 
-        mesh = welded;
+        mesh = welded;*/
     }
     else
     {