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

Restore wheels size when game is restarted.

Browse Source 
Fixes #3455
This commit is contained in:
Deve 2018-09-19 00:14:53 +02:00
parent e80e0555e1
commit 402cbea3d6
3 changed files with 30 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/karts/abstract_kart.hpp
View File

@ -274,6 +274,9 @@ public:
* \param slowdown Reduction of max speed. */
virtual void setSquash(float time, float slowdown) = 0;
// ------------------------------------------------------------------------
/** Makes the kart unsquashed again. */
virtual void unsetSquash() = 0;
// ------------------------------------------------------------------------
/** Returns the speed of the kart in meters/second. This is not declared
* pure abstract, since this function is not needed for certain classes,
* like Ghost. */

40
src/karts/kart.cpp
View File

@ -366,6 +366,8 @@ void Kart::reset()
m_collision_particles->setCreationRateAbsolute(0.0f);
#endif
unsetSquash();
m_race_position = m_initial_position;
m_finished_race = false;
m_eliminated = false;
@ -1831,6 +1833,29 @@ void Kart::setSquash(float time, float slowdown)
#endif
} // setSquash
void Kart::unsetSquash()
{
#ifndef SERVER_ONLY
m_squash_time = std::numeric_limits<float>::max();
m_node->setScale(core::vector3df(1.0f, 1.0f, 1.0f));
scene::ISceneNode* node = m_kart_model->getAnimatedNode() ?
m_kart_model->getAnimatedNode() : m_node;
if (m_vehicle->getNumWheels() > 0)
{
scene::ISceneNode** wheels = m_kart_model->getWheelNodes();
for (int i = 0; i < 4 && i < m_vehicle->getNumWheels(); i++)
{
if (wheels[i])
{
wheels[i]->setParent(node);
}
}
}
#endif
}
//-----------------------------------------------------------------------------
/** Returns if the kart is currently being squashed
*/
@ -3020,20 +3045,7 @@ void Kart::updateGraphics(float dt)
// If squasing time ends, reset the model
if (m_squash_time <= 0.0f || !isSquashed())
{
m_squash_time = std::numeric_limits<float>::max();
m_node->setScale(core::vector3df(1.0f, 1.0f, 1.0f));
scene::ISceneNode* node =
m_kart_model->getAnimatedNode() ?
m_kart_model->getAnimatedNode() : m_node;
if (m_vehicle->getNumWheels() > 0)
{
scene::ISceneNode **wheels = m_kart_model->getWheelNodes();
for (int i = 0; i < 4 && i < m_vehicle->getNumWheels(); ++i)
{
if (wheels[i])
wheels[i]->setParent(node);
}
}
unsetSquash();
}
} // if squashed
#endif

1
src/karts/kart.hpp
View File

@ -313,6 +313,7 @@ public:
virtual void handleZipper (const Material *m=NULL,
bool play_sound=false) OVERRIDE;
virtual void setSquash (float time, float slowdown) OVERRIDE;
virtual void unsetSquash () OVERRIDE;
virtual void crashed (AbstractKart *k, bool update_attachments) OVERRIDE;
virtual void crashed (const Material *m, const Vec3 &normal) OVERRIDE;