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

Removed runbber ball's time-between-ticks setting, which is not

Browse Source 
necessary anymore after alayan's changes to item distribution.
This commit is contained in:
hiker 2018-08-02 09:34:03 +10:00
parent 46706fb109
commit 0fa25db181
3 changed files with 0 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
data/powerup.xml
View File

@ -26,8 +26,6 @@
target-max-angle: Once the ball is aiming for its
target, it can at most change the angle
this much per second(!).
time-between-balls: Reduces the frequency with which rubber
balls are found to 1 every 'timer' seconds.
min-interpolation-distance: how far the control
points (which are center of squads)
must be from each other. A large value
@ -63,7 +61,6 @@
early-target-factor="1"
target-distance="15" target-max-angle = "90"
min-interpolation-distance="5"
time-between-balls="15"
squash-slowdown="0.5" squash-duration="2"
delete-time="5.0" max-height-difference="10" />
<item name="parachute" icon="parachute-icon.png"

6
src/items/rubber_ball.cpp
View File

@ -48,7 +48,6 @@ float RubberBall::m_st_max_height_difference;
float RubberBall::m_st_fast_ping_distance;
float RubberBall::m_st_early_target_factor;
int RubberBall::m_next_id = 0;
int RubberBall::m_ticks_between_balls;
// Debug only, so that we can get a feel on how well balls are aiming etc.
@ -305,7 +304,6 @@ void RubberBall::init(const XMLNode &node, scene::IMesh *rubberball)
m_st_max_height_difference = 10.0f;
m_st_fast_ping_distance = 50.0f;
m_st_early_target_factor = 1.0f;
m_ticks_between_balls = stk_config->time2Ticks(15.0f);
if(!node.get("interval", &m_st_interval))
Log::warn("powerup", "No interval specified for rubber ball.");
@ -341,10 +339,6 @@ void RubberBall::init(const XMLNode &node, scene::IMesh *rubberball)
if(!node.get("early-target-factor", &m_st_early_target_factor))
Log::warn("powerup",
"No early-target-factor specified for rubber ball.");
if(!node.get("time-between-balls", &m_ticks_between_balls))
Log::warn("powerup",
"No time-between-balls specified for rubber ball.");
m_ticks_between_balls = stk_config->time2Ticks(float(m_ticks_between_balls));
Flyable::init(node, rubberball, PowerupManager::POWERUP_RUBBERBALL);
} // init

9
src/items/rubber_ball.hpp
View File

@ -82,11 +82,6 @@ private:
* ball will be deleted. */
static int m_st_delete_ticks;
/** Timer before another rubber ball can be picked up. This is to ensure
* that there are not too many rubber balls on the track in races with many
* karts. */
static int m_ticks_between_balls;
/** This factor is used to influence how much the rubber ball should aim
* at its target early. It used the 'distance to center of track' of its
* target, and adjusts the interpolation control points to be more or
@ -212,10 +207,6 @@ public:
virtual bool hit(AbstractKart* kart, PhysicalObject* obj=NULL) OVERRIDE;
virtual void setAnimation(AbstractKartAnimation *animation) OVERRIDE;
// ------------------------------------------------------------------------
/** Returns time (in ticks) between rubberballs, to avoid that in games
* with many karts too many rubber balls are in play at the same time. */
static int getTicksBetweenRubberBalls() { return m_ticks_between_balls; }
// ------------------------------------------------------------------------
/** This object does not create an explosion, all affects on
* karts are handled by this hit() function. */
//virtual HitEffect *getHitEffect() const {return NULL; }