Merge branch 'master' into jgrpp

# Conflicts:
#	src/os/macosx/string_osx.cpp
This commit is contained in:
Jonathan G Rennison
2022-12-20 18:05:43 +00:00
15 changed files with 45 additions and 30 deletions

View File

@@ -3176,10 +3176,10 @@ struct VehicleDetailsWindow : Window {
/* Articulated road vehicles use a complete line. */
if (v->type == VEH_ROAD && v->HasArticulatedPart()) {
DrawVehicleImage(v, tr, INVALID_VEHICLE, EIT_IN_DETAILS, 0);
DrawVehicleImage(v, tr.WithHeight(ScaleGUITrad(GetVehicleHeight(v->type)), false), INVALID_VEHICLE, EIT_IN_DETAILS, 0);
} else {
Rect sr = tr.WithWidth(sprite_width, rtl);
DrawVehicleImage(v, sr, INVALID_VEHICLE, EIT_IN_DETAILS, 0);
DrawVehicleImage(v, sr.WithHeight(ScaleGUITrad(GetVehicleHeight(v->type)), false), INVALID_VEHICLE, EIT_IN_DETAILS, 0);
}
DrawVehicleDetails(v, tr.Indent(sprite_width, rtl), 0, 0, this->tab);