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

Fixed eager skipping of code when effects were disabled, which resulted in looking back to stop working

Browse Source 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@8667 178a84e3-b1eb-0310-8ba1-8eac791a3b58
This commit is contained in:
auria 2011-05-22 20:40:26 +00:00
parent 9e4b17d76f
commit fb7f9c6816
1 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/karts/kart.cpp
View File

@ -818,7 +818,7 @@ void Kart::update(float dt)
m_rain->update(dt); m_rain->update(dt);
} }
} // UserConfigParams::m_graphical_effects } // UserConfigParams::m_graphical_effects
m_nitro->update(); m_nitro->update();
updatePhysics(dt); updatePhysics(dt);
@ -1012,13 +1012,13 @@ void Kart::handleMaterialGFX()
{ {
const Material *material = getMaterial(); const Material *material = getMaterial();
if (m_terrain_particles) // First test: give the terrain effect, if the kart is
// on top of a surface (i.e. not falling), actually touching
// something with the wheels, and the material has not the
// below surface property set.
if (material && isOnGround() && !material->isBelowSurface() && m_kart_mode != EA_RESCUE)
{ {
// First test: give the terrain effect, if the kart is if (m_terrain_particles)
// on top of a surface (i.e. not falling), actually touching
// something with the wheels, and the material has not the
// below surface property set.
if(material && isOnGround() && !material->isBelowSurface() && m_kart_mode != EA_RESCUE)
{ {
Vec3 xyz; Vec3 xyz;
m_wheel_toggle = 1 - m_wheel_toggle; m_wheel_toggle = 1 - m_wheel_toggle;
@ -1064,9 +1064,11 @@ void Kart::handleMaterialGFX()
float create = pk->getMinRate()*(1-rate) + pk->getMaxRate()*rate; float create = pk->getMinRate()*(1-rate) + pk->getMaxRate()*rate;
m_terrain_particles->setParticleType(pk); m_terrain_particles->setParticleType(pk);
m_terrain_particles->setCreationRate(create); m_terrain_particles->setCreationRate(create);
return;
} }
return;
} }
// Now the kart is either falling, or driving on a terrain which // Now the kart is either falling, or driving on a terrain which
// has the 'below surface' flag set. Detect if there is a surface // has the 'below surface' flag set. Detect if there is a surface