mirror
/
OpenTTD
mirror of https://github.com/OpenTTD/OpenTTD
1
0
Fork 0
Code Issues

(svn r18296) -Codechange: show the next 4 orders instead of the first 4 orders in the ship/aircraft vehicle lists

release/1.0
rubidium 2009-11-26 11:34:12 +00:00
parent 1725a73700
commit 4978d30880
1 changed files with 16 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
src/vehicle_gui.cpp
View File

@ -753,16 +753,16 @@ static const NWidgetPart _nested_vehicle_list[] = {
EndContainer(), EndContainer(),
}; };
static void DrawSmallOrderList(const Vehicle *v, int left, int right, int y) static void DrawSmallOrderList(const Vehicle *v, int left, int right, int y, VehicleOrderID start = 0)
{ {
const Order *order; const Order *order = v->GetOrder(start);
if (order == NULL) return;
int i = 0; int i = 0;
VehicleOrderID oid = start;
int sel = v->cur_order_index; do {
if (oid == v->cur_order_index) DrawString(left, right, y, STR_TINY_RIGHT_ARROW, TC_BLACK);
FOR_VEHICLE_ORDERS(v, order) {
if (sel == 0) DrawString(left, right, y, STR_TINY_RIGHT_ARROW, TC_BLACK);
sel--;
if (order->IsType(OT_GOTO_STATION)) { if (order->IsType(OT_GOTO_STATION)) {
SetDParam(0, order->GetDestination()); SetDParam(0, order->GetDestination());
@ -771,7 +771,14 @@ static void DrawSmallOrderList(const Vehicle *v, int left, int right, int y)
y += FONT_HEIGHT_SMALL; y += FONT_HEIGHT_SMALL;
if (++i == 4) break; if (++i == 4) break;
} }
}
oid++;
order = order->next;
if (order == NULL) {
order = v->orders.list->GetFirstOrder();
oid = 0;
}
} while (oid != start);
} }
/** /**
@ -863,7 +870,7 @@ void BaseVehicleListWindow::DrawVehicleListItems(VehicleID selected_vehicle, int
DrawString(text_left, text_right, y, STR_TINY_GROUP, TC_BLACK); DrawString(text_left, text_right, y, STR_TINY_GROUP, TC_BLACK);
} }
if (show_orderlist) DrawSmallOrderList(v, orderlist_left, orderlist_right, y); if (show_orderlist) DrawSmallOrderList(v, orderlist_left, orderlist_right, y, v->cur_order_index);
if (v->IsInDepot()) { if (v->IsInDepot()) {
str = STR_BLUE_COMMA; str = STR_BLUE_COMMA;