From ec647975adfe1edeb5aad8702d8fbb92ab26b029 Mon Sep 17 00:00:00 2001 From: Rubidium Date: Sat, 15 Mar 2025 09:21:05 +0100 Subject: [PATCH] Cleanup: remove ancient FIXME comments --- src/aircraft_cmd.cpp | 3 --- src/network/network_gui.cpp | 2 -- src/saveload/afterload.cpp | 9 --------- src/station_cmd.cpp | 2 -- src/viewport.cpp | 2 -- 5 files changed, 18 deletions(-) diff --git a/src/aircraft_cmd.cpp b/src/aircraft_cmd.cpp index 7afaa8863c..bbde5c95c6 100644 --- a/src/aircraft_cmd.cpp +++ b/src/aircraft_cmd.cpp @@ -948,9 +948,6 @@ static bool AircraftController(Aircraft *v) SetBit(v->flags, VAF_HELI_DIRECT_DESCENT); if (st == nullptr) { - /* FIXME - AircraftController -> if station no longer exists, do not land - * helicopter will circle until sign disappears, then go to next order - * what to do when it is the only order left, right now it just stays in 1 place */ v->state = FLYING; UpdateAircraftCache(v); AircraftNextAirportPos_and_Order(v); diff --git a/src/network/network_gui.cpp b/src/network/network_gui.cpp index 229cd5547c..82e511613e 100644 --- a/src/network/network_gui.cpp +++ b/src/network/network_gui.cpp @@ -699,7 +699,6 @@ public: this->list_pos = (server == nullptr) ? SLP_INVALID : it - this->servers.begin(); this->SetDirty(); - /* FIXME the disabling should go into some InvalidateData, which is called instead of the SetDirty */ if (click_count > 1 && !this->IsWidgetDisabled(WID_NG_JOIN)) this->OnClick(pt, WID_NG_JOIN, 1); break; } @@ -713,7 +712,6 @@ public: this->ScrollToSelectedServer(); this->SetDirty(); - /* FIXME the disabling should go into some InvalidateData, which is called instead of the SetDirty */ if (click_count > 1 && !this->IsWidgetDisabled(WID_NG_JOIN)) this->OnClick(pt, WID_NG_JOIN, 1); } break; diff --git a/src/saveload/afterload.cpp b/src/saveload/afterload.cpp index 99086f6a59..1d5b970be7 100644 --- a/src/saveload/afterload.cpp +++ b/src/saveload/afterload.cpp @@ -181,15 +181,6 @@ static void UpdateExclusiveRights() for (Town *t : Town::Iterate()) { t->exclusivity = CompanyID::Invalid(); } - - /* FIXME old exclusive rights status is not being imported (stored in s->blocked_months_obsolete) - * could be implemented this way: - * 1.) Go through all stations - * Build an array town_blocked[ town_id ][ company_id ] - * that stores if at least one station in that town is blocked for a company - * 2.) Go through that array, if you find a town that is not blocked for - * one company, but for all others, then give it exclusivity. - */ } static const uint8_t convert_currency[] = { diff --git a/src/station_cmd.cpp b/src/station_cmd.cpp index 25b006e558..b9f908a934 100644 --- a/src/station_cmd.cpp +++ b/src/station_cmd.cpp @@ -3607,8 +3607,6 @@ static TrackStatus GetTileTrackStatus_Station(TileIndex tile, TransportType mode static void TileLoop_Station(TileIndex tile) { - /* FIXME -- GetTileTrackStatus_Station -> animated stationtiles - * hardcoded.....not good */ switch (GetStationType(tile)) { case StationType::Airport: AirportTileAnimationTrigger(Station::GetByTile(tile), tile, AAT_TILELOOP); diff --git a/src/viewport.cpp b/src/viewport.cpp index 78b487a8ef..c0f74f4c95 100644 --- a/src/viewport.cpp +++ b/src/viewport.cpp @@ -901,7 +901,6 @@ static std::string &AddStringToDraw(int x, int y, Colours colour, ViewportString */ static void DrawSelectionSprite(SpriteID image, PaletteID pal, const TileInfo *ti, int z_offset, FoundationPart foundation_part, int extra_offs_x = 0, int extra_offs_y = 0) { - /* FIXME: This is not totally valid for some autorail highlights that extend over the edges of the tile. */ if (_vd.foundation[foundation_part] == -1) { /* draw on real ground */ AddTileSpriteToDraw(image, pal, ti->x, ti->y, ti->z + z_offset, nullptr, extra_offs_x, extra_offs_y); @@ -1543,7 +1542,6 @@ void ViewportSign::MarkDirty(ZoomLevel maxzoom) const const uint height = WidgetDimensions::scaled.fullbevel.top + std::max(GetCharacterHeight(FS_NORMAL), GetCharacterHeight(FS_SMALL)) + WidgetDimensions::scaled.fullbevel.bottom + 1; for (ZoomLevel zoom = ZOOM_LVL_BEGIN; zoom != ZOOM_LVL_END; zoom++) { - /* FIXME: This doesn't switch to width_small when appropriate. */ zoomlevels[zoom].left = this->center - ScaleByZoom(half_width, zoom); zoomlevels[zoom].top = this->top - ScaleByZoom(1, zoom); zoomlevels[zoom].right = this->center + ScaleByZoom(half_width, zoom);