mirror
/
OpenTTD
mirror of https://github.com/OpenTTD/OpenTTD
1
0
Fork 0
Code Issues

(svn r24381) -Revert (r24380): RoadVehicle::IsInDepot was supposed to behave different to Train::IsInDepot.

release/1.3
frosch 2012-07-07 15:22:21 +00:00
parent c1dd0107c7
commit e0cf1e3e94
2 changed files with 3 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/roadveh.h
View File

@ -112,7 +112,7 @@ struct RoadVehicle FINAL : public GroundVehicle<RoadVehicle, VEH_ROAD> {
int GetDisplayMaxSpeed() const { return this->vcache.cached_max_speed / 2; } int GetDisplayMaxSpeed() const { return this->vcache.cached_max_speed / 2; }
Money GetRunningCost() const; Money GetRunningCost() const;
int GetDisplayImageWidth(Point *offset = NULL) const; int GetDisplayImageWidth(Point *offset = NULL) const;
bool IsInDepot() const; bool IsInDepot() const { return this->state == RVSB_IN_DEPOT; }
bool IsStoppedInDepot() const; bool IsStoppedInDepot() const;
bool Tick(); bool Tick();
void OnNewDay(); void OnNewDay();

9
src/roadveh_cmd.cpp
View File

@ -307,16 +307,11 @@ CommandCost CmdBuildRoadVehicle(TileIndex tile, DoCommandFlag flags, const Engin
} }
bool RoadVehicle::IsStoppedInDepot() const bool RoadVehicle::IsStoppedInDepot() const
{
if (this->IsFrontEngine() && !(this->vehstatus & VS_STOPPED)) return false;
return this->IsInDepot();
}
bool RoadVehicle::IsInDepot() const
{ {
TileIndex tile = this->tile; TileIndex tile = this->tile;
if (!IsRoadDepotTile(tile)) return false; if (!IsRoadDepotTile(tile)) return false;
if (this->IsFrontEngine() && !(this->vehstatus & VS_STOPPED)) return false;
for (const RoadVehicle *v = this; v != NULL; v = v->Next()) { for (const RoadVehicle *v = this; v != NULL; v = v->Next()) {
if (v->state != RVSB_IN_DEPOT || v->tile != tile) return false; if (v->state != RVSB_IN_DEPOT || v->tile != tile) return false;