author | bjarni |
Thu, 28 Sep 2006 23:05:03 +0000 | |
changeset 4668 | f7256d0e7682 |
parent 4634 | 07699ac2bf37 |
child 4709 | a81ab800c25b |
permissions | -rw-r--r-- |
2186 | 1 |
/* $Id$ */ |
2 |
||
0 | 3 |
#include "stdafx.h" |
1891
862800791170
(svn r2397) - CodeChange: rename all "ttd" files to "openttd" files.
Darkvater
parents:
1857
diff
changeset
|
4 |
#include "openttd.h" |
3144
33e42feae531
(svn r3763) Adapt to the new 'map accessors go in foo_map.h'-scheme
tron
parents:
3071
diff
changeset
|
5 |
#include "road_map.h" |
3315
c9d989783c55
(svn r4079) Add GetSation{Index,ByTile}() to get the station index resp. the station from a tile
tron
parents:
3269
diff
changeset
|
6 |
#include "station_map.h" |
1363
775a7ee52369
(svn r1867) Include tables/sprites.h only in files which need it
tron
parents:
1334
diff
changeset
|
7 |
#include "table/sprites.h" |
507
04b5403aaf6b
(svn r815) Include strings.h only in the files which need it.
tron
parents:
395
diff
changeset
|
8 |
#include "table/strings.h" |
2163
b17b313113a0
(svn r2673) Include functions.h directly, not globally via openttd.h
tron
parents:
2064
diff
changeset
|
9 |
#include "functions.h" |
679
04ca2cd69420
(svn r1117) Move map arrays and some related macros into their own files map.c and map.h
tron
parents:
560
diff
changeset
|
10 |
#include "map.h" |
1209
2e00193652b2
(svn r1713) Split off several functions which query/set information about a single tile from map.h and put them into a seperate file tile.h
tron
parents:
1095
diff
changeset
|
11 |
#include "tile.h" |
0 | 12 |
#include "window.h" |
13 |
#include "gui.h" |
|
14 |
#include "gfx.h" |
|
15 |
#include "vehicle.h" |
|
16 |
#include "station.h" |
|
17 |
#include "town.h" |
|
18 |
#include "command.h" |
|
19 |
#include "viewport.h" |
|
1313
f1013ec3d318
(svn r1817) -Codechange: Moved depot-functions to depot.c
truelight
parents:
1256
diff
changeset
|
20 |
#include "depot.h" |
1542
62a03537ad0b
(svn r2046) -Codechange: moved all waypoint code to waypoint.c/waypoint.h
truelight
parents:
1530
diff
changeset
|
21 |
#include "waypoint.h" |
2676
59b65b4fb480
(svn r3218) -Feature: Multiheaded train engines will now stay in the same train
bjarni
parents:
2668
diff
changeset
|
22 |
#include "train.h" |
3392
469942e8a0ca
(svn r4200) -Codechange: Make use of water map accessors when getting the Index of a Ship Depot. TODO: Store the depot index in the map
celestar
parents:
3387
diff
changeset
|
23 |
#include "water_map.h" |
4668
f7256d0e7682
(svn r6562) -Codechange: merged the vehicle list window widget arrays
bjarni
parents:
4634
diff
changeset
|
24 |
#include "vehicle_gui.h" |
0 | 25 |
|
4171 | 26 |
static int OrderGetSel(const Window *w) |
0 | 27 |
{ |
4171 | 28 |
const Vehicle *v = GetVehicle(w->window_number); |
0 | 29 |
int num = WP(w,order_d).sel; |
30 |
||
2549 | 31 |
return (num >= 0 && num < v->num_orders) ? num : v->num_orders; |
0 | 32 |
} |
33 |
||
1935
164d58b9137c
(svn r2441) -Feature: You can now give transfer order to set up feeder systems
celestar
parents:
1901
diff
changeset
|
34 |
static StringID StationOrderStrings[] = { |
1937
8497de87e4a2
(svn r2443) -Fix: somehow I delete one line too many :(
celestar
parents:
1935
diff
changeset
|
35 |
STR_8806_GO_TO, |
1935
164d58b9137c
(svn r2441) -Feature: You can now give transfer order to set up feeder systems
celestar
parents:
1901
diff
changeset
|
36 |
STR_8807_GO_TO_TRANSFER, |
164d58b9137c
(svn r2441) -Feature: You can now give transfer order to set up feeder systems
celestar
parents:
1901
diff
changeset
|
37 |
STR_8808_GO_TO_UNLOAD, |
164d58b9137c
(svn r2441) -Feature: You can now give transfer order to set up feeder systems
celestar
parents:
1901
diff
changeset
|
38 |
STR_8809_GO_TO_TRANSFER_UNLOAD, |
164d58b9137c
(svn r2441) -Feature: You can now give transfer order to set up feeder systems
celestar
parents:
1901
diff
changeset
|
39 |
STR_880A_GO_TO_LOAD, |
164d58b9137c
(svn r2441) -Feature: You can now give transfer order to set up feeder systems
celestar
parents:
1901
diff
changeset
|
40 |
STR_880B_GO_TO_TRANSFER_LOAD, |
164d58b9137c
(svn r2441) -Feature: You can now give transfer order to set up feeder systems
celestar
parents:
1901
diff
changeset
|
41 |
STR_NULL, |
164d58b9137c
(svn r2441) -Feature: You can now give transfer order to set up feeder systems
celestar
parents:
1901
diff
changeset
|
42 |
STR_NULL, |
164d58b9137c
(svn r2441) -Feature: You can now give transfer order to set up feeder systems
celestar
parents:
1901
diff
changeset
|
43 |
STR_880C_GO_NON_STOP_TO, |
164d58b9137c
(svn r2441) -Feature: You can now give transfer order to set up feeder systems
celestar
parents:
1901
diff
changeset
|
44 |
STR_880D_GO_TO_NON_STOP_TRANSFER, |
164d58b9137c
(svn r2441) -Feature: You can now give transfer order to set up feeder systems
celestar
parents:
1901
diff
changeset
|
45 |
STR_880E_GO_NON_STOP_TO_UNLOAD, |
164d58b9137c
(svn r2441) -Feature: You can now give transfer order to set up feeder systems
celestar
parents:
1901
diff
changeset
|
46 |
STR_880F_GO_TO_NON_STOP_TRANSFER_UNLOAD, |
164d58b9137c
(svn r2441) -Feature: You can now give transfer order to set up feeder systems
celestar
parents:
1901
diff
changeset
|
47 |
STR_8810_GO_NON_STOP_TO_LOAD, |
164d58b9137c
(svn r2441) -Feature: You can now give transfer order to set up feeder systems
celestar
parents:
1901
diff
changeset
|
48 |
STR_8811_GO_TO_NON_STOP_TRANSFER_LOAD, |
164d58b9137c
(svn r2441) -Feature: You can now give transfer order to set up feeder systems
celestar
parents:
1901
diff
changeset
|
49 |
STR_NULL |
164d58b9137c
(svn r2441) -Feature: You can now give transfer order to set up feeder systems
celestar
parents:
1901
diff
changeset
|
50 |
}; |
164d58b9137c
(svn r2441) -Feature: You can now give transfer order to set up feeder systems
celestar
parents:
1901
diff
changeset
|
51 |
|
0 | 52 |
static void DrawOrdersWindow(Window *w) |
53 |
{ |
|
1024
5e446b5b3ec5
(svn r1525) -Codechange: rewrote the _order_array, now it can be made dynamic.
truelight
parents:
1019
diff
changeset
|
54 |
const Vehicle *v; |
5e446b5b3ec5
(svn r1525) -Codechange: rewrote the _order_array, now it can be made dynamic.
truelight
parents:
1019
diff
changeset
|
55 |
const Order *order; |
5e446b5b3ec5
(svn r1525) -Codechange: rewrote the _order_array, now it can be made dynamic.
truelight
parents:
1019
diff
changeset
|
56 |
StringID str; |
5e446b5b3ec5
(svn r1525) -Codechange: rewrote the _order_array, now it can be made dynamic.
truelight
parents:
1019
diff
changeset
|
57 |
int sel; |
0 | 58 |
int y, i; |
1024
5e446b5b3ec5
(svn r1525) -Codechange: rewrote the _order_array, now it can be made dynamic.
truelight
parents:
1019
diff
changeset
|
59 |
bool shared_orders; |
5e446b5b3ec5
(svn r1525) -Codechange: rewrote the _order_array, now it can be made dynamic.
truelight
parents:
1019
diff
changeset
|
60 |
byte color; |
0 | 61 |
|
919
544f374ee392
(svn r1407) -Codechange: changed a lot around _stations, _vehicles, _towns and _industries
truelight
parents:
893
diff
changeset
|
62 |
v = GetVehicle(w->window_number); |
0 | 63 |
|
995
0a8d27dcc231
(svn r1493) -Codechange: Removed redundancy in the order GUI. Currently we had most
celestar
parents:
919
diff
changeset
|
64 |
w->disabled_state = (v->owner == _local_player) ? 0 : ( |
0a8d27dcc231
(svn r1493) -Codechange: Removed redundancy in the order GUI. Currently we had most
celestar
parents:
919
diff
changeset
|
65 |
1 << 4 | //skip |
0a8d27dcc231
(svn r1493) -Codechange: Removed redundancy in the order GUI. Currently we had most
celestar
parents:
919
diff
changeset
|
66 |
1 << 5 | //delete |
0a8d27dcc231
(svn r1493) -Codechange: Removed redundancy in the order GUI. Currently we had most
celestar
parents:
919
diff
changeset
|
67 |
1 << 6 | //non-stop |
0a8d27dcc231
(svn r1493) -Codechange: Removed redundancy in the order GUI. Currently we had most
celestar
parents:
919
diff
changeset
|
68 |
1 << 7 | //go-to |
0a8d27dcc231
(svn r1493) -Codechange: Removed redundancy in the order GUI. Currently we had most
celestar
parents:
919
diff
changeset
|
69 |
1 << 8 | //full load |
1935
164d58b9137c
(svn r2441) -Feature: You can now give transfer order to set up feeder systems
celestar
parents:
1901
diff
changeset
|
70 |
1 << 9 | //unload |
164d58b9137c
(svn r2441) -Feature: You can now give transfer order to set up feeder systems
celestar
parents:
1901
diff
changeset
|
71 |
1 << 10 //transfer |
995
0a8d27dcc231
(svn r1493) -Codechange: Removed redundancy in the order GUI. Currently we had most
celestar
parents:
919
diff
changeset
|
72 |
); |
1019
6bae6c11e865
(svn r1520) Trim 134 (!) lines with trailing whitespace ):
tron
parents:
1000
diff
changeset
|
73 |
|
4408
db2afc41002a
(svn r6161) -Feature: List of vehicles with the same shared orders
bjarni
parents:
4389
diff
changeset
|
74 |
if (v->type != VEH_Train) { |
db2afc41002a
(svn r6161) -Feature: List of vehicles with the same shared orders
bjarni
parents:
4389
diff
changeset
|
75 |
SETBIT(w->disabled_state, 6); // Disable non-stop for non-trains |
db2afc41002a
(svn r6161) -Feature: List of vehicles with the same shared orders
bjarni
parents:
4389
diff
changeset
|
76 |
switch (v->type) { |
4547
d37c2d172ad4
(svn r6379) -Codechange: cast 'remove babel' on widget's unkA and rename it to 'data'.
Darkvater
parents:
4527
diff
changeset
|
77 |
case VEH_Road: w->widget[11].data = STR_LORRY; break; |
d37c2d172ad4
(svn r6379) -Codechange: cast 'remove babel' on widget's unkA and rename it to 'data'.
Darkvater
parents:
4527
diff
changeset
|
78 |
case VEH_Ship: w->widget[11].data = STR_SHIP; break; |
d37c2d172ad4
(svn r6379) -Codechange: cast 'remove babel' on widget's unkA and rename it to 'data'.
Darkvater
parents:
4527
diff
changeset
|
79 |
case VEH_Aircraft: w->widget[11].data = STR_PLANE; break; |
4408
db2afc41002a
(svn r6161) -Feature: List of vehicles with the same shared orders
bjarni
parents:
4389
diff
changeset
|
80 |
default: NOT_REACHED(); break; |
db2afc41002a
(svn r6161) -Feature: List of vehicles with the same shared orders
bjarni
parents:
4389
diff
changeset
|
81 |
} |
db2afc41002a
(svn r6161) -Feature: List of vehicles with the same shared orders
bjarni
parents:
4389
diff
changeset
|
82 |
} |
0 | 83 |
|
1024
5e446b5b3ec5
(svn r1525) -Codechange: rewrote the _order_array, now it can be made dynamic.
truelight
parents:
1019
diff
changeset
|
84 |
shared_orders = IsOrderListShared(v); |
0 | 85 |
|
4408
db2afc41002a
(svn r6161) -Feature: List of vehicles with the same shared orders
bjarni
parents:
4389
diff
changeset
|
86 |
if (!shared_orders || v->orders == NULL) { |
db2afc41002a
(svn r6161) -Feature: List of vehicles with the same shared orders
bjarni
parents:
4389
diff
changeset
|
87 |
SETBIT(w->disabled_state, 11); // Disable list of vehicles with the same shared orders if there are no list |
db2afc41002a
(svn r6161) -Feature: List of vehicles with the same shared orders
bjarni
parents:
4389
diff
changeset
|
88 |
} |
db2afc41002a
(svn r6161) -Feature: List of vehicles with the same shared orders
bjarni
parents:
4389
diff
changeset
|
89 |
|
1857
f07b4fc6c4bf
(svn r2363) - Codechange: [NPF] Removed caching the endnode check. The code for this was buggy, fundamentally flawed and barely useful. (Hackykid)
matthijs
parents:
1752
diff
changeset
|
90 |
if ((uint)v->num_orders + (shared_orders?1:0) <= (uint)WP(w,order_d).sel) |
0 | 91 |
SETBIT(w->disabled_state, 5); /* delete */ |
92 |
||
1024
5e446b5b3ec5
(svn r1525) -Codechange: rewrote the _order_array, now it can be made dynamic.
truelight
parents:
1019
diff
changeset
|
93 |
if (v->num_orders == 0) |
0 | 94 |
SETBIT(w->disabled_state, 4); /* skip */ |
95 |
||
1024
5e446b5b3ec5
(svn r1525) -Codechange: rewrote the _order_array, now it can be made dynamic.
truelight
parents:
1019
diff
changeset
|
96 |
SetVScrollCount(w, v->num_orders + 1); |
0 | 97 |
|
98 |
sel = OrderGetSel(w); |
|
1024
5e446b5b3ec5
(svn r1525) -Codechange: rewrote the _order_array, now it can be made dynamic.
truelight
parents:
1019
diff
changeset
|
99 |
SetDParam(2, STR_8827_FULL_LOAD); |
193
0a7025304867
(svn r194) -Codechange: stripping trailing-spaces. Please keep this that way!
truelight
parents:
176
diff
changeset
|
100 |
|
1024
5e446b5b3ec5
(svn r1525) -Codechange: rewrote the _order_array, now it can be made dynamic.
truelight
parents:
1019
diff
changeset
|
101 |
order = GetVehicleOrder(v, sel); |
725 | 102 |
|
1024
5e446b5b3ec5
(svn r1525) -Codechange: rewrote the _order_array, now it can be made dynamic.
truelight
parents:
1019
diff
changeset
|
103 |
if (order != NULL) { |
5e446b5b3ec5
(svn r1525) -Codechange: rewrote the _order_array, now it can be made dynamic.
truelight
parents:
1019
diff
changeset
|
104 |
switch (order->type) { |
5e446b5b3ec5
(svn r1525) -Codechange: rewrote the _order_array, now it can be made dynamic.
truelight
parents:
1019
diff
changeset
|
105 |
case OT_GOTO_STATION: |
5e446b5b3ec5
(svn r1525) -Codechange: rewrote the _order_array, now it can be made dynamic.
truelight
parents:
1019
diff
changeset
|
106 |
break; |
2549 | 107 |
|
1024
5e446b5b3ec5
(svn r1525) -Codechange: rewrote the _order_array, now it can be made dynamic.
truelight
parents:
1019
diff
changeset
|
108 |
case OT_GOTO_DEPOT: |
4171 | 109 |
SETBIT(w->disabled_state, 9); /* unload */ |
1935
164d58b9137c
(svn r2441) -Feature: You can now give transfer order to set up feeder systems
celestar
parents:
1901
diff
changeset
|
110 |
SETBIT(w->disabled_state, 10); /* transfer */ |
1024
5e446b5b3ec5
(svn r1525) -Codechange: rewrote the _order_array, now it can be made dynamic.
truelight
parents:
1019
diff
changeset
|
111 |
SetDParam(2,STR_SERVICE); |
5e446b5b3ec5
(svn r1525) -Codechange: rewrote the _order_array, now it can be made dynamic.
truelight
parents:
1019
diff
changeset
|
112 |
break; |
725 | 113 |
|
1024
5e446b5b3ec5
(svn r1525) -Codechange: rewrote the _order_array, now it can be made dynamic.
truelight
parents:
1019
diff
changeset
|
114 |
case OT_GOTO_WAYPOINT: |
4171 | 115 |
SETBIT(w->disabled_state, 8); /* full load */ |
116 |
SETBIT(w->disabled_state, 9); /* unload */ |
|
1935
164d58b9137c
(svn r2441) -Feature: You can now give transfer order to set up feeder systems
celestar
parents:
1901
diff
changeset
|
117 |
SETBIT(w->disabled_state, 10); /* transfer */ |
1024
5e446b5b3ec5
(svn r1525) -Codechange: rewrote the _order_array, now it can be made dynamic.
truelight
parents:
1019
diff
changeset
|
118 |
break; |
5e446b5b3ec5
(svn r1525) -Codechange: rewrote the _order_array, now it can be made dynamic.
truelight
parents:
1019
diff
changeset
|
119 |
|
5e446b5b3ec5
(svn r1525) -Codechange: rewrote the _order_array, now it can be made dynamic.
truelight
parents:
1019
diff
changeset
|
120 |
default: |
4171 | 121 |
SETBIT(w->disabled_state, 6); /* nonstop */ |
122 |
SETBIT(w->disabled_state, 8); /* full load */ |
|
123 |
SETBIT(w->disabled_state, 9); /* unload */ |
|
1024
5e446b5b3ec5
(svn r1525) -Codechange: rewrote the _order_array, now it can be made dynamic.
truelight
parents:
1019
diff
changeset
|
124 |
} |
5e446b5b3ec5
(svn r1525) -Codechange: rewrote the _order_array, now it can be made dynamic.
truelight
parents:
1019
diff
changeset
|
125 |
} else { |
4171 | 126 |
SETBIT(w->disabled_state, 6); /* nonstop */ |
127 |
SETBIT(w->disabled_state, 8); /* full load */ |
|
128 |
SETBIT(w->disabled_state, 9); /* unload */ |
|
129 |
SETBIT(w->disabled_state, 10); /* transfer */ |
|
0 | 130 |
} |
131 |
||
534
306bc86eb23e
(svn r901) Small step in the process to clean up the DPARAM mess:
tron
parents:
507
diff
changeset
|
132 |
SetDParam(0, v->string_id); |
306bc86eb23e
(svn r901) Small step in the process to clean up the DPARAM mess:
tron
parents:
507
diff
changeset
|
133 |
SetDParam(1, v->unitnumber); |
0 | 134 |
DrawWindowWidgets(w); |
135 |
||
136 |
y = 15; |
|
137 |
||
1024
5e446b5b3ec5
(svn r1525) -Codechange: rewrote the _order_array, now it can be made dynamic.
truelight
parents:
1019
diff
changeset
|
138 |
i = w->vscroll.pos; |
5e446b5b3ec5
(svn r1525) -Codechange: rewrote the _order_array, now it can be made dynamic.
truelight
parents:
1019
diff
changeset
|
139 |
order = GetVehicleOrder(v, i); |
5e446b5b3ec5
(svn r1525) -Codechange: rewrote the _order_array, now it can be made dynamic.
truelight
parents:
1019
diff
changeset
|
140 |
while (order != NULL) { |
5e446b5b3ec5
(svn r1525) -Codechange: rewrote the _order_array, now it can be made dynamic.
truelight
parents:
1019
diff
changeset
|
141 |
str = (v->cur_order_index == i) ? STR_8805 : STR_8804; |
0 | 142 |
|
1242
1ca216c50426
(svn r1746) - Feature: [GUI] [ 1107690 ] Resizable orders GUI (nzhook)
darkvater
parents:
1214
diff
changeset
|
143 |
if (i - w->vscroll.pos < w->vscroll.cap) { |
1024
5e446b5b3ec5
(svn r1525) -Codechange: rewrote the _order_array, now it can be made dynamic.
truelight
parents:
1019
diff
changeset
|
144 |
SetDParam(1, 6); |
5e446b5b3ec5
(svn r1525) -Codechange: rewrote the _order_array, now it can be made dynamic.
truelight
parents:
1019
diff
changeset
|
145 |
|
2631
2ed0eb408229
(svn r3173) Use the trinary operator and switch to improve readability
tron
parents:
2549
diff
changeset
|
146 |
switch (order->type) { |
2ed0eb408229
(svn r3173) Use the trinary operator and switch to improve readability
tron
parents:
2549
diff
changeset
|
147 |
case OT_GOTO_STATION: |
2ed0eb408229
(svn r3173) Use the trinary operator and switch to improve readability
tron
parents:
2549
diff
changeset
|
148 |
SetDParam(1, StationOrderStrings[order->flags]); |
4527
fa30d19685c2
(svn r6353) -Codechange: Make DestinationID a typedef of uin16, which is as large as any type of destinataion (StationID, DepotID, WaypointID) it can hold
tron
parents:
4408
diff
changeset
|
149 |
SetDParam(2, order->dest); |
2631
2ed0eb408229
(svn r3173) Use the trinary operator and switch to improve readability
tron
parents:
2549
diff
changeset
|
150 |
break; |
1935
164d58b9137c
(svn r2441) -Feature: You can now give transfer order to set up feeder systems
celestar
parents:
1901
diff
changeset
|
151 |
|
2631
2ed0eb408229
(svn r3173) Use the trinary operator and switch to improve readability
tron
parents:
2549
diff
changeset
|
152 |
case OT_GOTO_DEPOT: { |
2ed0eb408229
(svn r3173) Use the trinary operator and switch to improve readability
tron
parents:
2549
diff
changeset
|
153 |
StringID s = STR_NULL; |
2ed0eb408229
(svn r3173) Use the trinary operator and switch to improve readability
tron
parents:
2549
diff
changeset
|
154 |
|
2ed0eb408229
(svn r3173) Use the trinary operator and switch to improve readability
tron
parents:
2549
diff
changeset
|
155 |
if (v->type == VEH_Aircraft) { |
2ed0eb408229
(svn r3173) Use the trinary operator and switch to improve readability
tron
parents:
2549
diff
changeset
|
156 |
s = STR_GO_TO_AIRPORT_HANGAR; |
4527
fa30d19685c2
(svn r6353) -Codechange: Make DestinationID a typedef of uin16, which is as large as any type of destinataion (StationID, DepotID, WaypointID) it can hold
tron
parents:
4408
diff
changeset
|
157 |
SetDParam(2, order->dest); |
2631
2ed0eb408229
(svn r3173) Use the trinary operator and switch to improve readability
tron
parents:
2549
diff
changeset
|
158 |
} else { |
4527
fa30d19685c2
(svn r6353) -Codechange: Make DestinationID a typedef of uin16, which is as large as any type of destinataion (StationID, DepotID, WaypointID) it can hold
tron
parents:
4408
diff
changeset
|
159 |
SetDParam(2, GetDepot(order->dest)->town_index); |
2631
2ed0eb408229
(svn r3173) Use the trinary operator and switch to improve readability
tron
parents:
2549
diff
changeset
|
160 |
|
2ed0eb408229
(svn r3173) Use the trinary operator and switch to improve readability
tron
parents:
2549
diff
changeset
|
161 |
switch (v->type) { |
2ed0eb408229
(svn r3173) Use the trinary operator and switch to improve readability
tron
parents:
2549
diff
changeset
|
162 |
case VEH_Train: s = (order->flags & OF_NON_STOP) ? STR_880F_GO_NON_STOP_TO_TRAIN_DEPOT : STR_GO_TO_TRAIN_DEPOT; break; |
2ed0eb408229
(svn r3173) Use the trinary operator and switch to improve readability
tron
parents:
2549
diff
changeset
|
163 |
case VEH_Road: s = STR_9038_GO_TO_ROADVEH_DEPOT; break; |
2ed0eb408229
(svn r3173) Use the trinary operator and switch to improve readability
tron
parents:
2549
diff
changeset
|
164 |
case VEH_Ship: s = STR_GO_TO_SHIP_DEPOT; break; |
2ed0eb408229
(svn r3173) Use the trinary operator and switch to improve readability
tron
parents:
2549
diff
changeset
|
165 |
default: break; |
2ed0eb408229
(svn r3173) Use the trinary operator and switch to improve readability
tron
parents:
2549
diff
changeset
|
166 |
} |
0 | 167 |
} |
1935
164d58b9137c
(svn r2441) -Feature: You can now give transfer order to set up feeder systems
celestar
parents:
1901
diff
changeset
|
168 |
|
2631
2ed0eb408229
(svn r3173) Use the trinary operator and switch to improve readability
tron
parents:
2549
diff
changeset
|
169 |
if (order->flags & OF_FULL_LOAD) s++; /* service at */ |
2ed0eb408229
(svn r3173) Use the trinary operator and switch to improve readability
tron
parents:
2549
diff
changeset
|
170 |
|
1935
164d58b9137c
(svn r2441) -Feature: You can now give transfer order to set up feeder systems
celestar
parents:
1901
diff
changeset
|
171 |
SetDParam(1, s); |
2631
2ed0eb408229
(svn r3173) Use the trinary operator and switch to improve readability
tron
parents:
2549
diff
changeset
|
172 |
break; |
0 | 173 |
} |
1024
5e446b5b3ec5
(svn r1525) -Codechange: rewrote the _order_array, now it can be made dynamic.
truelight
parents:
1019
diff
changeset
|
174 |
|
2631
2ed0eb408229
(svn r3173) Use the trinary operator and switch to improve readability
tron
parents:
2549
diff
changeset
|
175 |
case OT_GOTO_WAYPOINT: |
2ed0eb408229
(svn r3173) Use the trinary operator and switch to improve readability
tron
parents:
2549
diff
changeset
|
176 |
SetDParam(1, (order->flags & OF_NON_STOP) ? STR_GO_NON_STOP_TO_WAYPOINT : STR_GO_TO_WAYPOINT); |
4527
fa30d19685c2
(svn r6353) -Codechange: Make DestinationID a typedef of uin16, which is as large as any type of destinataion (StationID, DepotID, WaypointID) it can hold
tron
parents:
4408
diff
changeset
|
177 |
SetDParam(2, order->dest); |
2631
2ed0eb408229
(svn r3173) Use the trinary operator and switch to improve readability
tron
parents:
2549
diff
changeset
|
178 |
break; |
4351
c9799dd53eec
(svn r6052) -Codechange: change OrderType (order->type) in a typedef
truelight
parents:
4344
diff
changeset
|
179 |
|
c9799dd53eec
(svn r6052) -Codechange: change OrderType (order->type) in a typedef
truelight
parents:
4344
diff
changeset
|
180 |
default: break; |
0 | 181 |
} |
1024
5e446b5b3ec5
(svn r1525) -Codechange: rewrote the _order_array, now it can be made dynamic.
truelight
parents:
1019
diff
changeset
|
182 |
|
5e446b5b3ec5
(svn r1525) -Codechange: rewrote the _order_array, now it can be made dynamic.
truelight
parents:
1019
diff
changeset
|
183 |
color = (i == WP(w,order_d).sel) ? 0xC : 0x10; |
5e446b5b3ec5
(svn r1525) -Codechange: rewrote the _order_array, now it can be made dynamic.
truelight
parents:
1019
diff
changeset
|
184 |
SetDParam(0, i + 1); |
5e446b5b3ec5
(svn r1525) -Codechange: rewrote the _order_array, now it can be made dynamic.
truelight
parents:
1019
diff
changeset
|
185 |
if (order->type != OT_DUMMY) { |
5e446b5b3ec5
(svn r1525) -Codechange: rewrote the _order_array, now it can be made dynamic.
truelight
parents:
1019
diff
changeset
|
186 |
DrawString(2, y, str, color); |
5e446b5b3ec5
(svn r1525) -Codechange: rewrote the _order_array, now it can be made dynamic.
truelight
parents:
1019
diff
changeset
|
187 |
} else { |
5e446b5b3ec5
(svn r1525) -Codechange: rewrote the _order_array, now it can be made dynamic.
truelight
parents:
1019
diff
changeset
|
188 |
SetDParam(1, STR_INVALID_ORDER); |
4527
fa30d19685c2
(svn r6353) -Codechange: Make DestinationID a typedef of uin16, which is as large as any type of destinataion (StationID, DepotID, WaypointID) it can hold
tron
parents:
4408
diff
changeset
|
189 |
SetDParam(2, order->dest); |
1024
5e446b5b3ec5
(svn r1525) -Codechange: rewrote the _order_array, now it can be made dynamic.
truelight
parents:
1019
diff
changeset
|
190 |
DrawString(2, y, str, color); |
0 | 191 |
} |
192 |
y += 10; |
|
193 |
} |
|
194 |
||
195 |
i++; |
|
1024
5e446b5b3ec5
(svn r1525) -Codechange: rewrote the _order_array, now it can be made dynamic.
truelight
parents:
1019
diff
changeset
|
196 |
order = order->next; |
5e446b5b3ec5
(svn r1525) -Codechange: rewrote the _order_array, now it can be made dynamic.
truelight
parents:
1019
diff
changeset
|
197 |
} |
0 | 198 |
|
1242
1ca216c50426
(svn r1746) - Feature: [GUI] [ 1107690 ] Resizable orders GUI (nzhook)
darkvater
parents:
1214
diff
changeset
|
199 |
if (i - w->vscroll.pos < w->vscroll.cap) { |
1024
5e446b5b3ec5
(svn r1525) -Codechange: rewrote the _order_array, now it can be made dynamic.
truelight
parents:
1019
diff
changeset
|
200 |
str = shared_orders ? STR_END_OF_SHARED_ORDERS : STR_882A_END_OF_ORDERS; |
5e446b5b3ec5
(svn r1525) -Codechange: rewrote the _order_array, now it can be made dynamic.
truelight
parents:
1019
diff
changeset
|
201 |
color = (i == WP(w,order_d).sel) ? 0xC : 0x10; |
5e446b5b3ec5
(svn r1525) -Codechange: rewrote the _order_array, now it can be made dynamic.
truelight
parents:
1019
diff
changeset
|
202 |
DrawString(2, y, str, color); |
0 | 203 |
} |
204 |
} |
|
205 |
||
2436
7d5df545bd5d
(svn r2962) - const correctness for all Get* functions and most Draw* functions that don't change their pointer parameters
Darkvater
parents:
2186
diff
changeset
|
206 |
static Order GetOrderCmdFromTile(const Vehicle *v, TileIndex tile) |
0 | 207 |
{ |
558
1ae2a752501e
(svn r960) -Fix: forgotten conversion of orders for the AI (Tron)
darkvater
parents:
555
diff
changeset
|
208 |
Order order; |
3387
a779ba33aab4
(svn r4195) - Codechange: Initialize order variables to avoid a compiler warning. These are unused anyway... (smells of r3476-7, but not the same)
peter1138
parents:
3338
diff
changeset
|
209 |
order.next = NULL; |
a779ba33aab4
(svn r4195) - Codechange: Initialize order variables to avoid a compiler warning. These are unused anyway... (smells of r3476-7, but not the same)
peter1138
parents:
3338
diff
changeset
|
210 |
order.index = 0; |
0 | 211 |
|
212 |
// check depot first |
|
213 |
if (_patches.gotodepot) { |
|
1214
8262981ac274
(svn r1718) Use the enum TileType as parameter/return type for [GS]etTileType() instead of plain int.
tron
parents:
1209
diff
changeset
|
214 |
switch (GetTileType(tile)) { |
0 | 215 |
case MP_RAILWAY: |
1901
03bf9bf99319
(svn r2407) Use {Get,Is}TileOwner to get/check the owner of a tile and fix some bogus reads of _map_owner
tron
parents:
1891
diff
changeset
|
216 |
if (v->type == VEH_Train && IsTileOwner(tile, _local_player)) { |
4182
48dba107ff43
(svn r5624) Use {IsPlainRailTile,IsRailDepot,IsRailWaypoint,HasSignals}() instead of GetRailTile{T,Subt}ype() - this is more concise and a bit more flexible if/when the rail tile encoding changes
tron
parents:
4171
diff
changeset
|
217 |
if (IsRailDepot(tile)) { |
558
1ae2a752501e
(svn r960) -Fix: forgotten conversion of orders for the AI (Tron)
darkvater
parents:
555
diff
changeset
|
218 |
order.type = OT_GOTO_DEPOT; |
1530
2b46869fc0d4
(svn r2034) -Codechange: Replaced the rather meaningless LOAD and UNLOAD flags for depots by something more meaningful
celestar
parents:
1363
diff
changeset
|
219 |
order.flags = OF_PART_OF_ORDERS; |
4527
fa30d19685c2
(svn r6353) -Codechange: Make DestinationID a typedef of uin16, which is as large as any type of destinataion (StationID, DepotID, WaypointID) it can hold
tron
parents:
4408
diff
changeset
|
220 |
order.dest = GetDepotByTile(tile)->index; |
558
1ae2a752501e
(svn r960) -Fix: forgotten conversion of orders for the AI (Tron)
darkvater
parents:
555
diff
changeset
|
221 |
return order; |
560
60e198893a41
(svn r962) Fixed a problem with the new order system due to missing '{}' (another place)
Celestar
parents:
559
diff
changeset
|
222 |
} |
0 | 223 |
} |
224 |
break; |
|
225 |
||
226 |
case MP_STREET: |
|
3793
7fe24e10ea63
(svn r4789) - Codechange: rename RoadType to RoadTileType and ROAD_{NORMAL,CROSSING,DEPOT} to ROAD_TILE_* for consistency
rubidium
parents:
3792
diff
changeset
|
227 |
if (GetRoadTileType(tile) == ROAD_TILE_DEPOT && v->type == VEH_Road && IsTileOwner(tile, _local_player)) { |
558
1ae2a752501e
(svn r960) -Fix: forgotten conversion of orders for the AI (Tron)
darkvater
parents:
555
diff
changeset
|
228 |
order.type = OT_GOTO_DEPOT; |
1530
2b46869fc0d4
(svn r2034) -Codechange: Replaced the rather meaningless LOAD and UNLOAD flags for depots by something more meaningful
celestar
parents:
1363
diff
changeset
|
229 |
order.flags = OF_PART_OF_ORDERS; |
4527
fa30d19685c2
(svn r6353) -Codechange: Make DestinationID a typedef of uin16, which is as large as any type of destinataion (StationID, DepotID, WaypointID) it can hold
tron
parents:
4408
diff
changeset
|
230 |
order.dest = GetDepotByTile(tile)->index; |
558
1ae2a752501e
(svn r960) -Fix: forgotten conversion of orders for the AI (Tron)
darkvater
parents:
555
diff
changeset
|
231 |
return order; |
560
60e198893a41
(svn r962) Fixed a problem with the new order system due to missing '{}' (another place)
Celestar
parents:
559
diff
changeset
|
232 |
} |
0 | 233 |
break; |
234 |
||
235 |
case MP_STATION: |
|
236 |
if (v->type != VEH_Aircraft) break; |
|
3338
7cff208f0446
(svn r4120) Use the new station functions where appropriate
tron
parents:
3315
diff
changeset
|
237 |
if (IsHangar(tile) && IsTileOwner(tile, _local_player)) { |
558
1ae2a752501e
(svn r960) -Fix: forgotten conversion of orders for the AI (Tron)
darkvater
parents:
555
diff
changeset
|
238 |
order.type = OT_GOTO_DEPOT; |
2778
e0412c57f738
(svn r3325) - Fix: You couldn't send an airplane to a hangar for mandatory servicing, the NON_STOP flag failed the command.
Darkvater
parents:
2725
diff
changeset
|
239 |
order.flags = OF_PART_OF_ORDERS; |
4527
fa30d19685c2
(svn r6353) -Codechange: Make DestinationID a typedef of uin16, which is as large as any type of destinataion (StationID, DepotID, WaypointID) it can hold
tron
parents:
4408
diff
changeset
|
240 |
order.dest = GetStationIndex(tile); |
558
1ae2a752501e
(svn r960) -Fix: forgotten conversion of orders for the AI (Tron)
darkvater
parents:
555
diff
changeset
|
241 |
return order; |
560
60e198893a41
(svn r962) Fixed a problem with the new order system due to missing '{}' (another place)
Celestar
parents:
559
diff
changeset
|
242 |
} |
0 | 243 |
break; |
244 |
||
245 |
case MP_WATER: |
|
246 |
if (v->type != VEH_Ship) break; |
|
1334 | 247 |
if (IsTileDepotType(tile, TRANSPORT_WATER) && |
248 |
IsTileOwner(tile, _local_player)) { |
|
3392
469942e8a0ca
(svn r4200) -Codechange: Make use of water map accessors when getting the Index of a Ship Depot. TODO: Store the depot index in the map
celestar
parents:
3387
diff
changeset
|
249 |
TileIndex tile2 = GetOtherShipDepotTile(tile); |
469942e8a0ca
(svn r4200) -Codechange: Make use of water map accessors when getting the Index of a Ship Depot. TODO: Store the depot index in the map
celestar
parents:
3387
diff
changeset
|
250 |
|
558
1ae2a752501e
(svn r960) -Fix: forgotten conversion of orders for the AI (Tron)
darkvater
parents:
555
diff
changeset
|
251 |
order.type = OT_GOTO_DEPOT; |
1530
2b46869fc0d4
(svn r2034) -Codechange: Replaced the rather meaningless LOAD and UNLOAD flags for depots by something more meaningful
celestar
parents:
1363
diff
changeset
|
252 |
order.flags = OF_PART_OF_ORDERS; |
4527
fa30d19685c2
(svn r6353) -Codechange: Make DestinationID a typedef of uin16, which is as large as any type of destinataion (StationID, DepotID, WaypointID) it can hold
tron
parents:
4408
diff
changeset
|
253 |
order.dest = GetDepotByTile(tile < tile2 ? tile : tile2)->index; |
558
1ae2a752501e
(svn r960) -Fix: forgotten conversion of orders for the AI (Tron)
darkvater
parents:
555
diff
changeset
|
254 |
return order; |
0 | 255 |
} |
1214
8262981ac274
(svn r1718) Use the enum TileType as parameter/return type for [GS]etTileType() instead of plain int.
tron
parents:
1209
diff
changeset
|
256 |
|
8262981ac274
(svn r1718) Use the enum TileType as parameter/return type for [GS]etTileType() instead of plain int.
tron
parents:
1209
diff
changeset
|
257 |
default: |
8262981ac274
(svn r1718) Use the enum TileType as parameter/return type for [GS]etTileType() instead of plain int.
tron
parents:
1209
diff
changeset
|
258 |
break; |
0 | 259 |
} |
260 |
} |
|
261 |
||
395
788a9bba0889
(svn r587) -newgrf: Rename all /Checkpoint/i tokens to 'Waypoint's. The name actually makes some sense and is also compatible with TTDPatch (pasky).
darkvater
parents:
319
diff
changeset
|
262 |
// check waypoint |
1901
03bf9bf99319
(svn r2407) Use {Get,Is}TileOwner to get/check the owner of a tile and fix some bogus reads of _map_owner
tron
parents:
1891
diff
changeset
|
263 |
if (IsTileType(tile, MP_RAILWAY) && |
03bf9bf99319
(svn r2407) Use {Get,Is}TileOwner to get/check the owner of a tile and fix some bogus reads of _map_owner
tron
parents:
1891
diff
changeset
|
264 |
v->type == VEH_Train && |
03bf9bf99319
(svn r2407) Use {Get,Is}TileOwner to get/check the owner of a tile and fix some bogus reads of _map_owner
tron
parents:
1891
diff
changeset
|
265 |
IsTileOwner(tile, _local_player) && |
2668
c0f1828b89e4
(svn r3210) -Codechange: use IsRailWaypoint where possible (instead of magicnumbers)
truelight
parents:
2643
diff
changeset
|
266 |
IsRailWaypoint(tile)) { |
558
1ae2a752501e
(svn r960) -Fix: forgotten conversion of orders for the AI (Tron)
darkvater
parents:
555
diff
changeset
|
267 |
order.type = OT_GOTO_WAYPOINT; |
1ae2a752501e
(svn r960) -Fix: forgotten conversion of orders for the AI (Tron)
darkvater
parents:
555
diff
changeset
|
268 |
order.flags = 0; |
4527
fa30d19685c2
(svn r6353) -Codechange: Make DestinationID a typedef of uin16, which is as large as any type of destinataion (StationID, DepotID, WaypointID) it can hold
tron
parents:
4408
diff
changeset
|
269 |
order.dest = GetWaypointByTile(tile)->index; |
558
1ae2a752501e
(svn r960) -Fix: forgotten conversion of orders for the AI (Tron)
darkvater
parents:
555
diff
changeset
|
270 |
return order; |
1ae2a752501e
(svn r960) -Fix: forgotten conversion of orders for the AI (Tron)
darkvater
parents:
555
diff
changeset
|
271 |
} |
319
1769185de5f5
(svn r329) Fix: [ 1035066 ] 'Allow goto depot' turned off, no checkpoints in orders
dominik
parents:
193
diff
changeset
|
272 |
|
1035
812f837ee03f
(svn r1536) Move GET_TILEHEIGHT, GET_TILETYPE and IS_TILETYPE to map.h, turn them into inline functions and add some asserts
tron
parents:
1024
diff
changeset
|
273 |
if (IsTileType(tile, MP_STATION)) { |
3315
c9d989783c55
(svn r4079) Add GetSation{Index,ByTile}() to get the station index resp. the station from a tile
tron
parents:
3269
diff
changeset
|
274 |
StationID st_index = GetStationIndex(tile); |
4171 | 275 |
const Station *st = GetStation(st_index); |
0 | 276 |
|
277 |
if (st->owner == _current_player || st->owner == OWNER_NONE) { |
|
278 |
byte facil; |
|
279 |
(facil=FACIL_DOCK, v->type == VEH_Ship) || |
|
280 |
(facil=FACIL_TRAIN, v->type == VEH_Train) || |
|
281 |
(facil=FACIL_AIRPORT, v->type == VEH_Aircraft) || |
|
282 |
(facil=FACIL_BUS_STOP, v->type == VEH_Road && v->cargo_type == CT_PASSENGERS) || |
|
283 |
(facil=FACIL_TRUCK_STOP, 1); |
|
558
1ae2a752501e
(svn r960) -Fix: forgotten conversion of orders for the AI (Tron)
darkvater
parents:
555
diff
changeset
|
284 |
if (st->facilities & facil) { |
1ae2a752501e
(svn r960) -Fix: forgotten conversion of orders for the AI (Tron)
darkvater
parents:
555
diff
changeset
|
285 |
order.type = OT_GOTO_STATION; |
1ae2a752501e
(svn r960) -Fix: forgotten conversion of orders for the AI (Tron)
darkvater
parents:
555
diff
changeset
|
286 |
order.flags = 0; |
4527
fa30d19685c2
(svn r6353) -Codechange: Make DestinationID a typedef of uin16, which is as large as any type of destinataion (StationID, DepotID, WaypointID) it can hold
tron
parents:
4408
diff
changeset
|
287 |
order.dest = st_index; |
558
1ae2a752501e
(svn r960) -Fix: forgotten conversion of orders for the AI (Tron)
darkvater
parents:
555
diff
changeset
|
288 |
return order; |
1ae2a752501e
(svn r960) -Fix: forgotten conversion of orders for the AI (Tron)
darkvater
parents:
555
diff
changeset
|
289 |
} |
0 | 290 |
} |
291 |
} |
|
292 |
||
293 |
// not found |
|
558
1ae2a752501e
(svn r960) -Fix: forgotten conversion of orders for the AI (Tron)
darkvater
parents:
555
diff
changeset
|
294 |
order.type = OT_NOTHING; |
1ae2a752501e
(svn r960) -Fix: forgotten conversion of orders for the AI (Tron)
darkvater
parents:
555
diff
changeset
|
295 |
order.flags = 0; |
4527
fa30d19685c2
(svn r6353) -Codechange: Make DestinationID a typedef of uin16, which is as large as any type of destinataion (StationID, DepotID, WaypointID) it can hold
tron
parents:
4408
diff
changeset
|
296 |
order.dest = INVALID_STATION; |
558
1ae2a752501e
(svn r960) -Fix: forgotten conversion of orders for the AI (Tron)
darkvater
parents:
555
diff
changeset
|
297 |
return order; |
0 | 298 |
} |
299 |
||
4171 | 300 |
static bool HandleOrderVehClick(const Vehicle *v, const Vehicle *u, Window *w) |
0 | 301 |
{ |
2549 | 302 |
if (u->type != v->type) return false; |
0 | 303 |
|
2676
59b65b4fb480
(svn r3218) -Feature: Multiheaded train engines will now stay in the same train
bjarni
parents:
2668
diff
changeset
|
304 |
if (u->type == VEH_Train && !IsFrontEngine(u)) { |
0 | 305 |
u = GetFirstVehicleInChain(u); |
2676
59b65b4fb480
(svn r3218) -Feature: Multiheaded train engines will now stay in the same train
bjarni
parents:
2668
diff
changeset
|
306 |
if (!IsFrontEngine(u)) return false; |
0 | 307 |
} |
308 |
||
309 |
// v is vehicle getting orders. Only copy/clone orders if vehicle doesn't have any orders yet |
|
310 |
// obviously if you press CTRL on a non-empty orders vehicle you know what you are doing |
|
2549 | 311 |
if (v->num_orders != 0 && _ctrl_pressed == 0) return false; |
193
0a7025304867
(svn r194) -Codechange: stripping trailing-spaces. Please keep this that way!
truelight
parents:
176
diff
changeset
|
312 |
|
0 | 313 |
if (DoCommandP(v->tile, v->index | (u->index << 16), _ctrl_pressed ? 0 : 1, NULL, |
314 |
_ctrl_pressed ? CMD_CLONE_ORDER | CMD_MSG(STR_CANT_SHARE_ORDER_LIST) : CMD_CLONE_ORDER | CMD_MSG(STR_CANT_COPY_ORDER_LIST))) { |
|
315 |
WP(w,order_d).sel = -1; |
|
316 |
ResetObjectToPlace(); |
|
317 |
} |
|
318 |
||
319 |
return true; |
|
320 |
} |
|
321 |
||
4171 | 322 |
static void OrdersPlaceObj(const Vehicle *v, TileIndex tile, Window *w) |
0 | 323 |
{ |
558
1ae2a752501e
(svn r960) -Fix: forgotten conversion of orders for the AI (Tron)
darkvater
parents:
555
diff
changeset
|
324 |
Order cmd; |
4171 | 325 |
const Vehicle *u; |
193
0a7025304867
(svn r194) -Codechange: stripping trailing-spaces. Please keep this that way!
truelight
parents:
176
diff
changeset
|
326 |
|
0 | 327 |
// check if we're clicking on a vehicle first.. clone orders in that case. |
328 |
u = CheckMouseOverVehicle(); |
|
2549 | 329 |
if (u != NULL && HandleOrderVehClick(v, u, w)) return; |
0 | 330 |
|
331 |
cmd = GetOrderCmdFromTile(v, tile); |
|
558
1ae2a752501e
(svn r960) -Fix: forgotten conversion of orders for the AI (Tron)
darkvater
parents:
555
diff
changeset
|
332 |
if (cmd.type == OT_NOTHING) return; |
0 | 333 |
|
558
1ae2a752501e
(svn r960) -Fix: forgotten conversion of orders for the AI (Tron)
darkvater
parents:
555
diff
changeset
|
334 |
if (DoCommandP(v->tile, v->index + (OrderGetSel(w) << 16), PackOrder(&cmd), NULL, CMD_INSERT_ORDER | CMD_MSG(STR_8833_CAN_T_INSERT_NEW_ORDER))) { |
2549 | 335 |
if (WP(w,order_d).sel != -1) WP(w,order_d).sel++; |
0 | 336 |
ResetObjectToPlace(); |
337 |
} |
|
338 |
} |
|
339 |
||
4171 | 340 |
static void OrderClick_Goto(Window *w, const Vehicle *v) |
1000
db05d7d665b4
(svn r1498) -Feature: Addded keyboard shortcuts for the order window
Celestar
parents:
995
diff
changeset
|
341 |
{ |
db05d7d665b4
(svn r1498) -Feature: Addded keyboard shortcuts for the order window
Celestar
parents:
995
diff
changeset
|
342 |
InvalidateWidget(w, 7); |
db05d7d665b4
(svn r1498) -Feature: Addded keyboard shortcuts for the order window
Celestar
parents:
995
diff
changeset
|
343 |
TOGGLEBIT(w->click_state, 7); |
db05d7d665b4
(svn r1498) -Feature: Addded keyboard shortcuts for the order window
Celestar
parents:
995
diff
changeset
|
344 |
if (HASBIT(w->click_state, 7)) { |
db05d7d665b4
(svn r1498) -Feature: Addded keyboard shortcuts for the order window
Celestar
parents:
995
diff
changeset
|
345 |
_place_clicked_vehicle = NULL; |
db05d7d665b4
(svn r1498) -Feature: Addded keyboard shortcuts for the order window
Celestar
parents:
995
diff
changeset
|
346 |
SetObjectToPlaceWnd(ANIMCURSOR_PICKSTATION, 1, w); |
db05d7d665b4
(svn r1498) -Feature: Addded keyboard shortcuts for the order window
Celestar
parents:
995
diff
changeset
|
347 |
} else { |
db05d7d665b4
(svn r1498) -Feature: Addded keyboard shortcuts for the order window
Celestar
parents:
995
diff
changeset
|
348 |
ResetObjectToPlace(); |
db05d7d665b4
(svn r1498) -Feature: Addded keyboard shortcuts for the order window
Celestar
parents:
995
diff
changeset
|
349 |
} |
db05d7d665b4
(svn r1498) -Feature: Addded keyboard shortcuts for the order window
Celestar
parents:
995
diff
changeset
|
350 |
} |
db05d7d665b4
(svn r1498) -Feature: Addded keyboard shortcuts for the order window
Celestar
parents:
995
diff
changeset
|
351 |
|
4171 | 352 |
static void OrderClick_FullLoad(Window *w, const Vehicle *v) |
1000
db05d7d665b4
(svn r1498) -Feature: Addded keyboard shortcuts for the order window
Celestar
parents:
995
diff
changeset
|
353 |
{ |
1024
5e446b5b3ec5
(svn r1525) -Codechange: rewrote the _order_array, now it can be made dynamic.
truelight
parents:
1019
diff
changeset
|
354 |
DoCommandP(v->tile, v->index + (OrderGetSel(w) << 16), OFB_FULL_LOAD, NULL, CMD_MODIFY_ORDER | CMD_MSG(STR_8835_CAN_T_MODIFY_THIS_ORDER)); |
1000
db05d7d665b4
(svn r1498) -Feature: Addded keyboard shortcuts for the order window
Celestar
parents:
995
diff
changeset
|
355 |
} |
db05d7d665b4
(svn r1498) -Feature: Addded keyboard shortcuts for the order window
Celestar
parents:
995
diff
changeset
|
356 |
|
4171 | 357 |
static void OrderClick_Unload(Window *w, const Vehicle *v) |
1000
db05d7d665b4
(svn r1498) -Feature: Addded keyboard shortcuts for the order window
Celestar
parents:
995
diff
changeset
|
358 |
{ |
1024
5e446b5b3ec5
(svn r1525) -Codechange: rewrote the _order_array, now it can be made dynamic.
truelight
parents:
1019
diff
changeset
|
359 |
DoCommandP(v->tile, v->index + (OrderGetSel(w) << 16), OFB_UNLOAD, NULL, CMD_MODIFY_ORDER | CMD_MSG(STR_8835_CAN_T_MODIFY_THIS_ORDER)); |
5e446b5b3ec5
(svn r1525) -Codechange: rewrote the _order_array, now it can be made dynamic.
truelight
parents:
1019
diff
changeset
|
360 |
} |
5e446b5b3ec5
(svn r1525) -Codechange: rewrote the _order_array, now it can be made dynamic.
truelight
parents:
1019
diff
changeset
|
361 |
|
4171 | 362 |
static void OrderClick_Nonstop(Window *w, const Vehicle *v) |
1024
5e446b5b3ec5
(svn r1525) -Codechange: rewrote the _order_array, now it can be made dynamic.
truelight
parents:
1019
diff
changeset
|
363 |
{ |
5e446b5b3ec5
(svn r1525) -Codechange: rewrote the _order_array, now it can be made dynamic.
truelight
parents:
1019
diff
changeset
|
364 |
DoCommandP(v->tile, v->index + (OrderGetSel(w) << 16), OFB_NON_STOP, NULL, CMD_MODIFY_ORDER | CMD_MSG(STR_8835_CAN_T_MODIFY_THIS_ORDER)); |
1000
db05d7d665b4
(svn r1498) -Feature: Addded keyboard shortcuts for the order window
Celestar
parents:
995
diff
changeset
|
365 |
} |
db05d7d665b4
(svn r1498) -Feature: Addded keyboard shortcuts for the order window
Celestar
parents:
995
diff
changeset
|
366 |
|
2549 | 367 |
static void OrderClick_Transfer(Window* w, const Vehicle* v) |
1935
164d58b9137c
(svn r2441) -Feature: You can now give transfer order to set up feeder systems
celestar
parents:
1901
diff
changeset
|
368 |
{ |
164d58b9137c
(svn r2441) -Feature: You can now give transfer order to set up feeder systems
celestar
parents:
1901
diff
changeset
|
369 |
DoCommandP(v->tile, v->index + (OrderGetSel(w) << 16), OFB_TRANSFER, NULL, CMD_MODIFY_ORDER | CMD_MSG(STR_8835_CAN_T_MODIFY_THIS_ORDER)); |
164d58b9137c
(svn r2441) -Feature: You can now give transfer order to set up feeder systems
celestar
parents:
1901
diff
changeset
|
370 |
} |
164d58b9137c
(svn r2441) -Feature: You can now give transfer order to set up feeder systems
celestar
parents:
1901
diff
changeset
|
371 |
|
4171 | 372 |
static void OrderClick_Skip(Window *w, const Vehicle *v) |
1000
db05d7d665b4
(svn r1498) -Feature: Addded keyboard shortcuts for the order window
Celestar
parents:
995
diff
changeset
|
373 |
{ |
1024
5e446b5b3ec5
(svn r1525) -Codechange: rewrote the _order_array, now it can be made dynamic.
truelight
parents:
1019
diff
changeset
|
374 |
DoCommandP(v->tile, v->index, 0, NULL, CMD_SKIP_ORDER); |
1000
db05d7d665b4
(svn r1498) -Feature: Addded keyboard shortcuts for the order window
Celestar
parents:
995
diff
changeset
|
375 |
} |
db05d7d665b4
(svn r1498) -Feature: Addded keyboard shortcuts for the order window
Celestar
parents:
995
diff
changeset
|
376 |
|
4171 | 377 |
static void OrderClick_Delete(Window *w, const Vehicle *v) |
1000
db05d7d665b4
(svn r1498) -Feature: Addded keyboard shortcuts for the order window
Celestar
parents:
995
diff
changeset
|
378 |
{ |
1024
5e446b5b3ec5
(svn r1525) -Codechange: rewrote the _order_array, now it can be made dynamic.
truelight
parents:
1019
diff
changeset
|
379 |
DoCommandP(v->tile, v->index, OrderGetSel(w), NULL, CMD_DELETE_ORDER | CMD_MSG(STR_8834_CAN_T_DELETE_THIS_ORDER)); |
1000
db05d7d665b4
(svn r1498) -Feature: Addded keyboard shortcuts for the order window
Celestar
parents:
995
diff
changeset
|
380 |
} |
db05d7d665b4
(svn r1498) -Feature: Addded keyboard shortcuts for the order window
Celestar
parents:
995
diff
changeset
|
381 |
|
4171 | 382 |
typedef void OnButtonVehClick(Window *w, const Vehicle *v); |
1000
db05d7d665b4
(svn r1498) -Feature: Addded keyboard shortcuts for the order window
Celestar
parents:
995
diff
changeset
|
383 |
|
4171 | 384 |
static OnButtonVehClick* const _order_button_proc[] = { |
1000
db05d7d665b4
(svn r1498) -Feature: Addded keyboard shortcuts for the order window
Celestar
parents:
995
diff
changeset
|
385 |
OrderClick_Skip, |
db05d7d665b4
(svn r1498) -Feature: Addded keyboard shortcuts for the order window
Celestar
parents:
995
diff
changeset
|
386 |
OrderClick_Delete, |
db05d7d665b4
(svn r1498) -Feature: Addded keyboard shortcuts for the order window
Celestar
parents:
995
diff
changeset
|
387 |
OrderClick_Nonstop, |
db05d7d665b4
(svn r1498) -Feature: Addded keyboard shortcuts for the order window
Celestar
parents:
995
diff
changeset
|
388 |
OrderClick_Goto, |
db05d7d665b4
(svn r1498) -Feature: Addded keyboard shortcuts for the order window
Celestar
parents:
995
diff
changeset
|
389 |
OrderClick_FullLoad, |
1935
164d58b9137c
(svn r2441) -Feature: You can now give transfer order to set up feeder systems
celestar
parents:
1901
diff
changeset
|
390 |
OrderClick_Unload, |
164d58b9137c
(svn r2441) -Feature: You can now give transfer order to set up feeder systems
celestar
parents:
1901
diff
changeset
|
391 |
OrderClick_Transfer |
1000
db05d7d665b4
(svn r1498) -Feature: Addded keyboard shortcuts for the order window
Celestar
parents:
995
diff
changeset
|
392 |
}; |
db05d7d665b4
(svn r1498) -Feature: Addded keyboard shortcuts for the order window
Celestar
parents:
995
diff
changeset
|
393 |
|
db05d7d665b4
(svn r1498) -Feature: Addded keyboard shortcuts for the order window
Celestar
parents:
995
diff
changeset
|
394 |
static const uint16 _order_keycodes[] = { |
db05d7d665b4
(svn r1498) -Feature: Addded keyboard shortcuts for the order window
Celestar
parents:
995
diff
changeset
|
395 |
'D', //skip order |
db05d7d665b4
(svn r1498) -Feature: Addded keyboard shortcuts for the order window
Celestar
parents:
995
diff
changeset
|
396 |
'F', //delete order |
db05d7d665b4
(svn r1498) -Feature: Addded keyboard shortcuts for the order window
Celestar
parents:
995
diff
changeset
|
397 |
'G', //non-stop |
db05d7d665b4
(svn r1498) -Feature: Addded keyboard shortcuts for the order window
Celestar
parents:
995
diff
changeset
|
398 |
'H', //goto order |
db05d7d665b4
(svn r1498) -Feature: Addded keyboard shortcuts for the order window
Celestar
parents:
995
diff
changeset
|
399 |
'J', //full load |
db05d7d665b4
(svn r1498) -Feature: Addded keyboard shortcuts for the order window
Celestar
parents:
995
diff
changeset
|
400 |
'K' //unload |
db05d7d665b4
(svn r1498) -Feature: Addded keyboard shortcuts for the order window
Celestar
parents:
995
diff
changeset
|
401 |
}; |
0 | 402 |
|
403 |
static void OrdersWndProc(Window *w, WindowEvent *e) |
|
404 |
{ |
|
2549 | 405 |
switch (e->event) { |
0 | 406 |
case WE_PAINT: |
407 |
DrawOrdersWindow(w); |
|
408 |
break; |
|
409 |
||
410 |
case WE_CLICK: { |
|
919
544f374ee392
(svn r1407) -Codechange: changed a lot around _stations, _vehicles, _towns and _industries
truelight
parents:
893
diff
changeset
|
411 |
Vehicle *v = GetVehicle(w->window_number); |
4634
07699ac2bf37
(svn r6499) -Codechange: Finally, got "byte event" outside of the union WindowEvent, which is now a struct
belugas
parents:
4547
diff
changeset
|
412 |
switch (e->we.click.widget) { |
1242
1ca216c50426
(svn r1746) - Feature: [GUI] [ 1107690 ] Resizable orders GUI (nzhook)
darkvater
parents:
1214
diff
changeset
|
413 |
case 2: { /* orders list */ |
4634
07699ac2bf37
(svn r6499) -Codechange: Finally, got "byte event" outside of the union WindowEvent, which is now a struct
belugas
parents:
4547
diff
changeset
|
414 |
int sel = (e->we.click.pt.y - 15) / 10; |
0 | 415 |
|
4077
d4d440dd8925
(svn r5391) Miscellaneous, mostly bracing and whitespace, nothing spectacular
tron
parents:
4012
diff
changeset
|
416 |
if ((uint)sel >= w->vscroll.cap) return; |
0 | 417 |
|
418 |
sel += w->vscroll.pos; |
|
419 |
||
1024
5e446b5b3ec5
(svn r1525) -Codechange: rewrote the _order_array, now it can be made dynamic.
truelight
parents:
1019
diff
changeset
|
420 |
if (_ctrl_pressed && sel < v->num_orders) { |
1043
44508ede2f92
(svn r1544) -Fix: SwapOrder did not use AssignOrder, which caused the saveroutine to
truelight
parents:
1035
diff
changeset
|
421 |
const Order *ord = GetVehicleOrder(v, sel); |
4077
d4d440dd8925
(svn r5391) Miscellaneous, mostly bracing and whitespace, nothing spectacular
tron
parents:
4012
diff
changeset
|
422 |
TileIndex xy; |
d4d440dd8925
(svn r5391) Miscellaneous, mostly bracing and whitespace, nothing spectacular
tron
parents:
4012
diff
changeset
|
423 |
|
1024
5e446b5b3ec5
(svn r1525) -Codechange: rewrote the _order_array, now it can be made dynamic.
truelight
parents:
1019
diff
changeset
|
424 |
switch (ord->type) { |
4527
fa30d19685c2
(svn r6353) -Codechange: Make DestinationID a typedef of uin16, which is as large as any type of destinataion (StationID, DepotID, WaypointID) it can hold
tron
parents:
4408
diff
changeset
|
425 |
case OT_GOTO_STATION: xy = GetStation(ord->dest)->xy ; break; |
fa30d19685c2
(svn r6353) -Codechange: Make DestinationID a typedef of uin16, which is as large as any type of destinataion (StationID, DepotID, WaypointID) it can hold
tron
parents:
4408
diff
changeset
|
426 |
case OT_GOTO_DEPOT: xy = GetDepot(ord->dest)->xy; break; |
fa30d19685c2
(svn r6353) -Codechange: Make DestinationID a typedef of uin16, which is as large as any type of destinataion (StationID, DepotID, WaypointID) it can hold
tron
parents:
4408
diff
changeset
|
427 |
case OT_GOTO_WAYPOINT: xy = GetWaypoint(ord->dest)->xy; break; |
4077
d4d440dd8925
(svn r5391) Miscellaneous, mostly bracing and whitespace, nothing spectacular
tron
parents:
4012
diff
changeset
|
428 |
default: xy = 0; break; |
44
1923acc255d1
(svn r45) -Feature [992998] Scrollto Station in Orders. CTRL click on orders of a vehicle and main-window scrolls to that station. (chrishuebsch)
darkvater
parents:
25
diff
changeset
|
429 |
} |
1923acc255d1
(svn r45) -Feature [992998] Scrollto Station in Orders. CTRL click on orders of a vehicle and main-window scrolls to that station. (chrishuebsch)
darkvater
parents:
25
diff
changeset
|
430 |
|
4077
d4d440dd8925
(svn r5391) Miscellaneous, mostly bracing and whitespace, nothing spectacular
tron
parents:
4012
diff
changeset
|
431 |
if (xy != 0) ScrollMainWindowToTile(xy); |
44
1923acc255d1
(svn r45) -Feature [992998] Scrollto Station in Orders. CTRL click on orders of a vehicle and main-window scrolls to that station. (chrishuebsch)
darkvater
parents:
25
diff
changeset
|
432 |
return; |
1923acc255d1
(svn r45) -Feature [992998] Scrollto Station in Orders. CTRL click on orders of a vehicle and main-window scrolls to that station. (chrishuebsch)
darkvater
parents:
25
diff
changeset
|
433 |
} |
1923acc255d1
(svn r45) -Feature [992998] Scrollto Station in Orders. CTRL click on orders of a vehicle and main-window scrolls to that station. (chrishuebsch)
darkvater
parents:
25
diff
changeset
|
434 |
|
0 | 435 |
if (sel == WP(w,order_d).sel) sel = -1; |
436 |
WP(w,order_d).sel = sel; |
|
437 |
SetWindowDirty(w); |
|
438 |
} break; |
|
439 |
||
440 |
case 4: /* skip button */ |
|
1000
db05d7d665b4
(svn r1498) -Feature: Addded keyboard shortcuts for the order window
Celestar
parents:
995
diff
changeset
|
441 |
OrderClick_Skip(w, v); |
0 | 442 |
break; |
443 |
||
444 |
case 5: /* delete button */ |
|
1000
db05d7d665b4
(svn r1498) -Feature: Addded keyboard shortcuts for the order window
Celestar
parents:
995
diff
changeset
|
445 |
OrderClick_Delete(w, v); |
0 | 446 |
break; |
447 |
||
1000
db05d7d665b4
(svn r1498) -Feature: Addded keyboard shortcuts for the order window
Celestar
parents:
995
diff
changeset
|
448 |
case 6: /* non stop button */ |
db05d7d665b4
(svn r1498) -Feature: Addded keyboard shortcuts for the order window
Celestar
parents:
995
diff
changeset
|
449 |
OrderClick_Nonstop(w, v); |
db05d7d665b4
(svn r1498) -Feature: Addded keyboard shortcuts for the order window
Celestar
parents:
995
diff
changeset
|
450 |
break; |
1019
6bae6c11e865
(svn r1520) Trim 134 (!) lines with trailing whitespace ):
tron
parents:
1000
diff
changeset
|
451 |
|
0 | 452 |
case 7: /* goto button */ |
1000
db05d7d665b4
(svn r1498) -Feature: Addded keyboard shortcuts for the order window
Celestar
parents:
995
diff
changeset
|
453 |
OrderClick_Goto(w, v); |
0 | 454 |
break; |
455 |
||
456 |
case 8: /* full load button */ |
|
1000
db05d7d665b4
(svn r1498) -Feature: Addded keyboard shortcuts for the order window
Celestar
parents:
995
diff
changeset
|
457 |
OrderClick_FullLoad(w, v); |
0 | 458 |
break; |
459 |
||
460 |
case 9: /* unload button */ |
|
1000
db05d7d665b4
(svn r1498) -Feature: Addded keyboard shortcuts for the order window
Celestar
parents:
995
diff
changeset
|
461 |
OrderClick_Unload(w, v); |
0 | 462 |
break; |
1935
164d58b9137c
(svn r2441) -Feature: You can now give transfer order to set up feeder systems
celestar
parents:
1901
diff
changeset
|
463 |
case 10: /* transfer button */ |
164d58b9137c
(svn r2441) -Feature: You can now give transfer order to set up feeder systems
celestar
parents:
1901
diff
changeset
|
464 |
OrderClick_Transfer(w, v); |
164d58b9137c
(svn r2441) -Feature: You can now give transfer order to set up feeder systems
celestar
parents:
1901
diff
changeset
|
465 |
break; |
4408
db2afc41002a
(svn r6161) -Feature: List of vehicles with the same shared orders
bjarni
parents:
4389
diff
changeset
|
466 |
case 11: /* Vehicle with same shared Orders button */ |
4668
f7256d0e7682
(svn r6562) -Codechange: merged the vehicle list window widget arrays
bjarni
parents:
4634
diff
changeset
|
467 |
ShowVehWithSharedOrders(v, v->type); |
4408
db2afc41002a
(svn r6161) -Feature: List of vehicles with the same shared orders
bjarni
parents:
4389
diff
changeset
|
468 |
break; |
0 | 469 |
} |
470 |
} break; |
|
1019
6bae6c11e865
(svn r1520) Trim 134 (!) lines with trailing whitespace ):
tron
parents:
1000
diff
changeset
|
471 |
|
1000
db05d7d665b4
(svn r1498) -Feature: Addded keyboard shortcuts for the order window
Celestar
parents:
995
diff
changeset
|
472 |
case WE_KEYPRESS: { |
db05d7d665b4
(svn r1498) -Feature: Addded keyboard shortcuts for the order window
Celestar
parents:
995
diff
changeset
|
473 |
Vehicle *v = GetVehicle(w->window_number); |
db05d7d665b4
(svn r1498) -Feature: Addded keyboard shortcuts for the order window
Celestar
parents:
995
diff
changeset
|
474 |
uint i; |
db05d7d665b4
(svn r1498) -Feature: Addded keyboard shortcuts for the order window
Celestar
parents:
995
diff
changeset
|
475 |
|
2952 | 476 |
for (i = 0; i < lengthof(_order_keycodes); i++) { |
4634
07699ac2bf37
(svn r6499) -Codechange: Finally, got "byte event" outside of the union WindowEvent, which is now a struct
belugas
parents:
4547
diff
changeset
|
477 |
if (e->we.keypress.keycode == _order_keycodes[i]) { |
07699ac2bf37
(svn r6499) -Codechange: Finally, got "byte event" outside of the union WindowEvent, which is now a struct
belugas
parents:
4547
diff
changeset
|
478 |
e->we.keypress.cont = false; |
1019
6bae6c11e865
(svn r1520) Trim 134 (!) lines with trailing whitespace ):
tron
parents:
1000
diff
changeset
|
479 |
//see if the button is disabled |
4000
4009d092b306
(svn r5210) Many small changes which piled up: const, unsigned, variable scope, CSE for readability, DeMorgan, if cascades -> switch, whitespace, parentheses, bracing, misc.
tron
parents:
3793
diff
changeset
|
480 |
if (!HASBIT(w->disabled_state, i + 4)) _order_button_proc[i](w, v); |
1000
db05d7d665b4
(svn r1498) -Feature: Addded keyboard shortcuts for the order window
Celestar
parents:
995
diff
changeset
|
481 |
break; |
db05d7d665b4
(svn r1498) -Feature: Addded keyboard shortcuts for the order window
Celestar
parents:
995
diff
changeset
|
482 |
} |
db05d7d665b4
(svn r1498) -Feature: Addded keyboard shortcuts for the order window
Celestar
parents:
995
diff
changeset
|
483 |
} |
db05d7d665b4
(svn r1498) -Feature: Addded keyboard shortcuts for the order window
Celestar
parents:
995
diff
changeset
|
484 |
break; |
db05d7d665b4
(svn r1498) -Feature: Addded keyboard shortcuts for the order window
Celestar
parents:
995
diff
changeset
|
485 |
} |
db05d7d665b4
(svn r1498) -Feature: Addded keyboard shortcuts for the order window
Celestar
parents:
995
diff
changeset
|
486 |
|
0 | 487 |
case WE_RCLICK: { |
4171 | 488 |
const Vehicle *v = GetVehicle(w->window_number); |
2639 | 489 |
int s = OrderGetSel(w); |
490 |
||
4634
07699ac2bf37
(svn r6499) -Codechange: Finally, got "byte event" outside of the union WindowEvent, which is now a struct
belugas
parents:
4547
diff
changeset
|
491 |
if (e->we.click.widget != 8) break; |
2639 | 492 |
if (s == v->num_orders || GetVehicleOrder(v, s)->type != OT_GOTO_DEPOT) { |
1256
5b4916eb49ff
(svn r1760) -Fix: [ 1113399 ] Game no longer crashes when right-clicking a disabled Full Load button
celestar
parents:
1242
diff
changeset
|
493 |
GuiShowTooltips(STR_8857_MAKE_THE_HIGHLIGHTED_ORDER); |
2639 | 494 |
} else { |
0 | 495 |
GuiShowTooltips(STR_SERVICE_HINT); |
2639 | 496 |
} |
1242
1ca216c50426
(svn r1746) - Feature: [GUI] [ 1107690 ] Resizable orders GUI (nzhook)
darkvater
parents:
1214
diff
changeset
|
497 |
} break; |
0 | 498 |
|
499 |
case WE_PLACE_OBJ: { |
|
4634
07699ac2bf37
(svn r6499) -Codechange: Finally, got "byte event" outside of the union WindowEvent, which is now a struct
belugas
parents:
4547
diff
changeset
|
500 |
OrdersPlaceObj(GetVehicle(w->window_number), e->we.place.tile, w); |
0 | 501 |
} break; |
502 |
||
503 |
case WE_ABORT_PLACE_OBJ: { |
|
1242
1ca216c50426
(svn r1746) - Feature: [GUI] [ 1107690 ] Resizable orders GUI (nzhook)
darkvater
parents:
1214
diff
changeset
|
504 |
CLRBIT(w->click_state, 7); |
0 | 505 |
InvalidateWidget(w, 7); |
506 |
} break; |
|
507 |
||
508 |
// check if a vehicle in a depot was clicked.. |
|
509 |
case WE_MOUSELOOP: { |
|
4171 | 510 |
const Vehicle *v = _place_clicked_vehicle; |
25 | 511 |
/* |
512 |
* Check if we clicked on a vehicle |
|
513 |
* and if the GOTO button of this window is pressed |
|
514 |
* This is because of all open order windows WE_MOUSELOOP is called |
|
515 |
* and if you have 3 windows open, and this check is not done |
|
516 |
* the order is copied to the last open window instead of the |
|
517 |
* one where GOTO is enalbed |
|
518 |
*/ |
|
1242
1ca216c50426
(svn r1746) - Feature: [GUI] [ 1107690 ] Resizable orders GUI (nzhook)
darkvater
parents:
1214
diff
changeset
|
519 |
if (v != NULL && HASBIT(w->click_state, 7)) { |
0 | 520 |
_place_clicked_vehicle = NULL; |
919
544f374ee392
(svn r1407) -Codechange: changed a lot around _stations, _vehicles, _towns and _industries
truelight
parents:
893
diff
changeset
|
521 |
HandleOrderVehClick(GetVehicle(w->window_number), v, w); |
0 | 522 |
} |
523 |
} break; |
|
193
0a7025304867
(svn r194) -Codechange: stripping trailing-spaces. Please keep this that way!
truelight
parents:
176
diff
changeset
|
524 |
|
1242
1ca216c50426
(svn r1746) - Feature: [GUI] [ 1107690 ] Resizable orders GUI (nzhook)
darkvater
parents:
1214
diff
changeset
|
525 |
case WE_RESIZE: |
1ca216c50426
(svn r1746) - Feature: [GUI] [ 1107690 ] Resizable orders GUI (nzhook)
darkvater
parents:
1214
diff
changeset
|
526 |
/* Update the scroll + matrix */ |
1ca216c50426
(svn r1746) - Feature: [GUI] [ 1107690 ] Resizable orders GUI (nzhook)
darkvater
parents:
1214
diff
changeset
|
527 |
w->vscroll.cap = (w->widget[2].bottom - w->widget[2].top) / 10; |
1ca216c50426
(svn r1746) - Feature: [GUI] [ 1107690 ] Resizable orders GUI (nzhook)
darkvater
parents:
1214
diff
changeset
|
528 |
break; |
0 | 529 |
} |
530 |
} |
|
531 |
||
1081
0d79fc43fae2
(svn r1582) Fix: Only the train orders GUI has a non-stop button now.
dominik
parents:
1067
diff
changeset
|
532 |
static const Widget _orders_train_widgets[] = { |
4344
7e123fec5b0b
(svn r6045) -Cleanup: align all table-like structures using spaces, i.e. whitespace fixes only except for a few comments to make them uniform for the whole enum/struct.
rubidium
parents:
4182
diff
changeset
|
533 |
{ WWT_CLOSEBOX, RESIZE_NONE, 14, 0, 10, 0, 13, STR_00C5, STR_018B_CLOSE_WINDOW}, |
4408
db2afc41002a
(svn r6161) -Feature: List of vehicles with the same shared orders
bjarni
parents:
4389
diff
changeset
|
534 |
{ WWT_CAPTION, RESIZE_RIGHT, 14, 11, 398, 0, 13, STR_8829_ORDERS, STR_018C_WINDOW_TITLE_DRAG_THIS}, |
db2afc41002a
(svn r6161) -Feature: List of vehicles with the same shared orders
bjarni
parents:
4389
diff
changeset
|
535 |
{ WWT_PANEL, RESIZE_RB, 14, 0, 386, 14, 75, 0x0, STR_8852_ORDERS_LIST_CLICK_ON_ORDER}, |
db2afc41002a
(svn r6161) -Feature: List of vehicles with the same shared orders
bjarni
parents:
4389
diff
changeset
|
536 |
{ WWT_SCROLLBAR, RESIZE_LRB, 14, 387, 398, 14, 75, 0x0, STR_0190_SCROLL_BAR_SCROLLS_LIST}, |
4344
7e123fec5b0b
(svn r6045) -Cleanup: align all table-like structures using spaces, i.e. whitespace fixes only except for a few comments to make them uniform for the whole enum/struct.
rubidium
parents:
4182
diff
changeset
|
537 |
{ WWT_PUSHTXTBTN, RESIZE_TB, 14, 0, 52, 76, 87, STR_8823_SKIP, STR_8853_SKIP_THE_CURRENT_ORDER}, |
7e123fec5b0b
(svn r6045) -Cleanup: align all table-like structures using spaces, i.e. whitespace fixes only except for a few comments to make them uniform for the whole enum/struct.
rubidium
parents:
4182
diff
changeset
|
538 |
{ WWT_PUSHTXTBTN, RESIZE_TB, 14, 53, 105, 76, 87, STR_8824_DELETE, STR_8854_DELETE_THE_HIGHLIGHTED}, |
7e123fec5b0b
(svn r6045) -Cleanup: align all table-like structures using spaces, i.e. whitespace fixes only except for a few comments to make them uniform for the whole enum/struct.
rubidium
parents:
4182
diff
changeset
|
539 |
{ WWT_PUSHTXTBTN, RESIZE_TB, 14, 106, 158, 76, 87, STR_8825_NON_STOP, STR_8855_MAKE_THE_HIGHLIGHTED_ORDER}, |
7e123fec5b0b
(svn r6045) -Cleanup: align all table-like structures using spaces, i.e. whitespace fixes only except for a few comments to make them uniform for the whole enum/struct.
rubidium
parents:
4182
diff
changeset
|
540 |
{WWT_NODISTXTBTN, RESIZE_TB, 14, 159, 211, 76, 87, STR_8826_GO_TO, STR_8856_INSERT_A_NEW_ORDER_BEFORE}, |
7e123fec5b0b
(svn r6045) -Cleanup: align all table-like structures using spaces, i.e. whitespace fixes only except for a few comments to make them uniform for the whole enum/struct.
rubidium
parents:
4182
diff
changeset
|
541 |
{ WWT_PUSHTXTBTN, RESIZE_TB, 14, 212, 264, 76, 87, STR_FULLLOAD_OR_SERVICE, STR_NULL}, |
7e123fec5b0b
(svn r6045) -Cleanup: align all table-like structures using spaces, i.e. whitespace fixes only except for a few comments to make them uniform for the whole enum/struct.
rubidium
parents:
4182
diff
changeset
|
542 |
{ WWT_PUSHTXTBTN, RESIZE_TB, 14, 265, 319, 76, 87, STR_8828_UNLOAD, STR_8858_MAKE_THE_HIGHLIGHTED_ORDER}, |
7e123fec5b0b
(svn r6045) -Cleanup: align all table-like structures using spaces, i.e. whitespace fixes only except for a few comments to make them uniform for the whole enum/struct.
rubidium
parents:
4182
diff
changeset
|
543 |
{ WWT_PUSHTXTBTN, RESIZE_TB, 14, 320, 372, 76, 87, STR_886F_TRANSFER, STR_886D_MAKE_THE_HIGHLIGHTED_ORDER}, |
4408
db2afc41002a
(svn r6161) -Feature: List of vehicles with the same shared orders
bjarni
parents:
4389
diff
changeset
|
544 |
{ WWT_PUSHTXTBTN, RESIZE_TB, 14, 373, 386, 76, 87, STR_TRAIN, STR_VEH_WITH_SHARED_ORDERS_LIST_TIP}, |
db2afc41002a
(svn r6161) -Feature: List of vehicles with the same shared orders
bjarni
parents:
4389
diff
changeset
|
545 |
{ WWT_PANEL, RESIZE_RTB, 14, 387, 386, 76, 87, 0x0, STR_NULL}, |
db2afc41002a
(svn r6161) -Feature: List of vehicles with the same shared orders
bjarni
parents:
4389
diff
changeset
|
546 |
{ WWT_RESIZEBOX, RESIZE_LRTB, 14, 387, 398, 76, 87, 0x0, STR_RESIZE_BUTTON}, |
176
84990c4b9212
(svn r177) -Fix: padded out Widget code to solve warnings on C99 compiler (Tron)
darkvater
parents:
127
diff
changeset
|
547 |
{ WIDGETS_END}, |
0 | 548 |
}; |
549 |
||
1081
0d79fc43fae2
(svn r1582) Fix: Only the train orders GUI has a non-stop button now.
dominik
parents:
1067
diff
changeset
|
550 |
static const WindowDesc _orders_train_desc = { |
4408
db2afc41002a
(svn r6161) -Feature: List of vehicles with the same shared orders
bjarni
parents:
4389
diff
changeset
|
551 |
-1,-1, 399, 88, |
1081
0d79fc43fae2
(svn r1582) Fix: Only the train orders GUI has a non-stop button now.
dominik
parents:
1067
diff
changeset
|
552 |
WC_VEHICLE_ORDERS,WC_VEHICLE_VIEW, |
2064
e6a2b42d0b15
(svn r2573) Codechange: Removed WDF_RESTORE_DPARAM, it's not needed with the new string system.
ludde
parents:
2049
diff
changeset
|
553 |
WDF_STD_TOOLTIPS | WDF_STD_BTN | WDF_DEF_WIDGET | WDF_UNCLICK_BUTTONS | WDF_RESIZABLE, |
1081
0d79fc43fae2
(svn r1582) Fix: Only the train orders GUI has a non-stop button now.
dominik
parents:
1067
diff
changeset
|
554 |
_orders_train_widgets, |
0d79fc43fae2
(svn r1582) Fix: Only the train orders GUI has a non-stop button now.
dominik
parents:
1067
diff
changeset
|
555 |
OrdersWndProc |
0d79fc43fae2
(svn r1582) Fix: Only the train orders GUI has a non-stop button now.
dominik
parents:
1067
diff
changeset
|
556 |
}; |
0d79fc43fae2
(svn r1582) Fix: Only the train orders GUI has a non-stop button now.
dominik
parents:
1067
diff
changeset
|
557 |
|
0d79fc43fae2
(svn r1582) Fix: Only the train orders GUI has a non-stop button now.
dominik
parents:
1067
diff
changeset
|
558 |
static const Widget _orders_widgets[] = { |
4344
7e123fec5b0b
(svn r6045) -Cleanup: align all table-like structures using spaces, i.e. whitespace fixes only except for a few comments to make them uniform for the whole enum/struct.
rubidium
parents:
4182
diff
changeset
|
559 |
{ WWT_CLOSEBOX, RESIZE_NONE, 14, 0, 10, 0, 13, STR_00C5, STR_018B_CLOSE_WINDOW}, |
4408
db2afc41002a
(svn r6161) -Feature: List of vehicles with the same shared orders
bjarni
parents:
4389
diff
changeset
|
560 |
{ WWT_CAPTION, RESIZE_RIGHT, 14, 11, 409, 0, 13, STR_8829_ORDERS, STR_018C_WINDOW_TITLE_DRAG_THIS}, |
db2afc41002a
(svn r6161) -Feature: List of vehicles with the same shared orders
bjarni
parents:
4389
diff
changeset
|
561 |
{ WWT_PANEL, RESIZE_RB, 14, 0, 397, 14, 75, 0x0, STR_8852_ORDERS_LIST_CLICK_ON_ORDER}, |
db2afc41002a
(svn r6161) -Feature: List of vehicles with the same shared orders
bjarni
parents:
4389
diff
changeset
|
562 |
{ WWT_SCROLLBAR, RESIZE_LRB, 14, 398, 409, 14, 75, 0x0, STR_0190_SCROLL_BAR_SCROLLS_LIST}, |
4344
7e123fec5b0b
(svn r6045) -Cleanup: align all table-like structures using spaces, i.e. whitespace fixes only except for a few comments to make them uniform for the whole enum/struct.
rubidium
parents:
4182
diff
changeset
|
563 |
{ WWT_PUSHTXTBTN, RESIZE_TB, 14, 0, 63, 76, 87, STR_8823_SKIP, STR_8853_SKIP_THE_CURRENT_ORDER}, |
7e123fec5b0b
(svn r6045) -Cleanup: align all table-like structures using spaces, i.e. whitespace fixes only except for a few comments to make them uniform for the whole enum/struct.
rubidium
parents:
4182
diff
changeset
|
564 |
{ WWT_PUSHTXTBTN, RESIZE_TB, 14, 64, 128, 76, 87, STR_8824_DELETE, STR_8854_DELETE_THE_HIGHLIGHTED}, |
7e123fec5b0b
(svn r6045) -Cleanup: align all table-like structures using spaces, i.e. whitespace fixes only except for a few comments to make them uniform for the whole enum/struct.
rubidium
parents:
4182
diff
changeset
|
565 |
{ WWT_EMPTY, RESIZE_TB, 14, 0, 0, 76, 87, 0x0, 0x0}, |
7e123fec5b0b
(svn r6045) -Cleanup: align all table-like structures using spaces, i.e. whitespace fixes only except for a few comments to make them uniform for the whole enum/struct.
rubidium
parents:
4182
diff
changeset
|
566 |
{WWT_NODISTXTBTN, RESIZE_TB, 14, 129, 192, 76, 87, STR_8826_GO_TO, STR_8856_INSERT_A_NEW_ORDER_BEFORE}, |
7e123fec5b0b
(svn r6045) -Cleanup: align all table-like structures using spaces, i.e. whitespace fixes only except for a few comments to make them uniform for the whole enum/struct.
rubidium
parents:
4182
diff
changeset
|
567 |
{ WWT_PUSHTXTBTN, RESIZE_TB, 14, 193, 256, 76, 87, STR_FULLLOAD_OR_SERVICE, STR_NULL}, |
7e123fec5b0b
(svn r6045) -Cleanup: align all table-like structures using spaces, i.e. whitespace fixes only except for a few comments to make them uniform for the whole enum/struct.
rubidium
parents:
4182
diff
changeset
|
568 |
{ WWT_PUSHTXTBTN, RESIZE_TB, 14, 257, 319, 76, 87, STR_8828_UNLOAD, STR_8858_MAKE_THE_HIGHLIGHTED_ORDER}, |
7e123fec5b0b
(svn r6045) -Cleanup: align all table-like structures using spaces, i.e. whitespace fixes only except for a few comments to make them uniform for the whole enum/struct.
rubidium
parents:
4182
diff
changeset
|
569 |
{ WWT_PUSHTXTBTN, RESIZE_TB, 14, 320, 383, 76, 87, STR_886F_TRANSFER, STR_886D_MAKE_THE_HIGHLIGHTED_ORDER}, |
4408
db2afc41002a
(svn r6161) -Feature: List of vehicles with the same shared orders
bjarni
parents:
4389
diff
changeset
|
570 |
{ WWT_PUSHTXTBTN, RESIZE_TB, 14, 384, 397, 76, 87, STR_EMPTY, STR_VEH_WITH_SHARED_ORDERS_LIST_TIP}, |
db2afc41002a
(svn r6161) -Feature: List of vehicles with the same shared orders
bjarni
parents:
4389
diff
changeset
|
571 |
{ WWT_PANEL, RESIZE_RTB, 14, 397, 396, 76, 87, 0x0, STR_NULL}, |
db2afc41002a
(svn r6161) -Feature: List of vehicles with the same shared orders
bjarni
parents:
4389
diff
changeset
|
572 |
{ WWT_RESIZEBOX, RESIZE_LRTB, 14, 398, 409, 76, 87, 0x0, STR_RESIZE_BUTTON}, |
1081
0d79fc43fae2
(svn r1582) Fix: Only the train orders GUI has a non-stop button now.
dominik
parents:
1067
diff
changeset
|
573 |
{ WIDGETS_END}, |
0d79fc43fae2
(svn r1582) Fix: Only the train orders GUI has a non-stop button now.
dominik
parents:
1067
diff
changeset
|
574 |
}; |
0d79fc43fae2
(svn r1582) Fix: Only the train orders GUI has a non-stop button now.
dominik
parents:
1067
diff
changeset
|
575 |
|
995
0a8d27dcc231
(svn r1493) -Codechange: Removed redundancy in the order GUI. Currently we had most
celestar
parents:
919
diff
changeset
|
576 |
static const WindowDesc _orders_desc = { |
4408
db2afc41002a
(svn r6161) -Feature: List of vehicles with the same shared orders
bjarni
parents:
4389
diff
changeset
|
577 |
-1,-1, 410, 88, |
0 | 578 |
WC_VEHICLE_ORDERS,WC_VEHICLE_VIEW, |
2064
e6a2b42d0b15
(svn r2573) Codechange: Removed WDF_RESTORE_DPARAM, it's not needed with the new string system.
ludde
parents:
2049
diff
changeset
|
579 |
WDF_STD_TOOLTIPS | WDF_STD_BTN | WDF_DEF_WIDGET | WDF_UNCLICK_BUTTONS | WDF_RESIZABLE, |
995
0a8d27dcc231
(svn r1493) -Codechange: Removed redundancy in the order GUI. Currently we had most
celestar
parents:
919
diff
changeset
|
580 |
_orders_widgets, |
0 | 581 |
OrdersWndProc |
582 |
}; |
|
583 |
||
995
0a8d27dcc231
(svn r1493) -Codechange: Removed redundancy in the order GUI. Currently we had most
celestar
parents:
919
diff
changeset
|
584 |
static const Widget _other_orders_widgets[] = { |
4344
7e123fec5b0b
(svn r6045) -Cleanup: align all table-like structures using spaces, i.e. whitespace fixes only except for a few comments to make them uniform for the whole enum/struct.
rubidium
parents:
4182
diff
changeset
|
585 |
{ WWT_CLOSEBOX, RESIZE_NONE, 14, 0, 10, 0, 13, STR_00C5, STR_018B_CLOSE_WINDOW}, |
7e123fec5b0b
(svn r6045) -Cleanup: align all table-like structures using spaces, i.e. whitespace fixes only except for a few comments to make them uniform for the whole enum/struct.
rubidium
parents:
4182
diff
changeset
|
586 |
{ WWT_CAPTION, RESIZE_RIGHT, 14, 11, 331, 0, 13, STR_A00B_ORDERS, STR_018C_WINDOW_TITLE_DRAG_THIS}, |
7e123fec5b0b
(svn r6045) -Cleanup: align all table-like structures using spaces, i.e. whitespace fixes only except for a few comments to make them uniform for the whole enum/struct.
rubidium
parents:
4182
diff
changeset
|
587 |
{ WWT_PANEL, RESIZE_RB, 14, 0, 319, 14, 75, 0x0, STR_8852_ORDERS_LIST_CLICK_ON_ORDER}, |
7e123fec5b0b
(svn r6045) -Cleanup: align all table-like structures using spaces, i.e. whitespace fixes only except for a few comments to make them uniform for the whole enum/struct.
rubidium
parents:
4182
diff
changeset
|
588 |
{ WWT_SCROLLBAR, RESIZE_LRB, 14, 320, 331, 14, 75, 0x0, STR_0190_SCROLL_BAR_SCROLLS_LIST}, |
7e123fec5b0b
(svn r6045) -Cleanup: align all table-like structures using spaces, i.e. whitespace fixes only except for a few comments to make them uniform for the whole enum/struct.
rubidium
parents:
4182
diff
changeset
|
589 |
{ WWT_EMPTY, RESIZE_NONE, 14, 0, 319, 76, 87, 0x0, STR_NULL}, |
7e123fec5b0b
(svn r6045) -Cleanup: align all table-like structures using spaces, i.e. whitespace fixes only except for a few comments to make them uniform for the whole enum/struct.
rubidium
parents:
4182
diff
changeset
|
590 |
{ WWT_EMPTY, RESIZE_NONE, 14, 0, 319, 76, 87, 0x0, STR_NULL}, |
7e123fec5b0b
(svn r6045) -Cleanup: align all table-like structures using spaces, i.e. whitespace fixes only except for a few comments to make them uniform for the whole enum/struct.
rubidium
parents:
4182
diff
changeset
|
591 |
{ WWT_EMPTY, RESIZE_NONE, 14, 0, 319, 76, 87, 0x0, STR_NULL}, |
7e123fec5b0b
(svn r6045) -Cleanup: align all table-like structures using spaces, i.e. whitespace fixes only except for a few comments to make them uniform for the whole enum/struct.
rubidium
parents:
4182
diff
changeset
|
592 |
{ WWT_EMPTY, RESIZE_NONE, 14, 0, 319, 76, 87, 0x0, STR_NULL}, |
7e123fec5b0b
(svn r6045) -Cleanup: align all table-like structures using spaces, i.e. whitespace fixes only except for a few comments to make them uniform for the whole enum/struct.
rubidium
parents:
4182
diff
changeset
|
593 |
{ WWT_EMPTY, RESIZE_NONE, 14, 0, 319, 76, 87, 0x0, STR_NULL}, |
7e123fec5b0b
(svn r6045) -Cleanup: align all table-like structures using spaces, i.e. whitespace fixes only except for a few comments to make them uniform for the whole enum/struct.
rubidium
parents:
4182
diff
changeset
|
594 |
{ WWT_EMPTY, RESIZE_NONE, 14, 0, 319, 76, 87, 0x0, STR_NULL}, |
7e123fec5b0b
(svn r6045) -Cleanup: align all table-like structures using spaces, i.e. whitespace fixes only except for a few comments to make them uniform for the whole enum/struct.
rubidium
parents:
4182
diff
changeset
|
595 |
{ WWT_PANEL, RESIZE_RTB, 14, 0, 319, 76, 87, 0x0, STR_NULL}, |
7e123fec5b0b
(svn r6045) -Cleanup: align all table-like structures using spaces, i.e. whitespace fixes only except for a few comments to make them uniform for the whole enum/struct.
rubidium
parents:
4182
diff
changeset
|
596 |
{ WWT_RESIZEBOX, RESIZE_LRTB, 14, 320, 331, 76, 87, 0x0, STR_RESIZE_BUTTON}, |
176
84990c4b9212
(svn r177) -Fix: padded out Widget code to solve warnings on C99 compiler (Tron)
darkvater
parents:
127
diff
changeset
|
597 |
{ WIDGETS_END}, |
0 | 598 |
}; |
599 |
||
995
0a8d27dcc231
(svn r1493) -Codechange: Removed redundancy in the order GUI. Currently we had most
celestar
parents:
919
diff
changeset
|
600 |
static const WindowDesc _other_orders_desc = { |
1242
1ca216c50426
(svn r1746) - Feature: [GUI] [ 1107690 ] Resizable orders GUI (nzhook)
darkvater
parents:
1214
diff
changeset
|
601 |
-1,-1, 332, 88, |
0 | 602 |
WC_VEHICLE_ORDERS,WC_VEHICLE_VIEW, |
1242
1ca216c50426
(svn r1746) - Feature: [GUI] [ 1107690 ] Resizable orders GUI (nzhook)
darkvater
parents:
1214
diff
changeset
|
603 |
WDF_STD_TOOLTIPS | WDF_STD_BTN | WDF_DEF_WIDGET | WDF_UNCLICK_BUTTONS | WDF_RESIZABLE, |
995
0a8d27dcc231
(svn r1493) -Codechange: Removed redundancy in the order GUI. Currently we had most
celestar
parents:
919
diff
changeset
|
604 |
_other_orders_widgets, |
0 | 605 |
OrdersWndProc |
606 |
}; |
|
607 |
||
4171 | 608 |
void ShowOrdersWindow(const Vehicle *v) |
0 | 609 |
{ |
610 |
Window *w; |
|
611 |
VehicleID veh = v->index; |
|
612 |
||
613 |
DeleteWindowById(WC_VEHICLE_ORDERS, veh); |
|
614 |
DeleteWindowById(WC_VEHICLE_DETAILS, veh); |
|
193
0a7025304867
(svn r194) -Codechange: stripping trailing-spaces. Please keep this that way!
truelight
parents:
176
diff
changeset
|
615 |
|
0 | 616 |
_alloc_wnd_parent_num = veh; |
1019
6bae6c11e865
(svn r1520) Trim 134 (!) lines with trailing whitespace ):
tron
parents:
1000
diff
changeset
|
617 |
|
1081
0d79fc43fae2
(svn r1582) Fix: Only the train orders GUI has a non-stop button now.
dominik
parents:
1067
diff
changeset
|
618 |
if (v->owner != _local_player) { |
2549 | 619 |
w = AllocateWindowDesc(&_other_orders_desc); |
620 |
} else { |
|
621 |
w = AllocateWindowDesc((v->type == VEH_Train) ? &_orders_train_desc : &_orders_desc); |
|
622 |
} |
|
0 | 623 |
|
1242
1ca216c50426
(svn r1746) - Feature: [GUI] [ 1107690 ] Resizable orders GUI (nzhook)
darkvater
parents:
1214
diff
changeset
|
624 |
if (w != NULL) { |
1ca216c50426
(svn r1746) - Feature: [GUI] [ 1107690 ] Resizable orders GUI (nzhook)
darkvater
parents:
1214
diff
changeset
|
625 |
w->window_number = veh; |
1ca216c50426
(svn r1746) - Feature: [GUI] [ 1107690 ] Resizable orders GUI (nzhook)
darkvater
parents:
1214
diff
changeset
|
626 |
w->caption_color = v->owner; |
1ca216c50426
(svn r1746) - Feature: [GUI] [ 1107690 ] Resizable orders GUI (nzhook)
darkvater
parents:
1214
diff
changeset
|
627 |
w->vscroll.cap = 6; |
1ca216c50426
(svn r1746) - Feature: [GUI] [ 1107690 ] Resizable orders GUI (nzhook)
darkvater
parents:
1214
diff
changeset
|
628 |
w->resize.step_height = 10; |
1ca216c50426
(svn r1746) - Feature: [GUI] [ 1107690 ] Resizable orders GUI (nzhook)
darkvater
parents:
1214
diff
changeset
|
629 |
WP(w,order_d).sel = -1; |
1ca216c50426
(svn r1746) - Feature: [GUI] [ 1107690 ] Resizable orders GUI (nzhook)
darkvater
parents:
1214
diff
changeset
|
630 |
} |
0 | 631 |
} |