Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

FIX: Remove various trailing whitespaces for Github Actions #307

Merged
merged 2 commits into from Nov 23, 2020
Merged

FIX: Remove various trailing whitespaces for Github Actions #307

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
253f805
FIX: Remove trailing whitespace
MatthewForrester Nov 23, 2020
a543370
FIX: Remove more trailing whitespaces
MatthewForrester Nov 23, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
6 changes: 3 additions & 3 deletions simworld.cc
View file
Open in desktop
Expand Up @@ -6644,7 +6644,7 @@ sint32 karte_t::generate_passengers_or_mail(const goods_desc_t * wtyp)
car_minutes = UINT32_MAX_VALUE;
bool skip_route_checks = false;

// Make sure that the implicit minimum speed required to complete this journey within the journey time tolerance is possible.
// Make sure that the implicit minimum speed required to complete this journey within the journey time tolerance is possible.

const uint32 distance_to_destination_km = (straight_line_distance * get_settings().get_meters_per_tile()) / 1000u;
const uint32 implicit_minimum_speed_kmh = tolerance > 0 ? (distance_to_destination_km * 600) / tolerance : 0;
Expand Down Expand Up @@ -6796,13 +6796,13 @@ sint32 karte_t::generate_passengers_or_mail(const goods_desc_t * wtyp)
#endif
{
current_halt = nearby_halt.halt;

#ifdef MULTI_THREAD
// Start with the walking time to the start halt.
// Note that the walking time to the destination stop is already added by find_route.
current_journey_time = walking_time_tenths_from_distance(start_halts[passenger_generation_thread_number].get_element(i).distance);
#else
current_journey_time = walking_time_tenths_from_distance(start_halts[i].distance);
current_journey_time = walking_time_tenths_from_distance(start_halts[i].distance);
#endif
if (current_journey_time < best_journey_time && ((current_journey_time < walking_time && walking_time < walking_time_preference_threshold) || current_journey_time < walking_time_preference_threshold) && current_journey_time < tolerance)
{
Expand Down