mirror
/
OpenTTD
mirror of https://github.com/OpenTTD/OpenTTD
1
0
Fork 0
Code Issues

Change: Include dragged train in depot tile length display. (#14060) 

In the depot, when dragging a train over another train, the tile length displayed now includes the length of the dragged train.

As the parts are not moved yet, length changes due to callbacks are not taken into account.
pull/14004/head
Peter Nelson 2025-04-21 16:37:10 +01:00 committed by GitHub
parent 2a62eea005
commit 7d03cee512
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 31 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
src/depot_gui.cpp
View File

@ -302,6 +302,35 @@ struct DepotWindow : Window {
this->Window::Close();
}
/**
* Count the dragged selection length if appropriate for the provided train.
* @note This ignores potential changes in length due to callback returning different results.
* @param t Train being counted.
* @return Additional length of dragged selection to add.
*/
uint CountDraggedLength(const Train *t) const
{
/* Nothing is selected to add. */
if (this->sel == VehicleID::Invalid()) return 0;
/* Test if the dragged selection applies to this train. */
bool add_dragged = false;
for (const Train *u = t; u != nullptr; u = u->Next()) {
if (u->index == this->sel) return 0; // Selection is part of this train, so doesn't increase its length.
if (u->index == this->vehicle_over) add_dragged = true;
}
if (!add_dragged) return 0;
/* Sum the length of the dragged selection. */
uint length = 0;
for (Train *u = Train::Get(this->sel); u != nullptr; u = _cursor.vehchain ? u->Next() : (u->HasArticulatedPart() ? u->GetNextArticulatedPart() : nullptr)) {
length += u->gcache.cached_veh_length;
}
return length;
}
/**
* Draw a vehicle in the depot window in the box with the top left corner at x,y.
* @param v Vehicle to draw.
@ -327,9 +356,10 @@ struct DepotWindow : Window {
DrawTrainImage(u, image.Indent(x_space, rtl), this->sel, EIT_IN_DEPOT, free_wagon ? 0 : this->hscroll->GetPosition(), this->vehicle_over);
/* Length of consist in tiles with 1 fractional digit (rounded up) */
uint length = u->gcache.cached_total_length + this->CountDraggedLength(u);
Rect count = text.WithWidth(this->count_width - WidgetDimensions::scaled.hsep_normal, !rtl);
DrawString(count.left, count.right, count.bottom - GetCharacterHeight(FS_SMALL) + 1,
GetString(STR_JUST_DECIMAL, CeilDiv(u->gcache.cached_total_length * 10, TILE_SIZE), 1),
GetString(STR_JUST_DECIMAL, CeilDiv(length * 10, TILE_SIZE), 1),
TC_BLACK, SA_RIGHT | SA_FORCE, false, FS_SMALL); // Draw the counter
break;
}