dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'template_train_replacement-sx' into jgrpp

Browse Source 
# Conflicts:
#	src/window.cpp
This commit is contained in:
Jonathan G Rennison
2016-08-26 00:19:11 +01:00
parent 1d66e66c91 1af23b7caa
commit 761463d134
16 changed files with 232 additions and 130 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/train_gui.cpp
View File

@@ -58,15 +58,16 @@ void CcBuildWagon(const CommandCost &result, TileIndex tile, uint32 p1, uint32 p
* @param px The current x position to draw from.
* @param max_width The maximum space available to draw.
* @param selection Selected vehicle that is dragged.
* @param chain Whether a whole chain is dragged.
* @return The width of the highlight mark.
*/
static int HighlightDragPosition(int px, int max_width, VehicleID selection)
static int HighlightDragPosition(int px, int max_width, VehicleID selection, bool chain)
{
bool rtl = _current_text_dir == TD_RTL;
assert(selection != INVALID_VEHICLE);
int dragged_width = WD_FRAMERECT_LEFT + WD_FRAMERECT_RIGHT;
for (Train *t = Train::Get(selection); t != NULL; t = t->HasArticulatedPart() ? t->GetNextArticulatedPart() : NULL) {
for (Train *t = Train::Get(selection); t != NULL; t = chain ? t->Next() : (t->HasArticulatedPart() ? t->GetNextArticulatedPart() : NULL)) {
dragged_width += t->GetDisplayImageWidth(NULL);
}
@@ -116,7 +117,7 @@ void DrawTrainImage(const Train *v, int left, int right, int y, VehicleID select
for (; v != NULL && (rtl ? px > 0 : px < max_width); v = v->Next()) {
if (dragging && !drag_at_end_of_train && drag_dest == v->index) {
/* Highlight the drag-and-drop destination inside the train. */
int drag_hlight_width = HighlightDragPosition(px, max_width, selection);
int drag_hlight_width = HighlightDragPosition(px, max_width, selection, _cursor.vehchain);
px += rtl ? -drag_hlight_width : drag_hlight_width;
}
@@ -148,7 +149,7 @@ void DrawTrainImage(const Train *v, int left, int right, int y, VehicleID select
if (dragging && drag_at_end_of_train) {
/* Highlight the drag-and-drop destination at the end of the train. */
HighlightDragPosition(px, max_width, selection);
HighlightDragPosition(px, max_width, selection, _cursor.vehchain);
}
if (highlight_l != highlight_r) {