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

Merge branch 'master' of github.com:supertuxkart/stk-code

Browse Source
This commit is contained in:
hiker 2017-08-31 23:55:33 +10:00
commit f7397028ff
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/items/powerup.cpp
View File

@ -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() 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. //In this case this is a workaround, since the bubblegum item has two different sounds.

5
src/tracks/track.cpp
View File

@ -2030,11 +2030,6 @@ void Track::loadObjects(const XMLNode* root, const std::string& path, ModelDefin
m_sky_particles = m_sky_particles =
ParticleKindManager::get()->getParticles(weather_particles); ParticleKindManager::get()->getParticles(weather_particles);
} }
else
{
Log::error("track", "Bad weather node found - ignored.\n");
continue;
}
} }
else if (name == "sun") else if (name == "sun")
{ {