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

Removed neutral gear braking.

Browse Source 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/trunk/supertuxkart@2530 178a84e3-b1eb-0310-8ba1-8eac791a3b58
This commit is contained in:
stevo14 2008-11-30 16:42:56 +00:00
parent b679e6a3c6
commit 82cf380294
2 changed files with 11 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
src/karts/kart.cpp
View File

@ -721,14 +721,13 @@ void Kart::updatePhysics (float dt)
if(m_bounce_back_time>0.0f) engine_power = 0.0f; if(m_bounce_back_time>0.0f) engine_power = 0.0f;
m_vehicle->applyEngineForce(engine_power, 2); m_vehicle->applyEngineForce(engine_power, 2);
m_vehicle->applyEngineForce(engine_power, 3); m_vehicle->applyEngineForce(engine_power, 3);
m_reverse_allowed = true;
resetBrakes();
} }
else else
{ // not accelerating { // not accelerating
if(m_controls.brake) if(m_controls.brake)
{ // check if the player is currently only slowing down or moving backwards { // check if the player is currently only slowing down or moving backwards
if(m_speed > 1.0f) if(m_speed > 0.0f)
{ // going forward { // going forward
m_vehicle->applyEngineForce(0.f, 2);//engine off m_vehicle->applyEngineForce(0.f, 2);//engine off
m_vehicle->applyEngineForce(0.f, 3); m_vehicle->applyEngineForce(0.f, 3);
@ -737,30 +736,21 @@ void Kart::updatePhysics (float dt)
for(int i=0; i<4; i++) m_vehicle->setBrake(getBrakeFactor() * 4.0f, i); for(int i=0; i<4; i++) m_vehicle->setBrake(getBrakeFactor() * 4.0f, i);
m_skidding*= 1.08f;//skid a little when the brakes are hit (just enough to make the skiding sound) m_skidding*= 1.08f;//skid a little when the brakes are hit (just enough to make the skiding sound)
if(m_skidding>2.0f) m_skidding=2.0f; if(m_skidding>2.0f) m_skidding=2.0f;
m_reverse_allowed = false;
} }
else else
{ {
if(m_reverse_allowed) resetBrakes();
// going backward, apply reverse gear ratio
if ( fabs(m_speed) < m_max_speed*m_max_speed_reverse_ratio )
{ {
// going backward, apply reverse gear ratio m_vehicle->applyEngineForce(-engine_power*m_controls.brake, 2);
if ( fabs(m_speed) < m_max_speed*m_max_speed_reverse_ratio ) m_vehicle->applyEngineForce(-engine_power*m_controls.brake, 3);
{ }
m_vehicle->applyEngineForce(-engine_power*m_controls.brake, 2);
m_vehicle->applyEngineForce(-engine_power*m_controls.brake, 3);
}
else
{
m_vehicle->applyEngineForce(0.f, 2);
m_vehicle->applyEngineForce(0.f, 3);
}
}
else else
{ {
for(int i=0; i<4; i++) m_vehicle->setBrake(5.0f, i); m_vehicle->applyEngineForce(0.f, 2);
m_vehicle->applyEngineForce(0.f, 2); m_vehicle->applyEngineForce(0.f, 3);
m_vehicle->applyEngineForce(0.f, 3); }
}
} }
} }
else else
@ -771,7 +761,6 @@ void Kart::updatePhysics (float dt)
if(!RaceManager::getWorld()->isStartPhase()) if(!RaceManager::getWorld()->isStartPhase())
resetBrakes(); resetBrakes();
m_reverse_allowed = true;
} }
} }
#ifdef ENABLE_JUMP #ifdef ENABLE_JUMP

1
src/karts/kart.hpp
View File

@ -95,7 +95,6 @@ private:
float m_current_gear_ratio; float m_current_gear_ratio;
bool m_rescue; bool m_rescue;
bool m_eliminated; bool m_eliminated;
bool m_reverse_allowed;
SFXBase *m_engine_sound; SFXBase *m_engine_sound;
SFXBase *m_beep_sound; SFXBase *m_beep_sound;