diff options
| -rw-r--r-- | src/aircraft_cmd.cpp | 2 | ||||
| -rw-r--r-- | src/airport.cpp | 2 | ||||
| -rw-r--r-- | src/build_vehicle_gui.cpp | 2 | ||||
| -rw-r--r-- | src/company_cmd.cpp | 2 | ||||
| -rw-r--r-- | src/depot_gui.cpp | 2 | ||||
| -rw-r--r-- | src/genworld_gui.cpp | 4 | ||||
| -rw-r--r-- | src/main_gui.cpp | 2 | ||||
| -rw-r--r-- | src/misc_gui.cpp | 2 | ||||
| -rw-r--r-- | src/pathfinder/yapf/yapf_road.cpp | 2 | ||||
| -rw-r--r-- | src/rail_gui.cpp | 4 | ||||
| -rw-r--r-- | src/saveload/oldloader_sl.cpp | 2 | ||||
| -rw-r--r-- | src/widget_type.h | 2 | ||||
| -rw-r--r-- | src/window_gui.h | 2 |
13 files changed, 15 insertions, 15 deletions
diff --git a/src/aircraft_cmd.cpp b/src/aircraft_cmd.cpp index 9afad2f0b..419d96ff4 100644 --- a/src/aircraft_cmd.cpp +++ b/src/aircraft_cmd.cpp @@ -1664,7 +1664,7 @@ static bool AirportSetBlocks(Aircraft *v, const AirportFTA *current_pos, const A break; } current = current->next; - }; + } /* if the block to be checked is in the next position, then exclude that from * checking, because it has been set by the airplane before */ diff --git a/src/airport.cpp b/src/airport.cpp index 1141d78c1..2173da9ed 100644 --- a/src/airport.cpp +++ b/src/airport.cpp @@ -129,7 +129,7 @@ AirportFTAClass::~AirportFTAClass() AirportFTA *next = current->next; free(current); current = next; - }; + } } free(layout); } diff --git a/src/build_vehicle_gui.cpp b/src/build_vehicle_gui.cpp index 2f45f3787..dd3d8731d 100644 --- a/src/build_vehicle_gui.cpp +++ b/src/build_vehicle_gui.cpp @@ -609,7 +609,7 @@ static int DrawRailEnginePurchaseInfo(int left, int right, int y, EngineID engin SetDParam(1, rvi->pow_wag_weight); DrawString(left, right, y, STR_PURCHASE_INFO_PWAGPOWER_PWAGWEIGHT); y += FONT_HEIGHT_NORMAL; - }; + } return y; } diff --git a/src/company_cmd.cpp b/src/company_cmd.cpp index 4937274ce..7246a0172 100644 --- a/src/company_cmd.cpp +++ b/src/company_cmd.cpp @@ -437,7 +437,7 @@ static Colours GenerateCompanyColour() Swap(colours[j - 1], colours[j]); } } - }; + } /* Move the colours that look similar to each company's colour to the side */ Company *c; diff --git a/src/depot_gui.cpp b/src/depot_gui.cpp index 8b6188efd..77c1d8b85 100644 --- a/src/depot_gui.cpp +++ b/src/depot_gui.cpp @@ -849,7 +849,7 @@ struct DepotWindow : Window { this->sel = INVALID_VEHICLE; this->vehicle_over = INVALID_VEHICLE; this->SetWidgetDirty(DEPOT_WIDGET_MATRIX); - }; + } virtual void OnMouseDrag(Point pt, int widget) { diff --git a/src/genworld_gui.cpp b/src/genworld_gui.cpp index c16742fa3..7c01b1625 100644 --- a/src/genworld_gui.cpp +++ b/src/genworld_gui.cpp @@ -755,7 +755,7 @@ struct GenerateLandscapeWindow : public QueryStringBaseWindow { this->widget_id = widget; SetDParam(0, _settings_newgame.game_creation.custom_town_number); ShowQueryString(STR_JUST_INT, STR_MAPGEN_NUMBER_OF_TOWNS, 5, 50, this, CS_NUMERAL, QSF_NONE); - }; + } IConsoleSetSetting("difficulty.number_towns", index); break; @@ -776,7 +776,7 @@ struct GenerateLandscapeWindow : public QueryStringBaseWindow { this->widget_id = widget; SetDParam(0, _settings_newgame.game_creation.custom_sea_level); ShowQueryString(STR_JUST_INT, STR_MAPGEN_QUANTITY_OF_SEA_LAKES, 3, 50, this, CS_NUMERAL, QSF_NONE); - }; + } GameMode old_gm = _game_mode; _game_mode = GM_MENU; IConsoleSetSetting("difficulty.quantity_sea_lakes", index); diff --git a/src/main_gui.cpp b/src/main_gui.cpp index 37b452033..e572ea301 100644 --- a/src/main_gui.cpp +++ b/src/main_gui.cpp @@ -424,7 +424,7 @@ struct MainWindow : Window this->viewport->scrollpos_y += ScaleByZoom(delta.y, vp->zoom); this->viewport->dest_scrollpos_x = this->viewport->scrollpos_x; this->viewport->dest_scrollpos_y = this->viewport->scrollpos_y; - }; + } virtual void OnMouseWheel(int wheel) { diff --git a/src/misc_gui.cpp b/src/misc_gui.cpp index 9181cd618..31c3edad6 100644 --- a/src/misc_gui.cpp +++ b/src/misc_gui.cpp @@ -721,7 +721,7 @@ void ShowErrorMessage(StringID summary_msg, StringID detailed_msg, WarningLevel switch (wl) { case WL_WARNING: IConsolePrint(CC_WARNING, buf); break; default: IConsoleError(buf); break; - }; + } } bool no_timeout = wl == WL_CRITICAL; diff --git a/src/pathfinder/yapf/yapf_road.cpp b/src/pathfinder/yapf/yapf_road.cpp index 4bfa5b589..9d0b65eec 100644 --- a/src/pathfinder/yapf/yapf_road.cpp +++ b/src/pathfinder/yapf/yapf_road.cpp @@ -151,7 +151,7 @@ public: tile = F.m_new_tile; trackdir = new_td; if (tiles > MAX_MAP_SIZE) break; - }; + } /* save end of segment back to the node */ n.m_segment_last_tile = tile; diff --git a/src/rail_gui.cpp b/src/rail_gui.cpp index 6eab2eb4c..d8e901bba 100644 --- a/src/rail_gui.cpp +++ b/src/rail_gui.cpp @@ -1545,7 +1545,7 @@ public: { this->InitNested(desc, TRANSPORT_RAIL); this->OnInvalidateData(); - }; + } virtual void SetStringParameters(int widget) const { @@ -1782,7 +1782,7 @@ struct BuildRailWaypointWindow : PickerWindowBase { matrix->SetCount(_waypoint_count); matrix->SetClicked(_cur_waypoint_type); - }; + } virtual void UpdateWidgetSize(int widget, Dimension *size, const Dimension &padding, Dimension *fill, Dimension *resize) { diff --git a/src/saveload/oldloader_sl.cpp b/src/saveload/oldloader_sl.cpp index a42e6e14a..f6572cd8f 100644 --- a/src/saveload/oldloader_sl.cpp +++ b/src/saveload/oldloader_sl.cpp @@ -1530,7 +1530,7 @@ static bool LoadTTDPatchExtraChunks(LoadgameState *ls, int num) DEBUG(oldloader, 3, "TTDPatch game using GRF file with GRFID %0X", BSWAP32(c->ident.grfid)); } len -= 5; - }; + } /* Append static NewGRF configuration */ AppendStaticGRFConfigs(&_grfconfig); diff --git a/src/widget_type.h b/src/widget_type.h index 5d135552a..dc6f99363 100644 --- a/src/widget_type.h +++ b/src/widget_type.h @@ -145,7 +145,7 @@ public: this->padding_right = right; this->padding_bottom = bottom; this->padding_left = left; - }; + } FORCEINLINE uint GetHorizontalStepSize(SizingType sizing) const; FORCEINLINE uint GetVerticalStepSize(SizingType sizing) const; diff --git a/src/window_gui.h b/src/window_gui.h index 34347bfe6..724d77880 100644 --- a/src/window_gui.h +++ b/src/window_gui.h @@ -741,7 +741,7 @@ public: PickerWindowBase(Window *parent) : Window() { this->parent = parent; - }; + } virtual ~PickerWindowBase(); }; |