Removed #include of kart and player_kart from world.

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

src/challenges/challenge_data.cpp

@@ -23,6 +23,7 @@
 
 #include "karts/kart.hpp"
 #include "karts/kart_properties_manager.hpp"
+#include "karts/player_kart.hpp"
 #include "lisp/lisp.hpp"
 #include "lisp/parser.hpp"
 #include "modes/linear_world.hpp"

src/config/player.cpp

@@ -1,5 +1,6 @@
 
 #include "config/player.hpp"
+#include "karts/player_kart.hpp"
 #include "race/race_manager.hpp"
 #include "modes/world.hpp"
 

src/graphics/irr_driver.cpp

@@ -39,6 +39,7 @@
 #include "items/attachment_manager.hpp"
 #include "items/projectile_manager.hpp"
 #include "karts/kart_properties_manager.hpp"
+#include "karts/player_kart.hpp"
 #include "main_loop.hpp"
 #include "modes/world.hpp"
 #include "states_screens/state_manager.hpp"

src/input/input_device.cpp

@@ -3,6 +3,7 @@
 #include "guiengine/abstract_state_manager.hpp"
 #include "input/input.hpp"
 #include "input/input_device.hpp"
+#include "karts/player_kart.hpp"
 #include "modes/world.hpp"
 #include "race/race_manager.hpp"
 #include "states_screens/state_manager.hpp"

src/input/input_manager.cpp

@@ -37,6 +37,7 @@
 #include "input/input.hpp"
 #include "items/projectile_manager.hpp"
 #include "karts/kart.hpp"
+#include "karts/player_kart.hpp"
 #include "modes/world.hpp"
 #include "race/history.hpp"
 #include "race/race_manager.hpp"

src/modes/profile_world.cpp

@@ -17,8 +17,10 @@
 //  along with this program; if not, write to the Free Software
 //  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
-#include "graphics/irr_driver.hpp"
 #include "modes/profile_world.hpp"
+
+#include "graphics/camera.hpp"
+#include "graphics/irr_driver.hpp"
 #include "robots/default_robot.hpp"
 
 

src/modes/world.hpp

@@ -22,8 +22,6 @@
 
 #include <vector>
 
-#include "karts/kart.hpp"
-#include "karts/player_kart.hpp"
 #include "modes/clock.hpp"
 #include "network/network_kart.hpp"
 #include "physics/physics.hpp"
@@ -31,10 +29,12 @@
 #include "states_screens/race_gui.hpp"
 #include "utils/random_generator.hpp"
 
-class SFXBase;
 class btRigidBody;
-class Track;
+class Kart;
+class PlayerKart;
 class RaceGUI;
+class SFXBase;
+class Track;
 
 /** This class is responsible for running the actual race. A world is created
  *  by the race manager on the start of each race (so a new world is created

src/network/kart_control_message.cpp

@@ -19,6 +19,7 @@
 
 #include "network/kart_control_message.hpp"
 
+#include "karts/player_kart.hpp"
 #include "modes/world.hpp"
 #include "network/network_kart.hpp"
 

src/robots/default_robot.cpp

@@ -37,6 +37,7 @@
 #ifdef AI_DEBUG
 #include "graphics/irr_driver.hpp"
 #endif
+#include "karts/player_kart.hpp"
 #include "modes/linear_world.hpp"
 #include "network/network_manager.hpp"
 #include "race/race_manager.hpp"

src/robots/new_ai.cpp

@@ -37,6 +37,7 @@
 #ifdef AI_DEBUG
 #include "graphics/irr_driver.hpp"
 #endif
+#include "karts/player_kart.hpp"
 #include "modes/linear_world.hpp"
 #include "network/network_manager.hpp"
 #include "race/race_manager.hpp"

src/states_screens/race_gui.cpp

@@ -33,6 +33,7 @@ using namespace irr;
 #include "input/input.hpp"
 #include "input/input_manager.hpp"
 #include "karts/kart_properties_manager.hpp"
+#include "karts/player_kart.hpp"
 #include "modes/world.hpp"
 #include "race/race_manager.hpp"
 #include "tracks/track.hpp"
@@ -227,10 +228,7 @@ void RaceGUI::renderPlayerView(unsigned int player_id)
 
     if(player_kart->hasViewBlockedByPlunger())
     {
-        int offset_x = viewport.UpperLeftCorner.X;
         int offset_y = viewport.UpperLeftCorner.Y;
-        float split_screen_ratio_x = scaling.X;
-        float split_screen_ratio_y = scaling.Y;
 
         const int screen_width = viewport.LowerRightCorner.X-viewport.UpperLeftCorner.X;
         const int plunger_size = viewport.UpperLeftCorner.Y-viewport.LowerRightCorner.Y;
@@ -577,7 +575,7 @@ void RaceGUI::drawLap(const KartIconDisplayInfo* info, Kart* kart,
     const int lap = info[kart->getWorldKartId()].lap;
     
     if(lap<0) return;  // don't display 'lap 0/...'
-    float minRatio = std::min(scaling.X, scaling.Y);
+
     core::recti pos;
     pos.UpperLeftCorner.X  = viewport.UpperLeftCorner.X 
                            + (int)(0.15f*UserConfigParams::m_width*scaling.X);

src/tracks/ambient_light_sphere.cpp

@@ -24,6 +24,7 @@
 
 #include "graphics/camera.hpp"
 #include "io/xml_node.hpp"
+#include "karts/player_kart.hpp"
 #include "modes/world.hpp"
 #include "race/race_manager.hpp"
 #include "tracks/track.hpp"

src/utils/translation.cpp

@@ -335,7 +335,7 @@ wchar_t* w_gettext(const char* original)
 #else
     const char* original_t = original;
 #endif
-    
+
     wchar_t* out_ptr = utf8_to_wchar_t(original_t);
     
     if (out_ptr == NULL)
@@ -343,7 +343,8 @@ wchar_t* w_gettext(const char* original)
         std::cerr << "  ERROR in w_gettext! could not be converted to wchar_t.\n";
     }
     
-    std::wcout << L"  translation : " << out_ptr << std::endl;
+    std::wcout << L"  translation : " << irr::core::stringc(out_ptr).c_str() << std::endl;
+    fprintf(stdout, "translation is '%s'.\n",  irr::core::stringc(out_ptr).c_str());
     
     return out_ptr;