diff options
| author | smatz <smatz@openttd.org> | 2009-07-01 23:49:13 +0000 |
|---|---|---|
| committer | smatz <smatz@openttd.org> | 2009-07-01 23:49:13 +0000 |
| commit | ecfaa0564d9588b9f6826b1033d93b827751f410 (patch) | |
| tree | f04dff76baabb0dcc7e952f9d81b70828398a740 /src/train_cmd.cpp | |
| parent | adc5363202629aa07c762f459d7e9f5bc78efa34 (diff) | |
| download | openttd-ecfaa0564d9588b9f6826b1033d93b827751f410.tar.xz | |
(svn r16718) -Codechange: make IsFreeWagon() member of Train
Diffstat (limited to 'src/train_cmd.cpp')
| -rw-r--r-- | src/train_cmd.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/train_cmd.cpp b/src/train_cmd.cpp index a3e3179ee..dc7723f88 100644 --- a/src/train_cmd.cpp +++ b/src/train_cmd.cpp @@ -217,7 +217,7 @@ void TrainConsistChanged(Train *v, bool same_length) { uint16 max_speed = UINT16_MAX; - assert(v->IsFrontEngine() || IsFreeWagon(v)); + assert(v->IsFrontEngine() || v->IsFreeWagon()); const RailVehicleInfo *rvi_v = RailVehInfo(v->engine_type); EngineID first_engine = v->IsFrontEngine() ? v->engine_type : INVALID_ENGINE; @@ -752,7 +752,7 @@ static void NormalizeTrainVehInDepot(const Train *u) { const Train *v; FOR_ALL_TRAINS(v) { - if (IsFreeWagon(v) && v->tile == u->tile && + if (v->IsFreeWagon() && v->tile == u->tile && v->track == TRACK_BIT_DEPOT) { if (CmdFailed(DoCommand(0, v->index | (u->index << 16), 1, DC_EXEC, CMD_MOVE_RAIL_VEHICLE))) @@ -1030,7 +1030,7 @@ static void AddWagonToConsist(Train *v, Train *dest) */ static void NormaliseTrainConsist(Train *v) { - if (IsFreeWagon(v)) return; + if (v->IsFreeWagon()) return; assert(v->IsFrontEngine()); @@ -4459,7 +4459,7 @@ bool Train::Tick() if (!TrainLocoHandler(this, false)) return false; return TrainLocoHandler(this, true); - } else if (IsFreeWagon(this) && (this->vehstatus & VS_CRASHED)) { + } else if (this->IsFreeWagon() && (this->vehstatus & VS_CRASHED)) { /* Delete flooded standalone wagon chain */ if (++this->crash_anim_pos >= 4400) { delete this; |