More work on 'thou shalt not include irrlicht.h everywhere carelessly'

git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@8663 178a84e3-b1eb-0310-8ba1-8eac791a3b58

src/addons/network_http.hpp

@@ -28,9 +28,6 @@
 #endif
 #include <curl/curl.h>
 
-#include "irrlicht.h"
-using namespace irr;
-
 #include "utils/synchronised.hpp"
 
 class Request;

src/addons/news_manager.hpp

@@ -22,7 +22,7 @@
 #include <vector>
 
 
-#include "irrlicht.h"
+#include <irrString.h>
 using namespace irr;
 
 #include "utils/synchronised.hpp"

src/animations/animation_base.hpp

@@ -26,7 +26,7 @@
 
 #include <vector>
 
-#include "irrlicht.h"
+#include <vector3d.h>
 using namespace irr;
 
 #include "tracks/track_object.hpp"

src/animations/billboard_animation.hpp

@@ -22,12 +22,8 @@
 
 #include <string>
 
-#include "irrlicht.h"
-using namespace irr;
-
 #include "animations/animation_base.hpp"
 
-class Track;
 class XMLNode;
 
 /**

src/animations/ipo.hpp

@@ -23,7 +23,8 @@
 #include <string>
 #include <vector>
 
-#include "irrlicht.h"
+#include <vector2d.h>
+#include <vector3d.h>
 using namespace irr;
 
 #include "utils/no_copy.hpp"

src/animations/three_d_animation.hpp

@@ -22,7 +22,7 @@
 
 #include <string>
 
-#include "irrlicht.h"
+#include <vector3d.h>
 using namespace irr;
 
 #include "btBulletDynamicsCommon.h"

src/challenges/challenge.hpp

@@ -27,7 +27,7 @@
 #include <string>
 #include <vector>
 #include <fstream>
-#include <irrlicht.h>
+#include <irrString.h>
 
 #include "utils/no_copy.hpp"
 #include "utils/translation.hpp"

src/config/player.hpp

@@ -23,7 +23,7 @@
 #include <string>
 #include "config/user_config.hpp"
 #include "utils/no_copy.hpp"
-#include "irrlicht.h"
+#include <irrString.h>
 using namespace irr;
 
 /**

src/config/user_config.hpp

@@ -45,7 +45,7 @@ const int CURRENT_CONFIG_VERSION = 8;
 #include <vector>
 #include <fstream>
 
-#include "irrlicht.h"
+#include <irrString.h>
 using irr::core::stringc;
 using irr::core::stringw;
 

src/graphics/camera.cpp

@@ -37,6 +37,9 @@
 #include "utils/aligned_array.hpp"
 #include "utils/constants.hpp"
 
+#include <ICameraSceneNode.h>
+#include <ISceneManager.h>
+
 AlignedArray<Camera::EndCameraInformation> Camera::m_end_cameras;
 
 Camera::Camera(int camera_index, const Kart* kart)

src/graphics/camera.hpp

@@ -24,7 +24,13 @@
 
 #include <vector>
 
-#include "irrlicht.h"
+#include <SColor.h>
+#include <vector2d.h>
+#include <rect.h>
+namespace irr
+{
+    namespace scene { class ICameraSceneNode; }
+}
 using namespace irr;
 
 #include "io/xml_node.hpp"

src/graphics/explosion.cpp

@@ -28,6 +28,8 @@
 #include "race/race_manager.hpp"
 #include "utils/vec3.hpp"
 
+#include <IParticleSystemSceneNode.h>
+
 const float burst_time = 0.1f;
 
 Explosion::Explosion(const Vec3& coord, const char* explosion_sound, bool player_kart_hit)

src/graphics/explosion.hpp

@@ -22,7 +22,10 @@
 
 #include "utils/no_copy.hpp"
 
-#include "irrlicht.h"
+namespace irr
+{
+    namespace scene { class IParticleSystemSceneNode;  }
+}
 using namespace irr;
 
 class Vec3;

src/graphics/irr_driver.cpp

@@ -40,6 +40,8 @@
 #include "states_screens/state_manager.hpp"
 #include "utils/constants.hpp"
 
+#include <irrlicht.h>
+
 using namespace irr::core;
 using namespace irr::scene;
 using namespace irr::video;

src/graphics/irr_driver.hpp

@@ -27,7 +27,17 @@
 #include <string>
 #include <vector>
 
-#include "irrlicht.h"
+#include <IVideoDriver.h>
+#include <vector2d.h>
+#include <dimension2d.h>
+#include <SColor.h>
+#include <IrrlichtDevice.h>
+namespace irr
+{
+    namespace scene { class ISceneManager; class IMesh; class IAnimatedMeshSceneNode; class IAnimatedMesh;
+        class IMeshSceneNode; class IParticleSystemSceneNode; class ICameraSceneNode; class ILightSceneNode; }
+    namespace gui   { class IGUIEnvironment; class IGUIFont; }
+}
 using namespace irr;
 
 #include "utils/aligned_array.hpp"
@@ -39,7 +49,6 @@ using namespace irr;
 class Camera;
 class Kart;
 class PerCameraNode;
-namespace irr { namespace scene { class IAnimatedMeshSceneNode; } }
 
 struct VideoMode
 {

src/graphics/lod_node.cpp

@@ -19,6 +19,8 @@
 #include "graphics/irr_driver.hpp"
 #include "graphics/lod_node.hpp"
 
+#include <ISceneManager.h>
+#include <ICameraSceneNode.h>
 
 LODNode::LODNode(scene::ISceneNode* parent, scene::ISceneManager* mgr, s32 id)
 : ISceneNode(parent, mgr, id) //: IDummyTransformationSceneNode(parent, mgr, id)

src/graphics/lod_node.hpp

@@ -19,7 +19,13 @@
 #ifndef HEADER_LOD_NODE_HPP
 #define HEADER_LOD_NODE_HPP
 
-#include "irrlicht.h"
+#include <aabbox3d.h>
+#include <matrix4.h>
+#include <ISceneNode.h>
+namespace irr
+{
+    namespace scene { class ISceneManager; }
+}
 using namespace irr;
 
 #include <set>

src/graphics/material.hpp

@@ -24,7 +24,10 @@
 
 #include <string>
 
-#include "irrlicht.h"
+namespace irr
+{
+    namespace video { class ITexture; class SMaterial; }
+}
 using namespace irr;
 
 class XMLNode;

src/graphics/material_manager.cpp

@@ -28,6 +28,10 @@
 #include "io/xml_node.hpp"
 #include "utils/string_utils.hpp"
 
+#include <ITexture.h>
+#include <Smaterial.h>
+#include <ImeshBuffer.h>
+
 MaterialManager *material_manager=0;
 
 MaterialManager::MaterialManager()

src/graphics/material_manager.hpp

@@ -22,7 +22,11 @@
 
 #include "utils/no_copy.hpp"
 
-#include "irrlicht.h"
+namespace irr
+{
+    namespace video { class ITexture;    }
+    namespace scene { class IMeshBuffer; }
+}
 using namespace irr;
 
 #include <string>

src/graphics/mesh_tools.cpp

@@ -18,6 +18,8 @@
 //  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 #include "graphics/mesh_tools.hpp"
+#include <IMesh.h>
+#include <IMeshBuffer.h>
 
 void MeshTools::minMax3D(scene::IMesh* mesh, Vec3 *min, Vec3 *max) {
     

src/graphics/mesh_tools.hpp

@@ -20,7 +20,10 @@
 #ifndef HEADER_MESH_TOOLS_HPP
 #define HEADER_MESH_TOOLS_HPP
 
-#include "irrlicht.h"
+namespace irr
+{
+    namespace scene { class IMesh; }
+}
 using namespace irr;
 
 #include "utils/vec3.hpp"

src/graphics/moving_texture.hpp

@@ -23,7 +23,7 @@
 #include "utils/no_copy.hpp"
 
 #include <string>
-#include "irrlicht.h"
+#include <matrix4.h>
 using namespace irr;
 
 class XMLNode;

src/graphics/particle_emitter.cpp

@@ -27,6 +27,13 @@
 #include "tracks/track.hpp"
 #include "utils/constants.hpp"
 
+#include <SParticle.h>
+#include <IParticleAffector.h>
+#include <ICameraSceneNode.h>
+#include <IParticleSystemSceneNode.h>
+#include <IParticleBoxEmitter.h>
+#include <ISceneManager.h>
+
 class FadeAwayAffector : public scene::IParticleAffector
 {
     /** (Squared) distance from camera at which a particle started being faded out */

src/graphics/particle_emitter.hpp

@@ -20,7 +20,10 @@
 #ifndef HEADER_SMOKE_HPP
 #define HEADER_SMOKE_HPP
 
-#include "irrlicht.h"
+namespace irr
+{
+    namespace scene { class IParticleSystemSceneNode; class ISceneNode; class IParticleEmitter; }
+}
 using namespace irr;
 
 #include "utils/no_copy.hpp"

src/graphics/particle_kind.hpp

@@ -23,7 +23,7 @@
 #include "utils/no_copy.hpp"
 
 #include <string>
-#include "irrlicht.h"
+#include <SColor.h>
 using namespace irr;
 
 class Material;

src/graphics/per_camera_node.cpp

@@ -19,6 +19,9 @@
 #include "graphics/irr_driver.hpp"
 #include "graphics/per_camera_node.hpp"
 
+#include <ICameraSceneNode.h>
+#include <ISceneManager.h>
+#include <IMeshSceneNode.h>
 
 PerCameraNode::PerCameraNode(scene::ISceneNode* parent, scene::ISceneManager* mgr, s32 id,
                              scene::ICameraSceneNode* camera, scene::IMesh* mesh)

src/graphics/per_camera_node.hpp

@@ -19,7 +19,14 @@
 #ifndef HEADER_PER_CAMERA_HPP
 #define HEADER_PER_CAMERA_HPP
 
-#include "irrlicht.h"
+#include <matrix4.h>
+#include <aabbox3d.h>
+#include <IDummyTransformationSceneNode.h>
+#include <ESceneNodeTypes.h>
+namespace irr
+{
+    namespace scene { class ICameraSceneNode; class ISceneNode; class ISceneManager; class IMesh; }
+}
 using namespace irr;
 
 

src/graphics/rain.cpp

@@ -29,6 +29,9 @@
 #include "utils/constants.hpp"
 #include "utils/random_generator.hpp"
 
+#include <SMeshBuffer.h>
+#include <SMesh.h>
+
 const float RAIN_RADIUS[RAIN_RING_COUNT] = { 1.0f, 3.0f, 6.0f, 12.0f, 24.0f };
 const float RAIN_Y_TO = 25.0f;
 const float RAIN_Y_FROM = -10.0f;

src/graphics/rain.hpp

@@ -22,7 +22,14 @@
 
 class PerCameraNode;
 
-#include <irrlicht.h>
+#include <vector3d.h>
+namespace irr
+{
+    namespace video { class SMaterial; }
+    namespace scene { class ICameraSceneNode; class ISceneNode; }
+}
+using namespace irr;
+
 const int RAIN_RING_COUNT = 5;
 
 class SFXBase;

src/graphics/skid_marks.cpp

@@ -23,6 +23,9 @@
 #include "karts/kart.hpp"
 #include "physics/btKart.hpp"
 
+#include <IMeshSceneNode.h>
+#include <SMesh.h>
+
 float SkidMarks::m_avoid_z_fighting  = 0.0f;
 const int SkidMarks::m_start_alpha = 128;
 const int SkidMarks::m_start_grey = 32;

src/graphics/slip_stream.cpp

@@ -19,6 +19,7 @@
 
 #include "graphics/slip_stream.hpp"
 
+#include "graphics/material.hpp"
 #include "graphics/material_manager.hpp"
 #include "graphics/irr_driver.hpp"
 #include "io/file_manager.hpp"
@@ -27,6 +28,10 @@
 #include "tracks/quad.hpp"
 #include "utils/constants.hpp"
 
+#include <SMesh.h>
+#include <SMeshBuffer.h>
+#include <IMeshSceneNode.h>
+
 /** Creates the slip stream object using a moving texture.
  *  \param kart Pointer to the kart to which the slip stream
  *              belongs to.

src/graphics/stars.hpp

@@ -21,7 +21,11 @@
 
 #include <vector>
 
-#include "irrlicht.h"
+#include <vector3d.h>
+namespace irr
+{
+    namespace scene { class ISceneNode; }
+}
 using namespace irr;
 
 /**

src/guiengine/engine.cpp

@@ -587,6 +587,8 @@
 
 #include <iostream>
 #include <assert.h>
+#include <IGUIEnvironment.h>
+
 #include "io/file_manager.hpp"
 #include "input/input_manager.hpp"
 #include "guiengine/event_handler.hpp"

src/guiengine/event_handler.cpp

@@ -17,6 +17,9 @@
 
 #include "guiengine/event_handler.hpp"
 
+#include <IGUIEnvironment.h>
+#include <IGUIListBox.h>
+
 #include "guiengine/abstract_state_manager.hpp"
 #include "guiengine/engine.hpp"
 #include "guiengine/modaldialog.hpp"

src/guiengine/modaldialog.hpp

@@ -18,10 +18,7 @@
 #ifndef HEADER_MODAL_DIALOG_HPP
 #define HEADER_MODAL_DIALOG_HPP
 
-namespace irr
+#include <IGUIWindow.h>
-{
-    namespace gui { class IGUIWindow; }
-}
 
 #include "utils/ptr_vector.hpp"
 #include "guiengine/abstract_top_level_container.hpp"

src/guiengine/skin.hpp

@@ -19,7 +19,16 @@
 #ifndef HEADER_SKIN_HPP
 #define HEADER_SKIN_HPP
 
-#include "irrlicht.h"
+#include <rect.h>
+#include <SColor.h>
+#include <vector2d.h>
+#include <dimension2d.h>
+#include <IGUISkin.h>
+namespace irr
+{
+    namespace video { class ITexture;    }
+    namespace gui   { class IGUIElement; class IGUIFont; class IGUISpriteBank; }
+}
 #include "utils/ptr_vector.hpp"
 
 /**

src/guiengine/widget.cpp

@@ -317,6 +317,13 @@ void Widget::setParent(IGUIElement* parent)
 
 // -----------------------------------------------------------------------------
 
+bool Widget::isVisible() const
+{
+    return m_element && m_element->isVisible();
+}
+
+// -----------------------------------------------------------------------------
+
 void Widget::setVisible(bool visible)
 {
     if (m_element != NULL)
@@ -332,3 +339,14 @@ void Widget::setVisible(bool visible)
     }
 }
 
+// -----------------------------------------------------------------------------
+
+void Widget::moveIrrlichtElement()
+{
+    if (m_element != NULL)
+    {
+        m_element->setRelativePosition( irr::core::recti(irr::core::position2di(m_x, m_y),
+                                                         irr::core::dimension2di(m_w, m_h) ) );
+    }
+}
+

src/guiengine/widget.hpp

@@ -316,7 +316,7 @@ namespace GUIEngine
         void setVisible(bool visible);
 
         /** Returns if the element is visible. */
-        bool isVisible() const {return m_element && m_element->isVisible(); }
+        bool isVisible() const;
         
         /**
          * Call to resize/move the widget. Not all widgets can resize gracefully.
@@ -384,15 +384,7 @@ namespace GUIEngine
          */
         irr::gui::IGUIElement* getIrrlichtElement() { return m_element; }
         
-        void moveIrrlichtElement()
+        void moveIrrlichtElement();
-        {
-            if (m_element != NULL)
-            {
-                m_element->setRelativePosition( irr::core::recti(irr::core::position2di(m_x, m_y),
-                                                                 irr::core::dimension2di(m_w, m_h) ) );
-            }
-        }
-        
         bool isSameIrrlichtWidgetAs(const Widget* ref) const { return m_element == ref->m_element; }
 
         /**

src/guiengine/widgets/button_widget.cpp

@@ -17,6 +17,9 @@
 
 #include "guiengine/engine.hpp"
 #include "guiengine/widgets/button_widget.hpp"
+#include <IGUIElement.h>
+#include <IGUIEnvironment.h>
+#include <IGUIButton.h>
 using namespace GUIEngine;
 using namespace irr::core;
 using namespace irr;

src/guiengine/widgets/check_box_widget.cpp

@@ -17,6 +17,9 @@
 
 #include "guiengine/engine.hpp"
 #include "guiengine/widgets/check_box_widget.hpp"
+#include <IGUIElement.h>
+#include <IGUIEnvironment.h>
+#include <IGUIButton.h>
 using namespace GUIEngine;
 using namespace irr::core;
 using namespace irr;

src/guiengine/widgets/dynamic_ribbon_widget.cpp

@@ -21,6 +21,7 @@
 #include "io/file_manager.hpp"
 #include "states_screens/state_manager.hpp"
 
+#include <IGUIEnvironment.h>
 #include <sstream>
 
 using namespace GUIEngine;

src/guiengine/widgets/icon_button_widget.cpp

@@ -22,6 +22,11 @@
 #include "io/file_manager.hpp"
 #include "utils/translation.hpp"
 
+#include <IGUIElement.h>
+#include <IGUIEnvironment.h>
+#include <IGUIButton.h>
+#include <IGUIStaticText.h>
+
 using namespace GUIEngine;
 using namespace irr::video;
 using namespace irr::core;

src/guiengine/widgets/label_widget.cpp

@@ -22,6 +22,11 @@
 #include "guiengine/skin.hpp"
 #include "utils/translation.hpp"
 
+#include <IGUIElement.h>
+#include <IGUIEnvironment.h>
+#include <IGUIStaticText.h>
+#include <IGUIButton.h>
+
 #include <assert.h>
 
 using namespace GUIEngine;

src/guiengine/widgets/list_widget.cpp

@@ -16,12 +16,14 @@
 //  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 #include "graphics/irr_driver.hpp"
+#include "guiengine/CGUISpriteBank.h"
 #include "guiengine/engine.hpp"
 #include "guiengine/widgets/list_widget.hpp"
-
 #include "io/file_manager.hpp"
 
-#include "guiengine/CGUISpriteBank.h"
+#include <IGUIElement.h>
+#include <IGUIEnvironment.h>
+#include <IGUIListBox.h>
 
 #include <sstream>
 

src/guiengine/widgets/progress_bar_widget.cpp

@@ -19,6 +19,11 @@
 #include "guiengine/widgets/progress_bar_widget.hpp"
 #include "utils/string_utils.hpp"
 #include <string.h>
+
+#include <IGUIEnvironment.h>
+#include <IGUIElement.h>
+#include <IGUIButton.h>
+
 using namespace GUIEngine;
 using namespace irr::core;
 using namespace irr;

src/guiengine/widgets/ribbon_widget.cpp

@@ -29,6 +29,10 @@
 #include "states_screens/state_manager.hpp"
 #include "utils/string_utils.hpp"
 
+#include <IGUIElement.h>
+#include <IGUIEnvironment.h>
+#include <IGUIButton.h>
+
 using namespace GUIEngine;
 using namespace irr::core;
 using namespace irr::gui;

src/guiengine/widgets/ribbon_widget.hpp

@@ -26,6 +26,8 @@
 #include "guiengine/widgets/icon_button_widget.hpp"
 #include "utils/ptr_vector.hpp"
 
+#include <IGUIStaticText.h>
+
 namespace GUIEngine
 {
     /** Types of ribbons */

src/guiengine/widgets/spinner_widget.cpp

@@ -23,6 +23,12 @@
 #include "io/file_manager.hpp"
 #include "utils/string_utils.hpp"
 #include "utils/translation.hpp"
+
+#include <IGUIElement.h>
+#include <IGUIEnvironment.h>
+#include <IGUIButton.h>
+#include <IGUIStaticText.h>
+#include <IGUIImage.h>
 using namespace GUIEngine;
 using namespace irr::core;
 using namespace irr::gui;

src/guiengine/widgets/text_box_widget.cpp

@@ -23,6 +23,10 @@
 #include "utils/ptr_vector.hpp"
 #include "utils/translation.hpp"
 
+#include <IGUIElement.h>
+#include <IGUIEnvironment.h>
+#include <IGUIButton.h>
+
 using namespace irr;
 
 class MyCGUIEditBox : public CGUIEditBox

src/items/bowling.cpp

@@ -18,6 +18,7 @@
 //  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 #include "graphics/camera.hpp"
+#include "graphics/material.hpp"
 #include "io/xml_node.hpp"
 #include "items/bowling.hpp"
 #include "karts/kart.hpp"

src/items/flyable.cpp

@@ -27,6 +27,8 @@
 #endif
 #include <math.h>
 
+#include <IMeshSceneNode.h>
+
 #include "graphics/irr_driver.hpp"
 #include "graphics/mesh_tools.hpp"
 #include "graphics/stars.hpp"

src/items/item.cpp

@@ -19,6 +19,9 @@
 
 #include "items/item.hpp"
 
+#include <IMeshSceneNode.h>
+#include <ISceneManager.h>
+
 #include "graphics/irr_driver.hpp"
 #include "graphics/lod_node.hpp"
 #include "karts/kart.hpp"

src/items/rubber_band.cpp

@@ -19,6 +19,8 @@
 
 #include "items/rubber_band.hpp"
 
+#include <IMeshSceneNode.h>
+
 #include "graphics/irr_driver.hpp"
 #include "graphics/material_manager.hpp"
 #include "items/plunger.hpp"

src/karts/kart.cpp

@@ -24,6 +24,9 @@
 #include <iostream>
 #include <algorithm> // for min and max
 
+#include <ICameraSceneNode.h>
+#include <ISceneManager.h>
+
 #include "audio/music_manager.hpp"
 #include "audio/sfx_manager.hpp"
 #include "audio/sfx_base.hpp"

src/karts/kart.hpp

@@ -48,6 +48,7 @@ class SFXBase;
 class SkidMarks;
 class SlipStream;
 class ParticleEmitter;
+class ParticleKind;
 class Rain;
 
 /** The main kart class. All type of karts are of this object, but with 

src/karts/kart_model.cpp

@@ -19,6 +19,8 @@
 
 #include "karts/kart_model.hpp"
 
+#include <IMeshSceneNode.h>
+
 #include "config/stk_config.hpp"
 #include "config/user_config.hpp"
 #include "graphics/irr_driver.hpp"

src/modes/profile_world.cpp

@@ -23,6 +23,8 @@
 #include "graphics/irr_driver.hpp"
 #include "tracks/track.hpp"
 
+#include <ISceneManager.h>
+
 ProfileWorld::ProfileType ProfileWorld::m_profile_mode=PROFILE_NONE;
 int   ProfileWorld::m_num_laps = 0;
 float ProfileWorld::m_time   = 0.0f;

src/physics/irr_debug_drawer.hpp

@@ -20,9 +20,6 @@
 #ifndef HEADER_IRR_DEBUG_DRAWER_HPP
 #define HEADER_IRR_DEBUG_DRAWER_HPP
 
-#include "irrlicht.h"
-using namespace irr;
-
 #include "btBulletDynamicsCommon.h"
 
 #include "graphics/irr_driver.hpp"

src/states_screens/dialogs/add_device_dialog.cpp

@@ -30,6 +30,9 @@
 #include "utils/string_utils.hpp"
 #include "utils/translation.hpp"
 
+#include <IGUIStaticText.h>
+#include <IGUIEnvironment.h>
+
 using namespace GUIEngine;
 using namespace irr::gui;
 using namespace irr::core;

src/states_screens/dialogs/enter_player_name_dialog.cpp

@@ -17,6 +17,8 @@
 
 #include "states_screens/dialogs/enter_player_name_dialog.hpp"
 
+#include <IGUIEnvironment.h>
+
 #include "audio/sfx_manager.hpp"
 #include "guiengine/engine.hpp"
 #include "guiengine/widgets/button_widget.hpp"

src/states_screens/dialogs/player_info_dialog.cpp

@@ -17,6 +17,9 @@
 
 #include "states_screens/dialogs/player_info_dialog.hpp"
 
+#include <IGUIStaticText.h>
+#include <IGUIEnvironment.h>
+
 #include "config/player.hpp"
 #include "guiengine/engine.hpp"
 #include "guiengine/widgets/button_widget.hpp"

src/states_screens/feature_unlocked.cpp

@@ -36,6 +36,11 @@
 #include "tracks/track_manager.hpp"
 #include "utils/translation.hpp"
 
+#include <ILightSceneNode.h>
+#include <ICameraSceneNode.h>
+#include <IMeshSceneNode.h>
+#include <ISceneManager.h>
+
 using namespace irr::core;
 using namespace irr::gui;
 using namespace irr::video;

src/states_screens/grand_prix_lose.cpp

@@ -19,8 +19,6 @@
 
 #include "states_screens/grand_prix_lose.hpp"
 
-#include <SColor.h>
-#include <iostream>
 
 #include "audio/music_manager.hpp"
 #include "audio/sfx_manager.hpp"
@@ -36,6 +34,13 @@
 #include "states_screens/state_manager.hpp"
 #include "utils/translation.hpp"
 
+#include <ISceneManager.h>
+#include <SColor.h>
+#include <ICameraSceneNode.h>
+#include <ILightSceneNode.h>
+#include <IMeshSceneNode.h>
+//#include <iostream>
+
 using namespace irr::core;
 using namespace irr::gui;
 using namespace irr::video;

src/states_screens/grand_prix_lose.hpp

@@ -26,7 +26,7 @@
 #include <vector>
 #include <string>
 
-namespace irr { namespace scene { class ISceneNode; class ICameraSceneNode; class ILightSceneNode; } }
+namespace irr { namespace scene { class ISceneNode; class ICameraSceneNode; class ILightSceneNode; class IMeshSceneNode; } }
 class KartProperties;
 
 /**

src/states_screens/grand_prix_win.cpp

@@ -36,6 +36,13 @@
 #include "states_screens/state_manager.hpp"
 #include "utils/translation.hpp"
 
+#include <IGUIEnvironment.h>
+#include <ICameraSceneNode.h>
+#include <ISceneManager.h>
+#include <ILightSceneNode.h>
+#include <IGUIImage.h>
+#include <IMeshSceneNode.h>
+
 using namespace irr::core;
 using namespace irr::gui;
 using namespace irr::video;

src/states_screens/grand_prix_win.hpp

@@ -23,7 +23,7 @@
 #include "guiengine/screen.hpp"
 #include "karts/kart_model.hpp"
 
-namespace irr { namespace scene { class ISceneNode; class ICameraSceneNode; class ILightSceneNode; } }
+namespace irr { namespace scene { class ISceneNode; class ICameraSceneNode; class ILightSceneNode; class IMeshSceneNode; } }
 class KartProperties;
 
 /**

src/states_screens/race_gui_base.cpp

@@ -33,6 +33,7 @@
 
 #include "audio/music_manager.hpp"
 #include "graphics/irr_driver.hpp"
+#include "graphics/material.hpp"
 #include "graphics/material_manager.hpp"
 #include "guiengine/scalable_font.hpp"
 #include "io/file_manager.hpp"
@@ -41,6 +42,8 @@
 #include "modes/follow_the_leader.hpp"
 #include "modes/world.hpp"
 
+#include <ICameraSceneNode.h>
+
 RaceGUIBase::RaceGUIBase()
 {
     m_lightning             = 0.0f;

src/states_screens/race_result_gui.cpp

@@ -22,6 +22,7 @@
 #include "audio/music_manager.hpp"
 #include "audio/sfx_base.hpp"
 #include "challenges/unlock_manager.hpp"
+#include "graphics/material.hpp"
 #include "guiengine/engine.hpp"
 #include "guiengine/scalable_font.hpp"
 #include "guiengine/widget.hpp"

src/tracks/quad_graph.cpp

@@ -21,6 +21,9 @@
 
 #include "LinearMath/btTransform.h"
 
+#include <IMesh.h>
+#include <ICameraSceneNode.h>
+
 #include "config/user_config.hpp"
 #include "graphics/irr_driver.hpp"
 #include "io/file_manager.hpp"

src/tracks/terrain_info.hpp

@@ -20,9 +20,10 @@
 #ifndef HEADER_TERRAIN_INFO_HPP
 #define HEADER_TERRAIN_INFO_HPP
 
-#include "graphics/material.hpp"
 #include "utils/vec3.hpp"
 
+class Material;
+
 /** This class stores information about the triangle that's under an object, i.e.:
  *  the normal, a pointer to the material, and the height above th
  * \ingroup tracks

src/tracks/track.hpp

@@ -25,8 +25,8 @@
 
 namespace irr
 {
-    namespace video { class ITexture; class SColor; }
+    namespace video { class ITexture; class SColor;       }
-    namespace scene { class IMesh;                  }
+    namespace scene { class IMesh; class ILightSceneNode; }
 }
 using namespace irr;