Update create_kart_properties.py and include

src/graphics/camera.cpp

@@ -31,7 +31,6 @@
 #include "karts/abstract_kart.hpp"
 #include "karts/explosion_animation.hpp"
 #include "karts/kart.hpp"
-#include "karts/kart_properties.hpp"
 #include "karts/skidding.hpp"
 #include "physics/btKart.hpp"
 #include "race/race_manager.hpp"

src/graphics/camera_debug.cpp

@@ -25,7 +25,6 @@
 #include "karts/explosion_animation.hpp"
 #include "karts/kart.hpp"
 #include "karts/kart_model.hpp"
-#include "karts/kart_properties.hpp"
 #include "karts/skidding.hpp"
 #include "physics/btKart.hpp"
 

src/graphics/camera_end.cpp

@@ -20,7 +20,6 @@
 
 #include "config/user_config.hpp"
 #include "karts/abstract_kart.hpp"
-#include "karts/kart_properties.hpp"
 #include "race/race_manager.hpp"
 #include "tracks/drive_graph.hpp"
 

src/karts/abstract_characteristic.cpp

@@ -827,7 +827,6 @@ float AbstractCharacteristic::getWheelsDampingCompression() const
     return result;
 }  // getWheelsDampingCompression
 
-
 // ----------------------------------------------------------------------------
 float AbstractCharacteristic::getJumpAnimationTime() const
 {

src/karts/abstract_characteristic.hpp

@@ -291,11 +291,6 @@ public:
     float getWheelsDampingRelaxation() const;
     float getWheelsDampingCompression() const;
 
-    float getCameraDistance() const;
-    float getCameraForwardUpAngle() const;
-    bool getCameraForwardSmoothing() const;
-    float getCameraBackwardUpAngle() const;
-
     float getJumpAnimationTime() const;
 
     float getLeanMax() const;

src/karts/kart_properties.cpp

@@ -21,7 +21,6 @@
 #include "audio/sfx_manager.hpp"
 #include "addons/addon.hpp"
 #include "audio/sfx_manager.hpp"
-#include "config/user_config.hpp"
 #include "config/stk_config.hpp"
 #include "config/player_manager.hpp"
 #include "graphics/central_settings.hpp"
@@ -355,7 +354,6 @@ void KartProperties::combineCharacteristics(HandicapLevel handicap)
     m_combined_characteristic->addCharacteristic(kart_properties_manager->
         getDifficultyCharacteristic(RaceManager::get()->getDifficultyAsString(
             RaceManager::get()->getDifficulty())));
-    // FIXME add get user characteristics
 
     // Try to get the kart type
     const AbstractCharacteristic *characteristic = kart_properties_manager->
@@ -775,7 +773,6 @@ float KartProperties::getWheelsDampingCompression() const
     return m_cached_characteristic->getWheelsDampingCompression();
 }  // getWheelsDampingCompression
 
-
 // ----------------------------------------------------------------------------
 float KartProperties::getJumpAnimationTime() const
 {

src/karts/xml_characteristic.cpp

@@ -1,4 +1,4 @@
-
+//
 //  SuperTuxKart - a fun racing game with go-kart
 //  Copyright (C) 2006-2015 SuperTuxKart-Team
 //

src/states_screens/options/options_screen_ui.cpp

@@ -365,18 +365,18 @@ void OptionsScreenUI::init()
     updateCameraPresetSpinner();
 }   // init
 
-void updateCamera()
+void OptionsScreenUI::updateCamera()
 {
-  bool in_game = StateManager::get()->getGameState() == GUIEngine::INGAME_MENU;
+    bool in_game = StateManager::get()->getGameState() == GUIEngine::INGAME_MENU;
-  if (in_game)
+    if (in_game)
-  {
-    (Camera::getActiveCamera()->getCameraSceneNode())->setFOV(DEGREE_TO_RAD * UserConfigParams::m_camera_fov);
-    CameraNormal *camera = dynamic_cast<CameraNormal*>(Camera::getActiveCamera());
-    if (camera)
     {
-       camera->setDistanceToKart(UserConfigParams::m_camera_distance);
+        (Camera::getActiveCamera()->getCameraSceneNode())->setFOV(DEGREE_TO_RAD * UserConfigParams::m_camera_fov);
+        CameraNormal *camera = dynamic_cast<CameraNormal*>(Camera::getActiveCamera());
+        if (camera)
+        {
+            camera->setDistanceToKart(UserConfigParams::m_camera_distance);
+        }
     }
-  }
 }
 
 void OptionsScreenUI::updateCameraPresetSpinner()

src/states_screens/options/options_screen_ui.hpp

@@ -58,6 +58,7 @@ class OptionsScreenUI : public GUIEngine::Screen, public GUIEngine::ScreenSingle
 
     std::map<core::stringw, std::string> m_skins;
 
+    void updateCamera();
 public:
     friend class GUIEngine::ScreenSingleton<OptionsScreenUI>;
 

tools/create_kart_properties.py

@@ -34,7 +34,6 @@ Engine: power, maxSpeed, genericMaxSpeed, brakeFactor, brakeTimeIncrease, maxSpe
 Gear: switchRatio(std::vector<float>/floatVector), powerIncrease(std::vector<float>/floatVector)
 Mass
 Wheels: dampingRelaxation, dampingCompression
-Camera: distance, forwardUpAngle, forwardSmoothing(bool), backwardUpAngle
 Jump: animationTime
 Lean: max, speed
 Anvil: duration, weight, speedFactor