summaryrefslogtreecommitdiffstats
path: root/src/object/auto/autostation.cpp
diff options
context:
space:
mode:
authorerihel <erihel@gmail.com>2013-04-27 17:50:30 +0200
committererihel <erihel@gmail.com>2013-04-27 17:50:30 +0200
commit5669053de08bac9726902e96f89aa85b99909399 (patch)
treea72d5cafee0a50e33126f1a17b6581495df0be46 /src/object/auto/autostation.cpp
parent0ce02b21f40ed8a0086dffe2c4bb01eeff942e58 (diff)
downloadcolobot-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/autostation.cpp')
-rw-r--r--src/object/auto/autostation.cpp10
1 files changed, 5 insertions, 5 deletions
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();