diff options
author | erihel <erihel@gmail.com> | 2013-04-27 17:50:30 +0200 |
---|---|---|
committer | erihel <erihel@gmail.com> | 2013-04-27 17:50:30 +0200 |
commit | 5669053de08bac9726902e96f89aa85b99909399 (patch) | |
tree | a72d5cafee0a50e33126f1a17b6581495df0be46 /src/object/auto | |
parent | 0ce02b21f40ed8a0086dffe2c4bb01eeff942e58 (diff) | |
download | colobot-5669053de08bac9726902e96f89aa85b99909399.tar.gz colobot-5669053de08bac9726902e96f89aa85b99909399.tar.bz2 colobot-5669053de08bac9726902e96f89aa85b99909399.zip |
Some code refactoring
Changed vehicule (french) to vehicle (english) in enums and variables
Diffstat (limited to 'src/object/auto')
-rw-r--r-- | src/object/auto/autorepair.cpp | 12 | ||||
-rw-r--r-- | src/object/auto/autostation.cpp | 10 |
2 files changed, 11 insertions, 11 deletions
diff --git a/src/object/auto/autorepair.cpp b/src/object/auto/autorepair.cpp index 95b6cc8..67aa9af 100644 --- a/src/object/auto/autorepair.cpp +++ b/src/object/auto/autorepair.cpp @@ -74,7 +74,7 @@ void CAutoRepair::Init() bool CAutoRepair::EventProcess(const Event &event) { - CObject* vehicule; + CObject* vehicle; Math::Vector pos, speed; Math::Point dim; float angle, shield; @@ -137,16 +137,16 @@ bool CAutoRepair::EventProcess(const Event &event) if ( m_phase == ARP_REPAIR ) { - vehicule = SearchVehicle(); + vehicle = SearchVehicle(); if ( m_progress < 1.0f || - (vehicule != 0 && vehicule->GetShield() < 1.0f) ) + (vehicle != 0 && vehicle->GetShield() < 1.0f) ) { - if ( vehicule != 0 ) + if ( vehicle != 0 ) { - shield = vehicule->GetShield(); + shield = vehicle->GetShield(); shield += event.rTime*0.2f; if ( shield > 1.0f ) shield = 1.0f; - vehicule->SetShield(shield); + vehicle->SetShield(shield); } if ( m_lastParticle+m_engine->ParticleAdapt(0.05f) <= m_time ) diff --git a/src/object/auto/autostation.cpp b/src/object/auto/autostation.cpp index a2f5b6b..4ace2ac 100644 --- a/src/object/auto/autostation.cpp +++ b/src/object/auto/autostation.cpp @@ -82,7 +82,7 @@ bool CAutoStation::EventProcess(const Event &event) Math::Matrix* mat; Math::Vector pos, ppos, speed; Math::Point dim; - CObject* vehicule; + CObject* vehicle; CObject* power; Gfx::TerrainRes res; float big, energy, used, add, freq; @@ -133,10 +133,10 @@ bool CAutoStation::EventProcess(const Event &event) freq = 1.0f; if ( big > 0.0f ) { - vehicule = SearchVehicle(); - if ( vehicule != 0 ) + vehicle = SearchVehicle(); + if ( vehicle != 0 ) { - power = vehicule->GetPower(); + power = vehicle->GetPower(); if ( power != 0 && power->GetCapacity() == 1.0f ) { energy = power->GetEnergy(); @@ -149,7 +149,7 @@ bool CAutoStation::EventProcess(const Event &event) big -= add/4.0f; // discharge the large battery } - power = vehicule->GetFret(); + power = vehicle->GetFret(); if ( power != 0 && power->GetType() == OBJECT_POWER ) { energy = power->GetEnergy(); |