Merge branch 'master' into jgrpp

# Conflicts:
#	src/lang/arabic_egypt.txt
#	src/station_cmd.cpp
#	src/station_cmd.h
#	src/timetable_cmd.cpp
#	src/train_cmd.cpp
This commit is contained in:
Jonathan G Rennison
2022-07-30 20:38:34 +01:00
23 changed files with 247 additions and 114 deletions

View File

@@ -483,7 +483,7 @@ CommandCost CmdSetTimetableStart(TileIndex tile, DoCommandFlag flags, uint32 p1,
std::sort(vehs.begin(), vehs.end(), &VehicleTimetableSorter);
}
int idx = vehs.begin() - std::find(vehs.begin(), vehs.end(), v);
int idx = 0;
for (Vehicle *w : vehs) {
w->lateness_counter = 0;