equal
deleted
inserted
replaced
160 |
160 |
161 extern uint ConvertSpeedToDisplaySpeed(uint speed); |
161 extern uint ConvertSpeedToDisplaySpeed(uint speed); |
162 extern uint ConvertDisplaySpeedToSpeed(uint speed); |
162 extern uint ConvertDisplaySpeedToSpeed(uint speed); |
163 |
163 |
164 |
164 |
165 void DrawOrderString(const Vehicle *v, const Order *order, int order_index, int y, bool selected, bool timetable) |
165 void DrawOrderString(const Vehicle *v, const Order *order, int order_index, int y, bool selected, bool timetable, int width) |
166 { |
166 { |
167 StringID str = (v->cur_order_index == order_index) ? STR_8805 : STR_8804; |
167 StringID str = (v->cur_order_index == order_index) ? STR_8805 : STR_8804; |
168 SetDParam(6, STR_EMPTY); |
168 SetDParam(6, STR_EMPTY); |
169 |
169 |
170 switch (order->GetType()) { |
170 switch (order->GetType()) { |
255 |
255 |
256 default: NOT_REACHED(); |
256 default: NOT_REACHED(); |
257 } |
257 } |
258 |
258 |
259 SetDParam(0, order_index + 1); |
259 SetDParam(0, order_index + 1); |
260 DrawString(2, y, str, selected ? TC_WHITE : TC_BLACK); |
260 DrawStringTruncated(2, y, str, selected ? TC_WHITE : TC_BLACK, width); |
261 } |
261 } |
262 |
262 |
263 |
263 |
264 static Order GetOrderCmdFromTile(const Vehicle *v, TileIndex tile) |
264 static Order GetOrderCmdFromTile(const Vehicle *v, TileIndex tile) |
265 { |
265 { |
732 StringID str; |
732 StringID str; |
733 while (order != NULL) { |
733 while (order != NULL) { |
734 /* Don't draw anything if it extends past the end of the window. */ |
734 /* Don't draw anything if it extends past the end of the window. */ |
735 if (i - this->vscroll.pos >= this->vscroll.cap) break; |
735 if (i - this->vscroll.pos >= this->vscroll.cap) break; |
736 |
736 |
737 DrawOrderString(this->vehicle, order, i, y, i == this->selected_order, false); |
737 DrawOrderString(this->vehicle, order, i, y, i == this->selected_order, false, this->widget[ORDER_WIDGET_ORDER_LIST].right - 4); |
738 y += 10; |
738 y += 10; |
739 |
739 |
740 i++; |
740 i++; |
741 order = order->next; |
741 order = order->next; |
742 } |
742 } |