miguel.horta/openttd-cmclient
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/master'

Browse Source
This commit is contained in:
dP
2025-09-28 02:33:49 +05:00
parent 6a1400b6a6 d785467c28
commit 8404c2a7cc
926 changed files with 37901 additions and 27368 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/depot_gui.cpp
+35 -3
View File
@@ -19,6 +19,7 @@
#include "depot_base.h"
#include "spritecache.h"
#include "strings_func.h"
#include "sound_func.h"
#include "vehicle_func.h"
#include "company_func.h"
#include "tilehighlight_func.h"
@@ -208,7 +209,7 @@ void InitDepotWindowBlockSizes()
if (!e->IsEnabled()) continue;
uint w = TRAININFO_DEFAULT_VEHICLE_WIDTH;
if (e->GetGRF() != nullptr && is_custom_sprite(e->u.rail.image_index)) {
if (e->GetGRF() != nullptr && IsCustomVehicleSpriteNum(e->u.rail.image_index)) {
w = e->GetGRF()->traininfo_vehicle_width;
if (w != VEHICLEINFO_FULL_VEHICLE_WIDTH) {
/* Hopeless.
@@ -282,6 +283,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.
@@ -307,9 +337,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;
}
@@ -363,7 +394,7 @@ struct DepotWindow : Window {
*/
if (this->type == VEH_TRAIN && _consistent_train_width != 0) {
int w = ScaleSpriteTrad(2 * _consistent_train_width);
int col = GetColourGradient(wid->colour, SHADE_NORMAL);
PixelColour col = GetColourGradient(wid->colour, SHADE_NORMAL);
Rect image = ir.Indent(this->header_width, rtl).Indent(this->count_width, !rtl);
int first_line = w + (-this->hscroll->GetPosition()) % w;
if (rtl) {
@@ -765,6 +796,7 @@ struct DepotWindow : Window {
} else {
ResetObjectToPlace();
}
SndClickBeep();
break;
case WID_D_LOCATION: