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

(svn r1525) -Codechange: rewrote the _order_array, now it can be made dynamic.

Browse Source 
-Codechange: renamed all 'schedule' stuff to 'order(list)'
-Codechange: moved all order-stuff to order_cmd.c / order.h
-Codechange: vehicles that share orders are now linked to eachother
  with next_shared/prev_shared in Vehicle

  Developers: please use AssignOrder to assign data to an order. If not, 
   you _WILL_ make the save-routine to assert!
This commit is contained in:
truelight
2005-01-15 19:06:22 +00:00
parent 732c362dea
commit d275109e79
22 changed files with 1280 additions and 856 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
ship_gui.c
View File

@@ -863,15 +863,14 @@ void ShowShipDepotWindow(uint tile)
}
static void DrawSmallShipSchedule(Vehicle *v, int x, int y) {
Order *sched;
int sel;
Station *st;
int i = 0;
static void DrawSmallOrderList(Vehicle *v, int x, int y) {
const Order *order;
int sel, i = 0;
sel = v->cur_order_index;
order = v->orders;
for (sched = v->schedule_ptr; sched->type != OT_NOTHING; ++sched) {
while (order != NULL) {
if (sel == 0) {
_stringwidth_base = 0xE0;
DoDrawString( "\xAF", x-6, y, 16);
@@ -879,11 +878,9 @@ static void DrawSmallShipSchedule(Vehicle *v, int x, int y) {
}
sel--;
if (sched->type == OT_GOTO_STATION) {
st = GetStation(sched->station);
if (!(st->had_vehicle_of_type & HVOT_BUOY)) {
SetDParam(0, sched->station);
if (order->type == OT_GOTO_STATION) {
if (!(GetStation(order->station)->had_vehicle_of_type & HVOT_BUOY)) {
SetDParam(0, order->station);
DrawString(x, y, STR_A036, 0);
y += 6;
@@ -891,6 +888,8 @@ static void DrawSmallShipSchedule(Vehicle *v, int x, int y) {
break;
}
}
order = order->next;
}
}
@@ -998,7 +997,7 @@ static void PlayerShipsWndProc(Window *w, WindowEvent *e)
DrawString(x + 12, y, STR_01AB, 0);
}
DrawSmallShipSchedule(v, x + 138, y);
DrawSmallOrderList(v, x + 138, y);
y += PLY_WND_PRC__SIZE_OF_ROW_BIG;
}