cpp/openttd-patchpack/source Changeset - r22850:1d6a79ca3a7c

Changeset - r22850:1d6a79ca3a7c

Parent rev.

Child rev.

[Not reviewed]

master

0 10 0

J0an Josep - 7 years ago 2017-08-15 15:56:34
juanjo.ng.83@gmail.com

Fix b4b98e5165: Use FALLTHROUGH attribute with correct indentation.

10 files changed with 15 insertions and 15 deletions:

src/network/core/udp.cpp

src/newgrf_gui.cpp

src/newgrf_object.h

src/newgrf_station.h

src/rail_cmd.cpp

src/saveload/vehicle_sl.cpp

src/script/api/script_stationlist.cpp

src/town_gui.cpp

src/vehicle_gui.cpp

src/viewport.cpp

0 comments (0 inline, 0 general)

src/network/core/udp.cpp

➞

Show inline comments

@@ @@ -252,8 +252,8 @@ void NetworkUDPSocketHandler::ReceiveNet @@
 				*dst = c;
 				dst = &c->next;
+			}
 			FALLTHROUGH;
+		}
 		FALLTHROUGH;
 		case 3:
 			info->game_date      = Clamp(p->Recv_uint32(), 0, MAX_DATE);

src/newgrf_gui.cpp

➞

Show inline comments

@@ @@ -1033,8 +1033,8 @@ struct NewGRFWindow : public Window, New @@
 					break;
+				}
 				/* With double click, continue */
 				FALLTHROUGH;
+			}
 			FALLTHROUGH;
 			case WID_NS_REMOVE: { // Remove GRF
 				if (this->active_sel == NULL || !this->editable) break;
@@ @@ -1089,8 +1089,8 @@ struct NewGRFWindow : public Window, New @@
 					break;
+				}
 				/* With double click, continue */
 				FALLTHROUGH;
+			}
 			FALLTHROUGH;
 			case WID_NS_ADD:
 				if (this->avail_sel == NULL || !this->editable || HasBit(this->avail_sel->flags, GCF_INVALID)) break;

src/newgrf_object.h

➞

Show inline comments

@@ @@ -138,8 +138,8 @@ struct ObjectResolverObject : public Res @@
 			case VSG_SCOPE_PARENT: {
 				TownScopeResolver *tsr = this->GetTown();
 				if (tsr != NULL) return tsr;
 				FALLTHROUGH;
+			}
 			FALLTHROUGH;
 			default:
 				return ResolverObject::GetScope(scope, relative);

src/newgrf_station.h

➞

Show inline comments

@@ @@ -68,8 +68,8 @@ struct StationResolverObject : public Re @@
 			case VSG_SCOPE_PARENT: {
 				TownScopeResolver *tsr = this->GetTown();
 				if (tsr != NULL) return tsr;
 				FALLTHROUGH;
+			}
 			FALLTHROUGH;
 			default:
 				return ResolverObject::GetScope(scope, relative);

src/rail_cmd.cpp

➞

Show inline comments

@@ @@ -554,8 +554,8 @@ CommandCost CmdBuildSingleRail(TileIndex @@
 			if (IsLevelCrossing(tile) && GetCrossingRailBits(tile) == trackbit) {
 				return_cmd_error(STR_ERROR_ALREADY_BUILT);
+			}
 			FALLTHROUGH;
+		}
 		FALLTHROUGH;
 		default: {
 			/* Will there be flat water on the lower halftile? */

src/saveload/vehicle_sl.cpp

➞

Show inline comments

@@ @@ -433,8 +433,8 @@ void AfterLoadVehicles(bool part_of_load @@
 				RoadVehicle *rv = RoadVehicle::From(v);
 				rv->roadtype = HasBit(EngInfo(v->First()->engine_type)->misc_flags, EF_ROAD_TRAM) ? ROADTYPE_TRAM : ROADTYPE_ROAD;
 				rv->compatible_roadtypes = RoadTypeToRoadTypes(rv->roadtype);
 				FALLTHROUGH;
+			}
 			FALLTHROUGH;
 			case VEH_TRAIN:
 			case VEH_SHIP:

src/script/api/script_stationlist.cpp

➞

Show inline comments

@@ @@ -151,13 +151,13 @@ void CargoCollector::Update(StationID fr @@
 	switch (Tselector) {
 		case ScriptStationList_Cargo::CS_VIA_BY_FROM:
 			if (via != this->other_station) return;
-			/* fall through */
+			FALLTHROUGH;
 		case ScriptStationList_Cargo::CS_BY_FROM:
 			key = from;
 			break;
 		case ScriptStationList_Cargo::CS_FROM_BY_VIA:
 			if (from != this->other_station) return;
-			/* fall through */
+			FALLTHROUGH;
 		case ScriptStationList_Cargo::CS_BY_VIA:
 			key = via;
 			break;

src/town_gui.cpp

➞

Show inline comments

@@ @@ -269,8 +269,8 @@ public: @@
+				}
 				/* When double-clicking, continue */
 				if (click_count == 1 || y < 0) break;
 				FALLTHROUGH;
+			}
 			FALLTHROUGH;
 			case WID_TA_EXECUTE:
 				DoCommandP(this->town->xy, this->window_number, this->sel_index, CMD_DO_TOWN_ACTION | CMD_MSG(STR_ERROR_CAN_T_DO_THIS));

src/vehicle_gui.cpp

➞

Show inline comments

@@ @@ -817,8 +817,8 @@ struct RefitWindow : public Window { @@
 				Vehicle *v = Vehicle::Get(this->window_number);
 				this->selected_vehicle = v->index;
 				this->num_vehicles = UINT8_MAX;
 				FALLTHROUGH;
+			}
 			FALLTHROUGH;
 			case 2: { // The vehicle selection has changed; rebuild the entire list.
 				if (!gui_scope) break;
@@ @@ -843,8 +843,8 @@ struct RefitWindow : public Window { @@
 					this->information_width = max_width;
 					this->ReInit();
+				}
 				FALLTHROUGH;
+			}
 			FALLTHROUGH;
 			case 1: // A new cargo has been selected.
 				if (!gui_scope) break;
@@ @@ -905,8 +905,8 @@ struct RefitWindow : public Window { @@
 					if (_ctrl_pressed) this->num_vehicles = UINT8_MAX;
 					break;
+				}
 				FALLTHROUGH;
+			}
 			FALLTHROUGH;
 			default:
 				/* Clear the selection. */
@@ @@ -940,8 +940,8 @@ struct RefitWindow : public Window { @@
 				this->InvalidateData(1);
 				if (click_count == 1) break;
 				FALLTHROUGH;
+			}
 			FALLTHROUGH;
 			case WID_VR_REFIT: // refit button
 				if (this->cargo != NULL) {

src/viewport.cpp

➞

Show inline comments

@@ @@ -2636,8 +2636,8 @@ static int CalcHeightdiff(HighLightStyle @@
 			byte style_t = (byte)(TileX(end_tile) > TileX(start_tile));
 			start_tile = TILE_ADD(start_tile, ToTileIndexDiff(heightdiff_area_by_dir[style_t]));
 			end_tile   = TILE_ADD(end_tile, ToTileIndexDiff(heightdiff_area_by_dir[2 + style_t]));
 			FALLTHROUGH;
+		}
 		FALLTHROUGH;
 		case HT_POINT:
 			h0 = TileHeight(start_tile);

0 comments (0 inline, 0 general)