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

Don't create stars in no graphics

Browse Source
This commit is contained in:
Benau
2020-02-20 08:22:35 +08:00
parent b799d6454b
commit beba4fd4c3
2 changed files with 15 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/karts/explosion_animation.cpp
View File

@@ -288,7 +288,7 @@ void ExplosionAnimation::update(int ticks)
// ----------------------------------------------------------------------------
void ExplosionAnimation::updateGraphics(float dt)
{
if (!m_kart->getStarsEffect()->isEnabled())
if (m_kart->getStarsEffect() && !m_kart->getStarsEffect()->isEnabled())
{
// Set graphical effects for invulnerable time in updateGraphics
// to avoid issue with rewind

23
src/karts/kart.cpp
View File

@@ -129,7 +129,6 @@ Kart::Kart (const std::string& ident, unsigned int world_kart_id,
m_collision_particles = NULL;
m_controller = NULL;
m_saved_controller = NULL;
m_stars_effect = NULL;
m_consumption_per_tick = stk_config->ticks2Time(1) *
m_kart_properties->getNitroConsumption();
m_fire_clicked = 0;
@@ -341,7 +340,8 @@ void Kart::reset()
m_kart_properties->getNitroConsumption();
// Reset star effect in case that it is currently being shown.
m_stars_effect->reset();
if (m_stars_effect)
m_stars_effect->reset();
m_max_speed->reset();
m_powerup->reset();
@@ -1311,7 +1311,8 @@ void Kart::decreaseShieldTime()
*/
void Kart::showStarEffect(float t)
{
m_stars_effect->showFor(t);
if (m_stars_effect)
m_stars_effect->showFor(t);
} // showStarEffect
//-----------------------------------------------------------------------------
@@ -3014,7 +3015,8 @@ void Kart::loadData(RaceManager::KartType type, bool is_animated_model)
new KartGFX(this, Track::getCurrentTrack()->getIsDuringDay()));
m_skidding.reset(new Skidding(this));
// Create the stars effect
m_stars_effect.reset(new Stars(this));
if (!GUIEngine::isNoGraphics())
m_stars_effect.reset(new Stars(this));
} // loadData
@@ -3233,13 +3235,16 @@ void Kart::updateGraphics(float dt)
// update star effect (call will do nothing if stars are not activated)
// Remove it if no invulnerability
if (!isInvulnerable() && m_stars_effect->isEnabled())
if (m_stars_effect)
{
m_stars_effect->reset();
m_stars_effect->update(1);
if (!isInvulnerable() && m_stars_effect->isEnabled())
{
m_stars_effect->reset();
m_stars_effect->update(1);
}
else
m_stars_effect->update(dt);
}
else
m_stars_effect->update(dt);
// Update particle effects (creation rate, and emitter size
// depending on speed)