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

Replace accidently placed tabs

Browse Source
This commit is contained in:
Flakebi 2014-09-02 03:57:48 +02:00
parent 48323d4456
commit a31ec772ff
37 changed files with 84 additions and 84 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/graphics/slip_stream.cpp
View File

@ -70,10 +70,10 @@ SlipStream::SlipStream(AbstractKart* kart) : MovingTexture(0, 0), m_kart(kart)
m_slipstream_time = 0.0f;
float length = m_kart->getKartProperties()->getSlipstreamLength() *
m_kart->getPlayerDifficulty()->getSlipstreamLength();
m_kart->getPlayerDifficulty()->getSlipstreamLength();
float kw = m_kart->getKartWidth();
float ew = m_kart->getKartProperties()->getSlipstreamWidth() *
m_kart->getPlayerDifficulty()->getSlipstreamWidth();
m_kart->getPlayerDifficulty()->getSlipstreamWidth();
float kl = m_kart->getKartLength();
Vec3 p[4];
@ -380,7 +380,7 @@ void SlipStream::update(float dt)
#undef DISPLAY_SLIPSTREAM_WITH_0_SPEED_FOR_DEBUGGING
#ifndef DISPLAY_SLIPSTREAM_WITH_0_SPEED_FOR_DEBUGGING
if(m_kart->getSpeed()<m_kart->getKartProperties()->getSlipstreamMinSpeed() *
m_kart->getPlayerDifficulty()->getSlipstreamMinSpeed())
m_kart->getPlayerDifficulty()->getSlipstreamMinSpeed())
{
setIntensity(0, NULL);
m_slipstream_mode = SS_NONE;
@ -438,7 +438,7 @@ void SlipStream::update(float dt)
// away from the other kart
Vec3 delta = m_kart->getXYZ() - m_target_kart->getXYZ();
float l = m_kart->getKartProperties()->getSlipstreamLength() *
m_kart->getPlayerDifficulty()->getSlipstreamLength()
m_kart->getPlayerDifficulty()->getSlipstreamLength()
+ 0.5f*( m_target_kart->getKartLength()
+m_kart->getKartLength() );
if(delta.length2_2d() > l*l)
@ -502,7 +502,7 @@ void SlipStream::update(float dt)
m_slipstream_mode = SS_COLLECT;
if(m_slipstream_time>m_kart->getKartProperties()->getSlipstreamCollectTime() *
m_kart->getPlayerDifficulty()->getSlipstreamCollectTime())
m_kart->getPlayerDifficulty()->getSlipstreamCollectTime())
{
setIntensity(1.0f, m_target_kart);
}

2
src/items/plunger.cpp
View File

@ -178,7 +178,7 @@ bool Plunger::hit(AbstractKart *kart, PhysicalObject *obj)
else
{
m_keep_alive = m_owner->getKartProperties()->getRubberBandDuration() *
m_owner->getPlayerDifficulty()->getRubberBandDuration();
m_owner->getPlayerDifficulty()->getRubberBandDuration();
// Make this object invisible by placing it faaar down. Not that if this
// objects is simply removed from the scene graph, it might be auto-deleted

4
src/items/rubber_band.cpp
View File

@ -147,7 +147,7 @@ void RubberBand::update(float dt)
// ------------------------------
float l = (m_end_position-k).length2();
float max_len = m_owner->getKartProperties()->getRubberBandMaxLength() *
m_owner->getPlayerDifficulty()->getRubberBandMaxLength();
m_owner->getPlayerDifficulty()->getRubberBandMaxLength();
if(l>max_len*max_len)
{
// Rubber band snaps
@ -161,7 +161,7 @@ void RubberBand::update(float dt)
if(m_attached_state!=RB_TO_PLUNGER)
{
float force = m_owner->getKartProperties()->getRubberBandForce() *
m_owner->getPlayerDifficulty()->getRubberBandForce();
m_owner->getPlayerDifficulty()->getRubberBandForce();
Vec3 diff = m_end_position-k;
// detach rubber band if kart gets very close to hit point

2
src/items/swatter.cpp
View File

@ -294,7 +294,7 @@ void Swatter::squashThingsAround()
if(dist2 >= min_dist2) continue; // too far away, ignore this kart
kart->setSquash(kp->getSquashDuration() * kart->getPlayerDifficulty()->getSquashDuration(),
kp->getSquashSlowdown() * kart->getPlayerDifficulty()->getSquashSlowdown());
kp->getSquashSlowdown() * kart->getPlayerDifficulty()->getSquashSlowdown());
if (kart->getAttachment()->getType()==Attachment::ATTACH_BOMB)
{ // make bomb explode

2
src/karts/abstract_kart.hpp
View File

@ -64,7 +64,7 @@ protected:
/** The kart properties. */
const KartProperties *m_kart_properties;
/** The per-player difficulty. */
/** The per-player difficulty. */
const PlayerDifficulty *m_difficulty;
/** This stores a copy of the kart model. It has to be a copy

4
src/karts/explosion_animation.cpp
View File

@ -79,7 +79,7 @@ ExplosionAnimation::ExplosionAnimation(AbstractKart *kart,
m_orig_y = m_xyz.getY();
m_kart->playCustomSFX(SFXManager::CUSTOM_EXPLODE);
m_timer = m_kart->getKartProperties()->getExplosionTime() *
m_kart->getPlayerDifficulty()->getExplosionTime();
m_kart->getPlayerDifficulty()->getExplosionTime();
// Non-direct hits will be only affected half as much.
if(!direct_hit) m_timer*=0.5f;
@ -107,7 +107,7 @@ ExplosionAnimation::ExplosionAnimation(AbstractKart *kart,
// Set invulnerable time, and graphical effects
float t = m_kart->getKartProperties()->getExplosionInvulnerabilityTime() *
m_kart->getPlayerDifficulty()->getExplosionInvulnerabilityTime();
m_kart->getPlayerDifficulty()->getExplosionInvulnerabilityTime();
m_kart->setInvulnerableTime(t);
if ( UserConfigParams::m_graphical_effects )
{

2
src/karts/ghost_kart.cpp
View File

@ -25,7 +25,7 @@
GhostKart::GhostKart(const std::string& ident)
: Kart(ident, /*world kart id*/99999,
/*position*/-1, btTransform(), stk_config->getPlayerDifficulty(
PLAYER_DIFFICULTY_NORMAL))
PLAYER_DIFFICULTY_NORMAL))
{
m_current_transform = 0;
m_next_event = 0;

34
src/karts/kart.cpp
View File

@ -925,7 +925,7 @@ void Kart::collectedItem(Item *item, int add_info)
m_bubblegum_torque = ((rand()%2)
? m_kart_properties->getBubblegumTorque()
: -m_kart_properties->getBubblegumTorque()) *
m_difficulty->getBubblegumTorque();
m_difficulty->getBubblegumTorque();
m_max_speed->setSlowdown(MaxSpeed::MS_DECREASE_BUBBLE,
m_kart_properties->getBubblegumSpeedFraction() *
m_difficulty->getBubblegumSpeedFraction(),
@ -958,13 +958,13 @@ float Kart::getActualWheelForce()
for(unsigned int i=0; i<gear_ratio.size(); i++)
{
if(m_speed <= m_kart_properties->getMaxSpeed() *
m_difficulty->getMaxSpeed() * gear_ratio[i])
m_difficulty->getMaxSpeed() * gear_ratio[i])
{
assert(!isnan(m_kart_properties->getMaxPower() *
m_difficulty->getMaxPower()));
m_difficulty->getMaxPower()));
assert(!isnan(m_kart_properties->getGearPowerIncrease()[i]));
return m_kart_properties->getMaxPower() *
m_difficulty->getMaxPower()
m_difficulty->getMaxPower()
*m_kart_properties->getGearPowerIncrease()[i]
+add_force;
}
@ -1642,32 +1642,32 @@ void Kart::handleZipper(const Material *material, bool play_sound)
&speed_gain, &fade_out_time, &engine_force);
if(max_speed_increase<0)
max_speed_increase = m_kart_properties->getZipperMaxSpeedIncrease() *
m_difficulty->getZipperMaxSpeedIncrease();
m_difficulty->getZipperMaxSpeedIncrease();
if(duration<0)
duration = m_kart_properties->getZipperTime() *
m_difficulty->getZipperTime();
m_difficulty->getZipperTime();
if(speed_gain<0)
speed_gain = m_kart_properties->getZipperSpeedGain() *
m_difficulty->getZipperSpeedGain();
m_difficulty->getZipperSpeedGain();
if(fade_out_time<0)
fade_out_time = m_kart_properties->getZipperFadeOutTime() *
m_difficulty->getZipperFadeOutTime();
m_difficulty->getZipperFadeOutTime();
if(engine_force<0)
engine_force = m_kart_properties->getZipperForce() *
m_difficulty->getZipperForce();
m_difficulty->getZipperForce();
}
else
{
max_speed_increase = m_kart_properties->getZipperMaxSpeedIncrease() *
m_difficulty->getZipperMaxSpeedIncrease();
m_difficulty->getZipperMaxSpeedIncrease();
duration = m_kart_properties->getZipperTime() *
m_difficulty->getZipperTime();
m_difficulty->getZipperTime();
speed_gain = m_kart_properties->getZipperSpeedGain() *
m_difficulty->getZipperSpeedGain();
m_difficulty->getZipperSpeedGain();
fade_out_time = m_kart_properties->getZipperFadeOutTime() *
m_difficulty->getZipperFadeOutTime();
m_difficulty->getZipperFadeOutTime();
engine_force = m_kart_properties->getZipperForce() *
m_difficulty->getZipperForce();
m_difficulty->getZipperForce();
}
// Ignore a zipper that's activated while braking
if(m_controls.m_brake || m_speed<0) return;
@ -1706,7 +1706,7 @@ void Kart::updateNitro(float dt)
return;
}
m_collected_energy -= dt * m_kart_properties->getNitroConsumption() *
m_difficulty->getNitroConsumption();
m_difficulty->getNitroConsumption();
if (m_collected_energy < 0)
{
m_collected_energy = 0;
@ -2485,7 +2485,7 @@ void Kart::updateGraphics(float dt, const Vec3& offset_xyz,
// fabs(speed) is important, otherwise the negative number will
// become a huge unsigned number in the particle scene node!
float f = fabsf(getSpeed())/m_kart_properties->getMaxSpeed() *
m_difficulty->getMaxSpeed();
m_difficulty->getMaxSpeed();
// The speed of the kart can be higher (due to powerups) than
// the normal maximum speed of the kart.
if(f>1.0f) f = 1.0f;
@ -2517,7 +2517,7 @@ void Kart::updateGraphics(float dt, const Vec3& offset_xyz,
// its maximum speed, but not the current speed (by much). On the
// other hand, that ratio can often be greater than 1.
float speed_frac = m_speed / m_kart_properties->getMaxSpeed() *
m_difficulty->getMaxSpeed();
m_difficulty->getMaxSpeed();
if(speed_frac>1.0f)
speed_frac = 1.0f;
else if (speed_frac < 0.0f) // no leaning when backwards driving

2
src/karts/kart_gfx.cpp
View File

@ -276,7 +276,7 @@ void KartGFX::updateTerrain(const ParticleKind *pk)
rate = fabsf(m_kart->getControls().m_steer) > 0.8 ? skidding - 1 : 0;
else if (speed >= 0.5f && on_ground)
rate = speed/m_kart->getKartProperties()->getMaxSpeed() *
m_kart->getPlayerDifficulty()->getMaxSpeed();
m_kart->getPlayerDifficulty()->getMaxSpeed();
else
{
pe->setCreationRateAbsolute(0);

4
src/karts/max_speed.cpp
View File

@ -61,7 +61,7 @@ MaxSpeed::MaxSpeed(AbstractKart *kart)
void MaxSpeed::reset()
{
m_current_max_speed = m_kart->getKartProperties()->getMaxSpeed() *
m_kart->getPlayerDifficulty()->getMaxSpeed();
m_kart->getPlayerDifficulty()->getMaxSpeed();
m_min_speed = -1.0f;
for(unsigned int i=MS_DECREASE_MIN; i<MS_DECREASE_MAX; i++)
@ -242,7 +242,7 @@ void MaxSpeed::update(float dt)
m_add_engine_force = 0;
m_current_max_speed = m_kart->getKartProperties()->getMaxSpeed() *
m_kart->getPlayerDifficulty()->getMaxSpeed();
m_kart->getPlayerDifficulty()->getMaxSpeed();
// Then add the speed increase from each category
// ----------------------------------------------

2
src/karts/rescue_animation.cpp
View File

@ -40,7 +40,7 @@ RescueAnimation::RescueAnimation(AbstractKart *kart, bool is_auto_rescue)
m_referee = new Referee(*m_kart);
m_kart->getNode()->addChild(m_referee->getSceneNode());
m_timer = m_kart->getKartProperties()->getRescueTime() *
m_kart->getPlayerDifficulty()->getRescueTime();
m_kart->getPlayerDifficulty()->getRescueTime();
m_velocity = m_kart->getKartProperties()->getRescueHeight() / m_timer;
m_xyz = m_kart->getXYZ();

2
src/modes/soccer_world.cpp
View File

@ -478,7 +478,7 @@ AbstractKart *SoccerWorld::createKart(const std::string &kart_ident, int index,
btTransform init_pos = m_track->getStartTransform(posIndex);
AbstractKart *new_kart = new Kart(kart_ident, index, position, init_pos,
difficulty);
difficulty);
new_kart->init(race_manager->getKartType(index));
Controller *controller = NULL;

4
src/modes/world.cpp
View File

@ -179,7 +179,7 @@ void World::init()
int local_player_id = race_manager->getKartLocalPlayerId(i);
int global_player_id = race_manager->getKartGlobalPlayerId(i);
const PlayerDifficulty *player_difficulty =
stk_config->getPlayerDifficulty(race_manager->getPlayerDifficulty(i));
stk_config->getPlayerDifficulty(race_manager->getPlayerDifficulty(i));
AbstractKart* newkart = createKart(kart_ident, i, local_player_id,
global_player_id,
race_manager->getKartType(i),
@ -299,7 +299,7 @@ AbstractKart *World::createKart(const std::string &kart_ident, int index,
int position = index+1;
btTransform init_pos = m_track->getStartTransform(index);
AbstractKart *new_kart = new Kart(kart_ident, index, position, init_pos,
difficulty);
difficulty);
new_kart->init(race_manager->getKartType(index));
Controller *controller = NULL;
switch(kart_type)

4
src/physics/physics.cpp
View File

@ -190,7 +190,7 @@ void Physics::update(float dt)
AbstractKart *kart = p->getUserPointer(1)->getPointerKart();
const KartProperties* kp = kart->getKartProperties();
kart->setSquash(kp->getSquashDuration() * kart->getPlayerDifficulty()->getSquashDuration(),
kp->getSquashSlowdown() * kart->getPlayerDifficulty()->getSquashSlowdown());
kp->getSquashSlowdown() * kart->getPlayerDifficulty()->getSquashSlowdown());
}
else if(obj->isSoccerBall())
{
@ -220,7 +220,7 @@ void Physics::update(float dt)
AbstractKart *kart = p->getUserPointer(1)->getPointerKart();
const KartProperties* kp = kart->getKartProperties();
kart->setSquash(kp->getSquashDuration() * kart->getPlayerDifficulty()->getSquashDuration(),
kp->getSquashSlowdown() * kart->getPlayerDifficulty()->getSquashSlowdown());
kp->getSquashSlowdown() * kart->getPlayerDifficulty()->getSquashSlowdown());
}
continue;

4
src/race/race_manager.hpp
View File

@ -374,8 +374,8 @@ public:
*/
void setLocalKartSoccerTeam(unsigned int player_id, SoccerTeam team);
/** Sets the per-player difficulty for a player.
*/
/** Sets the per-player difficulty for a player.
*/
void setPlayerDifficulty(unsigned int player_id, PerPlayerDifficulty difficulty);
/** Sets the number of local players playing on this computer (including