ilikecats/stk-code_catmod
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Removed unnecessary flag to keep track if speed icnrease is defined.

Browse Source
This commit is contained in:
hiker 2016-10-04 08:28:01 +11:00
parent 84a3f5d8b2
commit 9595a76d36
2 changed files with 1 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/physics/btKart.cpp
View File

@ -116,7 +116,6 @@ void btKart::reset()
updateWheelTransform(i, true);
}
m_visual_wheels_touch_ground = false;
m_zipper_active = false;
m_zipper_speed = btScalar(0);
m_skid_angular_velocity = 0;
m_is_skidding = false;
@ -810,7 +809,7 @@ void btKart::updateFriction(btScalar timeStep)
(btRigidBody*) wheelInfo.m_raycastInfo.m_groundObject;
if(!groundObject) continue;
if(m_zipper_active && m_zipper_speed > 0)
if(m_zipper_speed > 0)
{
if (wheel==2 || wheel==3)
{
@ -882,7 +881,6 @@ void btKart::updateFriction(btScalar timeStep)
} // for (int wheel=0; wheel<getNumWheels(); wheel++)
m_zipper_active = false;
// Note: don't reset zipper speed, or the kart rewinder will
// get incorrect zipper information.
@ -1067,7 +1065,6 @@ void btKart::instantSpeedIncreaseTo(float speed)
{
return;
}
m_zipper_active = speed > 0;
m_zipper_speed = speed;
} // activateZipper

3
src/physics/btKart.hpp
View File

@ -69,9 +69,6 @@ private:
btScalar m_damping;
btVehicleRaycaster *m_vehicleRaycaster;
/** True if a zipper is active for that kart. */
bool m_zipper_active;
/** The zipper speed (i.e. the velocity the kart should reach in
* the first frame that the zipper is active). */
btScalar m_zipper_speed;