Update to 1.7.2

--HG--
branch : openttd
This commit is contained in:
Pavel Stupnikov
2018-01-15 12:54:57 +03:00
parent d7954d350f
commit c13f57641c
48 changed files with 815 additions and 765 deletions

View File

@@ -1,4 +1,4 @@
/* $Id: train_gui.cpp 27689 2016-12-10 14:33:58Z frosch $ */
/* $Id: train_gui.cpp 27940 2017-12-11 19:24:46Z frosch $ */
/*
* This file is part of OpenTTD.
@@ -64,14 +64,14 @@ static int HighlightDragPosition(int px, int max_width, VehicleID selection, boo
bool rtl = _current_text_dir == TD_RTL;
assert(selection != INVALID_VEHICLE);
int dragged_width = WD_FRAMERECT_LEFT + WD_FRAMERECT_RIGHT;
int dragged_width = 0;
for (Train *t = Train::Get(selection); t != NULL; t = chain ? t->Next() : (t->HasArticulatedPart() ? t->GetNextArticulatedPart() : NULL)) {
dragged_width += t->GetDisplayImageWidth(NULL);
}
int drag_hlight_left = rtl ? max(px -dragged_width, 0) : px;
int drag_hlight_right = rtl ? px : min(px + dragged_width, max_width);
int drag_hlight_width = max(drag_hlight_right - drag_hlight_left, 0);
int drag_hlight_left = rtl ? max(px - dragged_width + 1, 0) : px;
int drag_hlight_right = rtl ? px : min(px + dragged_width, max_width) - 1;
int drag_hlight_width = max(drag_hlight_right - drag_hlight_left + 1, 0);
if (drag_hlight_width > 0) {
GfxFillRect(drag_hlight_left + WD_FRAMERECT_LEFT, WD_FRAMERECT_TOP + 1,