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

make sure removeKart not called twice (eliminate+rescue)

Browse Source 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/irrlicht@3875 178a84e3-b1eb-0310-8ba1-8eac791a3b58
This commit is contained in:
davemk
2009-08-17 07:50:21 +00:00
parent b35ec4b31f
commit ae15f8a18e
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/karts/kart.cpp
View File

@@ -278,7 +278,10 @@ Kart::~Kart()
void Kart::eliminate()
{
m_eliminated = true;
RaceManager::getWorld()->getPhysics()->removeKart(this);
if (!m_rescue)
{
RaceManager::getWorld()->getPhysics()->removeKart(this);
}
// make the kart invisible by placing it way under the track
Vec3 hell(0, 0, -10000.0f);
@@ -553,9 +556,10 @@ void Kart::update(float dt)
m_attachment.set( ATTACH_TINYTUX, rescue_time ) ;
m_rescue_pitch = getHPR().getPitch();
m_rescue_roll = getHPR().getRoll();
RaceManager::getWorld()->getPhysics()->removeKart(this);
race_state->itemCollected(getWorldKartId(), -1, -1);
}
RaceManager::getWorld()->getPhysics()->removeKart(this);
btQuaternion q_roll (btVector3(0.f, 1.f, 0.f),
-m_rescue_roll*dt/rescue_time*M_PI/180.0f);
btQuaternion q_pitch(btVector3(1.f, 0.f, 0.f),