diff --git a/data/materials.dat b/data/materials.dat index 171f5719b..b0debec53 100644 --- a/data/materials.dat +++ b/data/materials.dat @@ -120,7 +120,7 @@ "stones.rgb" N N N 0.0 Y N 0.2 N N N N "pebbles.rgb" N N N 0.0 Y N 1.0 N N N N "floor.rgb" N N N 0.0 Y N 1.0 N N N N -"sand.rgb" N N N 0.0 Y N 0.5 N N N N +"sand.rgb" N N N 0.0 Y N 0.0000001 N N N N "sandgrass.rgb" N N N 0.0 Y N 0.5 N N N N "egypt.rgb" N N N 0.0 Y N 1.0 N N N Y "pyramidwall.rgb" N N N 0.0 Y N 1.0 N N N N diff --git a/src/kart.cpp b/src/kart.cpp index eed626c89..80ed1cef2 100644 --- a/src/kart.cpp +++ b/src/kart.cpp @@ -137,7 +137,6 @@ Kart::Kart (const KartProperties* kartProperties_, int position_ , m_finish_time = 0.0f; m_prev_accel = 0.0f; m_wheelie_angle = 0.0f; - m_current_friction = 1.0f; m_time_since_stuck = 0.0f; m_smokepuff = NULL; m_smoke_system = NULL; @@ -720,16 +719,7 @@ void Kart::update (float dt) updatePhysics(dt); sgCopyVec2 ( m_last_track_coords, m_curr_track_coords ); - if(m_material_hot && isOnGround()) - { - float r=m_material_hot->getFriction(); - if(rgetNumWheels(); i++) { // terrain dependent friction - m_vehicle->getWheelInfo(i).m_frictionSlip = - m_kart_properties->getFrictionSlip() * - getMaterial()->getFriction(); + m_vehicle->getWheelInfo(i).m_frictionSlip = getFrictionSlip() * + getMaterial()->getFriction(); } // for igetWheelBase();} float getHeightCOG () const {return m_kart_properties->getHeightCOG();} float getTireGrip () const {return m_kart_properties->getTireGrip();} + float getFrictionSlip () const {return m_kart_properties->getFrictionSlip();} float getMaxSteerAngle () const {return m_kart_properties->getMaxSteerAngle();} float getCornerStiffF () const {return m_kart_properties->getCornerStiffF();} float getCornerStiffR () const {return m_kart_properties->getCornerStiffR();}