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

A rubber ball hit is now a proper explosion (i.e. it also affects

Browse Source 
other karts close by), and the hit message is shown (we need
better hit messages for rubber balls ;) ).
Renamed checkDistanceToTarget() to updateDistanceToTarget.


git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@10005 178a84e3-b1eb-0310-8ba1-8eac791a3b58
This commit is contained in:
hikerstk 2011-10-17 06:07:44 +00:00
parent aa74b59dcb
commit 55cb9941b5
2 changed files with 20 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
src/items/rubber_ball.cpp
View File

@ -323,7 +323,7 @@ bool RubberBall::updateAndDelete(float dt)
return true;
}
}
checkDistanceToTarget();
updateDistanceToTarget();
Vec3 next_xyz;
if(m_aiming_at_target)
@ -345,7 +345,11 @@ bool RubberBall::updateAndDelete(float dt)
float terrain_height = getMaxTerrainHeight(vertical_offset)
- m_extend.getY();
if(new_y>terrain_height)
{
printf("Adjusting height from %f to %f.\n",
new_y, terrain_height);
new_y = terrain_height;
}
}
if(UserConfigParams::logFlyable())
@ -540,7 +544,7 @@ float RubberBall::getMaxTerrainHeight(const Vec3 &vertical_offset) const
* rubber ball will switch from following the quad graph structure to
* directly aim at the target.
*/
void RubberBall::checkDistanceToTarget()
void RubberBall::updateDistanceToTarget()
{
const LinearWorld *world = dynamic_cast<LinearWorld*>(World::getWorld());
if(!world) return; // FIXME battle mode
@ -599,7 +603,7 @@ void RubberBall::checkDistanceToTarget()
}
return;
} // checkDistanceToTarget
} // updateDistanceToTarget
// ----------------------------------------------------------------------------
/** Callback from the physics in case that a kart or object is hit. The rubber
@ -611,28 +615,20 @@ void RubberBall::checkDistanceToTarget()
*/
bool RubberBall::hit(Kart* kart, PhysicalObject* object)
{
if(kart)
if(kart && kart!=m_target)
{
// If the object is not the main target, only flatten the kart
if(kart!=m_target)
// If the squashed kart has a bomb, explode it.
if(kart->getAttachment()->getType()==Attachment::ATTACH_BOMB)
{
// If the squashed kart has a bomb, explode it.
if(kart->getAttachment()->getType()==Attachment::ATTACH_BOMB)
{
// make bomb explode
kart->getAttachment()->update(10000);
return false;
}
kart->setSquash(m_st_squash_duration, m_st_squash_slowdown);
// make bomb explode
kart->getAttachment()->update(10000);
return false;
}
else
{
// Else trigger the full explosion animation
kart->handleExplosion(kart->getXYZ(), /*direct hit*/true);
setHasHit();
return true;
}
kart->setSquash(m_st_squash_duration, m_st_squash_slowdown);
return false;
}
return Flyable::hit(kart, object);
bool was_real_hit = Flyable::hit(kart, object);
if(was_real_hit)
explode(kart, object);
return was_real_hit;
} // hit

4
src/items/rubber_ball.hpp
View File

@ -162,7 +162,7 @@ private:
SFXBase *m_hit_sfx;
void computeTarget();
void checkDistanceToTarget();
void updateDistanceToTarget();
unsigned int getSuccessorToHitTarget(unsigned int node_index,
float *f=NULL);
void getNextControlPoint();
@ -181,7 +181,7 @@ public:
// ------------------------------------------------------------------------
/** This object does not create an explosion, all affects on
* karts are handled by this hit() function. */
virtual HitEffect *getHitEffect() const {return NULL; }
//virtual HitEffect *getHitEffect() const {return NULL; }
}; // RubberBall