diff --git a/src/aircraft_gui.cpp b/src/aircraft_gui.cpp index f19ba61ae5..51463522b1 100644 --- a/src/aircraft_gui.cpp +++ b/src/aircraft_gui.cpp @@ -35,7 +35,7 @@ void DrawAircraftDetails(const Aircraft *v, int left, int right, int y) int y_offset = (v->Next()->cargo_cap != 0) ? -(FONT_HEIGHT_NORMAL + 1): 0; Money feeder_share = 0; - for (const Aircraft *u = v ; u != NULL ; u = u->Next()) { + for (const Aircraft *u = v; u != NULL; u = u->Next()) { if (u->IsNormalAircraft()) { SetDParam(0, u->engine_type); SetDParam(1, u->build_year); diff --git a/src/base_station_base.h b/src/base_station_base.h index 24317c5ab3..f4c26fa7ea 100644 --- a/src/base_station_base.h +++ b/src/base_station_base.h @@ -217,7 +217,7 @@ struct SpecializedStation : public BaseStation { */ static FORCEINLINE T *GetIfValid(size_t index) { - return IsValidID(index) ? Get(index) : NULL ; + return IsValidID(index) ? Get(index) : NULL; } /** diff --git a/src/company_base.h b/src/company_base.h index 919ad772a5..a88ca5800c 100644 --- a/src/company_base.h +++ b/src/company_base.h @@ -62,7 +62,7 @@ struct Company : CompanyPool::PoolItem<&_company_pool> { uint32 cargo_types; ///< which cargo types were transported the last year - TileIndex location_of_HQ; ///< northern tile of HQ ; INVALID_TILE when there is none + TileIndex location_of_HQ; ///< northern tile of HQ; INVALID_TILE when there is none TileIndex last_build_coordinate; OwnerByte share_owners[4]; diff --git a/src/group_gui.cpp b/src/group_gui.cpp index 7d5cd0d837..1c321c4b31 100644 --- a/src/group_gui.cpp +++ b/src/group_gui.cpp @@ -392,7 +392,7 @@ public: case GRP_WIDGET_LIST_GROUP: { int y1 = r.top + WD_FRAMERECT_TOP + 1; int max = min(this->vscroll2.GetPosition() + this->vscroll2.GetCapacity(), this->groups.Length()); - for (int i = this->vscroll2.GetPosition() ; i < max ; ++i) { + for (int i = this->vscroll2.GetPosition(); i < max; ++i) { const Group *g = this->groups[i]; assert(g->owner == this->owner); diff --git a/src/industry_gui.cpp b/src/industry_gui.cpp index f775679062..1a07bb2f27 100644 --- a/src/industry_gui.cpp +++ b/src/industry_gui.cpp @@ -399,7 +399,7 @@ public: switch (widget) { case DPIW_MATRIX_WIDGET: { const IndustrySpec *indsp; - int y = (pt.y - this->GetWidget(DPIW_MATRIX_WIDGET)->pos_y) / this->resize.step_height + this->vscroll.GetPosition() ; + int y = (pt.y - this->GetWidget(DPIW_MATRIX_WIDGET)->pos_y) / this->resize.step_height + this->vscroll.GetPosition(); if (y >= 0 && y < count) { // Is it within the boundaries of available data? this->selected_index = y; diff --git a/src/station_cmd.cpp b/src/station_cmd.cpp index 1d22af0067..76ebf346c9 100644 --- a/src/station_cmd.cpp +++ b/src/station_cmd.cpp @@ -1108,7 +1108,7 @@ CommandCost CmdBuildRailStation(TileIndex tile_org, DoCommandFlag flags, uint32 FreeTrainTrackReservation(v); *affected_vehicles.Append() = v; if (IsRailStationTile(v->tile)) SetRailStationPlatformReservation(v->tile, TrackdirToExitdir(v->GetVehicleTrackdir()), false); - for (; v->Next() != NULL; v = v->Next()) ; + for (; v->Next() != NULL; v = v->Next()) { } if (IsRailStationTile(v->tile)) SetRailStationPlatformReservation(v->tile, TrackdirToExitdir(ReverseTrackdir(v->GetVehicleTrackdir())), false); } } @@ -1148,7 +1148,7 @@ CommandCost CmdBuildRailStation(TileIndex tile_org, DoCommandFlag flags, uint32 Train *v = affected_vehicles[i]; if (IsRailStationTile(v->tile)) SetRailStationPlatformReservation(v->tile, TrackdirToExitdir(v->GetVehicleTrackdir()), true); TryPathReserve(v, true, true); - for (; v->Next() != NULL; v = v->Next()) ; + for (; v->Next() != NULL; v = v->Next()) { } if (IsRailStationTile(v->tile)) SetRailStationPlatformReservation(v->tile, TrackdirToExitdir(ReverseTrackdir(v->GetVehicleTrackdir())), true); } @@ -1269,7 +1269,7 @@ CommandCost RemoveFromRailBaseStation(TileArea ta, SmallVector &affected FreeTrainTrackReservation(v); if (IsRailStationTile(v->tile)) SetRailStationPlatformReservation(v->tile, TrackdirToExitdir(v->GetVehicleTrackdir()), false); Vehicle *temp = v; - for (; temp->Next() != NULL; temp = temp->Next()) ; + for (; temp->Next() != NULL; temp = temp->Next()) { } if (IsRailStationTile(temp->tile)) SetRailStationPlatformReservation(temp->tile, TrackdirToExitdir(ReverseTrackdir(temp->GetVehicleTrackdir())), false); } } @@ -1289,7 +1289,7 @@ CommandCost RemoveFromRailBaseStation(TileArea ta, SmallVector &affected /* Restore station reservation. */ if (IsRailStationTile(v->tile)) SetRailStationPlatformReservation(v->tile, TrackdirToExitdir(v->GetVehicleTrackdir()), true); TryPathReserve(v, true, true); - for (; v->Next() != NULL; v = v->Next()) ; + for (; v->Next() != NULL; v = v->Next()) { } if (IsRailStationTile(v->tile)) SetRailStationPlatformReservation(v->tile, TrackdirToExitdir(ReverseTrackdir(v->GetVehicleTrackdir())), true); } } diff --git a/src/train_gui.cpp b/src/train_gui.cpp index 38a5d9b0fc..f1c5d93d2c 100644 --- a/src/train_gui.cpp +++ b/src/train_gui.cpp @@ -200,7 +200,7 @@ int GetTrainDetailsWndVScroll(VehicleID veh_id, TrainDetailsWindowTabs det_tab) if (det_tab == TDW_TAB_TOTALS) { // Total cargo tab CargoArray act_cargo; CargoArray max_cargo; - for (const Vehicle *v = Vehicle::Get(veh_id) ; v != NULL ; v = v->Next()) { + for (const Vehicle *v = Vehicle::Get(veh_id); v != NULL; v = v->Next()) { act_cargo[v->cargo_type] += v->cargo.Count(); max_cargo[v->cargo_type] += v->cargo_cap; } @@ -213,7 +213,7 @@ int GetTrainDetailsWndVScroll(VehicleID veh_id, TrainDetailsWindowTabs det_tab) } num++; // needs one more because first line is description string } else { - for (const Train *v = Train::Get(veh_id) ; v != NULL ; v = v->Next()) { + for (const Train *v = Train::Get(veh_id); v != NULL; v = v->Next()) { if (!v->IsArticulatedPart() || v->cargo_cap != 0) num++; } } @@ -291,7 +291,7 @@ void DrawTrainDetails(const Train *v, int left, int right, int y, int vscroll_po CargoArray max_cargo; Money feeder_share = 0; - for (const Vehicle *u = v; u != NULL ; u = u->Next()) { + for (const Vehicle *u = v; u != NULL; u = u->Next()) { act_cargo[u->cargo_type] += u->cargo.Count(); max_cargo[u->cargo_type] += u->cargo_cap; feeder_share += u->cargo.FeederShare(); diff --git a/src/vehicle_base.h b/src/vehicle_base.h index b167ebc127..1e94d9e755 100644 --- a/src/vehicle_base.h +++ b/src/vehicle_base.h @@ -639,7 +639,7 @@ struct SpecializedVehicle : public Vehicle { */ static FORCEINLINE T *GetIfValid(size_t index) { - return IsValidID(index) ? Get(index) : NULL ; + return IsValidID(index) ? Get(index) : NULL; } /** @@ -690,7 +690,7 @@ struct DisasterVehicle : public SpecializedVehicleNextID() the returned value