diff options
author | frosch <frosch@openttd.org> | 2012-07-07 15:39:46 +0000 |
---|---|---|
committer | frosch <frosch@openttd.org> | 2012-07-07 15:39:46 +0000 |
commit | 08a8c3a773e9c730bd92a39e1e07403a172e866a (patch) | |
tree | 5fea4034f5d65bf6be9c28458ce05369d702a78d /src/aircraft.h | |
parent | 8d004f3c63fbff4f3524f770483db90408a98c50 (diff) | |
download | openttd-08a8c3a773e9c730bd92a39e1e07403a172e866a.tar.xz |
(svn r24384) -Fix [FS#5188-ish]: Make IsInDepot() functions behave consistent across vehicle types and add IsChainInDepot instead, if that is what shall be checked.
Diffstat (limited to 'src/aircraft.h')
-rw-r--r-- | src/aircraft.h | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/src/aircraft.h b/src/aircraft.h index b6c847812..dc8387f84 100644 --- a/src/aircraft.h +++ b/src/aircraft.h @@ -78,7 +78,13 @@ struct Aircraft FINAL : public SpecializedVehicle<Aircraft, VEH_AIRCRAFT> { int GetSpeedOldUnits() const { return this->vcache.cached_max_speed * 10 / 128; } int GetCurrentMaxSpeed() const { return this->GetSpeedOldUnits(); } Money GetRunningCost() const; - bool IsInDepot() const { return (this->vehstatus & VS_HIDDEN) != 0 && IsHangarTile(this->tile); } + + bool IsInDepot() const + { + assert(this->IsPrimaryVehicle()); + return (this->vehstatus & VS_HIDDEN) != 0 && IsHangarTile(this->tile); + } + bool Tick(); void OnNewDay(); uint Crash(bool flooded = false); |