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

Fix #889: Only play strike sfx when a bowling ball hits a kart (and not

Browse Source 
when it hits another flyable).


git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12619 178a84e3-b1eb-0310-8ba1-8eac791a3b58
This commit is contained in:
hikerstk 2013-04-07 22:37:09 +00:00
parent 9d46f847fc
commit 617bbc8f16
2 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/items/bowling.cpp
View File

@ -32,6 +32,7 @@ float Bowling::m_st_force_to_target;
Bowling::Bowling(AbstractKart *kart)
: Flyable(kart, PowerupManager::POWERUP_BOWLING, 50.0f /* mass */)
{
m_has_hit_kart = false;
float y_offset = 0.5f*kart->getKartLength() + m_extend.getZ()*0.5f;
// if the kart is looking backwards, release from the back
@ -188,7 +189,7 @@ bool Bowling::updateAndDelete(float dt)
if(vlen==0.0f) {
v = btVector3(.5f, .0, 0.5f); // avoid 0 div.
}
m_body->setLinearVelocity(v*m_speed/sqrt(vlen));
// m_body->setLinearVelocity(v*(m_speed/sqrt(vlen)));
} // vlen < 0.8*m_speed*m_speed
} // hat< m_max_height
@ -211,7 +212,10 @@ bool Bowling::hit(AbstractKart* kart, PhysicalObject* obj)
{
bool was_real_hit = Flyable::hit(kart, obj);
if(was_real_hit)
{
m_has_hit_kart = kart != NULL;
explode(kart, obj, /*hit_secondary*/false);
}
return was_real_hit;
} // hit
// ----------------------------------------------------------------------------
@ -220,5 +224,7 @@ bool Bowling::hit(AbstractKart* kart, PhysicalObject* obj)
*/
HitEffect* Bowling::getHitEffect() const
{
return new HitSFX(getXYZ(), "strike");
if(m_has_hit_kart)
return new HitSFX(getXYZ(), "strike");
return NULL;
} // getHitEffect

5
src/items/bowling.hpp
View File

@ -40,6 +40,11 @@ private:
static float m_st_max_distance_squared;
static float m_st_force_to_target;
/** If a bowling ball has hit something, this flag is set to indicate
* if a kart was hit or not. The sound effect is only played if a
* kart was hit. */
bool m_has_hit_kart;
public:
Bowling(AbstractKart* kart);
static void init(const XMLNode &node, scene::IMesh *bowling);