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@8665 178a84e3-b1eb-0310-8ba1-8eac791a3b58

src/addons/zip.cpp

@@ -15,7 +15,6 @@
 //  along with this program; if not, write to the Free Software
 //  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
-#include "irrlicht.h"
 #include <string.h>
 #include <iostream>
 #include <fstream> 
@@ -24,6 +23,7 @@
 #include "io/file_manager.hpp"
 #include "utils/string_utils.hpp"
 
+#include <IWriteFile.h>
 using namespace irr;
 using namespace io;
 s32 IFileSystem_copyFileToFile(IWriteFile* dst, IReadFile* src)

src/graphics/shadow.cpp

@@ -18,11 +18,12 @@
 //  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 #include "graphics/shadow.hpp"
-
-#include "irrlicht.h"
-
 #include "graphics/irr_driver.hpp"
 
+#include <IMesh.h>
+#include <IMeshSceneNode.h>
+#include <ISceneNode.h>
+
 Shadow::Shadow(video::ITexture *texture, scene::ISceneNode *node)
 {
     video::SMaterial m;

src/graphics/stars.cpp

@@ -18,13 +18,14 @@
 
 #include <cmath>
 
-#include "irrlicht.h"
-
 #include "graphics/irr_driver.hpp"
 #include "graphics/material.hpp"
 #include "graphics/material_manager.hpp"
 #include "utils/constants.hpp"
 
+#include <ISceneNode.h>
+#include <IBillboardSceneNode.h>
+
 const int STAR_AMOUNT = 7;
 const float RADIUS = 0.7f;
 const float STAR_SIZE = 0.4f;

src/guiengine/abstract_top_level_container.cpp

@@ -24,9 +24,10 @@
 #include "utils/ptr_vector.hpp"
 #include <sstream>
 
+#include <IGUIElement.h>
+
 using namespace GUIEngine;
 
-#include "irrlicht.h"
 using namespace irr;
 using namespace core;
 using namespace scene;

src/guiengine/layout_manager.cpp

@@ -19,13 +19,11 @@
 
 #include <sstream>
 
-#include "irrlicht.h"
+#include <IGUIFont.h>
+#include <ITexture.h>
 using namespace irr;
-using namespace core;
-using namespace scene;
-using namespace video;
-using namespace io;
 using namespace gui;
+using namespace video;
 
 #include "graphics/irr_driver.hpp"
 #include "guiengine/abstract_top_level_container.hpp"

src/guiengine/modaldialog.cpp

@@ -24,7 +24,8 @@
 #include "input/input_manager.hpp"
 #include "io/file_manager.hpp"
 
-#include "irrlicht.h"
+#include <IGUIEnvironment.h>
+
 using namespace irr;
 using namespace core;
 using namespace scene;

src/guiengine/screen.cpp

@@ -20,8 +20,6 @@
 #include <sstream>
 #include <assert.h>
 
-#include "irrlicht.h"
-
 #include "input/input.hpp"
 #include "io/file_manager.hpp"
 #include "guiengine/engine.hpp"

src/guiengine/widget.cpp

@@ -20,10 +20,10 @@
 #include <iostream>
 #include <sstream>
 
-#include "irrlicht.h"
+#include <IGUIElement.h>
+
 using namespace irr;
 using namespace core;
-using namespace scene;
 using namespace video;
 using namespace io;
 using namespace gui;

src/guiengine/widgets/bubble_widget.cpp

@@ -19,7 +19,10 @@
 #include "guiengine/widgets/bubble_widget.hpp"
 #include "utils/translation.hpp"
 
-#include <irrlicht.h>
+#include <IGUIStaticText.h>
+#include <IGUIElement.h>
+#include <IGUIEnvironment.h>
+
 using namespace irr::core;
 using namespace irr::gui;
 using namespace irr;

src/guiengine/widgets/model_view_widget.hpp

@@ -20,7 +20,7 @@
 #ifndef HEADER_MODELVIEW_HPP
 #define HEADER_MODELVIEW_HPP
 
-#include <irrlicht.h>
+#include <IMesh.h>
 
 #include "graphics/irr_driver.hpp"
 #include "guiengine/widgets/icon_button_widget.hpp"

src/io/file_manager.cpp

@@ -18,6 +18,8 @@
 //  along with this program; if not, write to the Free Software
 //  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
+#include <irrlicht.h>
+
 #include "io/file_manager.hpp"
 
 #include <stdio.h>

src/physics/physical_object.cpp

@@ -22,7 +22,6 @@
 #include <string>
 #include <vector>
 
-#include "irrlicht.h"
 using namespace irr;
 
 #include "graphics/irr_driver.hpp"
@@ -34,6 +33,9 @@ using namespace irr;
 #include "utils/constants.hpp"
 #include "utils/string_utils.hpp"
 
+#include <ISceneManager.h>
+#include <ImeshManipulator.h>
+
 // -----------------------------------------------------------------------------
 PhysicalObject::PhysicalObject(const XMLNode &xml_node)
               : TrackObject(xml_node)

src/states_screens/addons_screen.cpp

@@ -21,8 +21,6 @@
 
 #include <sstream>
 
-#include "irrlicht.h"
-
 #include "addons/addons_manager.hpp"
 #include "guiengine/widget.hpp"
 #include "guiengine/widgets/ribbon_widget.hpp"

src/states_screens/dialogs/gp_info_dialog.cpp

@@ -32,8 +32,8 @@
 #include "tracks/track_manager.hpp"
 #include "utils/translation.hpp"
 
-
-#include "irrlicht.h"
+#include <IGUIEnvironment.h>
+#include <IGUIStaticText.h>
 
 using namespace irr::gui;
 using namespace irr::video;

src/states_screens/dialogs/race_over_dialog.cpp

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

src/states_screens/dialogs/track_info_dialog.cpp

@@ -34,7 +34,9 @@
 #include "utils/string_utils.hpp"
 #include "utils/translation.hpp"
 
-#include "irrlicht.h"
+#include <IGUIEnvironment.h>
+#include <IGUIImage.h>
+#include <IGUIStaticText.h>
 
 using namespace irr::gui;
 using namespace irr::video;

src/states_screens/kart_selection.cpp

@@ -44,6 +44,9 @@
 #include "utils/string_utils.hpp"
 
 #include <string>
+#include <IGUIEnvironment.h>
+#include <IGUIImage.h>
+#include <IGUIButton.h>
 
 InputDevice* player_1_device = NULL;
 

src/states_screens/minimal_race_gui.cpp

@@ -20,7 +20,6 @@
 
 #include "states_screens/minimal_race_gui.hpp"
 
-#include "irrlicht.h"
 using namespace irr;
 
 #include "config/user_config.hpp"

src/states_screens/race_gui.cpp

@@ -20,7 +20,6 @@
 
 #include "states_screens/race_gui.hpp"
 
-#include "irrlicht.h"
 using namespace irr;
 
 #include <algorithm>

src/states_screens/race_setup_screen.cpp

@@ -15,8 +15,6 @@
 //  along with this program; if not, write to the Free Software
 //  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
-#include <irrlicht.h>
-
 #include "challenges/unlock_manager.hpp"
 #include "guiengine/widgets/dynamic_ribbon_widget.hpp"
 #include "guiengine/widgets/ribbon_widget.hpp"

src/tracks/check_line.cpp

@@ -21,7 +21,6 @@
 
 #include <string>
 
-#include "irrlicht.h"
 
 #include "io/xml_node.hpp"
 #include "modes/world.hpp"

src/tracks/quad.cpp

@@ -19,8 +19,9 @@
 
 #include "tracks/quad.hpp"
 
-#include "irrlicht.h"
 #include <algorithm>
+#include <S3DVertex.h>
+#include <triangle3d.h>
 
 #include "LinearMath/btTransform.h"
 

src/tracks/track.cpp

@@ -24,7 +24,6 @@
 #include <stdexcept>
 #include <sstream>
 
-#include "irrlicht.h"
 using namespace irr;
 
 #include "audio/music_manager.hpp"
@@ -57,6 +56,12 @@ using namespace irr;
 #include "utils/string_utils.hpp"
 #include "utils/translation.hpp"
 
+#include <ISceneManager.h>
+#include <IMeshSceneNode.h>
+#include <IMeshManipulator.h>
+#include <ILightSceneNode.h>
+#include <IMeshCache.h>
+
 const float Track::NOHIT           = -99999.9f;
 
 // ----------------------------------------------------------------------------