summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authoralberth <alberth@openttd.org>2009-09-16 19:00:53 +0000
committeralberth <alberth@openttd.org>2009-09-16 19:00:53 +0000
commit24e9ee8ab4244b5562d3a780b153b33d1a5b64df (patch)
treeb393d386de7c7af4e76727b9b33d531b4feacfd1
parent893f1282cb308fdf38160b68c5b30d3a6180bbda (diff)
downloadopenttd-24e9ee8ab4244b5562d3a780b153b33d1a5b64df.tar.xz
(svn r17557) -Codechange: Pass left and right edge to DrawOrderString().
-rw-r--r--src/order_func.h2
-rw-r--r--src/order_gui.cpp6
-rw-r--r--src/timetable_gui.cpp2
3 files changed, 5 insertions, 5 deletions
diff --git a/src/order_func.h b/src/order_func.h
index fd4034d34..0ba62fab6 100644
--- a/src/order_func.h
+++ b/src/order_func.h
@@ -47,7 +47,7 @@ bool ProcessOrders(Vehicle *v);
bool UpdateOrderDest(Vehicle *v, const Order *order, int conditional_depth = 0);
VehicleOrderID ProcessConditionalOrder(const Order *order, const Vehicle *v);
-void DrawOrderString(const Vehicle *v, const Order *order, int order_index, int y, bool selected, bool timetable, int width);
+void DrawOrderString(const Vehicle *v, const Order *order, int order_index, int y, bool selected, bool timetable, int left, int right);
#define MIN_SERVINT_PERCENT 5
#define MAX_SERVINT_PERCENT 90
diff --git a/src/order_gui.cpp b/src/order_gui.cpp
index 00b5843dd..70c18c173 100644
--- a/src/order_gui.cpp
+++ b/src/order_gui.cpp
@@ -183,7 +183,7 @@ static int DepotActionStringIndex(const Order *order)
}
}
-void DrawOrderString(const Vehicle *v, const Order *order, int order_index, int y, bool selected, bool timetable, int width)
+void DrawOrderString(const Vehicle *v, const Order *order, int order_index, int y, bool selected, bool timetable, int left, int right)
{
StringID str = (v->cur_order_index == order_index) ? STR_ORDER_SELECTED : STR_ORDER;
SetDParam(6, STR_EMPTY);
@@ -287,7 +287,7 @@ void DrawOrderString(const Vehicle *v, const Order *order, int order_index, int
}
SetDParam(0, order_index + 1);
- DrawString(2, width + 2, y, str, selected ? TC_WHITE : TC_BLACK);
+ DrawString(left, right, y, str, selected ? TC_WHITE : TC_BLACK);
}
@@ -842,7 +842,7 @@ public:
/* Don't draw anything if it extends past the end of the window. */
if (!this->vscroll.IsVisible(i)) break;
- DrawOrderString(this->vehicle, order, i, y, i == this->selected_order, false, this->widget[ORDER_WIDGET_ORDER_LIST].right - 4);
+ DrawOrderString(this->vehicle, order, i, y, i == this->selected_order, false, this->widget[ORDER_WIDGET_ORDER_LIST].left + 2, this->widget[ORDER_WIDGET_ORDER_LIST].right - 2);
y += ORDER_LIST_LINE_HEIGHT;
i++;
diff --git a/src/timetable_gui.cpp b/src/timetable_gui.cpp
index 46db9d703..c9267eed1 100644
--- a/src/timetable_gui.cpp
+++ b/src/timetable_gui.cpp
@@ -190,7 +190,7 @@ struct TimetableWindow : Window {
if (!this->vscroll.IsVisible(i)) break;
if (i % 2 == 0) {
- DrawOrderString(v, order, order_id, y, i == selected, true, this->widget[TTV_TIMETABLE_PANEL].right - 4);
+ DrawOrderString(v, order, order_id, y, i == selected, true, this->widget[TTV_TIMETABLE_PANEL].left + 2, this->widget[TTV_TIMETABLE_PANEL].right - 2);
order_id++;