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

Fix const issues around GetTrainStopLocation/GetCurrentMaxSpeed

Browse Source
This commit is contained in:
Jonathan G Rennison
2021-01-29 02:13:08 +00:00
parent b711f94d1c
commit 4e0804b791
3 changed files with 24 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/train.h
View File

@@ -169,7 +169,20 @@ struct Train FINAL : public GroundVehicle<Train, VEH_TRAIN> {
int strict_max_speed;
int advisory_max_speed;
};
MaxSpeedInfo GetCurrentMaxSpeedInfo() const;
private:
MaxSpeedInfo GetCurrentMaxSpeedInfoInternal(bool update_state) const;
public:
MaxSpeedInfo GetCurrentMaxSpeedInfo() const
{
return this->GetCurrentMaxSpeedInfoInternal(false);
}
MaxSpeedInfo GetCurrentMaxSpeedInfoAndUpdate()
{
return this->GetCurrentMaxSpeedInfoInternal(true);
}
int GetCurrentMaxSpeed() const;
@@ -438,11 +451,11 @@ inline int GetTileMarginInFrontOfTrain(const Train *v)
return GetTileMarginInFrontOfTrain(v, v->x_pos, v->y_pos);
}
int GetTrainStopLocation(StationID station_id, TileIndex tile, Train *v, int *station_ahead, int *station_length, int x_pos, int y_pos);
int GetTrainStopLocation(StationID station_id, TileIndex tile, Train *v, bool update_train_state, int *station_ahead, int *station_length, int x_pos, int y_pos);
inline int GetTrainStopLocation(StationID station_id, TileIndex tile, Train *v, int *station_ahead, int *station_length)
inline int GetTrainStopLocation(StationID station_id, TileIndex tile, Train *v, bool update_train_state, int *station_ahead, int *station_length)
{
return GetTrainStopLocation(station_id, tile, v, station_ahead, station_length, v->x_pos, v->y_pos);
return GetTrainStopLocation(station_id, tile, v, update_train_state, station_ahead, station_length, v->x_pos, v->y_pos);
}
#endif /* TRAIN_H */