summaryrefslogtreecommitdiff
path: root/src/aircraft_cmd.cpp
diff options
context:
space:
mode:
authorsmatz <smatz@openttd.org>2009-07-13 16:37:27 +0000
committersmatz <smatz@openttd.org>2009-07-13 16:37:27 +0000
commitb6960e4e17c9d9464041d8c04907a5e1caf5c609 (patch)
tree9a5101e644b98bd50bdb6d5f7adc7bbe17aee09a /src/aircraft_cmd.cpp
parent868c21cbcc3b04e4e6649417ff94763a82c7d8b5 (diff)
downloadopenttd-b6960e4e17c9d9464041d8c04907a5e1caf5c609.tar.xz
(svn r16814) -Codechange: make IsNormalAircraft() member of Aircraft
Diffstat (limited to 'src/aircraft_cmd.cpp')
-rw-r--r--src/aircraft_cmd.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/aircraft_cmd.cpp b/src/aircraft_cmd.cpp
index 4c2fd57a1..e3cd7f608 100644
--- a/src/aircraft_cmd.cpp
+++ b/src/aircraft_cmd.cpp
@@ -613,7 +613,7 @@ Money Aircraft::GetRunningCost() const
void Aircraft::OnNewDay()
{
- if (!IsNormalAircraft(this)) return;
+ if (!this->IsNormalAircraft()) return;
if ((++this->day_counter & 7) == 0) DecreaseVehicleValue(this);
@@ -2029,7 +2029,7 @@ static bool AircraftEventHandler(Aircraft *v, int loop)
bool Aircraft::Tick()
{
- if (!IsNormalAircraft(this)) return true;
+ if (!this->IsNormalAircraft()) return true;
if (!(this->vehstatus & VS_STOPPED)) this->running_ticks++;
@@ -2074,7 +2074,7 @@ void UpdateAirplanesOnNewStation(const Station *st)
Aircraft *v;
FOR_ALL_AIRCRAFT(v) {
- if (IsNormalAircraft(v)) {
+ if (v->IsNormalAircraft()) {
if (v->targetairport == st->index) { // if heading to this airport
/* update position of airplane. If plane is not flying, landing, or taking off
* you cannot delete airport, so it doesn't matter */