Removed physics.hpp #include from world.hpp.

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

src/graphics/irr_driver.cpp

@@ -39,6 +39,7 @@
 #include "main_loop.hpp"
 #include "modes/profile_world.hpp"
 #include "modes/world.hpp"
+#include "physics/physics.hpp"
 #include "states_screens/dialogs/confirm_resolution_dialog.hpp"
 #include "states_screens/state_manager.hpp"
 #include "utils/constants.hpp"

src/guiengine/engine.cpp

@@ -641,11 +641,8 @@ namespace GUIEngine
 
 #include "guiengine/engine.hpp"
 
-#include <iostream>
-#include <assert.h>
-#include <IGUIEnvironment.h>
-
 #include "io/file_manager.hpp"
+#include "graphics/irr_driver.hpp"
 #include "input/input_manager.hpp"
 #include "guiengine/event_handler.hpp"
 #include "guiengine/modaldialog.hpp"
@@ -657,6 +654,10 @@ namespace GUIEngine
 #include "modes/world.hpp"
 #include "states_screens/race_gui_base.hpp"
 
+#include <iostream>
+#include <assert.h>
+#include <irrlicht.h>
+
 using namespace irr::gui;
 using namespace irr::video;
 

src/guiengine/screen.cpp

@@ -16,19 +16,19 @@
 //  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 
-#include <assert.h>
+#include "guiengine/screen.hpp"
 
 #include "io/file_manager.hpp"
 #include "guiengine/engine.hpp"
 #include "guiengine/layout_manager.hpp"
 #include "guiengine/modaldialog.hpp"
-#include "guiengine/screen.hpp"
 #include "guiengine/widget.hpp"
 #include "modes/world.hpp"
 #include "states_screens/state_manager.hpp"
 
-using namespace irr;
+#include <irrlicht.h>
 
+using namespace irr;
 using namespace core;
 using namespace scene;
 using namespace video;
@@ -36,6 +36,8 @@ using namespace io;
 using namespace gui;
 using namespace GUIEngine;
 
+#include <assert.h>
+
 // -----------------------------------------------------------------------------
 
 Screen::Screen(const char* file, bool pause_race)

src/input/input_manager.cpp

@@ -16,14 +16,6 @@
 //  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 #include "input/input_manager.hpp"
-
-#include <map>
-#include <vector>
-#include <string>
-#include <iostream>
-#include <sstream>
-#include <algorithm>
-
 #include "main_loop.hpp"
 #include "guiengine/engine.hpp"
 #include "guiengine/event_handler.hpp"
@@ -36,6 +28,7 @@
 #include "modes/demo_world.hpp"
 #include "modes/profile_world.hpp"
 #include "modes/world.hpp"
+#include "physics/physics.hpp"
 #include "race/history.hpp"
 #include "replay/replay_recorder.hpp"
 #include "states_screens/kart_selection.hpp"
@@ -46,6 +39,14 @@
 
 #include <ISceneNode.h>
 
+#include <map>
+#include <vector>
+#include <string>
+#include <iostream>
+#include <sstream>
+#include <algorithm>
+
+
 InputManager *input_manager;
 
 using GUIEngine::EventPropagation;

src/items/flyable.cpp

@@ -39,6 +39,7 @@
 #include "karts/explosion_animation.hpp"
 #include "modes/world.hpp"
 #include "network/flyable_info.hpp"
+#include "physics/physics.hpp"
 #include "tracks/track.hpp"
 #include "utils/constants.hpp"
 #include "utils/string_utils.hpp"

src/items/plunger.cpp

@@ -29,6 +29,7 @@
 #include "karts/kart_properties.hpp"
 #include "modes/world.hpp"
 #include "physics/physical_object.hpp"
+#include "physics/physics.hpp"
 #include "tracks/track.hpp"
 #include "utils/constants.hpp"
 #include "utils/string_utils.hpp"

src/items/swatter.cpp

@@ -30,6 +30,7 @@
 #include "audio/sfx_base.hpp"
 #include "audio/sfx_manager.hpp"
 #include "graphics/explosion.hpp"
+#include "graphics/irr_driver.hpp"
 #include "io/file_manager.hpp"
 #include "items/attachment.hpp"
 #include "items/projectile_manager.hpp"

src/karts/abstract_kart_animation.cpp

@@ -16,9 +16,11 @@
 //  along with this program; if not, write to the Free Software
 //  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
-#include "karts/abstract_kart.hpp"
 #include "karts/abstract_kart_animation.hpp"
+
+#include "karts/abstract_kart.hpp"
 #include "modes/world.hpp"
+#include "physics/physics.hpp"
 
 AbstractKartAnimation::AbstractKartAnimation(AbstractKart *kart, 
                                              const std::string &name)

src/modes/linear_world.cpp

@@ -26,6 +26,7 @@
 #include "karts/controller/controller.hpp"
 #include "karts/kart_properties.hpp"
 #include "network/network_manager.hpp" 
+#include "physics/physics.hpp"
 #include "race/history.hpp"
 #include "states_screens/race_gui_base.hpp"
 #include "tracks/track_sector.hpp"

src/modes/overworld.cpp

@@ -16,6 +16,7 @@
 //  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 #include "challenges/unlock_manager.hpp"
+#include "graphics/irr_driver.hpp"
 #include "input/device_manager.hpp"
 #include "input/input.hpp"
 #include "input/input_manager.hpp"
@@ -24,6 +25,7 @@
 #include "karts/kart_properties_manager.hpp"
 #include "karts/rescue_animation.hpp"
 #include "modes/overworld.hpp"
+#include "physics/physics.hpp"
 #include "network/network_manager.hpp"
 #include "states_screens/dialogs/select_challenge.hpp"
 #include "states_screens/kart_selection.hpp"

src/modes/overworld.hpp

@@ -23,6 +23,7 @@
 #include "modes/linear_world.hpp"
 #include "utils/aligned_array.hpp"
 
+#include "LinearMath/btTransform.h"
 
 /*
  * The overworld map where challenges are played.

src/modes/three_strikes_battle.cpp

@@ -21,10 +21,12 @@
 #include <IMeshSceneNode.h>
 
 #include "audio/music_manager.hpp"
+#include "graphics/irr_driver.hpp"
 #include "io/file_manager.hpp"
 #include "karts/abstract_kart.hpp"
 #include "karts/kart_model.hpp"
 #include "karts/kart_properties.hpp"
+#include "physics/physics.hpp"
 #include "states_screens/race_gui_base.hpp"
 #include "tracks/track.hpp"
 #include "tracks/track_object_manager.hpp"

src/modes/three_strikes_battle.hpp

@@ -19,11 +19,13 @@
 #ifndef THREE_STRIKES_HPP
 #define THREE_STRIKES_HPP
 
-#include <string>
-
 #include "modes/world_with_rank.hpp"
 #include "states_screens/race_gui_base.hpp"
 
+#include <IMesh.h>
+
+#include <string>
+
 #define CLEAR_SPAWN_RANGE  5
 
 class PhysicalObject;

src/modes/world.cpp

@@ -43,6 +43,7 @@
 #include "network/network_manager.hpp"
 #include "network/race_state.hpp"
 #include "physics/btKart.hpp"
+#include "physics/physics.hpp"
 #include "physics/triangle_mesh.hpp"
 #include "race/highscore_manager.hpp"
 #include "race/history.hpp"

src/modes/world.hpp

@@ -28,7 +28,6 @@
 #include <vector>
 
 #include "modes/world_status.hpp"
-#include "physics/physics.hpp"
 #include "race/highscores.hpp"
 #include "states_screens/race_gui_base.hpp"
 #include "states_screens/state_manager.hpp"
@@ -37,8 +36,15 @@
 class AbstractKart;
 class btRigidBody;
 class Controller;
+class PhysicalObject;
+class Physics;
 class Track;
 
+namespace irr
+{
+    namespace scene { class ISceneNode; }
+}
+
 /** 
  *  \brief base class for all game modes
  *  This class is responsible for running the actual race. A world is created

src/modes/world_status.cpp

@@ -21,6 +21,7 @@
 #include "audio/sfx_manager.hpp"
 #include "audio/sfx_base.hpp"
 #include "config/stk_config.hpp"
+#include "graphics/irr_driver.hpp"
 #include "guiengine/modaldialog.hpp"
 #include "karts/abstract_kart.hpp"
 #include "modes/world.hpp"
@@ -28,6 +29,8 @@
 #include "network/network_manager.hpp"
 #include "states_screens/dialogs/race_over_dialog.hpp"
 
+#include <irrlicht.h>
+
 //-----------------------------------------------------------------------------
 WorldStatus::WorldStatus()
 {

src/network/race_state.cpp

@@ -17,13 +17,14 @@
 //  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 #include "network/race_state.hpp"
-#include "items/item_manager.hpp"
 
+#include "items/item_manager.hpp"
+#include "items/powerup.hpp"
+#include "items/projectile_manager.hpp"
 #include "karts/rescue_animation.hpp"
 #include "modes/world.hpp"
 #include "network/network_manager.hpp"
-#include "items/powerup.hpp"
-#include "items/projectile_manager.hpp"
+#include "physics/physics.hpp"
 
 RaceState *race_state=NULL;
 

src/physics/physical_object.cpp

@@ -28,6 +28,7 @@ using namespace irr;
 #include "io/file_manager.hpp"
 #include "io/xml_node.hpp"
 #include "modes/world.hpp"
+#include "physics/physics.hpp"
 #include "tracks/track.hpp"
 #include "utils/constants.hpp"
 #include "utils/string_utils.hpp"

src/physics/triangle_mesh.cpp

@@ -21,8 +21,10 @@
 #include "btBulletDynamicsCommon.h"
 
 #include "modes/world.hpp"
+#include "physics/physics.hpp"
 #include "utils/constants.hpp"
 #include "utils/time.hpp"
+
 #include <fstream>
 
 // -----------------------------------------------------------------------------

src/race/race_manager.cpp

@@ -24,6 +24,7 @@
 #include "challenges/unlock_manager.hpp"
 #include "config/user_config.hpp"
 #include "config/stk_config.hpp"
+#include "graphics/irr_driver.hpp"
 #include "input/device_manager.hpp"
 #include "input/input_manager.hpp"
 #include "karts/abstract_kart.hpp"

src/states_screens/state_manager.cpp

@@ -21,6 +21,7 @@
 #include "audio/sfx_manager.hpp"
 #include "audio/music_manager.hpp"
 #include "config/stk_config.hpp"
+#include "graphics/irr_driver.hpp"
 #include "guiengine/engine.hpp"
 #include "guiengine/modaldialog.hpp"
 #include "guiengine/screen.hpp"

src/tracks/check_line.cpp

@@ -18,6 +18,7 @@
 
 #include "tracks/check_line.hpp"
 
+#include "graphics/irr_driver.hpp"
 #include "io/xml_node.hpp"
 #include "karts/abstract_kart.hpp"
 #include "modes/world.hpp"

src/tracks/track.cpp

@@ -49,6 +49,7 @@ using namespace irr;
 #include "modes/linear_world.hpp"
 #include "modes/world.hpp"
 #include "physics/physical_object.hpp"
+#include "physics/physics.hpp"
 #include "physics/triangle_mesh.hpp"
 #include "race/race_manager.hpp"
 #include "tracks/bezier_curve.hpp"