dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Road vehicles may no longer be stopped on level crossings.

Browse Source
This commit is contained in:
Jonathan G Rennison
2017-05-08 21:54:15 +01:00
parent 0acb4fdd2f
commit 0073c4e71e
4 changed files with 39 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/roadveh.h
View File

@@ -126,6 +126,20 @@ struct RoadVehicle FINAL : public GroundVehicle<RoadVehicle, VEH_ROAD> {
int GetCurrentMaxSpeed() const;
int UpdateSpeed();
inline bool IsRoadVehicleOnLevelCrossing() const
{
for (const RoadVehicle *u = this; u != NULL; u = u->Next()) {
if (IsLevelCrossingTile(u->tile)) return true;
}
return false;
}
inline bool IsRoadVehicleStopped() const
{
if (!(this->vehstatus & VS_STOPPED)) return false;
return !this->IsRoadVehicleOnLevelCrossing();
}
protected: // These functions should not be called outside acceleration code.
/**
@@ -207,7 +221,7 @@ protected: // These functions should not be called outside acceleration code.
*/
inline AccelStatus GetAccelerationStatus() const
{
return (this->vehstatus & VS_STOPPED) ? AS_BRAKE : AS_ACCEL;
return this->IsRoadVehicleStopped() ? AS_BRAKE : AS_ACCEL;
}
/**