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

Bugfix: a crash could occur if the owner of a plunger is rescued while the

Browse Source 
plunger is still flying.


git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/trunk/supertuxkart@2929 178a84e3-b1eb-0310-8ba1-8eac791a3b58
This commit is contained in:
hikerstk 2009-01-15 12:54:00 +00:00
parent 31da6b69e0
commit f861652587
1 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/items/rubber_band.cpp
View File

@ -172,16 +172,22 @@ void RubberBand::checkForHit(const Vec3 &k, const Vec3 &p)
btCollisionWorld::ClosestRayResultCallback ray_callback(k, p);
// Disable raycast collision detection for this plunger and this kart!
short int old_plunger_group = m_plunger->getBody()->getBroadphaseHandle()->m_collisionFilterGroup;
short int old_kart_group = m_owner.getBody() ->getBroadphaseHandle()->m_collisionFilterGroup;
short int old_kart_group=0;
// If the owner is being rescued, the broadphase handle does not exist!
if(m_owner.getBody()->getBroadphaseHandle())
old_kart_group = m_owner.getBody()->getBroadphaseHandle()->m_collisionFilterGroup;
m_plunger->getBody()->getBroadphaseHandle()->m_collisionFilterGroup = 0;
m_owner.getBody()->getBroadphaseHandle()->m_collisionFilterGroup = 0;
if(m_owner.getBody()->getBroadphaseHandle())
m_owner.getBody()->getBroadphaseHandle()->m_collisionFilterGroup = 0;
// Do the raycast
RaceManager::getWorld()->getPhysics()->getPhysicsWorld()->rayTest(k, p,
ray_callback);
// Reset collision groups
m_plunger->getBody()->getBroadphaseHandle()->m_collisionFilterGroup = old_plunger_group;
m_owner.getBody() ->getBroadphaseHandle()->m_collisionFilterGroup = old_kart_group;
if(m_owner.getBody()->getBroadphaseHandle())
m_owner.getBody()->getBroadphaseHandle()->m_collisionFilterGroup = old_kart_group;
if(ray_callback.HasHit())
{
Vec3 pos(ray_callback.m_hitPointWorld);