Merge branch 'master' of github.com:supertuxkart/stk-code
This commit is contained in:
commit
f7397028ff
@ -325,6 +325,11 @@ void Powerup::use()
|
||||
}
|
||||
}
|
||||
|
||||
if (m_sound_use != NULL)
|
||||
{
|
||||
m_sound_use->deleteSFX();
|
||||
m_sound_use = NULL;
|
||||
}
|
||||
m_sound_use = SFXManager::get()->createSoundSource("inflate");//Extraordinary. Usually sounds are set in Powerup::set()
|
||||
//In this case this is a workaround, since the bubblegum item has two different sounds.
|
||||
|
||||
|
@ -2030,11 +2030,6 @@ void Track::loadObjects(const XMLNode* root, const std::string& path, ModelDefin
|
||||
m_sky_particles =
|
||||
ParticleKindManager::get()->getParticles(weather_particles);
|
||||
}
|
||||
else
|
||||
{
|
||||
Log::error("track", "Bad weather node found - ignored.\n");
|
||||
continue;
|
||||
}
|
||||
}
|
||||
else if (name == "sun")
|
||||
{
|
||||
|
Loading…
Reference in New Issue
Block a user