author | Darkvater |
Tue, 26 Dec 2006 17:36:18 +0000 | |
changeset 5380 | 8ea58542b6e0 |
parent 5297 | 26fe044e1524 |
permissions | -rw-r--r-- |
2186 | 1 |
/* $Id$ */ |
2 |
||
164
0cbdf3c9bde1
(svn r165) -Feature: Option to sort vehicles in vehicle-list window by different criteria. Total independent sort for all types and players. Periodic resort of list every 10 TTD days. Thank you for your graphical inspiration follow and buxo (since none of you provided any code).
darkvater
parents:
diff
changeset
|
3 |
#include "stdafx.h" |
1891
862800791170
(svn r2397) - CodeChange: rename all "ttd" files to "openttd" files.
Darkvater
parents:
1859
diff
changeset
|
4 |
#include "openttd.h" |
1299
39c06aba09aa
(svn r1803) Move debugging stuff into files of it's own
tron
parents:
1294
diff
changeset
|
5 |
#include "debug.h" |
2163
b17b313113a0
(svn r2673) Include functions.h directly, not globally via openttd.h
tron
parents:
2159
diff
changeset
|
6 |
#include "functions.h" |
2154
f86c59e73a16
(svn r2664) Remove depedency on player.h from variables.h
tron
parents:
1926
diff
changeset
|
7 |
#include "player.h" |
2466
1aa260b43faa
(svn r2992) Use PlayerID, StationID and INVALID_STATION instead of int, int and -1
tron
parents:
2462
diff
changeset
|
8 |
#include "station.h" |
1309
4403a69da4f8
(svn r1813) Declare functions implemented in strings.c in their own shiny new header (though i think some of these function don't belong into strings.c)
tron
parents:
1299
diff
changeset
|
9 |
#include "strings.h" |
1363
775a7ee52369
(svn r1867) Include tables/sprites.h only in files which need it
tron
parents:
1309
diff
changeset
|
10 |
#include "table/sprites.h" |
507
04b5403aaf6b
(svn r815) Include strings.h only in the files which need it.
tron
parents:
505
diff
changeset
|
11 |
#include "table/strings.h" |
164
0cbdf3c9bde1
(svn r165) -Feature: Option to sort vehicles in vehicle-list window by different criteria. Total independent sort for all types and players. Periodic resort of list every 10 TTD days. Thank you for your graphical inspiration follow and buxo (since none of you provided any code).
darkvater
parents:
diff
changeset
|
12 |
#include "vehicle.h" |
588 | 13 |
#include "window.h" |
842 | 14 |
#include "engine.h" |
15 |
#include "gui.h" |
|
16 |
#include "command.h" |
|
17 |
#include "gfx.h" |
|
2159
f6284cf5fab0
(svn r2669) Shuffle some more stuff around to reduce dependencies
tron
parents:
2154
diff
changeset
|
18 |
#include "variables.h" |
f6284cf5fab0
(svn r2669) Shuffle some more stuff around to reduce dependencies
tron
parents:
2154
diff
changeset
|
19 |
#include "vehicle_gui.h" |
2552
5b586a545665
(svn r3081) -Codechange: [autoreplace] complete rewrite of autoreplace
bjarni
parents:
2549
diff
changeset
|
20 |
#include "viewport.h" |
2676
59b65b4fb480
(svn r3218) -Feature: Multiheaded train engines will now stay in the same train
bjarni
parents:
2639
diff
changeset
|
21 |
#include "train.h" |
3650
4dd8517bdcf6
(svn r4561) - NewGRF: implement most of callback 0x23: additional text in vehicle purchase windows.
peter1138
parents:
3492
diff
changeset
|
22 |
#include "newgrf_callbacks.h" |
2962
f0a49b646c48
(svn r3524) - Split newgrf features from engine.[ch] into newgrf_engine.[ch], and add the new files to project files.
peter1138
parents:
2951
diff
changeset
|
23 |
#include "newgrf_engine.h" |
3650
4dd8517bdcf6
(svn r4561) - NewGRF: implement most of callback 0x23: additional text in vehicle purchase windows.
peter1138
parents:
3492
diff
changeset
|
24 |
#include "newgrf_text.h" |
4261
28670f743746
(svn r5887) -Cleanup: move date related functions, defines and variables to date.[ch]
rubidium
parents:
4243
diff
changeset
|
25 |
#include "date.h" |
4442
9f8bb348d58f
(svn r6215) -Codechange: [vehicle list windows] unified Player(vehicle)WndProc into PlayerVehWndProc
bjarni
parents:
4434
diff
changeset
|
26 |
#include "ship.h" |
9f8bb348d58f
(svn r6215) -Codechange: [vehicle list windows] unified Player(vehicle)WndProc into PlayerVehWndProc
bjarni
parents:
4434
diff
changeset
|
27 |
#include "aircraft.h" |
9f8bb348d58f
(svn r6215) -Codechange: [vehicle list windows] unified Player(vehicle)WndProc into PlayerVehWndProc
bjarni
parents:
4434
diff
changeset
|
28 |
#include "roadveh.h" |
9f8bb348d58f
(svn r6215) -Codechange: [vehicle list windows] unified Player(vehicle)WndProc into PlayerVehWndProc
bjarni
parents:
4434
diff
changeset
|
29 |
#include "depot.h" |
2159
f6284cf5fab0
(svn r2669) Shuffle some more stuff around to reduce dependencies
tron
parents:
2154
diff
changeset
|
30 |
|
4542
f42ecc669275
(svn r6372) -Codechange: static, unneeded decleration in headers, superfluous header includes
Darkvater
parents:
4541
diff
changeset
|
31 |
typedef struct Sorting { |
f42ecc669275
(svn r6372) -Codechange: static, unneeded decleration in headers, superfluous header includes
Darkvater
parents:
4541
diff
changeset
|
32 |
Listing aircraft; |
f42ecc669275
(svn r6372) -Codechange: static, unneeded decleration in headers, superfluous header includes
Darkvater
parents:
4541
diff
changeset
|
33 |
Listing roadveh; |
f42ecc669275
(svn r6372) -Codechange: static, unneeded decleration in headers, superfluous header includes
Darkvater
parents:
4541
diff
changeset
|
34 |
Listing ship; |
f42ecc669275
(svn r6372) -Codechange: static, unneeded decleration in headers, superfluous header includes
Darkvater
parents:
4541
diff
changeset
|
35 |
Listing train; |
f42ecc669275
(svn r6372) -Codechange: static, unneeded decleration in headers, superfluous header includes
Darkvater
parents:
4541
diff
changeset
|
36 |
} Sorting; |
f42ecc669275
(svn r6372) -Codechange: static, unneeded decleration in headers, superfluous header includes
Darkvater
parents:
4541
diff
changeset
|
37 |
|
f42ecc669275
(svn r6372) -Codechange: static, unneeded decleration in headers, superfluous header includes
Darkvater
parents:
4541
diff
changeset
|
38 |
static Sorting _sorting; |
f42ecc669275
(svn r6372) -Codechange: static, unneeded decleration in headers, superfluous header includes
Darkvater
parents:
4541
diff
changeset
|
39 |
|
f42ecc669275
(svn r6372) -Codechange: static, unneeded decleration in headers, superfluous header includes
Darkvater
parents:
4541
diff
changeset
|
40 |
typedef struct vehiclelist_d { |
4678
e5fe6e4aca39
(svn r6582) -Codechange: changed GenerateVehicleSortList() to reuse the same allocation over and over if possible (like BuildDepotVehicleList() )
bjarni
parents:
4677
diff
changeset
|
41 |
const Vehicle** sort_list; // List of vehicles (sorted) |
e5fe6e4aca39
(svn r6582) -Codechange: changed GenerateVehicleSortList() to reuse the same allocation over and over if possible (like BuildDepotVehicleList() )
bjarni
parents:
4677
diff
changeset
|
42 |
Listing *_sorting; // pointer to the appropiate subcategory of _sorting |
e5fe6e4aca39
(svn r6582) -Codechange: changed GenerateVehicleSortList() to reuse the same allocation over and over if possible (like BuildDepotVehicleList() )
bjarni
parents:
4677
diff
changeset
|
43 |
uint16 length_of_sort_list; // Keeps track of how many vehicle pointers sort list got space for |
e5fe6e4aca39
(svn r6582) -Codechange: changed GenerateVehicleSortList() to reuse the same allocation over and over if possible (like BuildDepotVehicleList() )
bjarni
parents:
4677
diff
changeset
|
44 |
byte vehicle_type; // The vehicle type that is sorted |
e5fe6e4aca39
(svn r6582) -Codechange: changed GenerateVehicleSortList() to reuse the same allocation over and over if possible (like BuildDepotVehicleList() )
bjarni
parents:
4677
diff
changeset
|
45 |
list_d l; // General list struct |
4542
f42ecc669275
(svn r6372) -Codechange: static, unneeded decleration in headers, superfluous header includes
Darkvater
parents:
4541
diff
changeset
|
46 |
} vehiclelist_d; |
f42ecc669275
(svn r6372) -Codechange: static, unneeded decleration in headers, superfluous header includes
Darkvater
parents:
4541
diff
changeset
|
47 |
assert_compile(WINDOW_CUSTOM_SIZE >= sizeof(vehiclelist_d)); |
2159
f6284cf5fab0
(svn r2669) Shuffle some more stuff around to reduce dependencies
tron
parents:
2154
diff
changeset
|
48 |
|
f6284cf5fab0
(svn r2669) Shuffle some more stuff around to reduce dependencies
tron
parents:
2154
diff
changeset
|
49 |
static bool _internal_sort_order; // descending/ascending |
164
0cbdf3c9bde1
(svn r165) -Feature: Option to sort vehicles in vehicle-list window by different criteria. Total independent sort for all types and players. Periodic resort of list every 10 TTD days. Thank you for your graphical inspiration follow and buxo (since none of you provided any code).
darkvater
parents:
diff
changeset
|
50 |
|
2520
8a52362c4ada
(svn r3049) Replace byte/int/uint by RailType where appropriate
tron
parents:
2519
diff
changeset
|
51 |
static RailType _railtype_selected_in_replace_gui; |
2288
2e27113b0611
(svn r2812) Move variables, which only vehicle_gui.c needs to know about, there
tron
parents:
2206
diff
changeset
|
52 |
|
2462 | 53 |
|
54 |
typedef int CDECL VehicleSortListingTypeFunction(const void*, const void*); |
|
55 |
||
56 |
static VehicleSortListingTypeFunction VehicleNumberSorter; |
|
57 |
static VehicleSortListingTypeFunction VehicleNameSorter; |
|
58 |
static VehicleSortListingTypeFunction VehicleAgeSorter; |
|
59 |
static VehicleSortListingTypeFunction VehicleProfitThisYearSorter; |
|
60 |
static VehicleSortListingTypeFunction VehicleProfitLastYearSorter; |
|
61 |
static VehicleSortListingTypeFunction VehicleCargoSorter; |
|
62 |
static VehicleSortListingTypeFunction VehicleReliabilitySorter; |
|
63 |
static VehicleSortListingTypeFunction VehicleMaxSpeedSorter; |
|
2965
3eb140bd49a3
(svn r3528) - Feature: Allow sorting of vehicle lists by model or value (based on meush's work)
peter1138
parents:
2962
diff
changeset
|
64 |
static VehicleSortListingTypeFunction VehicleModelSorter; |
3eb140bd49a3
(svn r3528) - Feature: Allow sorting of vehicle lists by model or value (based on meush's work)
peter1138
parents:
2962
diff
changeset
|
65 |
static VehicleSortListingTypeFunction VehicleValueSorter; |
2462 | 66 |
|
67 |
static VehicleSortListingTypeFunction* const _vehicle_sorter[] = { |
|
505
1d5e770d2ce4
(svn r813) Push two tables from vehicle_gui.h into vehicle_gui.c - they were in the binary 48 (!) times.
tron
parents:
243
diff
changeset
|
68 |
&VehicleNumberSorter, |
1d5e770d2ce4
(svn r813) Push two tables from vehicle_gui.h into vehicle_gui.c - they were in the binary 48 (!) times.
tron
parents:
243
diff
changeset
|
69 |
&VehicleNameSorter, |
1d5e770d2ce4
(svn r813) Push two tables from vehicle_gui.h into vehicle_gui.c - they were in the binary 48 (!) times.
tron
parents:
243
diff
changeset
|
70 |
&VehicleAgeSorter, |
1d5e770d2ce4
(svn r813) Push two tables from vehicle_gui.h into vehicle_gui.c - they were in the binary 48 (!) times.
tron
parents:
243
diff
changeset
|
71 |
&VehicleProfitThisYearSorter, |
1d5e770d2ce4
(svn r813) Push two tables from vehicle_gui.h into vehicle_gui.c - they were in the binary 48 (!) times.
tron
parents:
243
diff
changeset
|
72 |
&VehicleProfitLastYearSorter, |
1d5e770d2ce4
(svn r813) Push two tables from vehicle_gui.h into vehicle_gui.c - they were in the binary 48 (!) times.
tron
parents:
243
diff
changeset
|
73 |
&VehicleCargoSorter, |
1d5e770d2ce4
(svn r813) Push two tables from vehicle_gui.h into vehicle_gui.c - they were in the binary 48 (!) times.
tron
parents:
243
diff
changeset
|
74 |
&VehicleReliabilitySorter, |
2965
3eb140bd49a3
(svn r3528) - Feature: Allow sorting of vehicle lists by model or value (based on meush's work)
peter1138
parents:
2962
diff
changeset
|
75 |
&VehicleMaxSpeedSorter, |
3eb140bd49a3
(svn r3528) - Feature: Allow sorting of vehicle lists by model or value (based on meush's work)
peter1138
parents:
2962
diff
changeset
|
76 |
&VehicleModelSorter, |
3eb140bd49a3
(svn r3528) - Feature: Allow sorting of vehicle lists by model or value (based on meush's work)
peter1138
parents:
2962
diff
changeset
|
77 |
&VehicleValueSorter, |
505
1d5e770d2ce4
(svn r813) Push two tables from vehicle_gui.h into vehicle_gui.c - they were in the binary 48 (!) times.
tron
parents:
243
diff
changeset
|
78 |
}; |
1d5e770d2ce4
(svn r813) Push two tables from vehicle_gui.h into vehicle_gui.c - they were in the binary 48 (!) times.
tron
parents:
243
diff
changeset
|
79 |
|
4485
567db6062af9
(svn r6270) Remove the "unsorted" vehicle sorter, because it's plain useless
tron
parents:
4484
diff
changeset
|
80 |
static const StringID _vehicle_sort_listing[] = { |
505
1d5e770d2ce4
(svn r813) Push two tables from vehicle_gui.h into vehicle_gui.c - they were in the binary 48 (!) times.
tron
parents:
243
diff
changeset
|
81 |
STR_SORT_BY_NUMBER, |
1d5e770d2ce4
(svn r813) Push two tables from vehicle_gui.h into vehicle_gui.c - they were in the binary 48 (!) times.
tron
parents:
243
diff
changeset
|
82 |
STR_SORT_BY_DROPDOWN_NAME, |
1d5e770d2ce4
(svn r813) Push two tables from vehicle_gui.h into vehicle_gui.c - they were in the binary 48 (!) times.
tron
parents:
243
diff
changeset
|
83 |
STR_SORT_BY_AGE, |
1d5e770d2ce4
(svn r813) Push two tables from vehicle_gui.h into vehicle_gui.c - they were in the binary 48 (!) times.
tron
parents:
243
diff
changeset
|
84 |
STR_SORT_BY_PROFIT_THIS_YEAR, |
1d5e770d2ce4
(svn r813) Push two tables from vehicle_gui.h into vehicle_gui.c - they were in the binary 48 (!) times.
tron
parents:
243
diff
changeset
|
85 |
STR_SORT_BY_PROFIT_LAST_YEAR, |
1d5e770d2ce4
(svn r813) Push two tables from vehicle_gui.h into vehicle_gui.c - they were in the binary 48 (!) times.
tron
parents:
243
diff
changeset
|
86 |
STR_SORT_BY_TOTAL_CAPACITY_PER_CARGOTYPE, |
1d5e770d2ce4
(svn r813) Push two tables from vehicle_gui.h into vehicle_gui.c - they were in the binary 48 (!) times.
tron
parents:
243
diff
changeset
|
87 |
STR_SORT_BY_RELIABILITY, |
1d5e770d2ce4
(svn r813) Push two tables from vehicle_gui.h into vehicle_gui.c - they were in the binary 48 (!) times.
tron
parents:
243
diff
changeset
|
88 |
STR_SORT_BY_MAX_SPEED, |
2965
3eb140bd49a3
(svn r3528) - Feature: Allow sorting of vehicle lists by model or value (based on meush's work)
peter1138
parents:
2962
diff
changeset
|
89 |
STR_SORT_BY_MODEL, |
3eb140bd49a3
(svn r3528) - Feature: Allow sorting of vehicle lists by model or value (based on meush's work)
peter1138
parents:
2962
diff
changeset
|
90 |
STR_SORT_BY_VALUE, |
505
1d5e770d2ce4
(svn r813) Push two tables from vehicle_gui.h into vehicle_gui.c - they were in the binary 48 (!) times.
tron
parents:
243
diff
changeset
|
91 |
INVALID_STRING_ID |
1d5e770d2ce4
(svn r813) Push two tables from vehicle_gui.h into vehicle_gui.c - they were in the binary 48 (!) times.
tron
parents:
243
diff
changeset
|
92 |
}; |
1d5e770d2ce4
(svn r813) Push two tables from vehicle_gui.h into vehicle_gui.c - they were in the binary 48 (!) times.
tron
parents:
243
diff
changeset
|
93 |
|
2462 | 94 |
static const StringID _rail_types_list[] = { |
842 | 95 |
STR_RAIL_VEHICLES, |
3355
e414a0b104a6
(svn r4150) -Feature: Merged elrails into trunk. Thanks to Tron for lots of code and proofreading, thanks to peter1138 for another lot of code and ideas.
celestar
parents:
3040
diff
changeset
|
96 |
STR_ELRAIL_VEHICLES, |
842 | 97 |
STR_MONORAIL_VEHICLES, |
98 |
STR_MAGLEV_VEHICLES, |
|
99 |
INVALID_STRING_ID |
|
100 |
}; |
|
101 |
||
588 | 102 |
void RebuildVehicleLists(void) |
103 |
{ |
|
5124
2ca62776430e
(svn r7205) -Fix [FS#350, SF#1560913]: Window allocation and deletion messed with the actual window
Darkvater
parents:
5071
diff
changeset
|
104 |
Window* const *wz; |
588 | 105 |
|
5124
2ca62776430e
(svn r7205) -Fix [FS#350, SF#1560913]: Window allocation and deletion messed with the actual window
Darkvater
parents:
5071
diff
changeset
|
106 |
FOR_ALL_WINDOWS(wz) { |
2ca62776430e
(svn r7205) -Fix [FS#350, SF#1560913]: Window allocation and deletion messed with the actual window
Darkvater
parents:
5071
diff
changeset
|
107 |
Window *w = *wz; |
2ca62776430e
(svn r7205) -Fix [FS#350, SF#1560913]: Window allocation and deletion messed with the actual window
Darkvater
parents:
5071
diff
changeset
|
108 |
|
588 | 109 |
switch (w->window_class) { |
5124
2ca62776430e
(svn r7205) -Fix [FS#350, SF#1560913]: Window allocation and deletion messed with the actual window
Darkvater
parents:
5071
diff
changeset
|
110 |
case WC_TRAINS_LIST: |
2ca62776430e
(svn r7205) -Fix [FS#350, SF#1560913]: Window allocation and deletion messed with the actual window
Darkvater
parents:
5071
diff
changeset
|
111 |
case WC_ROADVEH_LIST: |
2ca62776430e
(svn r7205) -Fix [FS#350, SF#1560913]: Window allocation and deletion messed with the actual window
Darkvater
parents:
5071
diff
changeset
|
112 |
case WC_SHIPS_LIST: |
2ca62776430e
(svn r7205) -Fix [FS#350, SF#1560913]: Window allocation and deletion messed with the actual window
Darkvater
parents:
5071
diff
changeset
|
113 |
case WC_AIRCRAFT_LIST: |
2ca62776430e
(svn r7205) -Fix [FS#350, SF#1560913]: Window allocation and deletion messed with the actual window
Darkvater
parents:
5071
diff
changeset
|
114 |
WP(w, vehiclelist_d).l.flags |= VL_REBUILD; |
2ca62776430e
(svn r7205) -Fix [FS#350, SF#1560913]: Window allocation and deletion messed with the actual window
Darkvater
parents:
5071
diff
changeset
|
115 |
SetWindowDirty(w); |
2ca62776430e
(svn r7205) -Fix [FS#350, SF#1560913]: Window allocation and deletion messed with the actual window
Darkvater
parents:
5071
diff
changeset
|
116 |
break; |
588 | 117 |
} |
5124
2ca62776430e
(svn r7205) -Fix [FS#350, SF#1560913]: Window allocation and deletion messed with the actual window
Darkvater
parents:
5071
diff
changeset
|
118 |
} |
588 | 119 |
} |
120 |
||
121 |
void ResortVehicleLists(void) |
|
122 |
{ |
|
5124
2ca62776430e
(svn r7205) -Fix [FS#350, SF#1560913]: Window allocation and deletion messed with the actual window
Darkvater
parents:
5071
diff
changeset
|
123 |
Window* const *wz; |
588 | 124 |
|
5124
2ca62776430e
(svn r7205) -Fix [FS#350, SF#1560913]: Window allocation and deletion messed with the actual window
Darkvater
parents:
5071
diff
changeset
|
125 |
FOR_ALL_WINDOWS(wz) { |
2ca62776430e
(svn r7205) -Fix [FS#350, SF#1560913]: Window allocation and deletion messed with the actual window
Darkvater
parents:
5071
diff
changeset
|
126 |
Window *w = *wz; |
2ca62776430e
(svn r7205) -Fix [FS#350, SF#1560913]: Window allocation and deletion messed with the actual window
Darkvater
parents:
5071
diff
changeset
|
127 |
|
588 | 128 |
switch (w->window_class) { |
5124
2ca62776430e
(svn r7205) -Fix [FS#350, SF#1560913]: Window allocation and deletion messed with the actual window
Darkvater
parents:
5071
diff
changeset
|
129 |
case WC_TRAINS_LIST: |
2ca62776430e
(svn r7205) -Fix [FS#350, SF#1560913]: Window allocation and deletion messed with the actual window
Darkvater
parents:
5071
diff
changeset
|
130 |
case WC_ROADVEH_LIST: |
2ca62776430e
(svn r7205) -Fix [FS#350, SF#1560913]: Window allocation and deletion messed with the actual window
Darkvater
parents:
5071
diff
changeset
|
131 |
case WC_SHIPS_LIST: |
2ca62776430e
(svn r7205) -Fix [FS#350, SF#1560913]: Window allocation and deletion messed with the actual window
Darkvater
parents:
5071
diff
changeset
|
132 |
case WC_AIRCRAFT_LIST: |
2ca62776430e
(svn r7205) -Fix [FS#350, SF#1560913]: Window allocation and deletion messed with the actual window
Darkvater
parents:
5071
diff
changeset
|
133 |
WP(w, vehiclelist_d).l.flags |= VL_RESORT; |
2ca62776430e
(svn r7205) -Fix [FS#350, SF#1560913]: Window allocation and deletion messed with the actual window
Darkvater
parents:
5071
diff
changeset
|
134 |
SetWindowDirty(w); |
2ca62776430e
(svn r7205) -Fix [FS#350, SF#1560913]: Window allocation and deletion messed with the actual window
Darkvater
parents:
5071
diff
changeset
|
135 |
break; |
588 | 136 |
} |
5124
2ca62776430e
(svn r7205) -Fix [FS#350, SF#1560913]: Window allocation and deletion messed with the actual window
Darkvater
parents:
5071
diff
changeset
|
137 |
} |
588 | 138 |
} |
139 |
||
4681
bc077405e9a8
(svn r6586) -Feature: [depot window] added a vehicle list window with all vehicles having a certain depot in their orders
bjarni
parents:
4678
diff
changeset
|
140 |
static void BuildVehicleList(vehiclelist_d* vl, PlayerID owner, StationID station, OrderID order, uint16 depot_airport_index, uint16 window_type) |
588 | 141 |
{ |
4545
138a9195009a
(svn r6377) -Codechange: Set up the widgets in the WE_CREATE instead of on every WE_PAINT
Darkvater
parents:
4542
diff
changeset
|
142 |
if (!(vl->l.flags & VL_REBUILD)) return; |
588 | 143 |
|
5380
8ea58542b6e0
(svn r7565) -Codechange: Rework DEBUG functionality. Look for appropiate debugging levels to
Darkvater
parents:
5297
diff
changeset
|
144 |
DEBUG(misc, 3, "Building vehicle list for player %d at station %d", owner, station); |
588 | 145 |
|
4681
bc077405e9a8
(svn r6586) -Feature: [depot window] added a vehicle list window with all vehicles having a certain depot in their orders
bjarni
parents:
4678
diff
changeset
|
146 |
vl->l.list_length = GenerateVehicleSortList(&vl->sort_list, &vl->length_of_sort_list, vl->vehicle_type, owner, station, order, depot_airport_index, window_type); |
588 | 147 |
|
4545
138a9195009a
(svn r6377) -Codechange: Set up the widgets in the WE_CREATE instead of on every WE_PAINT
Darkvater
parents:
4542
diff
changeset
|
148 |
vl->l.flags &= ~VL_REBUILD; |
138a9195009a
(svn r6377) -Codechange: Set up the widgets in the WE_CREATE instead of on every WE_PAINT
Darkvater
parents:
4542
diff
changeset
|
149 |
vl->l.flags |= VL_RESORT; |
588 | 150 |
} |
151 |
||
4460
f5457e687b3e
(svn r6243) -Codechange: made SortVehicleList() static as well since that one is not used in any other files either (Thanks Tron for pointing this out)
bjarni
parents:
4459
diff
changeset
|
152 |
static void SortVehicleList(vehiclelist_d *vl) |
588 | 153 |
{ |
4545
138a9195009a
(svn r6377) -Codechange: Set up the widgets in the WE_CREATE instead of on every WE_PAINT
Darkvater
parents:
4542
diff
changeset
|
154 |
if (!(vl->l.flags & VL_RESORT)) return; |
588 | 155 |
|
4545
138a9195009a
(svn r6377) -Codechange: Set up the widgets in the WE_CREATE instead of on every WE_PAINT
Darkvater
parents:
4542
diff
changeset
|
156 |
_internal_sort_order = vl->l.flags & VL_DESC; |
138a9195009a
(svn r6377) -Codechange: Set up the widgets in the WE_CREATE instead of on every WE_PAINT
Darkvater
parents:
4542
diff
changeset
|
157 |
qsort((void*)vl->sort_list, vl->l.list_length, sizeof(vl->sort_list[0]), |
138a9195009a
(svn r6377) -Codechange: Set up the widgets in the WE_CREATE instead of on every WE_PAINT
Darkvater
parents:
4542
diff
changeset
|
158 |
_vehicle_sorter[vl->l.sort_type]); |
588 | 159 |
|
4545
138a9195009a
(svn r6377) -Codechange: Set up the widgets in the WE_CREATE instead of on every WE_PAINT
Darkvater
parents:
4542
diff
changeset
|
160 |
vl->l.resort_timer = DAY_TICKS * PERIODIC_RESORT_DAYS; |
138a9195009a
(svn r6377) -Codechange: Set up the widgets in the WE_CREATE instead of on every WE_PAINT
Darkvater
parents:
4542
diff
changeset
|
161 |
vl->l.flags &= ~VL_RESORT; |
588 | 162 |
} |
163 |
||
4740
953f60fa6d6a
(svn r6652) -Feature: [depot window] depot lists are now sorted, so vehicle 1 is always first and so on
bjarni
parents:
4735
diff
changeset
|
164 |
void DepotSortList(Vehicle **v, uint16 length) |
953f60fa6d6a
(svn r6652) -Feature: [depot window] depot lists are now sorted, so vehicle 1 is always first and so on
bjarni
parents:
4735
diff
changeset
|
165 |
{ |
953f60fa6d6a
(svn r6652) -Feature: [depot window] depot lists are now sorted, so vehicle 1 is always first and so on
bjarni
parents:
4735
diff
changeset
|
166 |
_internal_sort_order = 0; |
953f60fa6d6a
(svn r6652) -Feature: [depot window] depot lists are now sorted, so vehicle 1 is always first and so on
bjarni
parents:
4735
diff
changeset
|
167 |
qsort((void*)v, length, sizeof(v[0]), _vehicle_sorter[0]); |
953f60fa6d6a
(svn r6652) -Feature: [depot window] depot lists are now sorted, so vehicle 1 is always first and so on
bjarni
parents:
4735
diff
changeset
|
168 |
} |
588 | 169 |
|
164
0cbdf3c9bde1
(svn r165) -Feature: Option to sort vehicles in vehicle-list window by different criteria. Total independent sort for all types and players. Periodic resort of list every 10 TTD days. Thank you for your graphical inspiration follow and buxo (since none of you provided any code).
darkvater
parents:
diff
changeset
|
170 |
/* General Vehicle GUI based procedures that are independent of vehicle types */ |
1093
4fdc46eaf423
(svn r1594) Convert all undefined parameter lists to (void) and add the appropriate warning flags in the Makefile
tron
parents:
1067
diff
changeset
|
171 |
void InitializeVehiclesGuiList(void) |
164
0cbdf3c9bde1
(svn r165) -Feature: Option to sort vehicles in vehicle-list window by different criteria. Total independent sort for all types and players. Periodic resort of list every 10 TTD days. Thank you for your graphical inspiration follow and buxo (since none of you provided any code).
darkvater
parents:
diff
changeset
|
172 |
{ |
2519
beb11a5ac48c
(svn r3048) Replace 0/1/2 by RAILTYPE_RAIL/MONO/MAGLEV where appropriate
tron
parents:
2477
diff
changeset
|
173 |
_railtype_selected_in_replace_gui = RAILTYPE_RAIL; |
164
0cbdf3c9bde1
(svn r165) -Feature: Option to sort vehicles in vehicle-list window by different criteria. Total independent sort for all types and players. Periodic resort of list every 10 TTD days. Thank you for your graphical inspiration follow and buxo (since none of you provided any code).
darkvater
parents:
diff
changeset
|
174 |
} |
0cbdf3c9bde1
(svn r165) -Feature: Option to sort vehicles in vehicle-list window by different criteria. Total independent sort for all types and players. Periodic resort of list every 10 TTD days. Thank you for your graphical inspiration follow and buxo (since none of you provided any code).
darkvater
parents:
diff
changeset
|
175 |
|
0cbdf3c9bde1
(svn r165) -Feature: Option to sort vehicles in vehicle-list window by different criteria. Total independent sort for all types and players. Periodic resort of list every 10 TTD days. Thank you for your graphical inspiration follow and buxo (since none of you provided any code).
darkvater
parents:
diff
changeset
|
176 |
// draw the vehicle profit button in the vehicle list window. |
2436
7d5df545bd5d
(svn r2962) - const correctness for all Get* functions and most Draw* functions that don't change their pointer parameters
Darkvater
parents:
2375
diff
changeset
|
177 |
void DrawVehicleProfitButton(const Vehicle *v, int x, int y) |
164
0cbdf3c9bde1
(svn r165) -Feature: Option to sort vehicles in vehicle-list window by different criteria. Total independent sort for all types and players. Periodic resort of list every 10 TTD days. Thank you for your graphical inspiration follow and buxo (since none of you provided any code).
darkvater
parents:
diff
changeset
|
178 |
{ |
0cbdf3c9bde1
(svn r165) -Feature: Option to sort vehicles in vehicle-list window by different criteria. Total independent sort for all types and players. Periodic resort of list every 10 TTD days. Thank you for your graphical inspiration follow and buxo (since none of you provided any code).
darkvater
parents:
diff
changeset
|
179 |
uint32 ormod; |
0cbdf3c9bde1
(svn r165) -Feature: Option to sort vehicles in vehicle-list window by different criteria. Total independent sort for all types and players. Periodic resort of list every 10 TTD days. Thank you for your graphical inspiration follow and buxo (since none of you provided any code).
darkvater
parents:
diff
changeset
|
180 |
|
0cbdf3c9bde1
(svn r165) -Feature: Option to sort vehicles in vehicle-list window by different criteria. Total independent sort for all types and players. Periodic resort of list every 10 TTD days. Thank you for your graphical inspiration follow and buxo (since none of you provided any code).
darkvater
parents:
diff
changeset
|
181 |
// draw profit-based colored icons |
2639 | 182 |
if (v->age <= 365 * 2) { |
1688
af2bb9bcb2ed
(svn r2192) - Add greater control to the 'message options' window. Now you can turn off the telegraphc ticker sound for summarized messages, or turn off news-messages altogether (you get a red blot to notify you though). The [<][>] set the settings in one way, while clicking on the option itself, cycles it. This commit also 'fixes' bugs [1166973], [1121484] and patch [1169930].
Darkvater
parents:
1465
diff
changeset
|
183 |
ormod = PALETTE_TO_GREY; |
2639 | 184 |
} else if (v->profit_last_year < 0) { |
1688
af2bb9bcb2ed
(svn r2192) - Add greater control to the 'message options' window. Now you can turn off the telegraphc ticker sound for summarized messages, or turn off news-messages altogether (you get a red blot to notify you though). The [<][>] set the settings in one way, while clicking on the option itself, cycles it. This commit also 'fixes' bugs [1166973], [1121484] and patch [1169930].
Darkvater
parents:
1465
diff
changeset
|
185 |
ormod = PALETTE_TO_RED; |
2639 | 186 |
} else if (v->profit_last_year < 10000) { |
1688
af2bb9bcb2ed
(svn r2192) - Add greater control to the 'message options' window. Now you can turn off the telegraphc ticker sound for summarized messages, or turn off news-messages altogether (you get a red blot to notify you though). The [<][>] set the settings in one way, while clicking on the option itself, cycles it. This commit also 'fixes' bugs [1166973], [1121484] and patch [1169930].
Darkvater
parents:
1465
diff
changeset
|
187 |
ormod = PALETTE_TO_YELLOW; |
2639 | 188 |
} else { |
1688
af2bb9bcb2ed
(svn r2192) - Add greater control to the 'message options' window. Now you can turn off the telegraphc ticker sound for summarized messages, or turn off news-messages altogether (you get a red blot to notify you though). The [<][>] set the settings in one way, while clicking on the option itself, cycles it. This commit also 'fixes' bugs [1166973], [1121484] and patch [1169930].
Darkvater
parents:
1465
diff
changeset
|
189 |
ormod = PALETTE_TO_GREEN; |
2639 | 190 |
} |
1688
af2bb9bcb2ed
(svn r2192) - Add greater control to the 'message options' window. Now you can turn off the telegraphc ticker sound for summarized messages, or turn off news-messages altogether (you get a red blot to notify you though). The [<][>] set the settings in one way, while clicking on the option itself, cycles it. This commit also 'fixes' bugs [1166973], [1121484] and patch [1169930].
Darkvater
parents:
1465
diff
changeset
|
191 |
DrawSprite(SPR_BLOT | ormod, x, y); |
164
0cbdf3c9bde1
(svn r165) -Feature: Option to sort vehicles in vehicle-list window by different criteria. Total independent sort for all types and players. Periodic resort of list every 10 TTD days. Thank you for your graphical inspiration follow and buxo (since none of you provided any code).
darkvater
parents:
diff
changeset
|
192 |
} |
0cbdf3c9bde1
(svn r165) -Feature: Option to sort vehicles in vehicle-list window by different criteria. Total independent sort for all types and players. Periodic resort of list every 10 TTD days. Thank you for your graphical inspiration follow and buxo (since none of you provided any code).
darkvater
parents:
diff
changeset
|
193 |
|
4694
c917a3ad0dd2
(svn r6601) - Codechange: Support cargo subtypes in the refit window. The refit window has been altered to support resizing and scrolling. Note that the cargo subtype isn't yet passed for actual refitting yet. (Based on mart3p's patch)
peter1138
parents:
4686
diff
changeset
|
194 |
typedef struct RefitOption { |
c917a3ad0dd2
(svn r6601) - Codechange: Support cargo subtypes in the refit window. The refit window has been altered to support resizing and scrolling. Note that the cargo subtype isn't yet passed for actual refitting yet. (Based on mart3p's patch)
peter1138
parents:
4686
diff
changeset
|
195 |
CargoID cargo; |
c917a3ad0dd2
(svn r6601) - Codechange: Support cargo subtypes in the refit window. The refit window has been altered to support resizing and scrolling. Note that the cargo subtype isn't yet passed for actual refitting yet. (Based on mart3p's patch)
peter1138
parents:
4686
diff
changeset
|
196 |
byte subtype; |
c917a3ad0dd2
(svn r6601) - Codechange: Support cargo subtypes in the refit window. The refit window has been altered to support resizing and scrolling. Note that the cargo subtype isn't yet passed for actual refitting yet. (Based on mart3p's patch)
peter1138
parents:
4686
diff
changeset
|
197 |
uint16 value; |
c917a3ad0dd2
(svn r6601) - Codechange: Support cargo subtypes in the refit window. The refit window has been altered to support resizing and scrolling. Note that the cargo subtype isn't yet passed for actual refitting yet. (Based on mart3p's patch)
peter1138
parents:
4686
diff
changeset
|
198 |
EngineID engine; |
c917a3ad0dd2
(svn r6601) - Codechange: Support cargo subtypes in the refit window. The refit window has been altered to support resizing and scrolling. Note that the cargo subtype isn't yet passed for actual refitting yet. (Based on mart3p's patch)
peter1138
parents:
4686
diff
changeset
|
199 |
} RefitOption; |
c917a3ad0dd2
(svn r6601) - Codechange: Support cargo subtypes in the refit window. The refit window has been altered to support resizing and scrolling. Note that the cargo subtype isn't yet passed for actual refitting yet. (Based on mart3p's patch)
peter1138
parents:
4686
diff
changeset
|
200 |
|
c917a3ad0dd2
(svn r6601) - Codechange: Support cargo subtypes in the refit window. The refit window has been altered to support resizing and scrolling. Note that the cargo subtype isn't yet passed for actual refitting yet. (Based on mart3p's patch)
peter1138
parents:
4686
diff
changeset
|
201 |
typedef struct RefitList { |
c917a3ad0dd2
(svn r6601) - Codechange: Support cargo subtypes in the refit window. The refit window has been altered to support resizing and scrolling. Note that the cargo subtype isn't yet passed for actual refitting yet. (Based on mart3p's patch)
peter1138
parents:
4686
diff
changeset
|
202 |
uint num_lines; |
c917a3ad0dd2
(svn r6601) - Codechange: Support cargo subtypes in the refit window. The refit window has been altered to support resizing and scrolling. Note that the cargo subtype isn't yet passed for actual refitting yet. (Based on mart3p's patch)
peter1138
parents:
4686
diff
changeset
|
203 |
RefitOption *items; |
c917a3ad0dd2
(svn r6601) - Codechange: Support cargo subtypes in the refit window. The refit window has been altered to support resizing and scrolling. Note that the cargo subtype isn't yet passed for actual refitting yet. (Based on mart3p's patch)
peter1138
parents:
4686
diff
changeset
|
204 |
} RefitList; |
c917a3ad0dd2
(svn r6601) - Codechange: Support cargo subtypes in the refit window. The refit window has been altered to support resizing and scrolling. Note that the cargo subtype isn't yet passed for actual refitting yet. (Based on mart3p's patch)
peter1138
parents:
4686
diff
changeset
|
205 |
|
4695
3a5bf7ff066b
(svn r6602) - Feature: we now support NewGRF livery refits, as used by DBsetXL, amongst others. This requires a savegame bump to save the cargo subtype.
peter1138
parents:
4694
diff
changeset
|
206 |
static RefitList *BuildRefitList(const Vehicle *v) |
4694
c917a3ad0dd2
(svn r6601) - Codechange: Support cargo subtypes in the refit window. The refit window has been altered to support resizing and scrolling. Note that the cargo subtype isn't yet passed for actual refitting yet. (Based on mart3p's patch)
peter1138
parents:
4686
diff
changeset
|
207 |
{ |
c917a3ad0dd2
(svn r6601) - Codechange: Support cargo subtypes in the refit window. The refit window has been altered to support resizing and scrolling. Note that the cargo subtype isn't yet passed for actual refitting yet. (Based on mart3p's patch)
peter1138
parents:
4686
diff
changeset
|
208 |
uint max_lines = 256; |
c917a3ad0dd2
(svn r6601) - Codechange: Support cargo subtypes in the refit window. The refit window has been altered to support resizing and scrolling. Note that the cargo subtype isn't yet passed for actual refitting yet. (Based on mart3p's patch)
peter1138
parents:
4686
diff
changeset
|
209 |
RefitOption *refit = calloc(max_lines, sizeof(*refit)); |
c917a3ad0dd2
(svn r6601) - Codechange: Support cargo subtypes in the refit window. The refit window has been altered to support resizing and scrolling. Note that the cargo subtype isn't yet passed for actual refitting yet. (Based on mart3p's patch)
peter1138
parents:
4686
diff
changeset
|
210 |
RefitList *list = calloc(1, sizeof(*list)); |
c917a3ad0dd2
(svn r6601) - Codechange: Support cargo subtypes in the refit window. The refit window has been altered to support resizing and scrolling. Note that the cargo subtype isn't yet passed for actual refitting yet. (Based on mart3p's patch)
peter1138
parents:
4686
diff
changeset
|
211 |
Vehicle *u = (Vehicle*)v; |
c917a3ad0dd2
(svn r6601) - Codechange: Support cargo subtypes in the refit window. The refit window has been altered to support resizing and scrolling. Note that the cargo subtype isn't yet passed for actual refitting yet. (Based on mart3p's patch)
peter1138
parents:
4686
diff
changeset
|
212 |
uint num_lines = 0; |
c917a3ad0dd2
(svn r6601) - Codechange: Support cargo subtypes in the refit window. The refit window has been altered to support resizing and scrolling. Note that the cargo subtype isn't yet passed for actual refitting yet. (Based on mart3p's patch)
peter1138
parents:
4686
diff
changeset
|
213 |
uint i; |
c917a3ad0dd2
(svn r6601) - Codechange: Support cargo subtypes in the refit window. The refit window has been altered to support resizing and scrolling. Note that the cargo subtype isn't yet passed for actual refitting yet. (Based on mart3p's patch)
peter1138
parents:
4686
diff
changeset
|
214 |
|
c917a3ad0dd2
(svn r6601) - Codechange: Support cargo subtypes in the refit window. The refit window has been altered to support resizing and scrolling. Note that the cargo subtype isn't yet passed for actual refitting yet. (Based on mart3p's patch)
peter1138
parents:
4686
diff
changeset
|
215 |
do { |
c917a3ad0dd2
(svn r6601) - Codechange: Support cargo subtypes in the refit window. The refit window has been altered to support resizing and scrolling. Note that the cargo subtype isn't yet passed for actual refitting yet. (Based on mart3p's patch)
peter1138
parents:
4686
diff
changeset
|
216 |
CargoID cid; |
c917a3ad0dd2
(svn r6601) - Codechange: Support cargo subtypes in the refit window. The refit window has been altered to support resizing and scrolling. Note that the cargo subtype isn't yet passed for actual refitting yet. (Based on mart3p's patch)
peter1138
parents:
4686
diff
changeset
|
217 |
uint32 cmask = EngInfo(u->engine_type)->refit_mask; |
c917a3ad0dd2
(svn r6601) - Codechange: Support cargo subtypes in the refit window. The refit window has been altered to support resizing and scrolling. Note that the cargo subtype isn't yet passed for actual refitting yet. (Based on mart3p's patch)
peter1138
parents:
4686
diff
changeset
|
218 |
byte callbackmask = EngInfo(u->engine_type)->callbackmask; |
c917a3ad0dd2
(svn r6601) - Codechange: Support cargo subtypes in the refit window. The refit window has been altered to support resizing and scrolling. Note that the cargo subtype isn't yet passed for actual refitting yet. (Based on mart3p's patch)
peter1138
parents:
4686
diff
changeset
|
219 |
|
4933
0ae35137aeca
(svn r6920) - Codechange: Ignore refit options of an engine if it has no capacity.
peter1138
parents:
4932
diff
changeset
|
220 |
/* Skip this engine if it has no capacity */ |
0ae35137aeca
(svn r6920) - Codechange: Ignore refit options of an engine if it has no capacity.
peter1138
parents:
4932
diff
changeset
|
221 |
if (u->cargo_cap == 0) continue; |
0ae35137aeca
(svn r6920) - Codechange: Ignore refit options of an engine if it has no capacity.
peter1138
parents:
4932
diff
changeset
|
222 |
|
4694
c917a3ad0dd2
(svn r6601) - Codechange: Support cargo subtypes in the refit window. The refit window has been altered to support resizing and scrolling. Note that the cargo subtype isn't yet passed for actual refitting yet. (Based on mart3p's patch)
peter1138
parents:
4686
diff
changeset
|
223 |
/* Loop through all cargos in the refit mask */ |
c917a3ad0dd2
(svn r6601) - Codechange: Support cargo subtypes in the refit window. The refit window has been altered to support resizing and scrolling. Note that the cargo subtype isn't yet passed for actual refitting yet. (Based on mart3p's patch)
peter1138
parents:
4686
diff
changeset
|
224 |
for (cid = 0; cmask != 0 && num_lines < max_lines; cmask >>= 1, cid++) { |
4776
c798a32e8bc7
(svn r6690) - Fix (r6602): Translate global to per-climate cargo ids before... doing anything with them. (Thanks to MeusH for pointing this out...)
peter1138
parents:
4775
diff
changeset
|
225 |
CargoID lcid; |
c798a32e8bc7
(svn r6690) - Fix (r6602): Translate global to per-climate cargo ids before... doing anything with them. (Thanks to MeusH for pointing this out...)
peter1138
parents:
4775
diff
changeset
|
226 |
|
4694
c917a3ad0dd2
(svn r6601) - Codechange: Support cargo subtypes in the refit window. The refit window has been altered to support resizing and scrolling. Note that the cargo subtype isn't yet passed for actual refitting yet. (Based on mart3p's patch)
peter1138
parents:
4686
diff
changeset
|
227 |
/* Skip cargo type if it's not listed */ |
c917a3ad0dd2
(svn r6601) - Codechange: Support cargo subtypes in the refit window. The refit window has been altered to support resizing and scrolling. Note that the cargo subtype isn't yet passed for actual refitting yet. (Based on mart3p's patch)
peter1138
parents:
4686
diff
changeset
|
228 |
if (!HASBIT(cmask, 0)) continue; |
c917a3ad0dd2
(svn r6601) - Codechange: Support cargo subtypes in the refit window. The refit window has been altered to support resizing and scrolling. Note that the cargo subtype isn't yet passed for actual refitting yet. (Based on mart3p's patch)
peter1138
parents:
4686
diff
changeset
|
229 |
|
4776
c798a32e8bc7
(svn r6690) - Fix (r6602): Translate global to per-climate cargo ids before... doing anything with them. (Thanks to MeusH for pointing this out...)
peter1138
parents:
4775
diff
changeset
|
230 |
lcid = _local_cargo_id_ctype[cid]; |
c798a32e8bc7
(svn r6690) - Fix (r6602): Translate global to per-climate cargo ids before... doing anything with them. (Thanks to MeusH for pointing this out...)
peter1138
parents:
4775
diff
changeset
|
231 |
if (lcid == CT_INVALID) continue; |
c798a32e8bc7
(svn r6690) - Fix (r6602): Translate global to per-climate cargo ids before... doing anything with them. (Thanks to MeusH for pointing this out...)
peter1138
parents:
4775
diff
changeset
|
232 |
|
4694
c917a3ad0dd2
(svn r6601) - Codechange: Support cargo subtypes in the refit window. The refit window has been altered to support resizing and scrolling. Note that the cargo subtype isn't yet passed for actual refitting yet. (Based on mart3p's patch)
peter1138
parents:
4686
diff
changeset
|
233 |
/* Check the vehicle's callback mask for cargo suffixes */ |
c917a3ad0dd2
(svn r6601) - Codechange: Support cargo subtypes in the refit window. The refit window has been altered to support resizing and scrolling. Note that the cargo subtype isn't yet passed for actual refitting yet. (Based on mart3p's patch)
peter1138
parents:
4686
diff
changeset
|
234 |
if (HASBIT(callbackmask, CBM_CARGO_SUFFIX)) { |
c917a3ad0dd2
(svn r6601) - Codechange: Support cargo subtypes in the refit window. The refit window has been altered to support resizing and scrolling. Note that the cargo subtype isn't yet passed for actual refitting yet. (Based on mart3p's patch)
peter1138
parents:
4686
diff
changeset
|
235 |
/* Make a note of the original cargo type. It has to be |
c917a3ad0dd2
(svn r6601) - Codechange: Support cargo subtypes in the refit window. The refit window has been altered to support resizing and scrolling. Note that the cargo subtype isn't yet passed for actual refitting yet. (Based on mart3p's patch)
peter1138
parents:
4686
diff
changeset
|
236 |
* changed to test the cargo & subtype... */ |
c917a3ad0dd2
(svn r6601) - Codechange: Support cargo subtypes in the refit window. The refit window has been altered to support resizing and scrolling. Note that the cargo subtype isn't yet passed for actual refitting yet. (Based on mart3p's patch)
peter1138
parents:
4686
diff
changeset
|
237 |
CargoID temp_cargo = u->cargo_type; |
c917a3ad0dd2
(svn r6601) - Codechange: Support cargo subtypes in the refit window. The refit window has been altered to support resizing and scrolling. Note that the cargo subtype isn't yet passed for actual refitting yet. (Based on mart3p's patch)
peter1138
parents:
4686
diff
changeset
|
238 |
byte temp_subtype = u->cargo_subtype; |
c917a3ad0dd2
(svn r6601) - Codechange: Support cargo subtypes in the refit window. The refit window has been altered to support resizing and scrolling. Note that the cargo subtype isn't yet passed for actual refitting yet. (Based on mart3p's patch)
peter1138
parents:
4686
diff
changeset
|
239 |
byte refit_cyc; |
c917a3ad0dd2
(svn r6601) - Codechange: Support cargo subtypes in the refit window. The refit window has been altered to support resizing and scrolling. Note that the cargo subtype isn't yet passed for actual refitting yet. (Based on mart3p's patch)
peter1138
parents:
4686
diff
changeset
|
240 |
|
4776
c798a32e8bc7
(svn r6690) - Fix (r6602): Translate global to per-climate cargo ids before... doing anything with them. (Thanks to MeusH for pointing this out...)
peter1138
parents:
4775
diff
changeset
|
241 |
u->cargo_type = lcid; |
4694
c917a3ad0dd2
(svn r6601) - Codechange: Support cargo subtypes in the refit window. The refit window has been altered to support resizing and scrolling. Note that the cargo subtype isn't yet passed for actual refitting yet. (Based on mart3p's patch)
peter1138
parents:
4686
diff
changeset
|
242 |
|
c917a3ad0dd2
(svn r6601) - Codechange: Support cargo subtypes in the refit window. The refit window has been altered to support resizing and scrolling. Note that the cargo subtype isn't yet passed for actual refitting yet. (Based on mart3p's patch)
peter1138
parents:
4686
diff
changeset
|
243 |
for (refit_cyc = 0; refit_cyc < 16 && num_lines < max_lines; refit_cyc++) { |
c917a3ad0dd2
(svn r6601) - Codechange: Support cargo subtypes in the refit window. The refit window has been altered to support resizing and scrolling. Note that the cargo subtype isn't yet passed for actual refitting yet. (Based on mart3p's patch)
peter1138
parents:
4686
diff
changeset
|
244 |
bool duplicate = false; |
c917a3ad0dd2
(svn r6601) - Codechange: Support cargo subtypes in the refit window. The refit window has been altered to support resizing and scrolling. Note that the cargo subtype isn't yet passed for actual refitting yet. (Based on mart3p's patch)
peter1138
parents:
4686
diff
changeset
|
245 |
uint16 callback; |
c917a3ad0dd2
(svn r6601) - Codechange: Support cargo subtypes in the refit window. The refit window has been altered to support resizing and scrolling. Note that the cargo subtype isn't yet passed for actual refitting yet. (Based on mart3p's patch)
peter1138
parents:
4686
diff
changeset
|
246 |
|
c917a3ad0dd2
(svn r6601) - Codechange: Support cargo subtypes in the refit window. The refit window has been altered to support resizing and scrolling. Note that the cargo subtype isn't yet passed for actual refitting yet. (Based on mart3p's patch)
peter1138
parents:
4686
diff
changeset
|
247 |
u->cargo_subtype = refit_cyc; |
c917a3ad0dd2
(svn r6601) - Codechange: Support cargo subtypes in the refit window. The refit window has been altered to support resizing and scrolling. Note that the cargo subtype isn't yet passed for actual refitting yet. (Based on mart3p's patch)
peter1138
parents:
4686
diff
changeset
|
248 |
callback = GetVehicleCallback(CBID_VEHICLE_CARGO_SUFFIX, 0, 0, u->engine_type, u); |
c917a3ad0dd2
(svn r6601) - Codechange: Support cargo subtypes in the refit window. The refit window has been altered to support resizing and scrolling. Note that the cargo subtype isn't yet passed for actual refitting yet. (Based on mart3p's patch)
peter1138
parents:
4686
diff
changeset
|
249 |
|
c917a3ad0dd2
(svn r6601) - Codechange: Support cargo subtypes in the refit window. The refit window has been altered to support resizing and scrolling. Note that the cargo subtype isn't yet passed for actual refitting yet. (Based on mart3p's patch)
peter1138
parents:
4686
diff
changeset
|
250 |
if (callback == 0xFF) callback = CALLBACK_FAILED; |
c917a3ad0dd2
(svn r6601) - Codechange: Support cargo subtypes in the refit window. The refit window has been altered to support resizing and scrolling. Note that the cargo subtype isn't yet passed for actual refitting yet. (Based on mart3p's patch)
peter1138
parents:
4686
diff
changeset
|
251 |
if (refit_cyc != 0 && callback == CALLBACK_FAILED) break; |
c917a3ad0dd2
(svn r6601) - Codechange: Support cargo subtypes in the refit window. The refit window has been altered to support resizing and scrolling. Note that the cargo subtype isn't yet passed for actual refitting yet. (Based on mart3p's patch)
peter1138
parents:
4686
diff
changeset
|
252 |
|
c917a3ad0dd2
(svn r6601) - Codechange: Support cargo subtypes in the refit window. The refit window has been altered to support resizing and scrolling. Note that the cargo subtype isn't yet passed for actual refitting yet. (Based on mart3p's patch)
peter1138
parents:
4686
diff
changeset
|
253 |
/* Check if this cargo and subtype combination are listed */ |
c917a3ad0dd2
(svn r6601) - Codechange: Support cargo subtypes in the refit window. The refit window has been altered to support resizing and scrolling. Note that the cargo subtype isn't yet passed for actual refitting yet. (Based on mart3p's patch)
peter1138
parents:
4686
diff
changeset
|
254 |
for (i = 0; i < num_lines && !duplicate; i++) { |
4776
c798a32e8bc7
(svn r6690) - Fix (r6602): Translate global to per-climate cargo ids before... doing anything with them. (Thanks to MeusH for pointing this out...)
peter1138
parents:
4775
diff
changeset
|
255 |
if (refit[i].cargo == lcid && refit[i].value == callback) duplicate = true; |
4694
c917a3ad0dd2
(svn r6601) - Codechange: Support cargo subtypes in the refit window. The refit window has been altered to support resizing and scrolling. Note that the cargo subtype isn't yet passed for actual refitting yet. (Based on mart3p's patch)
peter1138
parents:
4686
diff
changeset
|
256 |
} |
c917a3ad0dd2
(svn r6601) - Codechange: Support cargo subtypes in the refit window. The refit window has been altered to support resizing and scrolling. Note that the cargo subtype isn't yet passed for actual refitting yet. (Based on mart3p's patch)
peter1138
parents:
4686
diff
changeset
|
257 |
|
c917a3ad0dd2
(svn r6601) - Codechange: Support cargo subtypes in the refit window. The refit window has been altered to support resizing and scrolling. Note that the cargo subtype isn't yet passed for actual refitting yet. (Based on mart3p's patch)
peter1138
parents:
4686
diff
changeset
|
258 |
if (duplicate) continue; |
c917a3ad0dd2
(svn r6601) - Codechange: Support cargo subtypes in the refit window. The refit window has been altered to support resizing and scrolling. Note that the cargo subtype isn't yet passed for actual refitting yet. (Based on mart3p's patch)
peter1138
parents:
4686
diff
changeset
|
259 |
|
4776
c798a32e8bc7
(svn r6690) - Fix (r6602): Translate global to per-climate cargo ids before... doing anything with them. (Thanks to MeusH for pointing this out...)
peter1138
parents:
4775
diff
changeset
|
260 |
refit[num_lines].cargo = lcid; |
4694
c917a3ad0dd2
(svn r6601) - Codechange: Support cargo subtypes in the refit window. The refit window has been altered to support resizing and scrolling. Note that the cargo subtype isn't yet passed for actual refitting yet. (Based on mart3p's patch)
peter1138
parents:
4686
diff
changeset
|
261 |
refit[num_lines].subtype = refit_cyc; |
c917a3ad0dd2
(svn r6601) - Codechange: Support cargo subtypes in the refit window. The refit window has been altered to support resizing and scrolling. Note that the cargo subtype isn't yet passed for actual refitting yet. (Based on mart3p's patch)
peter1138
parents:
4686
diff
changeset
|
262 |
refit[num_lines].value = callback; |
c917a3ad0dd2
(svn r6601) - Codechange: Support cargo subtypes in the refit window. The refit window has been altered to support resizing and scrolling. Note that the cargo subtype isn't yet passed for actual refitting yet. (Based on mart3p's patch)
peter1138
parents:
4686
diff
changeset
|
263 |
refit[num_lines].engine = u->engine_type; |
c917a3ad0dd2
(svn r6601) - Codechange: Support cargo subtypes in the refit window. The refit window has been altered to support resizing and scrolling. Note that the cargo subtype isn't yet passed for actual refitting yet. (Based on mart3p's patch)
peter1138
parents:
4686
diff
changeset
|
264 |
num_lines++; |
c917a3ad0dd2
(svn r6601) - Codechange: Support cargo subtypes in the refit window. The refit window has been altered to support resizing and scrolling. Note that the cargo subtype isn't yet passed for actual refitting yet. (Based on mart3p's patch)
peter1138
parents:
4686
diff
changeset
|
265 |
} |
c917a3ad0dd2
(svn r6601) - Codechange: Support cargo subtypes in the refit window. The refit window has been altered to support resizing and scrolling. Note that the cargo subtype isn't yet passed for actual refitting yet. (Based on mart3p's patch)
peter1138
parents:
4686
diff
changeset
|
266 |
|
c917a3ad0dd2
(svn r6601) - Codechange: Support cargo subtypes in the refit window. The refit window has been altered to support resizing and scrolling. Note that the cargo subtype isn't yet passed for actual refitting yet. (Based on mart3p's patch)
peter1138
parents:
4686
diff
changeset
|
267 |
/* Reset the vehicle's cargo type */ |
c917a3ad0dd2
(svn r6601) - Codechange: Support cargo subtypes in the refit window. The refit window has been altered to support resizing and scrolling. Note that the cargo subtype isn't yet passed for actual refitting yet. (Based on mart3p's patch)
peter1138
parents:
4686
diff
changeset
|
268 |
u->cargo_type = temp_cargo; |
c917a3ad0dd2
(svn r6601) - Codechange: Support cargo subtypes in the refit window. The refit window has been altered to support resizing and scrolling. Note that the cargo subtype isn't yet passed for actual refitting yet. (Based on mart3p's patch)
peter1138
parents:
4686
diff
changeset
|
269 |
u->cargo_subtype = temp_subtype; |
c917a3ad0dd2
(svn r6601) - Codechange: Support cargo subtypes in the refit window. The refit window has been altered to support resizing and scrolling. Note that the cargo subtype isn't yet passed for actual refitting yet. (Based on mart3p's patch)
peter1138
parents:
4686
diff
changeset
|
270 |
} else { |
c917a3ad0dd2
(svn r6601) - Codechange: Support cargo subtypes in the refit window. The refit window has been altered to support resizing and scrolling. Note that the cargo subtype isn't yet passed for actual refitting yet. (Based on mart3p's patch)
peter1138
parents:
4686
diff
changeset
|
271 |
/* No cargo suffix callback -- use no subtype */ |
c917a3ad0dd2
(svn r6601) - Codechange: Support cargo subtypes in the refit window. The refit window has been altered to support resizing and scrolling. Note that the cargo subtype isn't yet passed for actual refitting yet. (Based on mart3p's patch)
peter1138
parents:
4686
diff
changeset
|
272 |
bool duplicate = false; |
c917a3ad0dd2
(svn r6601) - Codechange: Support cargo subtypes in the refit window. The refit window has been altered to support resizing and scrolling. Note that the cargo subtype isn't yet passed for actual refitting yet. (Based on mart3p's patch)
peter1138
parents:
4686
diff
changeset
|
273 |
|
c917a3ad0dd2
(svn r6601) - Codechange: Support cargo subtypes in the refit window. The refit window has been altered to support resizing and scrolling. Note that the cargo subtype isn't yet passed for actual refitting yet. (Based on mart3p's patch)
peter1138
parents:
4686
diff
changeset
|
274 |
for (i = 0; i < num_lines && !duplicate; i++) { |
4776
c798a32e8bc7
(svn r6690) - Fix (r6602): Translate global to per-climate cargo ids before... doing anything with them. (Thanks to MeusH for pointing this out...)
peter1138
parents:
4775
diff
changeset
|
275 |
if (refit[i].cargo == lcid && refit[i].value == CALLBACK_FAILED) duplicate = true; |
4694
c917a3ad0dd2
(svn r6601) - Codechange: Support cargo subtypes in the refit window. The refit window has been altered to support resizing and scrolling. Note that the cargo subtype isn't yet passed for actual refitting yet. (Based on mart3p's patch)
peter1138
parents:
4686
diff
changeset
|
276 |
} |
c917a3ad0dd2
(svn r6601) - Codechange: Support cargo subtypes in the refit window. The refit window has been altered to support resizing and scrolling. Note that the cargo subtype isn't yet passed for actual refitting yet. (Based on mart3p's patch)
peter1138
parents:
4686
diff
changeset
|
277 |
|
c917a3ad0dd2
(svn r6601) - Codechange: Support cargo subtypes in the refit window. The refit window has been altered to support resizing and scrolling. Note that the cargo subtype isn't yet passed for actual refitting yet. (Based on mart3p's patch)
peter1138
parents:
4686
diff
changeset
|
278 |
if (!duplicate) { |
4776
c798a32e8bc7
(svn r6690) - Fix (r6602): Translate global to per-climate cargo ids before... doing anything with them. (Thanks to MeusH for pointing this out...)
peter1138
parents:
4775
diff
changeset
|
279 |
refit[num_lines].cargo = lcid; |
4694
c917a3ad0dd2
(svn r6601) - Codechange: Support cargo subtypes in the refit window. The refit window has been altered to support resizing and scrolling. Note that the cargo subtype isn't yet passed for actual refitting yet. (Based on mart3p's patch)
peter1138
parents:
4686
diff
changeset
|
280 |
refit[num_lines].subtype = 0; |
c917a3ad0dd2
(svn r6601) - Codechange: Support cargo subtypes in the refit window. The refit window has been altered to support resizing and scrolling. Note that the cargo subtype isn't yet passed for actual refitting yet. (Based on mart3p's patch)
peter1138
parents:
4686
diff
changeset
|
281 |
refit[num_lines].value = CALLBACK_FAILED; |
c917a3ad0dd2
(svn r6601) - Codechange: Support cargo subtypes in the refit window. The refit window has been altered to support resizing and scrolling. Note that the cargo subtype isn't yet passed for actual refitting yet. (Based on mart3p's patch)
peter1138
parents:
4686
diff
changeset
|
282 |
refit[num_lines].engine = INVALID_ENGINE; |
c917a3ad0dd2
(svn r6601) - Codechange: Support cargo subtypes in the refit window. The refit window has been altered to support resizing and scrolling. Note that the cargo subtype isn't yet passed for actual refitting yet. (Based on mart3p's patch)
peter1138
parents:
4686
diff
changeset
|
283 |
num_lines++; |
c917a3ad0dd2
(svn r6601) - Codechange: Support cargo subtypes in the refit window. The refit window has been altered to support resizing and scrolling. Note that the cargo subtype isn't yet passed for actual refitting yet. (Based on mart3p's patch)
peter1138
parents:
4686
diff
changeset
|
284 |
} |
c917a3ad0dd2
(svn r6601) - Codechange: Support cargo subtypes in the refit window. The refit window has been altered to support resizing and scrolling. Note that the cargo subtype isn't yet passed for actual refitting yet. (Based on mart3p's patch)
peter1138
parents:
4686
diff
changeset
|
285 |
} |
c917a3ad0dd2
(svn r6601) - Codechange: Support cargo subtypes in the refit window. The refit window has been altered to support resizing and scrolling. Note that the cargo subtype isn't yet passed for actual refitting yet. (Based on mart3p's patch)
peter1138
parents:
4686
diff
changeset
|
286 |
} |
4933
0ae35137aeca
(svn r6920) - Codechange: Ignore refit options of an engine if it has no capacity.
peter1138
parents:
4932
diff
changeset
|
287 |
} while (v->type == VEH_Train && (u = u->next) != NULL && num_lines < max_lines); |
4694
c917a3ad0dd2
(svn r6601) - Codechange: Support cargo subtypes in the refit window. The refit window has been altered to support resizing and scrolling. Note that the cargo subtype isn't yet passed for actual refitting yet. (Based on mart3p's patch)
peter1138
parents:
4686
diff
changeset
|
288 |
|
c917a3ad0dd2
(svn r6601) - Codechange: Support cargo subtypes in the refit window. The refit window has been altered to support resizing and scrolling. Note that the cargo subtype isn't yet passed for actual refitting yet. (Based on mart3p's patch)
peter1138
parents:
4686
diff
changeset
|
289 |
list->num_lines = num_lines; |
c917a3ad0dd2
(svn r6601) - Codechange: Support cargo subtypes in the refit window. The refit window has been altered to support resizing and scrolling. Note that the cargo subtype isn't yet passed for actual refitting yet. (Based on mart3p's patch)
peter1138
parents:
4686
diff
changeset
|
290 |
list->items = refit; |
c917a3ad0dd2
(svn r6601) - Codechange: Support cargo subtypes in the refit window. The refit window has been altered to support resizing and scrolling. Note that the cargo subtype isn't yet passed for actual refitting yet. (Based on mart3p's patch)
peter1138
parents:
4686
diff
changeset
|
291 |
|
c917a3ad0dd2
(svn r6601) - Codechange: Support cargo subtypes in the refit window. The refit window has been altered to support resizing and scrolling. Note that the cargo subtype isn't yet passed for actual refitting yet. (Based on mart3p's patch)
peter1138
parents:
4686
diff
changeset
|
292 |
return list; |
c917a3ad0dd2
(svn r6601) - Codechange: Support cargo subtypes in the refit window. The refit window has been altered to support resizing and scrolling. Note that the cargo subtype isn't yet passed for actual refitting yet. (Based on mart3p's patch)
peter1138
parents:
4686
diff
changeset
|
293 |
} |
c917a3ad0dd2
(svn r6601) - Codechange: Support cargo subtypes in the refit window. The refit window has been altered to support resizing and scrolling. Note that the cargo subtype isn't yet passed for actual refitting yet. (Based on mart3p's patch)
peter1138
parents:
4686
diff
changeset
|
294 |
|
1859
870dcb6fd65b
(svn r2365) - Change: [refitting] Make refitting capacities for trains newgrf compatible. Train vehicles can now carry twice as much mail/goods as other cargo, and four times as much passengers.
hackykid
parents:
1802
diff
changeset
|
295 |
/** Draw the list of available refit options for a consist. |
1802
da61740cc1e7
(svn r2306) - CodeChange: Check the last commands; refits. This needed an extensive rewrite and global/local-cargo ID juggling and bitmasking. However with this done it looks better as well and is compatible with newgrf handling. Big thanks to HackyKid for doing most of the work. This also closes patch "[ 1199277 ] Command checks"
Darkvater
parents:
1763
diff
changeset
|
296 |
* Draw the list and highlight the selected refit option (if any) |
1859
870dcb6fd65b
(svn r2365) - Change: [refitting] Make refitting capacities for trains newgrf compatible. Train vehicles can now carry twice as much mail/goods as other cargo, and four times as much passengers.
hackykid
parents:
1802
diff
changeset
|
297 |
* @param *v first vehicle in consist to get the refit-options of |
1802
da61740cc1e7
(svn r2306) - CodeChange: Check the last commands; refits. This needed an extensive rewrite and global/local-cargo ID juggling and bitmasking. However with this done it looks better as well and is compatible with newgrf handling. Big thanks to HackyKid for doing most of the work. This also closes patch "[ 1199277 ] Command checks"
Darkvater
parents:
1763
diff
changeset
|
298 |
* @param sel selected refit cargo-type in the window |
4695
3a5bf7ff066b
(svn r6602) - Feature: we now support NewGRF livery refits, as used by DBsetXL, amongst others. This requires a savegame bump to save the cargo subtype.
peter1138
parents:
4694
diff
changeset
|
299 |
* @return the refit option that is hightlighted, NULL if none |
1802
da61740cc1e7
(svn r2306) - CodeChange: Check the last commands; refits. This needed an extensive rewrite and global/local-cargo ID juggling and bitmasking. However with this done it looks better as well and is compatible with newgrf handling. Big thanks to HackyKid for doing most of the work. This also closes patch "[ 1199277 ] Command checks"
Darkvater
parents:
1763
diff
changeset
|
300 |
*/ |
4695
3a5bf7ff066b
(svn r6602) - Feature: we now support NewGRF livery refits, as used by DBsetXL, amongst others. This requires a savegame bump to save the cargo subtype.
peter1138
parents:
4694
diff
changeset
|
301 |
static RefitOption *DrawVehicleRefitWindow(const RefitList *list, int sel, uint pos, uint rows, uint delta) |
1802
da61740cc1e7
(svn r2306) - CodeChange: Check the last commands; refits. This needed an extensive rewrite and global/local-cargo ID juggling and bitmasking. However with this done it looks better as well and is compatible with newgrf handling. Big thanks to HackyKid for doing most of the work. This also closes patch "[ 1199277 ] Command checks"
Darkvater
parents:
1763
diff
changeset
|
302 |
{ |
4694
c917a3ad0dd2
(svn r6601) - Codechange: Support cargo subtypes in the refit window. The refit window has been altered to support resizing and scrolling. Note that the cargo subtype isn't yet passed for actual refitting yet. (Based on mart3p's patch)
peter1138
parents:
4686
diff
changeset
|
303 |
RefitOption *refit = list->items; |
4695
3a5bf7ff066b
(svn r6602) - Feature: we now support NewGRF livery refits, as used by DBsetXL, amongst others. This requires a savegame bump to save the cargo subtype.
peter1138
parents:
4694
diff
changeset
|
304 |
RefitOption *selected = NULL; |
4694
c917a3ad0dd2
(svn r6601) - Codechange: Support cargo subtypes in the refit window. The refit window has been altered to support resizing and scrolling. Note that the cargo subtype isn't yet passed for actual refitting yet. (Based on mart3p's patch)
peter1138
parents:
4686
diff
changeset
|
305 |
uint num_lines = list->num_lines; |
c917a3ad0dd2
(svn r6601) - Codechange: Support cargo subtypes in the refit window. The refit window has been altered to support resizing and scrolling. Note that the cargo subtype isn't yet passed for actual refitting yet. (Based on mart3p's patch)
peter1138
parents:
4686
diff
changeset
|
306 |
uint y = 31; |
c917a3ad0dd2
(svn r6601) - Codechange: Support cargo subtypes in the refit window. The refit window has been altered to support resizing and scrolling. Note that the cargo subtype isn't yet passed for actual refitting yet. (Based on mart3p's patch)
peter1138
parents:
4686
diff
changeset
|
307 |
uint i; |
1802
da61740cc1e7
(svn r2306) - CodeChange: Check the last commands; refits. This needed an extensive rewrite and global/local-cargo ID juggling and bitmasking. However with this done it looks better as well and is compatible with newgrf handling. Big thanks to HackyKid for doing most of the work. This also closes patch "[ 1199277 ] Command checks"
Darkvater
parents:
1763
diff
changeset
|
308 |
|
4694
c917a3ad0dd2
(svn r6601) - Codechange: Support cargo subtypes in the refit window. The refit window has been altered to support resizing and scrolling. Note that the cargo subtype isn't yet passed for actual refitting yet. (Based on mart3p's patch)
peter1138
parents:
4686
diff
changeset
|
309 |
/* Draw the list, and find the selected cargo (by its position in list) */ |
4697
67032d30eab0
(svn r6607) - Fix (r6601): Fix selection of refit type when the list is scrolled.
peter1138
parents:
4695
diff
changeset
|
310 |
for (i = 0; i < num_lines; i++) { |
4694
c917a3ad0dd2
(svn r6601) - Codechange: Support cargo subtypes in the refit window. The refit window has been altered to support resizing and scrolling. Note that the cargo subtype isn't yet passed for actual refitting yet. (Based on mart3p's patch)
peter1138
parents:
4686
diff
changeset
|
311 |
byte colour = 16; |
c917a3ad0dd2
(svn r6601) - Codechange: Support cargo subtypes in the refit window. The refit window has been altered to support resizing and scrolling. Note that the cargo subtype isn't yet passed for actual refitting yet. (Based on mart3p's patch)
peter1138
parents:
4686
diff
changeset
|
312 |
if (sel == 0) { |
4695
3a5bf7ff066b
(svn r6602) - Feature: we now support NewGRF livery refits, as used by DBsetXL, amongst others. This requires a savegame bump to save the cargo subtype.
peter1138
parents:
4694
diff
changeset
|
313 |
selected = &refit[i]; |
4694
c917a3ad0dd2
(svn r6601) - Codechange: Support cargo subtypes in the refit window. The refit window has been altered to support resizing and scrolling. Note that the cargo subtype isn't yet passed for actual refitting yet. (Based on mart3p's patch)
peter1138
parents:
4686
diff
changeset
|
314 |
colour = 12; |
c917a3ad0dd2
(svn r6601) - Codechange: Support cargo subtypes in the refit window. The refit window has been altered to support resizing and scrolling. Note that the cargo subtype isn't yet passed for actual refitting yet. (Based on mart3p's patch)
peter1138
parents:
4686
diff
changeset
|
315 |
} |
1859
870dcb6fd65b
(svn r2365) - Change: [refitting] Make refitting capacities for trains newgrf compatible. Train vehicles can now carry twice as much mail/goods as other cargo, and four times as much passengers.
hackykid
parents:
1802
diff
changeset
|
316 |
|
4697
67032d30eab0
(svn r6607) - Fix (r6601): Fix selection of refit type when the list is scrolled.
peter1138
parents:
4695
diff
changeset
|
317 |
if (i >= pos && i < pos + rows) { |
4694
c917a3ad0dd2
(svn r6601) - Codechange: Support cargo subtypes in the refit window. The refit window has been altered to support resizing and scrolling. Note that the cargo subtype isn't yet passed for actual refitting yet. (Based on mart3p's patch)
peter1138
parents:
4686
diff
changeset
|
318 |
/* Draw the cargo name */ |
4776
c798a32e8bc7
(svn r6690) - Fix (r6602): Translate global to per-climate cargo ids before... doing anything with them. (Thanks to MeusH for pointing this out...)
peter1138
parents:
4775
diff
changeset
|
319 |
int last_x = DrawString(2, y, _cargoc.names_s[refit[i].cargo], colour); |
4694
c917a3ad0dd2
(svn r6601) - Codechange: Support cargo subtypes in the refit window. The refit window has been altered to support resizing and scrolling. Note that the cargo subtype isn't yet passed for actual refitting yet. (Based on mart3p's patch)
peter1138
parents:
4686
diff
changeset
|
320 |
|
c917a3ad0dd2
(svn r6601) - Codechange: Support cargo subtypes in the refit window. The refit window has been altered to support resizing and scrolling. Note that the cargo subtype isn't yet passed for actual refitting yet. (Based on mart3p's patch)
peter1138
parents:
4686
diff
changeset
|
321 |
/* If the callback succeeded, draw the cargo suffix */ |
c917a3ad0dd2
(svn r6601) - Codechange: Support cargo subtypes in the refit window. The refit window has been altered to support resizing and scrolling. Note that the cargo subtype isn't yet passed for actual refitting yet. (Based on mart3p's patch)
peter1138
parents:
4686
diff
changeset
|
322 |
if (refit[i].value != CALLBACK_FAILED) { |
c917a3ad0dd2
(svn r6601) - Codechange: Support cargo subtypes in the refit window. The refit window has been altered to support resizing and scrolling. Note that the cargo subtype isn't yet passed for actual refitting yet. (Based on mart3p's patch)
peter1138
parents:
4686
diff
changeset
|
323 |
DrawString(last_x + 1, y, GetGRFStringID(GetEngineGRFID(refit[i].engine), 0xD000 + refit[i].value), colour); |
3025
9e60c370415c
(svn r3605) - Remove silly macro and fix indenting in DrawVehicleRefitWindow()
peter1138
parents:
2989
diff
changeset
|
324 |
} |
4694
c917a3ad0dd2
(svn r6601) - Codechange: Support cargo subtypes in the refit window. The refit window has been altered to support resizing and scrolling. Note that the cargo subtype isn't yet passed for actual refitting yet. (Based on mart3p's patch)
peter1138
parents:
4686
diff
changeset
|
325 |
y += delta; |
c917a3ad0dd2
(svn r6601) - Codechange: Support cargo subtypes in the refit window. The refit window has been altered to support resizing and scrolling. Note that the cargo subtype isn't yet passed for actual refitting yet. (Based on mart3p's patch)
peter1138
parents:
4686
diff
changeset
|
326 |
} |
3025
9e60c370415c
(svn r3605) - Remove silly macro and fix indenting in DrawVehicleRefitWindow()
peter1138
parents:
2989
diff
changeset
|
327 |
|
4694
c917a3ad0dd2
(svn r6601) - Codechange: Support cargo subtypes in the refit window. The refit window has been altered to support resizing and scrolling. Note that the cargo subtype isn't yet passed for actual refitting yet. (Based on mart3p's patch)
peter1138
parents:
4686
diff
changeset
|
328 |
sel--; |
3025
9e60c370415c
(svn r3605) - Remove silly macro and fix indenting in DrawVehicleRefitWindow()
peter1138
parents:
2989
diff
changeset
|
329 |
} |
9e60c370415c
(svn r3605) - Remove silly macro and fix indenting in DrawVehicleRefitWindow()
peter1138
parents:
2989
diff
changeset
|
330 |
|
4695
3a5bf7ff066b
(svn r6602) - Feature: we now support NewGRF livery refits, as used by DBsetXL, amongst others. This requires a savegame bump to save the cargo subtype.
peter1138
parents:
4694
diff
changeset
|
331 |
return selected; |
1802
da61740cc1e7
(svn r2306) - CodeChange: Check the last commands; refits. This needed an extensive rewrite and global/local-cargo ID juggling and bitmasking. However with this done it looks better as well and is compatible with newgrf handling. Big thanks to HackyKid for doing most of the work. This also closes patch "[ 1199277 ] Command checks"
Darkvater
parents:
1763
diff
changeset
|
332 |
} |
da61740cc1e7
(svn r2306) - CodeChange: Check the last commands; refits. This needed an extensive rewrite and global/local-cargo ID juggling and bitmasking. However with this done it looks better as well and is compatible with newgrf handling. Big thanks to HackyKid for doing most of the work. This also closes patch "[ 1199277 ] Command checks"
Darkvater
parents:
1763
diff
changeset
|
333 |
|
4642
e27b0f7e89e9
(svn r6518) -Codechange: unified the vehicle refit windows
bjarni
parents:
4634
diff
changeset
|
334 |
static void VehicleRefitWndProc(Window *w, WindowEvent *e) |
e27b0f7e89e9
(svn r6518) -Codechange: unified the vehicle refit windows
bjarni
parents:
4634
diff
changeset
|
335 |
{ |
e27b0f7e89e9
(svn r6518) -Codechange: unified the vehicle refit windows
bjarni
parents:
4634
diff
changeset
|
336 |
switch (e->event) { |
e27b0f7e89e9
(svn r6518) -Codechange: unified the vehicle refit windows
bjarni
parents:
4634
diff
changeset
|
337 |
case WE_PAINT: { |
4694
c917a3ad0dd2
(svn r6601) - Codechange: Support cargo subtypes in the refit window. The refit window has been altered to support resizing and scrolling. Note that the cargo subtype isn't yet passed for actual refitting yet. (Based on mart3p's patch)
peter1138
parents:
4686
diff
changeset
|
338 |
Vehicle *v = GetVehicle(w->window_number); |
c917a3ad0dd2
(svn r6601) - Codechange: Support cargo subtypes in the refit window. The refit window has been altered to support resizing and scrolling. Note that the cargo subtype isn't yet passed for actual refitting yet. (Based on mart3p's patch)
peter1138
parents:
4686
diff
changeset
|
339 |
|
c917a3ad0dd2
(svn r6601) - Codechange: Support cargo subtypes in the refit window. The refit window has been altered to support resizing and scrolling. Note that the cargo subtype isn't yet passed for actual refitting yet. (Based on mart3p's patch)
peter1138
parents:
4686
diff
changeset
|
340 |
if (v->type == VEH_Train) { |
c917a3ad0dd2
(svn r6601) - Codechange: Support cargo subtypes in the refit window. The refit window has been altered to support resizing and scrolling. Note that the cargo subtype isn't yet passed for actual refitting yet. (Based on mart3p's patch)
peter1138
parents:
4686
diff
changeset
|
341 |
uint length = CountVehiclesInChain(v); |
c917a3ad0dd2
(svn r6601) - Codechange: Support cargo subtypes in the refit window. The refit window has been altered to support resizing and scrolling. Note that the cargo subtype isn't yet passed for actual refitting yet. (Based on mart3p's patch)
peter1138
parents:
4686
diff
changeset
|
342 |
|
c917a3ad0dd2
(svn r6601) - Codechange: Support cargo subtypes in the refit window. The refit window has been altered to support resizing and scrolling. Note that the cargo subtype isn't yet passed for actual refitting yet. (Based on mart3p's patch)
peter1138
parents:
4686
diff
changeset
|
343 |
if (length != WP(w, refit_d).length) { |
c917a3ad0dd2
(svn r6601) - Codechange: Support cargo subtypes in the refit window. The refit window has been altered to support resizing and scrolling. Note that the cargo subtype isn't yet passed for actual refitting yet. (Based on mart3p's patch)
peter1138
parents:
4686
diff
changeset
|
344 |
/* Consist length has changed, so rebuild the refit list */ |
c917a3ad0dd2
(svn r6601) - Codechange: Support cargo subtypes in the refit window. The refit window has been altered to support resizing and scrolling. Note that the cargo subtype isn't yet passed for actual refitting yet. (Based on mart3p's patch)
peter1138
parents:
4686
diff
changeset
|
345 |
free(WP(w, refit_d).list->items); |
c917a3ad0dd2
(svn r6601) - Codechange: Support cargo subtypes in the refit window. The refit window has been altered to support resizing and scrolling. Note that the cargo subtype isn't yet passed for actual refitting yet. (Based on mart3p's patch)
peter1138
parents:
4686
diff
changeset
|
346 |
free(WP(w, refit_d).list); |
c917a3ad0dd2
(svn r6601) - Codechange: Support cargo subtypes in the refit window. The refit window has been altered to support resizing and scrolling. Note that the cargo subtype isn't yet passed for actual refitting yet. (Based on mart3p's patch)
peter1138
parents:
4686
diff
changeset
|
347 |
WP(w, refit_d).list = BuildRefitList(v); |
c917a3ad0dd2
(svn r6601) - Codechange: Support cargo subtypes in the refit window. The refit window has been altered to support resizing and scrolling. Note that the cargo subtype isn't yet passed for actual refitting yet. (Based on mart3p's patch)
peter1138
parents:
4686
diff
changeset
|
348 |
WP(w, refit_d).length = length; |
c917a3ad0dd2
(svn r6601) - Codechange: Support cargo subtypes in the refit window. The refit window has been altered to support resizing and scrolling. Note that the cargo subtype isn't yet passed for actual refitting yet. (Based on mart3p's patch)
peter1138
parents:
4686
diff
changeset
|
349 |
} |
c917a3ad0dd2
(svn r6601) - Codechange: Support cargo subtypes in the refit window. The refit window has been altered to support resizing and scrolling. Note that the cargo subtype isn't yet passed for actual refitting yet. (Based on mart3p's patch)
peter1138
parents:
4686
diff
changeset
|
350 |
} |
4642
e27b0f7e89e9
(svn r6518) -Codechange: unified the vehicle refit windows
bjarni
parents:
4634
diff
changeset
|
351 |
|
4698
b787a418296f
(svn r6608) - Fix (r6601): The scroll bar could fall out of the window... more gui-fu needed...
peter1138
parents:
4697
diff
changeset
|
352 |
SetVScrollCount(w, WP(w, refit_d).list->num_lines); |
b787a418296f
(svn r6608) - Fix (r6601): The scroll bar could fall out of the window... more gui-fu needed...
peter1138
parents:
4697
diff
changeset
|
353 |
|
4642
e27b0f7e89e9
(svn r6518) -Codechange: unified the vehicle refit windows
bjarni
parents:
4634
diff
changeset
|
354 |
SetDParam(0, v->string_id); |
e27b0f7e89e9
(svn r6518) -Codechange: unified the vehicle refit windows
bjarni
parents:
4634
diff
changeset
|
355 |
SetDParam(1, v->unitnumber); |
e27b0f7e89e9
(svn r6518) -Codechange: unified the vehicle refit windows
bjarni
parents:
4634
diff
changeset
|
356 |
DrawWindowWidgets(w); |
e27b0f7e89e9
(svn r6518) -Codechange: unified the vehicle refit windows
bjarni
parents:
4634
diff
changeset
|
357 |
|
4694
c917a3ad0dd2
(svn r6601) - Codechange: Support cargo subtypes in the refit window. The refit window has been altered to support resizing and scrolling. Note that the cargo subtype isn't yet passed for actual refitting yet. (Based on mart3p's patch)
peter1138
parents:
4686
diff
changeset
|
358 |
WP(w,refit_d).cargo = DrawVehicleRefitWindow(WP(w, refit_d).list, WP(w, refit_d).sel, w->vscroll.pos, w->vscroll.cap, w->resize.step_height); |
4642
e27b0f7e89e9
(svn r6518) -Codechange: unified the vehicle refit windows
bjarni
parents:
4634
diff
changeset
|
359 |
|
4695
3a5bf7ff066b
(svn r6602) - Feature: we now support NewGRF livery refits, as used by DBsetXL, amongst others. This requires a savegame bump to save the cargo subtype.
peter1138
parents:
4694
diff
changeset
|
360 |
if (WP(w,refit_d).cargo != NULL) { |
4642
e27b0f7e89e9
(svn r6518) -Codechange: unified the vehicle refit windows
bjarni
parents:
4634
diff
changeset
|
361 |
int32 cost = 0; |
e27b0f7e89e9
(svn r6518) -Codechange: unified the vehicle refit windows
bjarni
parents:
4634
diff
changeset
|
362 |
switch (GetVehicle(w->window_number)->type) { |
e27b0f7e89e9
(svn r6518) -Codechange: unified the vehicle refit windows
bjarni
parents:
4634
diff
changeset
|
363 |
case VEH_Train: cost = CMD_REFIT_RAIL_VEHICLE; break; |
e27b0f7e89e9
(svn r6518) -Codechange: unified the vehicle refit windows
bjarni
parents:
4634
diff
changeset
|
364 |
case VEH_Road: cost = CMD_REFIT_ROAD_VEH; break; |
e27b0f7e89e9
(svn r6518) -Codechange: unified the vehicle refit windows
bjarni
parents:
4634
diff
changeset
|
365 |
case VEH_Ship: cost = CMD_REFIT_SHIP; break; |
e27b0f7e89e9
(svn r6518) -Codechange: unified the vehicle refit windows
bjarni
parents:
4634
diff
changeset
|
366 |
case VEH_Aircraft: cost = CMD_REFIT_AIRCRAFT; break; |
e27b0f7e89e9
(svn r6518) -Codechange: unified the vehicle refit windows
bjarni
parents:
4634
diff
changeset
|
367 |
} |
e27b0f7e89e9
(svn r6518) -Codechange: unified the vehicle refit windows
bjarni
parents:
4634
diff
changeset
|
368 |
|
4695
3a5bf7ff066b
(svn r6602) - Feature: we now support NewGRF livery refits, as used by DBsetXL, amongst others. This requires a savegame bump to save the cargo subtype.
peter1138
parents:
4694
diff
changeset
|
369 |
cost = DoCommand(v->tile, v->index, WP(w,refit_d).cargo->cargo | WP(w,refit_d).cargo->subtype << 8, DC_QUERY_COST, cost); |
4642
e27b0f7e89e9
(svn r6518) -Codechange: unified the vehicle refit windows
bjarni
parents:
4634
diff
changeset
|
370 |
if (!CmdFailed(cost)) { |
4896
f86350aaaaa5
(svn r6855) - Codechange: When displaying a "quantity of cargo" string, use the {CARGO} command and supply the cargo type and quantity, instead of manually looking up the cargo type's string.
peter1138
parents:
4863
diff
changeset
|
371 |
SetDParam(0, WP(w,refit_d).cargo->cargo); |
4642
e27b0f7e89e9
(svn r6518) -Codechange: unified the vehicle refit windows
bjarni
parents:
4634
diff
changeset
|
372 |
SetDParam(1, _returned_refit_capacity); |
e27b0f7e89e9
(svn r6518) -Codechange: unified the vehicle refit windows
bjarni
parents:
4634
diff
changeset
|
373 |
SetDParam(2, cost); |
4694
c917a3ad0dd2
(svn r6601) - Codechange: Support cargo subtypes in the refit window. The refit window has been altered to support resizing and scrolling. Note that the cargo subtype isn't yet passed for actual refitting yet. (Based on mart3p's patch)
peter1138
parents:
4686
diff
changeset
|
374 |
DrawString(2, w->widget[5].top + 1, STR_9840_NEW_CAPACITY_COST_OF_REFIT, 0); |
4642
e27b0f7e89e9
(svn r6518) -Codechange: unified the vehicle refit windows
bjarni
parents:
4634
diff
changeset
|
375 |
} |
e27b0f7e89e9
(svn r6518) -Codechange: unified the vehicle refit windows
bjarni
parents:
4634
diff
changeset
|
376 |
} |
e27b0f7e89e9
(svn r6518) -Codechange: unified the vehicle refit windows
bjarni
parents:
4634
diff
changeset
|
377 |
} break; |
e27b0f7e89e9
(svn r6518) -Codechange: unified the vehicle refit windows
bjarni
parents:
4634
diff
changeset
|
378 |
|
e27b0f7e89e9
(svn r6518) -Codechange: unified the vehicle refit windows
bjarni
parents:
4634
diff
changeset
|
379 |
case WE_CLICK: |
e27b0f7e89e9
(svn r6518) -Codechange: unified the vehicle refit windows
bjarni
parents:
4634
diff
changeset
|
380 |
switch (e->we.click.widget) { |
4694
c917a3ad0dd2
(svn r6601) - Codechange: Support cargo subtypes in the refit window. The refit window has been altered to support resizing and scrolling. Note that the cargo subtype isn't yet passed for actual refitting yet. (Based on mart3p's patch)
peter1138
parents:
4686
diff
changeset
|
381 |
case 3: { // listbox |
c917a3ad0dd2
(svn r6601) - Codechange: Support cargo subtypes in the refit window. The refit window has been altered to support resizing and scrolling. Note that the cargo subtype isn't yet passed for actual refitting yet. (Based on mart3p's patch)
peter1138
parents:
4686
diff
changeset
|
382 |
int y = e->we.click.pt.y - w->widget[3].top; |
4642
e27b0f7e89e9
(svn r6518) -Codechange: unified the vehicle refit windows
bjarni
parents:
4634
diff
changeset
|
383 |
if (y >= 0) { |
4697
67032d30eab0
(svn r6607) - Fix (r6601): Fix selection of refit type when the list is scrolled.
peter1138
parents:
4695
diff
changeset
|
384 |
WP(w,refit_d).sel = (y / (int)w->resize.step_height) + w->vscroll.pos; |
4642
e27b0f7e89e9
(svn r6518) -Codechange: unified the vehicle refit windows
bjarni
parents:
4634
diff
changeset
|
385 |
SetWindowDirty(w); |
e27b0f7e89e9
(svn r6518) -Codechange: unified the vehicle refit windows
bjarni
parents:
4634
diff
changeset
|
386 |
} |
e27b0f7e89e9
(svn r6518) -Codechange: unified the vehicle refit windows
bjarni
parents:
4634
diff
changeset
|
387 |
} break; |
4694
c917a3ad0dd2
(svn r6601) - Codechange: Support cargo subtypes in the refit window. The refit window has been altered to support resizing and scrolling. Note that the cargo subtype isn't yet passed for actual refitting yet. (Based on mart3p's patch)
peter1138
parents:
4686
diff
changeset
|
388 |
case 6: // refit button |
4695
3a5bf7ff066b
(svn r6602) - Feature: we now support NewGRF livery refits, as used by DBsetXL, amongst others. This requires a savegame bump to save the cargo subtype.
peter1138
parents:
4694
diff
changeset
|
389 |
if (WP(w,refit_d).cargo != NULL) { |
4642
e27b0f7e89e9
(svn r6518) -Codechange: unified the vehicle refit windows
bjarni
parents:
4634
diff
changeset
|
390 |
const Vehicle *v = GetVehicle(w->window_number); |
e27b0f7e89e9
(svn r6518) -Codechange: unified the vehicle refit windows
bjarni
parents:
4634
diff
changeset
|
391 |
|
4712
4335ad42e163
(svn r6624) -Feature: added ability to add refit commands to vehicle orders (can only be done in goto depot orders)
bjarni
parents:
4709
diff
changeset
|
392 |
if (WP(w, refit_d).order == INVALID_VEH_ORDER_ID) { |
4335ad42e163
(svn r6624) -Feature: added ability to add refit commands to vehicle orders (can only be done in goto depot orders)
bjarni
parents:
4709
diff
changeset
|
393 |
int command = 0; |
4335ad42e163
(svn r6624) -Feature: added ability to add refit commands to vehicle orders (can only be done in goto depot orders)
bjarni
parents:
4709
diff
changeset
|
394 |
|
4335ad42e163
(svn r6624) -Feature: added ability to add refit commands to vehicle orders (can only be done in goto depot orders)
bjarni
parents:
4709
diff
changeset
|
395 |
switch (v->type) { |
4335ad42e163
(svn r6624) -Feature: added ability to add refit commands to vehicle orders (can only be done in goto depot orders)
bjarni
parents:
4709
diff
changeset
|
396 |
case VEH_Train: command = CMD_REFIT_RAIL_VEHICLE | CMD_MSG(STR_RAIL_CAN_T_REFIT_VEHICLE); break; |
4335ad42e163
(svn r6624) -Feature: added ability to add refit commands to vehicle orders (can only be done in goto depot orders)
bjarni
parents:
4709
diff
changeset
|
397 |
case VEH_Road: command = CMD_REFIT_ROAD_VEH | CMD_MSG(STR_REFIT_ROAD_VEHICLE_CAN_T); break; |
4335ad42e163
(svn r6624) -Feature: added ability to add refit commands to vehicle orders (can only be done in goto depot orders)
bjarni
parents:
4709
diff
changeset
|
398 |
case VEH_Ship: command = CMD_REFIT_SHIP | CMD_MSG(STR_9841_CAN_T_REFIT_SHIP); break; |
4335ad42e163
(svn r6624) -Feature: added ability to add refit commands to vehicle orders (can only be done in goto depot orders)
bjarni
parents:
4709
diff
changeset
|
399 |
case VEH_Aircraft: command = CMD_REFIT_AIRCRAFT | CMD_MSG(STR_A042_CAN_T_REFIT_AIRCRAFT); break; |
4335ad42e163
(svn r6624) -Feature: added ability to add refit commands to vehicle orders (can only be done in goto depot orders)
bjarni
parents:
4709
diff
changeset
|
400 |
} |
4335ad42e163
(svn r6624) -Feature: added ability to add refit commands to vehicle orders (can only be done in goto depot orders)
bjarni
parents:
4709
diff
changeset
|
401 |
if (DoCommandP(v->tile, v->index, WP(w,refit_d).cargo->cargo | WP(w,refit_d).cargo->subtype << 8, NULL, command)) DeleteWindow(w); |
4335ad42e163
(svn r6624) -Feature: added ability to add refit commands to vehicle orders (can only be done in goto depot orders)
bjarni
parents:
4709
diff
changeset
|
402 |
} else { |
4335ad42e163
(svn r6624) -Feature: added ability to add refit commands to vehicle orders (can only be done in goto depot orders)
bjarni
parents:
4709
diff
changeset
|
403 |
if (DoCommandP(v->tile, v->index, WP(w,refit_d).cargo->cargo | WP(w,refit_d).cargo->subtype << 8 | WP(w, refit_d).order << 16, NULL, CMD_ORDER_REFIT)) DeleteWindow(w); |
4642
e27b0f7e89e9
(svn r6518) -Codechange: unified the vehicle refit windows
bjarni
parents:
4634
diff
changeset
|
404 |
} |
e27b0f7e89e9
(svn r6518) -Codechange: unified the vehicle refit windows
bjarni
parents:
4634
diff
changeset
|
405 |
} |
e27b0f7e89e9
(svn r6518) -Codechange: unified the vehicle refit windows
bjarni
parents:
4634
diff
changeset
|
406 |
break; |
e27b0f7e89e9
(svn r6518) -Codechange: unified the vehicle refit windows
bjarni
parents:
4634
diff
changeset
|
407 |
} |
e27b0f7e89e9
(svn r6518) -Codechange: unified the vehicle refit windows
bjarni
parents:
4634
diff
changeset
|
408 |
break; |
4694
c917a3ad0dd2
(svn r6601) - Codechange: Support cargo subtypes in the refit window. The refit window has been altered to support resizing and scrolling. Note that the cargo subtype isn't yet passed for actual refitting yet. (Based on mart3p's patch)
peter1138
parents:
4686
diff
changeset
|
409 |
|
c917a3ad0dd2
(svn r6601) - Codechange: Support cargo subtypes in the refit window. The refit window has been altered to support resizing and scrolling. Note that the cargo subtype isn't yet passed for actual refitting yet. (Based on mart3p's patch)
peter1138
parents:
4686
diff
changeset
|
410 |
case WE_RESIZE: |
c917a3ad0dd2
(svn r6601) - Codechange: Support cargo subtypes in the refit window. The refit window has been altered to support resizing and scrolling. Note that the cargo subtype isn't yet passed for actual refitting yet. (Based on mart3p's patch)
peter1138
parents:
4686
diff
changeset
|
411 |
w->vscroll.cap += e->we.sizing.diff.y / (int)w->resize.step_height; |
c917a3ad0dd2
(svn r6601) - Codechange: Support cargo subtypes in the refit window. The refit window has been altered to support resizing and scrolling. Note that the cargo subtype isn't yet passed for actual refitting yet. (Based on mart3p's patch)
peter1138
parents:
4686
diff
changeset
|
412 |
w->widget[3].data = (w->vscroll.cap << 8) + 1; |
c917a3ad0dd2
(svn r6601) - Codechange: Support cargo subtypes in the refit window. The refit window has been altered to support resizing and scrolling. Note that the cargo subtype isn't yet passed for actual refitting yet. (Based on mart3p's patch)
peter1138
parents:
4686
diff
changeset
|
413 |
break; |
c917a3ad0dd2
(svn r6601) - Codechange: Support cargo subtypes in the refit window. The refit window has been altered to support resizing and scrolling. Note that the cargo subtype isn't yet passed for actual refitting yet. (Based on mart3p's patch)
peter1138
parents:
4686
diff
changeset
|
414 |
|
c917a3ad0dd2
(svn r6601) - Codechange: Support cargo subtypes in the refit window. The refit window has been altered to support resizing and scrolling. Note that the cargo subtype isn't yet passed for actual refitting yet. (Based on mart3p's patch)
peter1138
parents:
4686
diff
changeset
|
415 |
case WE_DESTROY: |
c917a3ad0dd2
(svn r6601) - Codechange: Support cargo subtypes in the refit window. The refit window has been altered to support resizing and scrolling. Note that the cargo subtype isn't yet passed for actual refitting yet. (Based on mart3p's patch)
peter1138
parents:
4686
diff
changeset
|
416 |
free(WP(w, refit_d).list->items); |
c917a3ad0dd2
(svn r6601) - Codechange: Support cargo subtypes in the refit window. The refit window has been altered to support resizing and scrolling. Note that the cargo subtype isn't yet passed for actual refitting yet. (Based on mart3p's patch)
peter1138
parents:
4686
diff
changeset
|
417 |
free(WP(w, refit_d).list); |
c917a3ad0dd2
(svn r6601) - Codechange: Support cargo subtypes in the refit window. The refit window has been altered to support resizing and scrolling. Note that the cargo subtype isn't yet passed for actual refitting yet. (Based on mart3p's patch)
peter1138
parents:
4686
diff
changeset
|
418 |
break; |
4642
e27b0f7e89e9
(svn r6518) -Codechange: unified the vehicle refit windows
bjarni
parents:
4634
diff
changeset
|
419 |
} |
e27b0f7e89e9
(svn r6518) -Codechange: unified the vehicle refit windows
bjarni
parents:
4634
diff
changeset
|
420 |
} |
e27b0f7e89e9
(svn r6518) -Codechange: unified the vehicle refit windows
bjarni
parents:
4634
diff
changeset
|
421 |
|
e27b0f7e89e9
(svn r6518) -Codechange: unified the vehicle refit windows
bjarni
parents:
4634
diff
changeset
|
422 |
|
e27b0f7e89e9
(svn r6518) -Codechange: unified the vehicle refit windows
bjarni
parents:
4634
diff
changeset
|
423 |
static const Widget _vehicle_refit_widgets[] = { |
e27b0f7e89e9
(svn r6518) -Codechange: unified the vehicle refit windows
bjarni
parents:
4634
diff
changeset
|
424 |
{ WWT_CLOSEBOX, RESIZE_NONE, 14, 0, 10, 0, 13, STR_00C5, STR_018B_CLOSE_WINDOW}, |
e27b0f7e89e9
(svn r6518) -Codechange: unified the vehicle refit windows
bjarni
parents:
4634
diff
changeset
|
425 |
{ WWT_CAPTION, RESIZE_NONE, 14, 11, 239, 0, 13, STR_983B_REFIT, STR_018C_WINDOW_TITLE_DRAG_THIS}, |
4694
c917a3ad0dd2
(svn r6601) - Codechange: Support cargo subtypes in the refit window. The refit window has been altered to support resizing and scrolling. Note that the cargo subtype isn't yet passed for actual refitting yet. (Based on mart3p's patch)
peter1138
parents:
4686
diff
changeset
|
426 |
{ WWT_TEXTBTN, RESIZE_NONE, 14, 0, 239, 14, 27, STR_983F_SELECT_CARGO_TYPE_TO_CARRY, STR_983D_SELECT_TYPE_OF_CARGO_FOR}, |
4775
1fb972035324
(svn r6689) -Fix: corrected vehicle type in tooltip for the list in the refit window
bjarni
parents:
4762
diff
changeset
|
427 |
{ WWT_MATRIX, RESIZE_BOTTOM, 14, 0, 227, 28, 139, 0x801, STR_EMPTY}, |
4694
c917a3ad0dd2
(svn r6601) - Codechange: Support cargo subtypes in the refit window. The refit window has been altered to support resizing and scrolling. Note that the cargo subtype isn't yet passed for actual refitting yet. (Based on mart3p's patch)
peter1138
parents:
4686
diff
changeset
|
428 |
{ WWT_SCROLLBAR, RESIZE_BOTTOM, 14, 228, 239, 28, 139, 0x0, STR_0190_SCROLL_BAR_SCROLLS_LIST}, |
4938
0447845fd1b3
(svn r6925) -Codechange: Be more strict with widget distinctions. WWT_PANEL is only plain panel,
Darkvater
parents:
4933
diff
changeset
|
429 |
{ WWT_PANEL, RESIZE_TB, 14, 0, 239, 140, 161, 0x0, STR_NULL}, |
4694
c917a3ad0dd2
(svn r6601) - Codechange: Support cargo subtypes in the refit window. The refit window has been altered to support resizing and scrolling. Note that the cargo subtype isn't yet passed for actual refitting yet. (Based on mart3p's patch)
peter1138
parents:
4686
diff
changeset
|
430 |
{ WWT_PUSHTXTBTN, RESIZE_TB, 14, 0, 227, 162, 173, 0x0, STR_NULL}, |
c917a3ad0dd2
(svn r6601) - Codechange: Support cargo subtypes in the refit window. The refit window has been altered to support resizing and scrolling. Note that the cargo subtype isn't yet passed for actual refitting yet. (Based on mart3p's patch)
peter1138
parents:
4686
diff
changeset
|
431 |
{ WWT_RESIZEBOX, RESIZE_TB, 14, 228, 239, 162, 173, 0x0, STR_RESIZE_BUTTON}, |
4642
e27b0f7e89e9
(svn r6518) -Codechange: unified the vehicle refit windows
bjarni
parents:
4634
diff
changeset
|
432 |
{ WIDGETS_END}, |
e27b0f7e89e9
(svn r6518) -Codechange: unified the vehicle refit windows
bjarni
parents:
4634
diff
changeset
|
433 |
}; |
e27b0f7e89e9
(svn r6518) -Codechange: unified the vehicle refit windows
bjarni
parents:
4634
diff
changeset
|
434 |
|
e27b0f7e89e9
(svn r6518) -Codechange: unified the vehicle refit windows
bjarni
parents:
4634
diff
changeset
|
435 |
static const WindowDesc _vehicle_refit_desc = { |
5070
7f5b13b7e728
(svn r7128) -Codechange: Replace magic numbers by magic enums (windowdesc positioning WDP_AUTO = -1)
Darkvater
parents:
5005
diff
changeset
|
436 |
WDP_AUTO, WDP_AUTO, 240, 174, |
4642
e27b0f7e89e9
(svn r6518) -Codechange: unified the vehicle refit windows
bjarni
parents:
4634
diff
changeset
|
437 |
WC_VEHICLE_REFIT,WC_VEHICLE_VIEW, |
4694
c917a3ad0dd2
(svn r6601) - Codechange: Support cargo subtypes in the refit window. The refit window has been altered to support resizing and scrolling. Note that the cargo subtype isn't yet passed for actual refitting yet. (Based on mart3p's patch)
peter1138
parents:
4686
diff
changeset
|
438 |
WDF_STD_TOOLTIPS | WDF_STD_BTN | WDF_DEF_WIDGET | WDF_UNCLICK_BUTTONS | WDF_RESIZABLE, |
4642
e27b0f7e89e9
(svn r6518) -Codechange: unified the vehicle refit windows
bjarni
parents:
4634
diff
changeset
|
439 |
_vehicle_refit_widgets, |
e27b0f7e89e9
(svn r6518) -Codechange: unified the vehicle refit windows
bjarni
parents:
4634
diff
changeset
|
440 |
VehicleRefitWndProc, |
e27b0f7e89e9
(svn r6518) -Codechange: unified the vehicle refit windows
bjarni
parents:
4634
diff
changeset
|
441 |
}; |
e27b0f7e89e9
(svn r6518) -Codechange: unified the vehicle refit windows
bjarni
parents:
4634
diff
changeset
|
442 |
|
e27b0f7e89e9
(svn r6518) -Codechange: unified the vehicle refit windows
bjarni
parents:
4634
diff
changeset
|
443 |
/** Show the refit window for a vehicle |
e27b0f7e89e9
(svn r6518) -Codechange: unified the vehicle refit windows
bjarni
parents:
4634
diff
changeset
|
444 |
* @param *v The vehicle to show the refit window for |
e27b0f7e89e9
(svn r6518) -Codechange: unified the vehicle refit windows
bjarni
parents:
4634
diff
changeset
|
445 |
*/ |
4712
4335ad42e163
(svn r6624) -Feature: added ability to add refit commands to vehicle orders (can only be done in goto depot orders)
bjarni
parents:
4709
diff
changeset
|
446 |
void ShowVehicleRefitWindow(const Vehicle *v, VehicleOrderID order) |
4642
e27b0f7e89e9
(svn r6518) -Codechange: unified the vehicle refit windows
bjarni
parents:
4634
diff
changeset
|
447 |
{ |
e27b0f7e89e9
(svn r6518) -Codechange: unified the vehicle refit windows
bjarni
parents:
4634
diff
changeset
|
448 |
Window *w; |
e27b0f7e89e9
(svn r6518) -Codechange: unified the vehicle refit windows
bjarni
parents:
4634
diff
changeset
|
449 |
|
e27b0f7e89e9
(svn r6518) -Codechange: unified the vehicle refit windows
bjarni
parents:
4634
diff
changeset
|
450 |
DeleteWindowById(WC_VEHICLE_REFIT, v->index); |
e27b0f7e89e9
(svn r6518) -Codechange: unified the vehicle refit windows
bjarni
parents:
4634
diff
changeset
|
451 |
|
5071
e28106dfcb6f
(svn r7129) -Codechange: Get rid of a global variable that only sets a window's number.
Darkvater
parents:
5070
diff
changeset
|
452 |
w = AllocateWindowDescFront(&_vehicle_refit_desc, v->index); |
4712
4335ad42e163
(svn r6624) -Feature: added ability to add refit commands to vehicle orders (can only be done in goto depot orders)
bjarni
parents:
4709
diff
changeset
|
453 |
WP(w, refit_d).order = order; |
4704
557cdcda0c47
(svn r6614) -Fix: added check to see if a newly opened refit window is different from NULL before assigning data to it
bjarni
parents:
4702
diff
changeset
|
454 |
|
557cdcda0c47
(svn r6614) -Fix: added check to see if a newly opened refit window is different from NULL before assigning data to it
bjarni
parents:
4702
diff
changeset
|
455 |
if (w != NULL) { |
557cdcda0c47
(svn r6614) -Fix: added check to see if a newly opened refit window is different from NULL before assigning data to it
bjarni
parents:
4702
diff
changeset
|
456 |
w->caption_color = v->owner; |
557cdcda0c47
(svn r6614) -Fix: added check to see if a newly opened refit window is different from NULL before assigning data to it
bjarni
parents:
4702
diff
changeset
|
457 |
w->vscroll.cap = 8; |
557cdcda0c47
(svn r6614) -Fix: added check to see if a newly opened refit window is different from NULL before assigning data to it
bjarni
parents:
4702
diff
changeset
|
458 |
w->resize.step_height = 14; |
557cdcda0c47
(svn r6614) -Fix: added check to see if a newly opened refit window is different from NULL before assigning data to it
bjarni
parents:
4702
diff
changeset
|
459 |
WP(w, refit_d).sel = -1; |
557cdcda0c47
(svn r6614) -Fix: added check to see if a newly opened refit window is different from NULL before assigning data to it
bjarni
parents:
4702
diff
changeset
|
460 |
WP(w, refit_d).list = BuildRefitList(v); |
557cdcda0c47
(svn r6614) -Fix: added check to see if a newly opened refit window is different from NULL before assigning data to it
bjarni
parents:
4702
diff
changeset
|
461 |
if (v->type == VEH_Train) WP(w, refit_d).length = CountVehiclesInChain(v); |
557cdcda0c47
(svn r6614) -Fix: added check to see if a newly opened refit window is different from NULL before assigning data to it
bjarni
parents:
4702
diff
changeset
|
462 |
SetVScrollCount(w, WP(w, refit_d).list->num_lines); |
557cdcda0c47
(svn r6614) -Fix: added check to see if a newly opened refit window is different from NULL before assigning data to it
bjarni
parents:
4702
diff
changeset
|
463 |
|
557cdcda0c47
(svn r6614) -Fix: added check to see if a newly opened refit window is different from NULL before assigning data to it
bjarni
parents:
4702
diff
changeset
|
464 |
switch (v->type) { |
557cdcda0c47
(svn r6614) -Fix: added check to see if a newly opened refit window is different from NULL before assigning data to it
bjarni
parents:
4702
diff
changeset
|
465 |
case VEH_Train: |
4775
1fb972035324
(svn r6689) -Fix: corrected vehicle type in tooltip for the list in the refit window
bjarni
parents:
4762
diff
changeset
|
466 |
w->widget[3].tooltips = STR_RAIL_SELECT_TYPE_OF_CARGO_FOR; |
4704
557cdcda0c47
(svn r6614) -Fix: added check to see if a newly opened refit window is different from NULL before assigning data to it
bjarni
parents:
4702
diff
changeset
|
467 |
w->widget[6].data = STR_RAIL_REFIT_VEHICLE; |
557cdcda0c47
(svn r6614) -Fix: added check to see if a newly opened refit window is different from NULL before assigning data to it
bjarni
parents:
4702
diff
changeset
|
468 |
w->widget[6].tooltips = STR_RAIL_REFIT_TO_CARRY_HIGHLIGHTED; |
557cdcda0c47
(svn r6614) -Fix: added check to see if a newly opened refit window is different from NULL before assigning data to it
bjarni
parents:
4702
diff
changeset
|
469 |
break; |
557cdcda0c47
(svn r6614) -Fix: added check to see if a newly opened refit window is different from NULL before assigning data to it
bjarni
parents:
4702
diff
changeset
|
470 |
case VEH_Road: |
4775
1fb972035324
(svn r6689) -Fix: corrected vehicle type in tooltip for the list in the refit window
bjarni
parents:
4762
diff
changeset
|
471 |
w->widget[3].tooltips = STR_ROAD_SELECT_TYPE_OF_CARGO_FOR; |
4704
557cdcda0c47
(svn r6614) -Fix: added check to see if a newly opened refit window is different from NULL before assigning data to it
bjarni
parents:
4702
diff
changeset
|
472 |
w->widget[6].data = STR_REFIT_ROAD_VEHICLE; |
557cdcda0c47
(svn r6614) -Fix: added check to see if a newly opened refit window is different from NULL before assigning data to it
bjarni
parents:
4702
diff
changeset
|
473 |
w->widget[6].tooltips = STR_REFIT_ROAD_VEHICLE_TO_CARRY_HIGHLIGHTED; |
557cdcda0c47
(svn r6614) -Fix: added check to see if a newly opened refit window is different from NULL before assigning data to it
bjarni
parents:
4702
diff
changeset
|
474 |
break; |
557cdcda0c47
(svn r6614) -Fix: added check to see if a newly opened refit window is different from NULL before assigning data to it
bjarni
parents:
4702
diff
changeset
|
475 |
case VEH_Ship: |
4775
1fb972035324
(svn r6689) -Fix: corrected vehicle type in tooltip for the list in the refit window
bjarni
parents:
4762
diff
changeset
|
476 |
w->widget[3].tooltips = STR_983D_SELECT_TYPE_OF_CARGO_FOR; |
4704
557cdcda0c47
(svn r6614) -Fix: added check to see if a newly opened refit window is different from NULL before assigning data to it
bjarni
parents:
4702
diff
changeset
|
477 |
w->widget[6].data = STR_983C_REFIT_SHIP; |
557cdcda0c47
(svn r6614) -Fix: added check to see if a newly opened refit window is different from NULL before assigning data to it
bjarni
parents:
4702
diff
changeset
|
478 |
w->widget[6].tooltips = STR_983E_REFIT_SHIP_TO_CARRY_HIGHLIGHTED; |
557cdcda0c47
(svn r6614) -Fix: added check to see if a newly opened refit window is different from NULL before assigning data to it
bjarni
parents:
4702
diff
changeset
|
479 |
break; |
557cdcda0c47
(svn r6614) -Fix: added check to see if a newly opened refit window is different from NULL before assigning data to it
bjarni
parents:
4702
diff
changeset
|
480 |
case VEH_Aircraft: |
4775
1fb972035324
(svn r6689) -Fix: corrected vehicle type in tooltip for the list in the refit window
bjarni
parents:
4762
diff
changeset
|
481 |
w->widget[3].tooltips = STR_A03E_SELECT_TYPE_OF_CARGO_FOR; |
4704
557cdcda0c47
(svn r6614) -Fix: added check to see if a newly opened refit window is different from NULL before assigning data to it
bjarni
parents:
4702
diff
changeset
|
482 |
w->widget[6].data = STR_A03D_REFIT_AIRCRAFT; |
557cdcda0c47
(svn r6614) -Fix: added check to see if a newly opened refit window is different from NULL before assigning data to it
bjarni
parents:
4702
diff
changeset
|
483 |
w->widget[6].tooltips = STR_A03F_REFIT_AIRCRAFT_TO_CARRY; |
557cdcda0c47
(svn r6614) -Fix: added check to see if a newly opened refit window is different from NULL before assigning data to it
bjarni
parents:
4702
diff
changeset
|
484 |
break; |
557cdcda0c47
(svn r6614) -Fix: added check to see if a newly opened refit window is different from NULL before assigning data to it
bjarni
parents:
4702
diff
changeset
|
485 |
default: NOT_REACHED(); |
557cdcda0c47
(svn r6614) -Fix: added check to see if a newly opened refit window is different from NULL before assigning data to it
bjarni
parents:
4702
diff
changeset
|
486 |
} |
4642
e27b0f7e89e9
(svn r6518) -Codechange: unified the vehicle refit windows
bjarni
parents:
4634
diff
changeset
|
487 |
} |
e27b0f7e89e9
(svn r6518) -Codechange: unified the vehicle refit windows
bjarni
parents:
4634
diff
changeset
|
488 |
} |
e27b0f7e89e9
(svn r6518) -Codechange: unified the vehicle refit windows
bjarni
parents:
4634
diff
changeset
|
489 |
|
3650
4dd8517bdcf6
(svn r4561) - NewGRF: implement most of callback 0x23: additional text in vehicle purchase windows.
peter1138
parents:
3492
diff
changeset
|
490 |
/* Display additional text from NewGRF in the purchase information window */ |
4932
4bf213d0ed53
(svn r6912) - Feature: Show a list of cargo types that a vehicle is refittable to in the purchase information window. (mart3p)
peter1138
parents:
4931
diff
changeset
|
491 |
uint ShowAdditionalText(int x, int y, uint w, EngineID engine) |
3650
4dd8517bdcf6
(svn r4561) - NewGRF: implement most of callback 0x23: additional text in vehicle purchase windows.
peter1138
parents:
3492
diff
changeset
|
492 |
{ |
4dd8517bdcf6
(svn r4561) - NewGRF: implement most of callback 0x23: additional text in vehicle purchase windows.
peter1138
parents:
3492
diff
changeset
|
493 |
uint16 callback = GetVehicleCallback(CBID_VEHICLE_ADDITIONAL_TEXT, 0, 0, engine, NULL); |
4dd8517bdcf6
(svn r4561) - NewGRF: implement most of callback 0x23: additional text in vehicle purchase windows.
peter1138
parents:
3492
diff
changeset
|
494 |
if (callback == CALLBACK_FAILED) return 0; |
4dd8517bdcf6
(svn r4561) - NewGRF: implement most of callback 0x23: additional text in vehicle purchase windows.
peter1138
parents:
3492
diff
changeset
|
495 |
|
4928
ff53f78c5a87
(svn r6908) - Codechange: Modify DrawStringMultiLine() to return the number of pixel lines used, and use it for drawing NewGRF additional text (mart3p)
peter1138
parents:
4912
diff
changeset
|
496 |
// STR_02BD is used to start the string with {BLACK} |
ff53f78c5a87
(svn r6908) - Codechange: Modify DrawStringMultiLine() to return the number of pixel lines used, and use it for drawing NewGRF additional text (mart3p)
peter1138
parents:
4912
diff
changeset
|
497 |
SetDParam(0, GetGRFStringID(GetEngineGRFID(engine), 0xD000 + callback)); |
ff53f78c5a87
(svn r6908) - Codechange: Modify DrawStringMultiLine() to return the number of pixel lines used, and use it for drawing NewGRF additional text (mart3p)
peter1138
parents:
4912
diff
changeset
|
498 |
return DrawStringMultiLine(x, y, STR_02BD, w); |
3650
4dd8517bdcf6
(svn r4561) - NewGRF: implement most of callback 0x23: additional text in vehicle purchase windows.
peter1138
parents:
3492
diff
changeset
|
499 |
} |
4dd8517bdcf6
(svn r4561) - NewGRF: implement most of callback 0x23: additional text in vehicle purchase windows.
peter1138
parents:
3492
diff
changeset
|
500 |
|
4932
4bf213d0ed53
(svn r6912) - Feature: Show a list of cargo types that a vehicle is refittable to in the purchase information window. (mart3p)
peter1138
parents:
4931
diff
changeset
|
501 |
/* Count the number of bits that are set in a mask */ |
4bf213d0ed53
(svn r6912) - Feature: Show a list of cargo types that a vehicle is refittable to in the purchase information window. (mart3p)
peter1138
parents:
4931
diff
changeset
|
502 |
static uint CountBits(uint32 mask) |
4bf213d0ed53
(svn r6912) - Feature: Show a list of cargo types that a vehicle is refittable to in the purchase information window. (mart3p)
peter1138
parents:
4931
diff
changeset
|
503 |
{ |
4bf213d0ed53
(svn r6912) - Feature: Show a list of cargo types that a vehicle is refittable to in the purchase information window. (mart3p)
peter1138
parents:
4931
diff
changeset
|
504 |
uint c = 0; |
4bf213d0ed53
(svn r6912) - Feature: Show a list of cargo types that a vehicle is refittable to in the purchase information window. (mart3p)
peter1138
parents:
4931
diff
changeset
|
505 |
for (; mask != 0; mask >>= 1) if (HASBIT(mask, 0)) c++; |
4bf213d0ed53
(svn r6912) - Feature: Show a list of cargo types that a vehicle is refittable to in the purchase information window. (mart3p)
peter1138
parents:
4931
diff
changeset
|
506 |
return c; |
4bf213d0ed53
(svn r6912) - Feature: Show a list of cargo types that a vehicle is refittable to in the purchase information window. (mart3p)
peter1138
parents:
4931
diff
changeset
|
507 |
} |
4bf213d0ed53
(svn r6912) - Feature: Show a list of cargo types that a vehicle is refittable to in the purchase information window. (mart3p)
peter1138
parents:
4931
diff
changeset
|
508 |
|
4bf213d0ed53
(svn r6912) - Feature: Show a list of cargo types that a vehicle is refittable to in the purchase information window. (mart3p)
peter1138
parents:
4931
diff
changeset
|
509 |
/* Display list of cargo types of the engine, for the purchase information window */ |
4bf213d0ed53
(svn r6912) - Feature: Show a list of cargo types that a vehicle is refittable to in the purchase information window. (mart3p)
peter1138
parents:
4931
diff
changeset
|
510 |
uint ShowRefitOptionsList(int x, int y, uint w, EngineID engine) |
4bf213d0ed53
(svn r6912) - Feature: Show a list of cargo types that a vehicle is refittable to in the purchase information window. (mart3p)
peter1138
parents:
4931
diff
changeset
|
511 |
{ |
4bf213d0ed53
(svn r6912) - Feature: Show a list of cargo types that a vehicle is refittable to in the purchase information window. (mart3p)
peter1138
parents:
4931
diff
changeset
|
512 |
/* List of cargo types of this engine */ |
4bf213d0ed53
(svn r6912) - Feature: Show a list of cargo types that a vehicle is refittable to in the purchase information window. (mart3p)
peter1138
parents:
4931
diff
changeset
|
513 |
uint32 cmask = EngInfo(engine)->refit_mask; |
4bf213d0ed53
(svn r6912) - Feature: Show a list of cargo types that a vehicle is refittable to in the purchase information window. (mart3p)
peter1138
parents:
4931
diff
changeset
|
514 |
/* List of cargo types available in this climate */ |
4bf213d0ed53
(svn r6912) - Feature: Show a list of cargo types that a vehicle is refittable to in the purchase information window. (mart3p)
peter1138
parents:
4931
diff
changeset
|
515 |
uint32 lmask = _landscape_global_cargo_mask[_opt.landscape]; |
4bf213d0ed53
(svn r6912) - Feature: Show a list of cargo types that a vehicle is refittable to in the purchase information window. (mart3p)
peter1138
parents:
4931
diff
changeset
|
516 |
char *b = _userstring; |
4bf213d0ed53
(svn r6912) - Feature: Show a list of cargo types that a vehicle is refittable to in the purchase information window. (mart3p)
peter1138
parents:
4931
diff
changeset
|
517 |
|
4bf213d0ed53
(svn r6912) - Feature: Show a list of cargo types that a vehicle is refittable to in the purchase information window. (mart3p)
peter1138
parents:
4931
diff
changeset
|
518 |
/* Draw nothing if the engine is not refittable */ |
4bf213d0ed53
(svn r6912) - Feature: Show a list of cargo types that a vehicle is refittable to in the purchase information window. (mart3p)
peter1138
parents:
4931
diff
changeset
|
519 |
if (CountBits(cmask) <= 1) return 0; |
4bf213d0ed53
(svn r6912) - Feature: Show a list of cargo types that a vehicle is refittable to in the purchase information window. (mart3p)
peter1138
parents:
4931
diff
changeset
|
520 |
|
4bf213d0ed53
(svn r6912) - Feature: Show a list of cargo types that a vehicle is refittable to in the purchase information window. (mart3p)
peter1138
parents:
4931
diff
changeset
|
521 |
b = InlineString(b, STR_PURCHASE_INFO_REFITTABLE_TO); |
4bf213d0ed53
(svn r6912) - Feature: Show a list of cargo types that a vehicle is refittable to in the purchase information window. (mart3p)
peter1138
parents:
4931
diff
changeset
|
522 |
|
4bf213d0ed53
(svn r6912) - Feature: Show a list of cargo types that a vehicle is refittable to in the purchase information window. (mart3p)
peter1138
parents:
4931
diff
changeset
|
523 |
if (cmask == lmask) { |
4bf213d0ed53
(svn r6912) - Feature: Show a list of cargo types that a vehicle is refittable to in the purchase information window. (mart3p)
peter1138
parents:
4931
diff
changeset
|
524 |
/* Engine can be refitted to all types in this climate */ |
4bf213d0ed53
(svn r6912) - Feature: Show a list of cargo types that a vehicle is refittable to in the purchase information window. (mart3p)
peter1138
parents:
4931
diff
changeset
|
525 |
b = InlineString(b, STR_PURCHASE_INFO_ALL_TYPES); |
4bf213d0ed53
(svn r6912) - Feature: Show a list of cargo types that a vehicle is refittable to in the purchase information window. (mart3p)
peter1138
parents:
4931
diff
changeset
|
526 |
} else { |
4bf213d0ed53
(svn r6912) - Feature: Show a list of cargo types that a vehicle is refittable to in the purchase information window. (mart3p)
peter1138
parents:
4931
diff
changeset
|
527 |
CargoID cid; |
4bf213d0ed53
(svn r6912) - Feature: Show a list of cargo types that a vehicle is refittable to in the purchase information window. (mart3p)
peter1138
parents:
4931
diff
changeset
|
528 |
|
4bf213d0ed53
(svn r6912) - Feature: Show a list of cargo types that a vehicle is refittable to in the purchase information window. (mart3p)
peter1138
parents:
4931
diff
changeset
|
529 |
/* Check if we are able to refit to more cargo types and unable to. If |
4bf213d0ed53
(svn r6912) - Feature: Show a list of cargo types that a vehicle is refittable to in the purchase information window. (mart3p)
peter1138
parents:
4931
diff
changeset
|
530 |
* so, invert the cargo types to list those that we can't refit to. */ |
4bf213d0ed53
(svn r6912) - Feature: Show a list of cargo types that a vehicle is refittable to in the purchase information window. (mart3p)
peter1138
parents:
4931
diff
changeset
|
531 |
if (CountBits(cmask ^ lmask) < CountBits(cmask)) { |
4bf213d0ed53
(svn r6912) - Feature: Show a list of cargo types that a vehicle is refittable to in the purchase information window. (mart3p)
peter1138
parents:
4931
diff
changeset
|
532 |
cmask ^= lmask; |
4bf213d0ed53
(svn r6912) - Feature: Show a list of cargo types that a vehicle is refittable to in the purchase information window. (mart3p)
peter1138
parents:
4931
diff
changeset
|
533 |
b = InlineString(b, STR_PURCHASE_INFO_ALL_BUT); |
4bf213d0ed53
(svn r6912) - Feature: Show a list of cargo types that a vehicle is refittable to in the purchase information window. (mart3p)
peter1138
parents:
4931
diff
changeset
|
534 |
} |
4bf213d0ed53
(svn r6912) - Feature: Show a list of cargo types that a vehicle is refittable to in the purchase information window. (mart3p)
peter1138
parents:
4931
diff
changeset
|
535 |
|
4bf213d0ed53
(svn r6912) - Feature: Show a list of cargo types that a vehicle is refittable to in the purchase information window. (mart3p)
peter1138
parents:
4931
diff
changeset
|
536 |
/* Add each cargo type to the list */ |
4bf213d0ed53
(svn r6912) - Feature: Show a list of cargo types that a vehicle is refittable to in the purchase information window. (mart3p)
peter1138
parents:
4931
diff
changeset
|
537 |
for (cid = 0; cmask != 0; cmask >>= 1, cid++) { |
4bf213d0ed53
(svn r6912) - Feature: Show a list of cargo types that a vehicle is refittable to in the purchase information window. (mart3p)
peter1138
parents:
4931
diff
changeset
|
538 |
if (!HASBIT(cmask, 0)) continue; |
4bf213d0ed53
(svn r6912) - Feature: Show a list of cargo types that a vehicle is refittable to in the purchase information window. (mart3p)
peter1138
parents:
4931
diff
changeset
|
539 |
|
4bf213d0ed53
(svn r6912) - Feature: Show a list of cargo types that a vehicle is refittable to in the purchase information window. (mart3p)
peter1138
parents:
4931
diff
changeset
|
540 |
b = InlineString(b, _cargoc.names_s[_local_cargo_id_ctype[cid]]); |
4bf213d0ed53
(svn r6912) - Feature: Show a list of cargo types that a vehicle is refittable to in the purchase information window. (mart3p)
peter1138
parents:
4931
diff
changeset
|
541 |
if (cmask > 1) b = strecpy(b, ", ", lastof(_userstring)); |
4bf213d0ed53
(svn r6912) - Feature: Show a list of cargo types that a vehicle is refittable to in the purchase information window. (mart3p)
peter1138
parents:
4931
diff
changeset
|
542 |
} |
4bf213d0ed53
(svn r6912) - Feature: Show a list of cargo types that a vehicle is refittable to in the purchase information window. (mart3p)
peter1138
parents:
4931
diff
changeset
|
543 |
} |
4bf213d0ed53
(svn r6912) - Feature: Show a list of cargo types that a vehicle is refittable to in the purchase information window. (mart3p)
peter1138
parents:
4931
diff
changeset
|
544 |
|
4bf213d0ed53
(svn r6912) - Feature: Show a list of cargo types that a vehicle is refittable to in the purchase information window. (mart3p)
peter1138
parents:
4931
diff
changeset
|
545 |
/* Terminate and display the completed string */ |
4bf213d0ed53
(svn r6912) - Feature: Show a list of cargo types that a vehicle is refittable to in the purchase information window. (mart3p)
peter1138
parents:
4931
diff
changeset
|
546 |
*b = '\0'; |
4bf213d0ed53
(svn r6912) - Feature: Show a list of cargo types that a vehicle is refittable to in the purchase information window. (mart3p)
peter1138
parents:
4931
diff
changeset
|
547 |
return DrawStringMultiLine(x, y, STR_SPEC_USERSTRING, w); |
4bf213d0ed53
(svn r6912) - Feature: Show a list of cargo types that a vehicle is refittable to in the purchase information window. (mart3p)
peter1138
parents:
4931
diff
changeset
|
548 |
} |
4bf213d0ed53
(svn r6912) - Feature: Show a list of cargo types that a vehicle is refittable to in the purchase information window. (mart3p)
peter1138
parents:
4931
diff
changeset
|
549 |
|
168
79f9ed5b23e6
(svn r169) -Fix: move around sort-widgets a bit so it looks more natural
darkvater
parents:
164
diff
changeset
|
550 |
|
243
9a40daa560ae
(svn r244) -Fix: Stations were not sorted for non-player-0 players
darkvater
parents:
193
diff
changeset
|
551 |
// if the sorting criteria had the same value, sort vehicle by unitnumber |
9a40daa560ae
(svn r244) -Fix: Stations were not sorted for non-player-0 players
darkvater
parents:
193
diff
changeset
|
552 |
#define VEHICLEUNITNUMBERSORTER(r, a, b) {if (r == 0) {r = a->unitnumber - b->unitnumber;}} |
9a40daa560ae
(svn r244) -Fix: Stations were not sorted for non-player-0 players
darkvater
parents:
193
diff
changeset
|
553 |
|
2462 | 554 |
static int CDECL VehicleNumberSorter(const void *a, const void *b) |
168
79f9ed5b23e6
(svn r169) -Fix: move around sort-widgets a bit so it looks more natural
darkvater
parents:
164
diff
changeset
|
555 |
{ |
4266
0de669884154
(svn r5894) Remove a totally unnecessary indirection in the vehicle sorter code. Less code, less data, simply better
tron
parents:
4261
diff
changeset
|
556 |
const Vehicle* va = *(const Vehicle**)a; |
0de669884154
(svn r5894) Remove a totally unnecessary indirection in the vehicle sorter code. Less code, less data, simply better
tron
parents:
4261
diff
changeset
|
557 |
const Vehicle* vb = *(const Vehicle**)b; |
168
79f9ed5b23e6
(svn r169) -Fix: move around sort-widgets a bit so it looks more natural
darkvater
parents:
164
diff
changeset
|
558 |
int r = va->unitnumber - vb->unitnumber; |
79f9ed5b23e6
(svn r169) -Fix: move around sort-widgets a bit so it looks more natural
darkvater
parents:
164
diff
changeset
|
559 |
|
79f9ed5b23e6
(svn r169) -Fix: move around sort-widgets a bit so it looks more natural
darkvater
parents:
164
diff
changeset
|
560 |
return (_internal_sort_order & 1) ? -r : r; |
164
0cbdf3c9bde1
(svn r165) -Feature: Option to sort vehicles in vehicle-list window by different criteria. Total independent sort for all types and players. Periodic resort of list every 10 TTD days. Thank you for your graphical inspiration follow and buxo (since none of you provided any code).
darkvater
parents:
diff
changeset
|
561 |
} |
0cbdf3c9bde1
(svn r165) -Feature: Option to sort vehicles in vehicle-list window by different criteria. Total independent sort for all types and players. Periodic resort of list every 10 TTD days. Thank you for your graphical inspiration follow and buxo (since none of you provided any code).
darkvater
parents:
diff
changeset
|
562 |
|
2462 | 563 |
static int CDECL VehicleNameSorter(const void *a, const void *b) |
164
0cbdf3c9bde1
(svn r165) -Feature: Option to sort vehicles in vehicle-list window by different criteria. Total independent sort for all types and players. Periodic resort of list every 10 TTD days. Thank you for your graphical inspiration follow and buxo (since none of you provided any code).
darkvater
parents:
diff
changeset
|
564 |
{ |
4863
c178519a8627
(svn r6789) - Codechange: Tidy up VehicleNameSorter() to use no global vars, and match the style of EngineNameSorter(). This also removes a bug where _internal_name_sorter_id was never set properly for anything other than trains.
peter1138
parents:
4835
diff
changeset
|
565 |
static const Vehicle *last_vehicle[2] = { NULL, NULL }; |
c178519a8627
(svn r6789) - Codechange: Tidy up VehicleNameSorter() to use no global vars, and match the style of EngineNameSorter(). This also removes a bug where _internal_name_sorter_id was never set properly for anything other than trains.
peter1138
parents:
4835
diff
changeset
|
566 |
static char last_name[2][64] = { "", "" }; |
c178519a8627
(svn r6789) - Codechange: Tidy up VehicleNameSorter() to use no global vars, and match the style of EngineNameSorter(). This also removes a bug where _internal_name_sorter_id was never set properly for anything other than trains.
peter1138
parents:
4835
diff
changeset
|
567 |
|
4266
0de669884154
(svn r5894) Remove a totally unnecessary indirection in the vehicle sorter code. Less code, less data, simply better
tron
parents:
4261
diff
changeset
|
568 |
const Vehicle* va = *(const Vehicle**)a; |
0de669884154
(svn r5894) Remove a totally unnecessary indirection in the vehicle sorter code. Less code, less data, simply better
tron
parents:
4261
diff
changeset
|
569 |
const Vehicle* vb = *(const Vehicle**)b; |
164
0cbdf3c9bde1
(svn r165) -Feature: Option to sort vehicles in vehicle-list window by different criteria. Total independent sort for all types and players. Periodic resort of list every 10 TTD days. Thank you for your graphical inspiration follow and buxo (since none of you provided any code).
darkvater
parents:
diff
changeset
|
570 |
int r; |
0cbdf3c9bde1
(svn r165) -Feature: Option to sort vehicles in vehicle-list window by different criteria. Total independent sort for all types and players. Periodic resort of list every 10 TTD days. Thank you for your graphical inspiration follow and buxo (since none of you provided any code).
darkvater
parents:
diff
changeset
|
571 |
|
4863
c178519a8627
(svn r6789) - Codechange: Tidy up VehicleNameSorter() to use no global vars, and match the style of EngineNameSorter(). This also removes a bug where _internal_name_sorter_id was never set properly for anything other than trains.
peter1138
parents:
4835
diff
changeset
|
572 |
if (va != last_vehicle[0]) { |
c178519a8627
(svn r6789) - Codechange: Tidy up VehicleNameSorter() to use no global vars, and match the style of EngineNameSorter(). This also removes a bug where _internal_name_sorter_id was never set properly for anything other than trains.
peter1138
parents:
4835
diff
changeset
|
573 |
last_vehicle[0] = va; |
c178519a8627
(svn r6789) - Codechange: Tidy up VehicleNameSorter() to use no global vars, and match the style of EngineNameSorter(). This also removes a bug where _internal_name_sorter_id was never set properly for anything other than trains.
peter1138
parents:
4835
diff
changeset
|
574 |
if (IsCustomName(va->string_id)) { |
4912
0f51b47cb983
(svn r6884) -Codechange: Add strict bounds checking in string formatting system.
Darkvater
parents:
4896
diff
changeset
|
575 |
GetString(last_name[0], va->string_id, lastof(last_name[0])); |
4863
c178519a8627
(svn r6789) - Codechange: Tidy up VehicleNameSorter() to use no global vars, and match the style of EngineNameSorter(). This also removes a bug where _internal_name_sorter_id was never set properly for anything other than trains.
peter1138
parents:
4835
diff
changeset
|
576 |
} else { |
c178519a8627
(svn r6789) - Codechange: Tidy up VehicleNameSorter() to use no global vars, and match the style of EngineNameSorter(). This also removes a bug where _internal_name_sorter_id was never set properly for anything other than trains.
peter1138
parents:
4835
diff
changeset
|
577 |
last_name[0][0] = '\0'; |
164
0cbdf3c9bde1
(svn r165) -Feature: Option to sort vehicles in vehicle-list window by different criteria. Total independent sort for all types and players. Periodic resort of list every 10 TTD days. Thank you for your graphical inspiration follow and buxo (since none of you provided any code).
darkvater
parents:
diff
changeset
|
578 |
} |
0cbdf3c9bde1
(svn r165) -Feature: Option to sort vehicles in vehicle-list window by different criteria. Total independent sort for all types and players. Periodic resort of list every 10 TTD days. Thank you for your graphical inspiration follow and buxo (since none of you provided any code).
darkvater
parents:
diff
changeset
|
579 |
} |
0cbdf3c9bde1
(svn r165) -Feature: Option to sort vehicles in vehicle-list window by different criteria. Total independent sort for all types and players. Periodic resort of list every 10 TTD days. Thank you for your graphical inspiration follow and buxo (since none of you provided any code).
darkvater
parents:
diff
changeset
|
580 |
|
4863
c178519a8627
(svn r6789) - Codechange: Tidy up VehicleNameSorter() to use no global vars, and match the style of EngineNameSorter(). This also removes a bug where _internal_name_sorter_id was never set properly for anything other than trains.
peter1138
parents:
4835
diff
changeset
|
581 |
if (vb != last_vehicle[1]) { |
c178519a8627
(svn r6789) - Codechange: Tidy up VehicleNameSorter() to use no global vars, and match the style of EngineNameSorter(). This also removes a bug where _internal_name_sorter_id was never set properly for anything other than trains.
peter1138
parents:
4835
diff
changeset
|
582 |
last_vehicle[1] = vb; |
c178519a8627
(svn r6789) - Codechange: Tidy up VehicleNameSorter() to use no global vars, and match the style of EngineNameSorter(). This also removes a bug where _internal_name_sorter_id was never set properly for anything other than trains.
peter1138
parents:
4835
diff
changeset
|
583 |
if (IsCustomName(vb->string_id)) { |
4912
0f51b47cb983
(svn r6884) -Codechange: Add strict bounds checking in string formatting system.
Darkvater
parents:
4896
diff
changeset
|
584 |
GetString(last_name[1], vb->string_id, lastof(last_name[1])); |
4863
c178519a8627
(svn r6789) - Codechange: Tidy up VehicleNameSorter() to use no global vars, and match the style of EngineNameSorter(). This also removes a bug where _internal_name_sorter_id was never set properly for anything other than trains.
peter1138
parents:
4835
diff
changeset
|
585 |
} else { |
c178519a8627
(svn r6789) - Codechange: Tidy up VehicleNameSorter() to use no global vars, and match the style of EngineNameSorter(). This also removes a bug where _internal_name_sorter_id was never set properly for anything other than trains.
peter1138
parents:
4835
diff
changeset
|
586 |
last_name[1][0] = '\0'; |
c178519a8627
(svn r6789) - Codechange: Tidy up VehicleNameSorter() to use no global vars, and match the style of EngineNameSorter(). This also removes a bug where _internal_name_sorter_id was never set properly for anything other than trains.
peter1138
parents:
4835
diff
changeset
|
587 |
} |
c178519a8627
(svn r6789) - Codechange: Tidy up VehicleNameSorter() to use no global vars, and match the style of EngineNameSorter(). This also removes a bug where _internal_name_sorter_id was never set properly for anything other than trains.
peter1138
parents:
4835
diff
changeset
|
588 |
} |
c178519a8627
(svn r6789) - Codechange: Tidy up VehicleNameSorter() to use no global vars, and match the style of EngineNameSorter(). This also removes a bug where _internal_name_sorter_id was never set properly for anything other than trains.
peter1138
parents:
4835
diff
changeset
|
589 |
|
c178519a8627
(svn r6789) - Codechange: Tidy up VehicleNameSorter() to use no global vars, and match the style of EngineNameSorter(). This also removes a bug where _internal_name_sorter_id was never set properly for anything other than trains.
peter1138
parents:
4835
diff
changeset
|
590 |
r = strcmp(last_name[0], last_name[1]); // sort by name |
193
0a7025304867
(svn r194) -Codechange: stripping trailing-spaces. Please keep this that way!
truelight
parents:
171
diff
changeset
|
591 |
|
243
9a40daa560ae
(svn r244) -Fix: Stations were not sorted for non-player-0 players
darkvater
parents:
193
diff
changeset
|
592 |
VEHICLEUNITNUMBERSORTER(r, va, vb); |
168
79f9ed5b23e6
(svn r169) -Fix: move around sort-widgets a bit so it looks more natural
darkvater
parents:
164
diff
changeset
|
593 |
|
79f9ed5b23e6
(svn r169) -Fix: move around sort-widgets a bit so it looks more natural
darkvater
parents:
164
diff
changeset
|
594 |
return (_internal_sort_order & 1) ? -r : r; |
164
0cbdf3c9bde1
(svn r165) -Feature: Option to sort vehicles in vehicle-list window by different criteria. Total independent sort for all types and players. Periodic resort of list every 10 TTD days. Thank you for your graphical inspiration follow and buxo (since none of you provided any code).
darkvater
parents:
diff
changeset
|
595 |
} |
0cbdf3c9bde1
(svn r165) -Feature: Option to sort vehicles in vehicle-list window by different criteria. Total independent sort for all types and players. Periodic resort of list every 10 TTD days. Thank you for your graphical inspiration follow and buxo (since none of you provided any code).
darkvater
parents:
diff
changeset
|
596 |
|
2462 | 597 |
static int CDECL VehicleAgeSorter(const void *a, const void *b) |
164
0cbdf3c9bde1
(svn r165) -Feature: Option to sort vehicles in vehicle-list window by different criteria. Total independent sort for all types and players. Periodic resort of list every 10 TTD days. Thank you for your graphical inspiration follow and buxo (since none of you provided any code).
darkvater
parents:
diff
changeset
|
598 |
{ |
4266
0de669884154
(svn r5894) Remove a totally unnecessary indirection in the vehicle sorter code. Less code, less data, simply better
tron
parents:
4261
diff
changeset
|
599 |
const Vehicle* va = *(const Vehicle**)a; |
0de669884154
(svn r5894) Remove a totally unnecessary indirection in the vehicle sorter code. Less code, less data, simply better
tron
parents:
4261
diff
changeset
|
600 |
const Vehicle* vb = *(const Vehicle**)b; |
168
79f9ed5b23e6
(svn r169) -Fix: move around sort-widgets a bit so it looks more natural
darkvater
parents:
164
diff
changeset
|
601 |
int r = va->age - vb->age; |
164
0cbdf3c9bde1
(svn r165) -Feature: Option to sort vehicles in vehicle-list window by different criteria. Total independent sort for all types and players. Periodic resort of list every 10 TTD days. Thank you for your graphical inspiration follow and buxo (since none of you provided any code).
darkvater
parents:
diff
changeset
|
602 |
|
243
9a40daa560ae
(svn r244) -Fix: Stations were not sorted for non-player-0 players
darkvater
parents:
193
diff
changeset
|
603 |
VEHICLEUNITNUMBERSORTER(r, va, vb); |
168
79f9ed5b23e6
(svn r169) -Fix: move around sort-widgets a bit so it looks more natural
darkvater
parents:
164
diff
changeset
|
604 |
|
79f9ed5b23e6
(svn r169) -Fix: move around sort-widgets a bit so it looks more natural
darkvater
parents:
164
diff
changeset
|
605 |
return (_internal_sort_order & 1) ? -r : r; |
79f9ed5b23e6
(svn r169) -Fix: move around sort-widgets a bit so it looks more natural
darkvater
parents:
164
diff
changeset
|
606 |
} |
79f9ed5b23e6
(svn r169) -Fix: move around sort-widgets a bit so it looks more natural
darkvater
parents:
164
diff
changeset
|
607 |
|
2462 | 608 |
static int CDECL VehicleProfitThisYearSorter(const void *a, const void *b) |
168
79f9ed5b23e6
(svn r169) -Fix: move around sort-widgets a bit so it looks more natural
darkvater
parents:
164
diff
changeset
|
609 |
{ |
4266
0de669884154
(svn r5894) Remove a totally unnecessary indirection in the vehicle sorter code. Less code, less data, simply better
tron
parents:
4261
diff
changeset
|
610 |
const Vehicle* va = *(const Vehicle**)a; |
0de669884154
(svn r5894) Remove a totally unnecessary indirection in the vehicle sorter code. Less code, less data, simply better
tron
parents:
4261
diff
changeset
|
611 |
const Vehicle* vb = *(const Vehicle**)b; |
168
79f9ed5b23e6
(svn r169) -Fix: move around sort-widgets a bit so it looks more natural
darkvater
parents:
164
diff
changeset
|
612 |
int r = va->profit_this_year - vb->profit_this_year; |
193
0a7025304867
(svn r194) -Codechange: stripping trailing-spaces. Please keep this that way!
truelight
parents:
171
diff
changeset
|
613 |
|
243
9a40daa560ae
(svn r244) -Fix: Stations were not sorted for non-player-0 players
darkvater
parents:
193
diff
changeset
|
614 |
VEHICLEUNITNUMBERSORTER(r, va, vb); |
168
79f9ed5b23e6
(svn r169) -Fix: move around sort-widgets a bit so it looks more natural
darkvater
parents:
164
diff
changeset
|
615 |
|
79f9ed5b23e6
(svn r169) -Fix: move around sort-widgets a bit so it looks more natural
darkvater
parents:
164
diff
changeset
|
616 |
return (_internal_sort_order & 1) ? -r : r; |
79f9ed5b23e6
(svn r169) -Fix: move around sort-widgets a bit so it looks more natural
darkvater
parents:
164
diff
changeset
|
617 |
} |
79f9ed5b23e6
(svn r169) -Fix: move around sort-widgets a bit so it looks more natural
darkvater
parents:
164
diff
changeset
|
618 |
|
2462 | 619 |
static int CDECL VehicleProfitLastYearSorter(const void *a, const void *b) |
168
79f9ed5b23e6
(svn r169) -Fix: move around sort-widgets a bit so it looks more natural
darkvater
parents:
164
diff
changeset
|
620 |
{ |
4266
0de669884154
(svn r5894) Remove a totally unnecessary indirection in the vehicle sorter code. Less code, less data, simply better
tron
parents:
4261
diff
changeset
|
621 |
const Vehicle* va = *(const Vehicle**)a; |
0de669884154
(svn r5894) Remove a totally unnecessary indirection in the vehicle sorter code. Less code, less data, simply better
tron
parents:
4261
diff
changeset
|
622 |
const Vehicle* vb = *(const Vehicle**)b; |
168
79f9ed5b23e6
(svn r169) -Fix: move around sort-widgets a bit so it looks more natural
darkvater
parents:
164
diff
changeset
|
623 |
int r = va->profit_last_year - vb->profit_last_year; |
79f9ed5b23e6
(svn r169) -Fix: move around sort-widgets a bit so it looks more natural
darkvater
parents:
164
diff
changeset
|
624 |
|
243
9a40daa560ae
(svn r244) -Fix: Stations were not sorted for non-player-0 players
darkvater
parents:
193
diff
changeset
|
625 |
VEHICLEUNITNUMBERSORTER(r, va, vb); |
168
79f9ed5b23e6
(svn r169) -Fix: move around sort-widgets a bit so it looks more natural
darkvater
parents:
164
diff
changeset
|
626 |
|
79f9ed5b23e6
(svn r169) -Fix: move around sort-widgets a bit so it looks more natural
darkvater
parents:
164
diff
changeset
|
627 |
return (_internal_sort_order & 1) ? -r : r; |
79f9ed5b23e6
(svn r169) -Fix: move around sort-widgets a bit so it looks more natural
darkvater
parents:
164
diff
changeset
|
628 |
} |
79f9ed5b23e6
(svn r169) -Fix: move around sort-widgets a bit so it looks more natural
darkvater
parents:
164
diff
changeset
|
629 |
|
2462 | 630 |
static int CDECL VehicleCargoSorter(const void *a, const void *b) |
168
79f9ed5b23e6
(svn r169) -Fix: move around sort-widgets a bit so it looks more natural
darkvater
parents:
164
diff
changeset
|
631 |
{ |
4266
0de669884154
(svn r5894) Remove a totally unnecessary indirection in the vehicle sorter code. Less code, less data, simply better
tron
parents:
4261
diff
changeset
|
632 |
const Vehicle* va = *(const Vehicle**)a; |
0de669884154
(svn r5894) Remove a totally unnecessary indirection in the vehicle sorter code. Less code, less data, simply better
tron
parents:
4261
diff
changeset
|
633 |
const Vehicle* vb = *(const Vehicle**)b; |
2549 | 634 |
const Vehicle* v; |
635 |
AcceptedCargo cargoa; |
|
636 |
AcceptedCargo cargob; |
|
168
79f9ed5b23e6
(svn r169) -Fix: move around sort-widgets a bit so it looks more natural
darkvater
parents:
164
diff
changeset
|
637 |
int r = 0; |
79f9ed5b23e6
(svn r169) -Fix: move around sort-widgets a bit so it looks more natural
darkvater
parents:
164
diff
changeset
|
638 |
int i; |
79f9ed5b23e6
(svn r169) -Fix: move around sort-widgets a bit so it looks more natural
darkvater
parents:
164
diff
changeset
|
639 |
|
2549 | 640 |
memset(cargoa, 0, sizeof(cargoa)); |
641 |
memset(cargob, 0, sizeof(cargob)); |
|
642 |
for (v = va; v != NULL; v = v->next) cargoa[v->cargo_type] += v->cargo_cap; |
|
643 |
for (v = vb; v != NULL; v = v->next) cargob[v->cargo_type] += v->cargo_cap; |
|
168
79f9ed5b23e6
(svn r169) -Fix: move around sort-widgets a bit so it looks more natural
darkvater
parents:
164
diff
changeset
|
644 |
|
79f9ed5b23e6
(svn r169) -Fix: move around sort-widgets a bit so it looks more natural
darkvater
parents:
164
diff
changeset
|
645 |
for (i = 0; i < NUM_CARGO; i++) { |
2549 | 646 |
r = cargoa[i] - cargob[i]; |
647 |
if (r != 0) break; |
|
168
79f9ed5b23e6
(svn r169) -Fix: move around sort-widgets a bit so it looks more natural
darkvater
parents:
164
diff
changeset
|
648 |
} |
164
0cbdf3c9bde1
(svn r165) -Feature: Option to sort vehicles in vehicle-list window by different criteria. Total independent sort for all types and players. Periodic resort of list every 10 TTD days. Thank you for your graphical inspiration follow and buxo (since none of you provided any code).
darkvater
parents:
diff
changeset
|
649 |
|
594
1b51f81b4a77
(svn r1016) Make the cargo sorter not consider the number of wagons of a particular cargo type but the sum of their capacity.
tron
parents:
588
diff
changeset
|
650 |
VEHICLEUNITNUMBERSORTER(r, va, vb); |
1b51f81b4a77
(svn r1016) Make the cargo sorter not consider the number of wagons of a particular cargo type but the sum of their capacity.
tron
parents:
588
diff
changeset
|
651 |
|
168
79f9ed5b23e6
(svn r169) -Fix: move around sort-widgets a bit so it looks more natural
darkvater
parents:
164
diff
changeset
|
652 |
return (_internal_sort_order & 1) ? -r : r; |
164
0cbdf3c9bde1
(svn r165) -Feature: Option to sort vehicles in vehicle-list window by different criteria. Total independent sort for all types and players. Periodic resort of list every 10 TTD days. Thank you for your graphical inspiration follow and buxo (since none of you provided any code).
darkvater
parents:
diff
changeset
|
653 |
} |
168
79f9ed5b23e6
(svn r169) -Fix: move around sort-widgets a bit so it looks more natural
darkvater
parents:
164
diff
changeset
|
654 |
|
2462 | 655 |
static int CDECL VehicleReliabilitySorter(const void *a, const void *b) |
168
79f9ed5b23e6
(svn r169) -Fix: move around sort-widgets a bit so it looks more natural
darkvater
parents:
164
diff
changeset
|
656 |
{ |
4266
0de669884154
(svn r5894) Remove a totally unnecessary indirection in the vehicle sorter code. Less code, less data, simply better
tron
parents:
4261
diff
changeset
|
657 |
const Vehicle* va = *(const Vehicle**)a; |
0de669884154
(svn r5894) Remove a totally unnecessary indirection in the vehicle sorter code. Less code, less data, simply better
tron
parents:
4261
diff
changeset
|
658 |
const Vehicle* vb = *(const Vehicle**)b; |
168
79f9ed5b23e6
(svn r169) -Fix: move around sort-widgets a bit so it looks more natural
darkvater
parents:
164
diff
changeset
|
659 |
int r = va->reliability - vb->reliability; |
79f9ed5b23e6
(svn r169) -Fix: move around sort-widgets a bit so it looks more natural
darkvater
parents:
164
diff
changeset
|
660 |
|
243
9a40daa560ae
(svn r244) -Fix: Stations were not sorted for non-player-0 players
darkvater
parents:
193
diff
changeset
|
661 |
VEHICLEUNITNUMBERSORTER(r, va, vb); |
168
79f9ed5b23e6
(svn r169) -Fix: move around sort-widgets a bit so it looks more natural
darkvater
parents:
164
diff
changeset
|
662 |
|
79f9ed5b23e6
(svn r169) -Fix: move around sort-widgets a bit so it looks more natural
darkvater
parents:
164
diff
changeset
|
663 |
return (_internal_sort_order & 1) ? -r : r; |
79f9ed5b23e6
(svn r169) -Fix: move around sort-widgets a bit so it looks more natural
darkvater
parents:
164
diff
changeset
|
664 |
} |
79f9ed5b23e6
(svn r169) -Fix: move around sort-widgets a bit so it looks more natural
darkvater
parents:
164
diff
changeset
|
665 |
|
2462 | 666 |
static int CDECL VehicleMaxSpeedSorter(const void *a, const void *b) |
168
79f9ed5b23e6
(svn r169) -Fix: move around sort-widgets a bit so it looks more natural
darkvater
parents:
164
diff
changeset
|
667 |
{ |
4266
0de669884154
(svn r5894) Remove a totally unnecessary indirection in the vehicle sorter code. Less code, less data, simply better
tron
parents:
4261
diff
changeset
|
668 |
const Vehicle* va = *(const Vehicle**)a; |
0de669884154
(svn r5894) Remove a totally unnecessary indirection in the vehicle sorter code. Less code, less data, simply better
tron
parents:
4261
diff
changeset
|
669 |
const Vehicle* vb = *(const Vehicle**)b; |
1179
ce0a75460808
(svn r1681) -Feature: New realistic acceleration.
celestar
parents:
1178
diff
changeset
|
670 |
int max_speed_a = 0xFFFF, max_speed_b = 0xFFFF; |
ce0a75460808
(svn r1681) -Feature: New realistic acceleration.
celestar
parents:
1178
diff
changeset
|
671 |
int r; |
ce0a75460808
(svn r1681) -Feature: New realistic acceleration.
celestar
parents:
1178
diff
changeset
|
672 |
const Vehicle *ua = va, *ub = vb; |
ce0a75460808
(svn r1681) -Feature: New realistic acceleration.
celestar
parents:
1178
diff
changeset
|
673 |
|
1191
dc46f04aab3a
(svn r1695) -Fix: I broke maximum speed sorting for anything but trains with the new acceleration. Sorry
Celestar
parents:
1182
diff
changeset
|
674 |
if (va->type == VEH_Train && vb->type == VEH_Train) { |
dc46f04aab3a
(svn r1695) -Fix: I broke maximum speed sorting for anything but trains with the new acceleration. Sorry
Celestar
parents:
1182
diff
changeset
|
675 |
do { |
dc46f04aab3a
(svn r1695) -Fix: I broke maximum speed sorting for anything but trains with the new acceleration. Sorry
Celestar
parents:
1182
diff
changeset
|
676 |
if (RailVehInfo(ua->engine_type)->max_speed != 0) |
dc46f04aab3a
(svn r1695) -Fix: I broke maximum speed sorting for anything but trains with the new acceleration. Sorry
Celestar
parents:
1182
diff
changeset
|
677 |
max_speed_a = min(max_speed_a, RailVehInfo(ua->engine_type)->max_speed); |
dc46f04aab3a
(svn r1695) -Fix: I broke maximum speed sorting for anything but trains with the new acceleration. Sorry
Celestar
parents:
1182
diff
changeset
|
678 |
} while ((ua = ua->next) != NULL); |
1179
ce0a75460808
(svn r1681) -Feature: New realistic acceleration.
celestar
parents:
1178
diff
changeset
|
679 |
|
1191
dc46f04aab3a
(svn r1695) -Fix: I broke maximum speed sorting for anything but trains with the new acceleration. Sorry
Celestar
parents:
1182
diff
changeset
|
680 |
do { |
dc46f04aab3a
(svn r1695) -Fix: I broke maximum speed sorting for anything but trains with the new acceleration. Sorry
Celestar
parents:
1182
diff
changeset
|
681 |
if (RailVehInfo(ub->engine_type)->max_speed != 0) |
dc46f04aab3a
(svn r1695) -Fix: I broke maximum speed sorting for anything but trains with the new acceleration. Sorry
Celestar
parents:
1182
diff
changeset
|
682 |
max_speed_b = min(max_speed_b, RailVehInfo(ub->engine_type)->max_speed); |
dc46f04aab3a
(svn r1695) -Fix: I broke maximum speed sorting for anything but trains with the new acceleration. Sorry
Celestar
parents:
1182
diff
changeset
|
683 |
} while ((ub = ub->next) != NULL); |
dc46f04aab3a
(svn r1695) -Fix: I broke maximum speed sorting for anything but trains with the new acceleration. Sorry
Celestar
parents:
1182
diff
changeset
|
684 |
|
dc46f04aab3a
(svn r1695) -Fix: I broke maximum speed sorting for anything but trains with the new acceleration. Sorry
Celestar
parents:
1182
diff
changeset
|
685 |
r = max_speed_a - max_speed_b; |
dc46f04aab3a
(svn r1695) -Fix: I broke maximum speed sorting for anything but trains with the new acceleration. Sorry
Celestar
parents:
1182
diff
changeset
|
686 |
} else { |
dc46f04aab3a
(svn r1695) -Fix: I broke maximum speed sorting for anything but trains with the new acceleration. Sorry
Celestar
parents:
1182
diff
changeset
|
687 |
r = va->max_speed - vb->max_speed; |
dc46f04aab3a
(svn r1695) -Fix: I broke maximum speed sorting for anything but trains with the new acceleration. Sorry
Celestar
parents:
1182
diff
changeset
|
688 |
} |
168
79f9ed5b23e6
(svn r169) -Fix: move around sort-widgets a bit so it looks more natural
darkvater
parents:
164
diff
changeset
|
689 |
|
243
9a40daa560ae
(svn r244) -Fix: Stations were not sorted for non-player-0 players
darkvater
parents:
193
diff
changeset
|
690 |
VEHICLEUNITNUMBERSORTER(r, va, vb); |
168
79f9ed5b23e6
(svn r169) -Fix: move around sort-widgets a bit so it looks more natural
darkvater
parents:
164
diff
changeset
|
691 |
|
79f9ed5b23e6
(svn r169) -Fix: move around sort-widgets a bit so it looks more natural
darkvater
parents:
164
diff
changeset
|
692 |
return (_internal_sort_order & 1) ? -r : r; |
193
0a7025304867
(svn r194) -Codechange: stripping trailing-spaces. Please keep this that way!
truelight
parents:
171
diff
changeset
|
693 |
} |
842 | 694 |
|
2965
3eb140bd49a3
(svn r3528) - Feature: Allow sorting of vehicle lists by model or value (based on meush's work)
peter1138
parents:
2962
diff
changeset
|
695 |
static int CDECL VehicleModelSorter(const void *a, const void *b) |
3eb140bd49a3
(svn r3528) - Feature: Allow sorting of vehicle lists by model or value (based on meush's work)
peter1138
parents:
2962
diff
changeset
|
696 |
{ |
4266
0de669884154
(svn r5894) Remove a totally unnecessary indirection in the vehicle sorter code. Less code, less data, simply better
tron
parents:
4261
diff
changeset
|
697 |
const Vehicle* va = *(const Vehicle**)a; |
0de669884154
(svn r5894) Remove a totally unnecessary indirection in the vehicle sorter code. Less code, less data, simply better
tron
parents:
4261
diff
changeset
|
698 |
const Vehicle* vb = *(const Vehicle**)b; |
2965
3eb140bd49a3
(svn r3528) - Feature: Allow sorting of vehicle lists by model or value (based on meush's work)
peter1138
parents:
2962
diff
changeset
|
699 |
int r = va->engine_type - vb->engine_type; |
3eb140bd49a3
(svn r3528) - Feature: Allow sorting of vehicle lists by model or value (based on meush's work)
peter1138
parents:
2962
diff
changeset
|
700 |
|
3eb140bd49a3
(svn r3528) - Feature: Allow sorting of vehicle lists by model or value (based on meush's work)
peter1138
parents:
2962
diff
changeset
|
701 |
VEHICLEUNITNUMBERSORTER(r, va, vb); |
3eb140bd49a3
(svn r3528) - Feature: Allow sorting of vehicle lists by model or value (based on meush's work)
peter1138
parents:
2962
diff
changeset
|
702 |
|
3eb140bd49a3
(svn r3528) - Feature: Allow sorting of vehicle lists by model or value (based on meush's work)
peter1138
parents:
2962
diff
changeset
|
703 |
return (_internal_sort_order & 1) ? -r : r; |
3eb140bd49a3
(svn r3528) - Feature: Allow sorting of vehicle lists by model or value (based on meush's work)
peter1138
parents:
2962
diff
changeset
|
704 |
} |
3eb140bd49a3
(svn r3528) - Feature: Allow sorting of vehicle lists by model or value (based on meush's work)
peter1138
parents:
2962
diff
changeset
|
705 |
|
3eb140bd49a3
(svn r3528) - Feature: Allow sorting of vehicle lists by model or value (based on meush's work)
peter1138
parents:
2962
diff
changeset
|
706 |
static int CDECL VehicleValueSorter(const void *a, const void *b) |
3eb140bd49a3
(svn r3528) - Feature: Allow sorting of vehicle lists by model or value (based on meush's work)
peter1138
parents:
2962
diff
changeset
|
707 |
{ |
4266
0de669884154
(svn r5894) Remove a totally unnecessary indirection in the vehicle sorter code. Less code, less data, simply better
tron
parents:
4261
diff
changeset
|
708 |
const Vehicle* va = *(const Vehicle**)a; |
0de669884154
(svn r5894) Remove a totally unnecessary indirection in the vehicle sorter code. Less code, less data, simply better
tron
parents:
4261
diff
changeset
|
709 |
const Vehicle* vb = *(const Vehicle**)b; |
2965
3eb140bd49a3
(svn r3528) - Feature: Allow sorting of vehicle lists by model or value (based on meush's work)
peter1138
parents:
2962
diff
changeset
|
710 |
const Vehicle *u; |
3eb140bd49a3
(svn r3528) - Feature: Allow sorting of vehicle lists by model or value (based on meush's work)
peter1138
parents:
2962
diff
changeset
|
711 |
int valuea = 0, valueb = 0; |
3eb140bd49a3
(svn r3528) - Feature: Allow sorting of vehicle lists by model or value (based on meush's work)
peter1138
parents:
2962
diff
changeset
|
712 |
int r; |
3eb140bd49a3
(svn r3528) - Feature: Allow sorting of vehicle lists by model or value (based on meush's work)
peter1138
parents:
2962
diff
changeset
|
713 |
|
3eb140bd49a3
(svn r3528) - Feature: Allow sorting of vehicle lists by model or value (based on meush's work)
peter1138
parents:
2962
diff
changeset
|
714 |
for (u = va; u != NULL; u = u->next) valuea += u->value; |
3eb140bd49a3
(svn r3528) - Feature: Allow sorting of vehicle lists by model or value (based on meush's work)
peter1138
parents:
2962
diff
changeset
|
715 |
for (u = vb; u != NULL; u = u->next) valueb += u->value; |
3eb140bd49a3
(svn r3528) - Feature: Allow sorting of vehicle lists by model or value (based on meush's work)
peter1138
parents:
2962
diff
changeset
|
716 |
|
3eb140bd49a3
(svn r3528) - Feature: Allow sorting of vehicle lists by model or value (based on meush's work)
peter1138
parents:
2962
diff
changeset
|
717 |
r = valuea - valueb; |
3eb140bd49a3
(svn r3528) - Feature: Allow sorting of vehicle lists by model or value (based on meush's work)
peter1138
parents:
2962
diff
changeset
|
718 |
|
3eb140bd49a3
(svn r3528) - Feature: Allow sorting of vehicle lists by model or value (based on meush's work)
peter1138
parents:
2962
diff
changeset
|
719 |
VEHICLEUNITNUMBERSORTER(r, va, vb); |
3eb140bd49a3
(svn r3528) - Feature: Allow sorting of vehicle lists by model or value (based on meush's work)
peter1138
parents:
2962
diff
changeset
|
720 |
|
3eb140bd49a3
(svn r3528) - Feature: Allow sorting of vehicle lists by model or value (based on meush's work)
peter1138
parents:
2962
diff
changeset
|
721 |
return (_internal_sort_order & 1) ? -r : r; |
3eb140bd49a3
(svn r3528) - Feature: Allow sorting of vehicle lists by model or value (based on meush's work)
peter1138
parents:
2962
diff
changeset
|
722 |
} |
3eb140bd49a3
(svn r3528) - Feature: Allow sorting of vehicle lists by model or value (based on meush's work)
peter1138
parents:
2962
diff
changeset
|
723 |
|
842 | 724 |
// this define is to match engine.c, but engine.c keeps it to itself |
725 |
// ENGINE_AVAILABLE is used in ReplaceVehicleWndProc |
|
2530
df14798edc40
(svn r3059) Use bitfields to encode railtype and climates of engines instead of manual shifting/anding
tron
parents:
2520
diff
changeset
|
726 |
#define ENGINE_AVAILABLE ((e->flags & 1 && HASBIT(info->climates, _opt.landscape)) || HASBIT(e->player_avail, _local_player)) |
842 | 727 |
|
728 |
/* if show_outdated is selected, it do not sort psudo engines properly but it draws all engines |
|
4434
a08cb4b5c179
(svn r6204) -Cleanup: replace non-indentation with spaces; like '}<TAB>else {' -> '} else {', tabs between code and comment, etc.
rubidium
parents:
4432
diff
changeset
|
729 |
* if used compined with show_cars set to false, it will work as intended. Replace window do it like that |
a08cb4b5c179
(svn r6204) -Cleanup: replace non-indentation with spaces; like '}<TAB>else {' -> '} else {', tabs between code and comment, etc.
rubidium
parents:
4432
diff
changeset
|
730 |
* this was a big hack even before show_outdated was added. Stupid newgrf :p |
a08cb4b5c179
(svn r6204) -Cleanup: replace non-indentation with spaces; like '}<TAB>else {' -> '} else {', tabs between code and comment, etc.
rubidium
parents:
4432
diff
changeset
|
731 |
*/ |
2746
47c6e734556e
(svn r3291) - Codechange, Autoreplace: Replace int with EngineID and -1 with INVALID_ENGINE, as appropriate.
peter1138
parents:
2725
diff
changeset
|
732 |
static void train_engine_drawing_loop(int *x, int *y, int *pos, int *sel, EngineID *selected_id, RailType railtype, |
3355
e414a0b104a6
(svn r4150) -Feature: Merged elrails into trunk. Thanks to Tron for lots of code and proofreading, thanks to peter1138 for another lot of code and ideas.
celestar
parents:
3040
diff
changeset
|
733 |
uint8 lines_drawn, bool is_engine, bool show_cars, bool show_outdated, bool show_compatible) |
842 | 734 |
{ |
2971
cae3a81e8674
(svn r3546) - NewGRF feature: Implement rail vehicle 'property' 0x1A: allows shuffling order of rail vehicle purchase list (and replace vehicle list)
peter1138
parents:
2970
diff
changeset
|
735 |
EngineID j; |
842 | 736 |
byte colour; |
2569
fe379f11f6bf
(svn r3106) -Autoreplace feature: Continue to show old vehicles in replace window after all player's vehicles of that type have been replaced. This allows the replacement to be removed. These vehicles are shown in grey instead of the player's colour.
peter1138
parents:
2556
diff
changeset
|
737 |
const Player *p = GetPlayer(_local_player); |
867
dffd33233237
(svn r1348) -Feature: resizable windows. Read the comment in window.h to find out
truelight
parents:
845
diff
changeset
|
738 |
|
2971
cae3a81e8674
(svn r3546) - NewGRF feature: Implement rail vehicle 'property' 0x1A: allows shuffling order of rail vehicle purchase list (and replace vehicle list)
peter1138
parents:
2970
diff
changeset
|
739 |
for (j = 0; j < NUM_TRAIN_ENGINES; j++) { |
cae3a81e8674
(svn r3546) - NewGRF feature: Implement rail vehicle 'property' 0x1A: allows shuffling order of rail vehicle purchase list (and replace vehicle list)
peter1138
parents:
2970
diff
changeset
|
740 |
EngineID i = GetRailVehAtPosition(j); |
1926
530480d14685
(svn r2432) Use GetEngine() instead of DEREF_ENGINE() or even _engines[]
tron
parents:
1923
diff
changeset
|
741 |
const Engine *e = GetEngine(i); |
842 | 742 |
const RailVehicleInfo *rvi = RailVehInfo(i); |
3393
c40975f04842
(svn r4201) - Codechange: Do for _engine_info[] what we do for _*_vehicle_info[]; create and use a function to retrieve data, and ensure constness.
peter1138
parents:
3355
diff
changeset
|
743 |
const EngineInfo *info = EngInfo(i); |
842 | 744 |
|
4574
61a17f80cfb9
(svn r6424) -Codechange: [autoreplace] removed a loop though all vehicles from each time the window is redrawn
bjarni
parents:
4569
diff
changeset
|
745 |
if (!EngineHasReplacementForPlayer(p, i) && p->num_engines[i] == 0 && show_outdated) continue; |
1128
ca7f860db7ac
(svn r1629) added a counter to tell how many engines you have of each type to the autoreplace vehicle windows and made them show only the vehicles you actually have in the left list.
bjarni
parents:
1093
diff
changeset
|
746 |
|
2970
3b9380f10074
(svn r3535) -Feature: [autoreplace] allow autoreplacing of train wagons
bjarni
parents:
2965
diff
changeset
|
747 |
if ((rvi->power == 0 && !show_cars) || (rvi->power != 0 && show_cars)) // show wagons or engines (works since wagons do not have power) |
842 | 748 |
continue; |
867
dffd33233237
(svn r1348) -Feature: resizable windows. Read the comment in window.h to find out
truelight
parents:
845
diff
changeset
|
749 |
|
2971
cae3a81e8674
(svn r3546) - NewGRF feature: Implement rail vehicle 'property' 0x1A: allows shuffling order of rail vehicle purchase list (and replace vehicle list)
peter1138
parents:
2970
diff
changeset
|
750 |
if (*sel == 0) *selected_id = j; |
842 | 751 |
|
752 |
||
753 |
colour = *sel == 0 ? 0xC : 0x10; |
|
3492
265e806ed58e
(svn r4343) [Autoreplace] Fix drawing of train list for outdated engines. Fixes FS#106
peter1138
parents:
3414
diff
changeset
|
754 |
if (!(ENGINE_AVAILABLE && show_outdated && RailVehInfo(i)->power && IsCompatibleRail(e->railtype, railtype))) { |
3414
d728e3793041
(svn r4229) [elrail & autoreplace] Always show compatible rail vehicles in the left list, and only the selected rail type in the right list, to
peter1138
parents:
3393
diff
changeset
|
755 |
if ((!IsCompatibleRail(e->railtype, railtype) && show_compatible) |
3355
e414a0b104a6
(svn r4150) -Feature: Merged elrails into trunk. Thanks to Tron for lots of code and proofreading, thanks to peter1138 for another lot of code and ideas.
celestar
parents:
3040
diff
changeset
|
756 |
|| (e->railtype != railtype && !show_compatible) |
e414a0b104a6
(svn r4150) -Feature: Merged elrails into trunk. Thanks to Tron for lots of code and proofreading, thanks to peter1138 for another lot of code and ideas.
celestar
parents:
3040
diff
changeset
|
757 |
|| !(rvi->flags & RVI_WAGON) != is_engine || |
842 | 758 |
!HASBIT(e->player_avail, _local_player)) |
759 |
continue; |
|
4432
372316ca7924
(svn r6195) -Codechange: do not use '//' in '/* ... */' style comments and '/*' or '*/' in '//' style comments.
rubidium
parents:
4414
diff
changeset
|
760 |
#if 0 |
372316ca7924
(svn r6195) -Codechange: do not use '//' in '/* ... */' style comments and '/*' or '*/' in '//' style comments.
rubidium
parents:
4414
diff
changeset
|
761 |
} else { |
372316ca7924
(svn r6195) -Codechange: do not use '//' in '/* ... */' style comments and '/*' or '*/' in '//' style comments.
rubidium
parents:
4414
diff
changeset
|
762 |
// TODO find a nice red colour for vehicles being replaced |
842 | 763 |
if ( _autoreplace_array[i] != i ) |
764 |
colour = *sel == 0 ? 0x44 : 0x45; |
|
4432
372316ca7924
(svn r6195) -Codechange: do not use '//' in '/* ... */' style comments and '/*' or '*/' in '//' style comments.
rubidium
parents:
4414
diff
changeset
|
765 |
#endif |
372316ca7924
(svn r6195) -Codechange: do not use '//' in '/* ... */' style comments and '/*' or '*/' in '//' style comments.
rubidium
parents:
4414
diff
changeset
|
766 |
} |
867
dffd33233237
(svn r1348) -Feature: resizable windows. Read the comment in window.h to find out
truelight
parents:
845
diff
changeset
|
767 |
|
842 | 768 |
if (IS_INT_INSIDE(--*pos, -lines_drawn, 0)) { |
769 |
DrawString(*x + 59, *y + 2, GetCustomEngineName(i), |
|
770 |
colour); |
|
2569
fe379f11f6bf
(svn r3106) -Autoreplace feature: Continue to show old vehicles in replace window after all player's vehicles of that type have been replaced. This allows the replacement to be removed. These vehicles are shown in grey instead of the player's colour.
peter1138
parents:
2556
diff
changeset
|
771 |
// show_outdated is true only for left side, which is where we show old replacements |
4574
61a17f80cfb9
(svn r6424) -Codechange: [autoreplace] removed a loop though all vehicles from each time the window is redrawn
bjarni
parents:
4569
diff
changeset
|
772 |
DrawTrainEngine(*x + 29, *y + 6, i, (p->num_engines[i] == 0 && show_outdated) ? |
3040
7043c0de7c6d
(svn r3620) - 2cc: Replace use of macro to determine colour map with a function call for drawing of vehicles.
peter1138
parents:
3030
diff
changeset
|
773 |
PALETTE_CRASH : GetEnginePalette(i, _local_player)); |
1128
ca7f860db7ac
(svn r1629) added a counter to tell how many engines you have of each type to the autoreplace vehicle windows and made them show only the vehicles you actually have in the left list.
bjarni
parents:
1093
diff
changeset
|
774 |
if ( show_outdated ) { |
4574
61a17f80cfb9
(svn r6424) -Codechange: [autoreplace] removed a loop though all vehicles from each time the window is redrawn
bjarni
parents:
4569
diff
changeset
|
775 |
SetDParam(0, p->num_engines[i]); |
1128
ca7f860db7ac
(svn r1629) added a counter to tell how many engines you have of each type to the autoreplace vehicle windows and made them show only the vehicles you actually have in the left list.
bjarni
parents:
1093
diff
changeset
|
776 |
DrawStringRightAligned(213, *y+5, STR_TINY_BLACK, 0); |
ca7f860db7ac
(svn r1629) added a counter to tell how many engines you have of each type to the autoreplace vehicle windows and made them show only the vehicles you actually have in the left list.
bjarni
parents:
1093
diff
changeset
|
777 |
} |
842 | 778 |
*y += 14; |
779 |
} |
|
780 |
--*sel; |
|
781 |
} |
|
782 |
} |
|
783 |
||
784 |
||
785 |
static void SetupScrollStuffForReplaceWindow(Window *w) |
|
786 |
{ |
|
2746
47c6e734556e
(svn r3291) - Codechange, Autoreplace: Replace int with EngineID and -1 with INVALID_ENGINE, as appropriate.
peter1138
parents:
2725
diff
changeset
|
787 |
EngineID selected_id[2] = { INVALID_ENGINE, INVALID_ENGINE }; |
3029
f796d046b34d
(svn r3609) Some more simplification in the same function as r3608
tron
parents:
3028
diff
changeset
|
788 |
const Player* p = GetPlayer(_local_player); |
f796d046b34d
(svn r3609) Some more simplification in the same function as r3608
tron
parents:
3028
diff
changeset
|
789 |
uint sel[2]; |
f796d046b34d
(svn r3609) Some more simplification in the same function as r3608
tron
parents:
3028
diff
changeset
|
790 |
uint count = 0; |
f796d046b34d
(svn r3609) Some more simplification in the same function as r3608
tron
parents:
3028
diff
changeset
|
791 |
uint count2 = 0; |
3028
82836d6e3a27
(svn r3608) No functional change, just make some code more comprehensible: Reduce variable scope, remove write-only variables, turn do-while-loops with multiple induction variables into canonical for-loops
tron
parents:
3025
diff
changeset
|
792 |
EngineID i; |
867
dffd33233237
(svn r1348) -Feature: resizable windows. Read the comment in window.h to find out
truelight
parents:
845
diff
changeset
|
793 |
|
912
a5fb6ad68d80
(svn r1399) -Fix: Fixes for compiling with Watcom C/C++ (ie, OS/2 port). (orudge)
truelight
parents:
907
diff
changeset
|
794 |
sel[0] = WP(w,replaceveh_d).sel_index[0]; |
a5fb6ad68d80
(svn r1399) -Fix: Fixes for compiling with Watcom C/C++ (ie, OS/2 port). (orudge)
truelight
parents:
907
diff
changeset
|
795 |
sel[1] = WP(w,replaceveh_d).sel_index[1]; |
915 | 796 |
|
842 | 797 |
switch (WP(w,replaceveh_d).vehicletype) { |
798 |
case VEH_Train: { |
|
3028
82836d6e3a27
(svn r3608) No functional change, just make some code more comprehensible: Reduce variable scope, remove write-only variables, turn do-while-loops with multiple induction variables into canonical for-loops
tron
parents:
3025
diff
changeset
|
799 |
RailType railtype = _railtype_selected_in_replace_gui; |
82836d6e3a27
(svn r3608) No functional change, just make some code more comprehensible: Reduce variable scope, remove write-only variables, turn do-while-loops with multiple induction variables into canonical for-loops
tron
parents:
3025
diff
changeset
|
800 |
|
4434
a08cb4b5c179
(svn r6204) -Cleanup: replace non-indentation with spaces; like '}<TAB>else {' -> '} else {', tabs between code and comment, etc.
rubidium
parents:
4432
diff
changeset
|
801 |
w->widget[13].color = _player_colors[_local_player]; // sets the colour of that art thing |
a08cb4b5c179
(svn r6204) -Cleanup: replace non-indentation with spaces; like '}<TAB>else {' -> '} else {', tabs between code and comment, etc.
rubidium
parents:
4432
diff
changeset
|
802 |
w->widget[16].color = _player_colors[_local_player]; // sets the colour of that art thing |
3029
f796d046b34d
(svn r3609) Some more simplification in the same function as r3608
tron
parents:
3028
diff
changeset
|
803 |
|
2971
cae3a81e8674
(svn r3546) - NewGRF feature: Implement rail vehicle 'property' 0x1A: allows shuffling order of rail vehicle purchase list (and replace vehicle list)
peter1138
parents:
2970
diff
changeset
|
804 |
for (i = 0; i < NUM_TRAIN_ENGINES; i++) { |
3028
82836d6e3a27
(svn r3608) No functional change, just make some code more comprehensible: Reduce variable scope, remove write-only variables, turn do-while-loops with multiple induction variables into canonical for-loops
tron
parents:
3025
diff
changeset
|
805 |
EngineID eid = GetRailVehAtPosition(i); |
82836d6e3a27
(svn r3608) No functional change, just make some code more comprehensible: Reduce variable scope, remove write-only variables, turn do-while-loops with multiple induction variables into canonical for-loops
tron
parents:
3025
diff
changeset
|
806 |
const Engine* e = GetEngine(eid); |
3393
c40975f04842
(svn r4201) - Codechange: Do for _engine_info[] what we do for _*_vehicle_info[]; create and use a function to retrieve data, and ensure constness.
peter1138
parents:
3355
diff
changeset
|
807 |
const EngineInfo* info = EngInfo(eid); |
867
dffd33233237
(svn r1348) -Feature: resizable windows. Read the comment in window.h to find out
truelight
parents:
845
diff
changeset
|
808 |
|
3355
e414a0b104a6
(svn r4150) -Feature: Merged elrails into trunk. Thanks to Tron for lots of code and proofreading, thanks to peter1138 for another lot of code and ideas.
celestar
parents:
3040
diff
changeset
|
809 |
// left window contains compatible engines while right window only contains engines of the selected type |
4084
318905f3d768
(svn r5399) Simplify a conditional expression: (a && b) || (!a && !b) -> a == b
tron
parents:
4023
diff
changeset
|
810 |
if (ENGINE_AVAILABLE && |
318905f3d768
(svn r5399) Simplify a conditional expression: (a && b) || (!a && !b) -> a == b
tron
parents:
4023
diff
changeset
|
811 |
(RailVehInfo(eid)->power != 0) == (WP(w, replaceveh_d).wagon_btnstate != 0)) { |
4574
61a17f80cfb9
(svn r6424) -Codechange: [autoreplace] removed a loop though all vehicles from each time the window is redrawn
bjarni
parents:
4569
diff
changeset
|
812 |
if (IsCompatibleRail(e->railtype, railtype) && (p->num_engines[eid] > 0 || EngineHasReplacementForPlayer(p, eid))) { |
3029
f796d046b34d
(svn r3609) Some more simplification in the same function as r3608
tron
parents:
3028
diff
changeset
|
813 |
if (sel[0] == count) selected_id[0] = eid; |
1134
f7342e7b4718
(svn r1635) fix: forgot to set SetVScrollCount properly in autoreplace train GUI. It appears ok now
bjarni
parents:
1128
diff
changeset
|
814 |
count++; |
1128
ca7f860db7ac
(svn r1629) added a counter to tell how many engines you have of each type to the autoreplace vehicle windows and made them show only the vehicles you actually have in the left list.
bjarni
parents:
1093
diff
changeset
|
815 |
} |
3355
e414a0b104a6
(svn r4150) -Feature: Merged elrails into trunk. Thanks to Tron for lots of code and proofreading, thanks to peter1138 for another lot of code and ideas.
celestar
parents:
3040
diff
changeset
|
816 |
if (e->railtype == railtype && HASBIT(e->player_avail, _local_player)) { |
3029
f796d046b34d
(svn r3609) Some more simplification in the same function as r3608
tron
parents:
3028
diff
changeset
|
817 |
if (sel[1] == count2) selected_id[1] = eid; |
1128
ca7f860db7ac
(svn r1629) added a counter to tell how many engines you have of each type to the autoreplace vehicle windows and made them show only the vehicles you actually have in the left list.
bjarni
parents:
1093
diff
changeset
|
818 |
count2++; |
842 | 819 |
} |
820 |
} |
|
1128
ca7f860db7ac
(svn r1629) added a counter to tell how many engines you have of each type to the autoreplace vehicle windows and made them show only the vehicles you actually have in the left list.
bjarni
parents:
1093
diff
changeset
|
821 |
} |
842 | 822 |
break; |
1128
ca7f860db7ac
(svn r1629) added a counter to tell how many engines you have of each type to the autoreplace vehicle windows and made them show only the vehicles you actually have in the left list.
bjarni
parents:
1093
diff
changeset
|
823 |
} |
3028
82836d6e3a27
(svn r3608) No functional change, just make some code more comprehensible: Reduce variable scope, remove write-only variables, turn do-while-loops with multiple induction variables into canonical for-loops
tron
parents:
3025
diff
changeset
|
824 |
|
842 | 825 |
case VEH_Road: { |
3028
82836d6e3a27
(svn r3608) No functional change, just make some code more comprehensible: Reduce variable scope, remove write-only variables, turn do-while-loops with multiple induction variables into canonical for-loops
tron
parents:
3025
diff
changeset
|
826 |
for (i = ROAD_ENGINES_INDEX; i < ROAD_ENGINES_INDEX + NUM_ROAD_ENGINES; i++) { |
4574
61a17f80cfb9
(svn r6424) -Codechange: [autoreplace] removed a loop though all vehicles from each time the window is redrawn
bjarni
parents:
4569
diff
changeset
|
827 |
if (p->num_engines[i] > 0 || EngineHasReplacementForPlayer(p, i)) { |
3029
f796d046b34d
(svn r3609) Some more simplification in the same function as r3608
tron
parents:
3028
diff
changeset
|
828 |
if (sel[0] == count) selected_id[0] = i; |
842 | 829 |
count++; |
830 |
} |
|
3028
82836d6e3a27
(svn r3608) No functional change, just make some code more comprehensible: Reduce variable scope, remove write-only variables, turn do-while-loops with multiple induction variables into canonical for-loops
tron
parents:
3025
diff
changeset
|
831 |
} |
867
dffd33233237
(svn r1348) -Feature: resizable windows. Read the comment in window.h to find out
truelight
parents:
845
diff
changeset
|
832 |
|
2746
47c6e734556e
(svn r3291) - Codechange, Autoreplace: Replace int with EngineID and -1 with INVALID_ENGINE, as appropriate.
peter1138
parents:
2725
diff
changeset
|
833 |
if (selected_id[0] != INVALID_ENGINE) { // only draw right array if we have anything in the left one |
3028
82836d6e3a27
(svn r3608) No functional change, just make some code more comprehensible: Reduce variable scope, remove write-only variables, turn do-while-loops with multiple induction variables into canonical for-loops
tron
parents:
3025
diff
changeset
|
834 |
CargoID cargo = RoadVehInfo(selected_id[0])->cargo_type; |
867
dffd33233237
(svn r1348) -Feature: resizable windows. Read the comment in window.h to find out
truelight
parents:
845
diff
changeset
|
835 |
|
3028
82836d6e3a27
(svn r3608) No functional change, just make some code more comprehensible: Reduce variable scope, remove write-only variables, turn do-while-loops with multiple induction variables into canonical for-loops
tron
parents:
3025
diff
changeset
|
836 |
for (i = ROAD_ENGINES_INDEX; i < ROAD_ENGINES_INDEX + NUM_ROAD_ENGINES; i++) { |
3029
f796d046b34d
(svn r3609) Some more simplification in the same function as r3608
tron
parents:
3028
diff
changeset
|
837 |
if (cargo == RoadVehInfo(i)->cargo_type && |
f796d046b34d
(svn r3609) Some more simplification in the same function as r3608
tron
parents:
3028
diff
changeset
|
838 |
HASBIT(GetEngine(i)->player_avail, _local_player)) { |
f796d046b34d
(svn r3609) Some more simplification in the same function as r3608
tron
parents:
3028
diff
changeset
|
839 |
if (sel[1] == count2) selected_id[1] = i; |
842 | 840 |
count2++; |
841 |
} |
|
3028
82836d6e3a27
(svn r3608) No functional change, just make some code more comprehensible: Reduce variable scope, remove write-only variables, turn do-while-loops with multiple induction variables into canonical for-loops
tron
parents:
3025
diff
changeset
|
842 |
} |
867
dffd33233237
(svn r1348) -Feature: resizable windows. Read the comment in window.h to find out
truelight
parents:
845
diff
changeset
|
843 |
} |
842 | 844 |
break; |
845 |
} |
|
867
dffd33233237
(svn r1348) -Feature: resizable windows. Read the comment in window.h to find out
truelight
parents:
845
diff
changeset
|
846 |
|
842 | 847 |
case VEH_Ship: { |
3028
82836d6e3a27
(svn r3608) No functional change, just make some code more comprehensible: Reduce variable scope, remove write-only variables, turn do-while-loops with multiple induction variables into canonical for-loops
tron
parents:
3025
diff
changeset
|
848 |
for (i = SHIP_ENGINES_INDEX; i < SHIP_ENGINES_INDEX + NUM_SHIP_ENGINES; i++) { |
4574
61a17f80cfb9
(svn r6424) -Codechange: [autoreplace] removed a loop though all vehicles from each time the window is redrawn
bjarni
parents:
4569
diff
changeset
|
849 |
if (p->num_engines[i] > 0 || EngineHasReplacementForPlayer(p, i)) { |
3029
f796d046b34d
(svn r3609) Some more simplification in the same function as r3608
tron
parents:
3028
diff
changeset
|
850 |
if (sel[0] == count) selected_id[0] = i; |
842 | 851 |
count++; |
852 |
} |
|
3028
82836d6e3a27
(svn r3608) No functional change, just make some code more comprehensible: Reduce variable scope, remove write-only variables, turn do-while-loops with multiple induction variables into canonical for-loops
tron
parents:
3025
diff
changeset
|
853 |
} |
867
dffd33233237
(svn r1348) -Feature: resizable windows. Read the comment in window.h to find out
truelight
parents:
845
diff
changeset
|
854 |
|
2746
47c6e734556e
(svn r3291) - Codechange, Autoreplace: Replace int with EngineID and -1 with INVALID_ENGINE, as appropriate.
peter1138
parents:
2725
diff
changeset
|
855 |
if (selected_id[0] != INVALID_ENGINE) { |
3030 | 856 |
const ShipVehicleInfo* svi = ShipVehInfo(selected_id[0]); |
857 |
CargoID cargo = svi->cargo_type; |
|
858 |
byte refittable = svi->refittable; |
|
867
dffd33233237
(svn r1348) -Feature: resizable windows. Read the comment in window.h to find out
truelight
parents:
845
diff
changeset
|
859 |
|
3028
82836d6e3a27
(svn r3608) No functional change, just make some code more comprehensible: Reduce variable scope, remove write-only variables, turn do-while-loops with multiple induction variables into canonical for-loops
tron
parents:
3025
diff
changeset
|
860 |
for (i = SHIP_ENGINES_INDEX; i < SHIP_ENGINES_INDEX + NUM_SHIP_ENGINES; i++) { |
3029
f796d046b34d
(svn r3609) Some more simplification in the same function as r3608
tron
parents:
3028
diff
changeset
|
861 |
if (HASBIT(GetEngine(i)->player_avail, _local_player) && ( |
3028
82836d6e3a27
(svn r3608) No functional change, just make some code more comprehensible: Reduce variable scope, remove write-only variables, turn do-while-loops with multiple induction variables into canonical for-loops
tron
parents:
3025
diff
changeset
|
862 |
ShipVehInfo(i)->cargo_type == cargo || |
82836d6e3a27
(svn r3608) No functional change, just make some code more comprehensible: Reduce variable scope, remove write-only variables, turn do-while-loops with multiple induction variables into canonical for-loops
tron
parents:
3025
diff
changeset
|
863 |
ShipVehInfo(i)->refittable & refittable |
82836d6e3a27
(svn r3608) No functional change, just make some code more comprehensible: Reduce variable scope, remove write-only variables, turn do-while-loops with multiple induction variables into canonical for-loops
tron
parents:
3025
diff
changeset
|
864 |
)) { |
3029
f796d046b34d
(svn r3609) Some more simplification in the same function as r3608
tron
parents:
3028
diff
changeset
|
865 |
if (sel[1] == count2) selected_id[1] = i; |
842 | 866 |
count2++; |
867 |
} |
|
3028
82836d6e3a27
(svn r3608) No functional change, just make some code more comprehensible: Reduce variable scope, remove write-only variables, turn do-while-loops with multiple induction variables into canonical for-loops
tron
parents:
3025
diff
changeset
|
868 |
} |
842 | 869 |
} |
870 |
break; |
|
3028
82836d6e3a27
(svn r3608) No functional change, just make some code more comprehensible: Reduce variable scope, remove write-only variables, turn do-while-loops with multiple induction variables into canonical for-loops
tron
parents:
3025
diff
changeset
|
871 |
} |
867
dffd33233237
(svn r1348) -Feature: resizable windows. Read the comment in window.h to find out
truelight
parents:
845
diff
changeset
|
872 |
|
3028
82836d6e3a27
(svn r3608) No functional change, just make some code more comprehensible: Reduce variable scope, remove write-only variables, turn do-while-loops with multiple induction variables into canonical for-loops
tron
parents:
3025
diff
changeset
|
873 |
case VEH_Aircraft: { |
82836d6e3a27
(svn r3608) No functional change, just make some code more comprehensible: Reduce variable scope, remove write-only variables, turn do-while-loops with multiple induction variables into canonical for-loops
tron
parents:
3025
diff
changeset
|
874 |
for (i = AIRCRAFT_ENGINES_INDEX; i < AIRCRAFT_ENGINES_INDEX + NUM_AIRCRAFT_ENGINES; i++) { |
4574
61a17f80cfb9
(svn r6424) -Codechange: [autoreplace] removed a loop though all vehicles from each time the window is redrawn
bjarni
parents:
4569
diff
changeset
|
875 |
if (p->num_engines[i] > 0 || EngineHasReplacementForPlayer(p, i)) { |
3029
f796d046b34d
(svn r3609) Some more simplification in the same function as r3608
tron
parents:
3028
diff
changeset
|
876 |
if (sel[0] == count) selected_id[0] = i; |
842 | 877 |
count++; |
878 |
} |
|
3028
82836d6e3a27
(svn r3608) No functional change, just make some code more comprehensible: Reduce variable scope, remove write-only variables, turn do-while-loops with multiple induction variables into canonical for-loops
tron
parents:
3025
diff
changeset
|
879 |
} |
867
dffd33233237
(svn r1348) -Feature: resizable windows. Read the comment in window.h to find out
truelight
parents:
845
diff
changeset
|
880 |
|
2746
47c6e734556e
(svn r3291) - Codechange, Autoreplace: Replace int with EngineID and -1 with INVALID_ENGINE, as appropriate.
peter1138
parents:
2725
diff
changeset
|
881 |
if (selected_id[0] != INVALID_ENGINE) { |
3028
82836d6e3a27
(svn r3608) No functional change, just make some code more comprehensible: Reduce variable scope, remove write-only variables, turn do-while-loops with multiple induction variables into canonical for-loops
tron
parents:
3025
diff
changeset
|
882 |
byte subtype = AircraftVehInfo(selected_id[0])->subtype; |
82836d6e3a27
(svn r3608) No functional change, just make some code more comprehensible: Reduce variable scope, remove write-only variables, turn do-while-loops with multiple induction variables into canonical for-loops
tron
parents:
3025
diff
changeset
|
883 |
|
82836d6e3a27
(svn r3608) No functional change, just make some code more comprehensible: Reduce variable scope, remove write-only variables, turn do-while-loops with multiple induction variables into canonical for-loops
tron
parents:
3025
diff
changeset
|
884 |
for (i = AIRCRAFT_ENGINES_INDEX; i < AIRCRAFT_ENGINES_INDEX + NUM_AIRCRAFT_ENGINES; i++) { |
3029
f796d046b34d
(svn r3609) Some more simplification in the same function as r3608
tron
parents:
3028
diff
changeset
|
885 |
if (HASBIT(GetEngine(i)->player_avail, _local_player) && |
4023
5d84c056a2b1
(svn r5262) Add symbolic names for the aircraft subtypes. not perfect, but better than raw numbers
tron
parents:
3650
diff
changeset
|
886 |
(subtype & AIR_CTOL) == (AircraftVehInfo(i)->subtype & AIR_CTOL)) { |
3029
f796d046b34d
(svn r3609) Some more simplification in the same function as r3608
tron
parents:
3028
diff
changeset
|
887 |
if (sel[1] == count2) selected_id[1] = i; |
f796d046b34d
(svn r3609) Some more simplification in the same function as r3608
tron
parents:
3028
diff
changeset
|
888 |
count2++; |
842 | 889 |
} |
3028
82836d6e3a27
(svn r3608) No functional change, just make some code more comprehensible: Reduce variable scope, remove write-only variables, turn do-while-loops with multiple induction variables into canonical for-loops
tron
parents:
3025
diff
changeset
|
890 |
} |
842 | 891 |
} |
892 |
break; |
|
893 |
} |
|
894 |
} |
|
895 |
// sets up the number of items in each list |
|
896 |
SetVScrollCount(w, count); |
|
897 |
SetVScroll2Count(w, count2); |
|
898 |
WP(w,replaceveh_d).sel_engine[0] = selected_id[0]; |
|
899 |
WP(w,replaceveh_d).sel_engine[1] = selected_id[1]; |
|
867
dffd33233237
(svn r1348) -Feature: resizable windows. Read the comment in window.h to find out
truelight
parents:
845
diff
changeset
|
900 |
|
842 | 901 |
WP(w,replaceveh_d).count[0] = count; |
902 |
WP(w,replaceveh_d).count[1] = count2; |
|
903 |
return; |
|
904 |
} |
|
905 |
||
906 |
||
907 |
static void DrawEngineArrayInReplaceWindow(Window *w, int x, int y, int x2, int y2, int pos, int pos2, |
|
2746
47c6e734556e
(svn r3291) - Codechange, Autoreplace: Replace int with EngineID and -1 with INVALID_ENGINE, as appropriate.
peter1138
parents:
2725
diff
changeset
|
908 |
int sel1, int sel2, EngineID selected_id1, EngineID selected_id2) |
842 | 909 |
{ |
912
a5fb6ad68d80
(svn r1399) -Fix: Fixes for compiling with Watcom C/C++ (ie, OS/2 port). (orudge)
truelight
parents:
907
diff
changeset
|
910 |
int sel[2]; |
2746
47c6e734556e
(svn r3291) - Codechange, Autoreplace: Replace int with EngineID and -1 with INVALID_ENGINE, as appropriate.
peter1138
parents:
2725
diff
changeset
|
911 |
EngineID selected_id[2]; |
2569
fe379f11f6bf
(svn r3106) -Autoreplace feature: Continue to show old vehicles in replace window after all player's vehicles of that type have been replaced. This allows the replacement to be removed. These vehicles are shown in grey instead of the player's colour.
peter1138
parents:
2556
diff
changeset
|
912 |
const Player *p = GetPlayer(_local_player); |
912
a5fb6ad68d80
(svn r1399) -Fix: Fixes for compiling with Watcom C/C++ (ie, OS/2 port). (orudge)
truelight
parents:
907
diff
changeset
|
913 |
|
a5fb6ad68d80
(svn r1399) -Fix: Fixes for compiling with Watcom C/C++ (ie, OS/2 port). (orudge)
truelight
parents:
907
diff
changeset
|
914 |
sel[0] = sel1; |
a5fb6ad68d80
(svn r1399) -Fix: Fixes for compiling with Watcom C/C++ (ie, OS/2 port). (orudge)
truelight
parents:
907
diff
changeset
|
915 |
sel[1] = sel2; |
915 | 916 |
|
912
a5fb6ad68d80
(svn r1399) -Fix: Fixes for compiling with Watcom C/C++ (ie, OS/2 port). (orudge)
truelight
parents:
907
diff
changeset
|
917 |
selected_id[0] = selected_id1; |
a5fb6ad68d80
(svn r1399) -Fix: Fixes for compiling with Watcom C/C++ (ie, OS/2 port). (orudge)
truelight
parents:
907
diff
changeset
|
918 |
selected_id[1] = selected_id2; |
915 | 919 |
|
842 | 920 |
switch (WP(w,replaceveh_d).vehicletype) { |
921 |
case VEH_Train: { |
|
2520
8a52362c4ada
(svn r3049) Replace byte/int/uint by RailType where appropriate
tron
parents:
2519
diff
changeset
|
922 |
RailType railtype = _railtype_selected_in_replace_gui; |
4931
c25335d7e99c
(svn r6911) - Codechange: Add extra space to all purchase windows (and the replace window) to allow room for more text. (mart3p)
peter1138
parents:
4930
diff
changeset
|
923 |
DrawString(157, w->widget[14].top + 1, _rail_types_list[railtype], 0x10); |
842 | 924 |
/* draw sorting criteria string */ |
925 |
||
926 |
/* Ensure that custom engines which substituted wagons |
|
4549
106ed18a7675
(svn r6381) -Cleanup: make the '/* */' comments that span multiple lines more uniform.
rubidium
parents:
4547
diff
changeset
|
927 |
* are sorted correctly. |
106ed18a7675
(svn r6381) -Cleanup: make the '/* */' comments that span multiple lines more uniform.
rubidium
parents:
4547
diff
changeset
|
928 |
* XXX - DO NOT EVER DO THIS EVER AGAIN! GRRR hacking in wagons as |
106ed18a7675
(svn r6381) -Cleanup: make the '/* */' comments that span multiple lines more uniform.
rubidium
parents:
4547
diff
changeset
|
929 |
* engines to get more types.. Stays here until we have our own format |
106ed18a7675
(svn r6381) -Cleanup: make the '/* */' comments that span multiple lines more uniform.
rubidium
parents:
4547
diff
changeset
|
930 |
* then it is exit!!! */ |
2970
3b9380f10074
(svn r3535) -Feature: [autoreplace] allow autoreplacing of train wagons
bjarni
parents:
2965
diff
changeset
|
931 |
if (WP(w,replaceveh_d).wagon_btnstate) { |
3355
e414a0b104a6
(svn r4150) -Feature: Merged elrails into trunk. Thanks to Tron for lots of code and proofreading, thanks to peter1138 for another lot of code and ideas.
celestar
parents:
3040
diff
changeset
|
932 |
train_engine_drawing_loop(&x, &y, &pos, &sel[0], &selected_id[0], railtype, w->vscroll.cap, true, false, true, true); // True engines |
e414a0b104a6
(svn r4150) -Feature: Merged elrails into trunk. Thanks to Tron for lots of code and proofreading, thanks to peter1138 for another lot of code and ideas.
celestar
parents:
3040
diff
changeset
|
933 |
train_engine_drawing_loop(&x2, &y2, &pos2, &sel[1], &selected_id[1], railtype, w->vscroll.cap, true, false, false, false); // True engines |
e414a0b104a6
(svn r4150) -Feature: Merged elrails into trunk. Thanks to Tron for lots of code and proofreading, thanks to peter1138 for another lot of code and ideas.
celestar
parents:
3040
diff
changeset
|
934 |
train_engine_drawing_loop(&x2, &y2, &pos2, &sel[1], &selected_id[1], railtype, w->vscroll.cap, false, false, false, false); // Feeble wagons |
2970
3b9380f10074
(svn r3535) -Feature: [autoreplace] allow autoreplacing of train wagons
bjarni
parents:
2965
diff
changeset
|
935 |
} else { |
3355
e414a0b104a6
(svn r4150) -Feature: Merged elrails into trunk. Thanks to Tron for lots of code and proofreading, thanks to peter1138 for another lot of code and ideas.
celestar
parents:
3040
diff
changeset
|
936 |
train_engine_drawing_loop(&x, &y, &pos, &sel[0], &selected_id[0], railtype, w->vscroll.cap, false, true, true, true); |
e414a0b104a6
(svn r4150) -Feature: Merged elrails into trunk. Thanks to Tron for lots of code and proofreading, thanks to peter1138 for another lot of code and ideas.
celestar
parents:
3040
diff
changeset
|
937 |
train_engine_drawing_loop(&x2, &y2, &pos2, &sel[1], &selected_id[1], railtype, w->vscroll.cap, false, true, false, true); |
2970
3b9380f10074
(svn r3535) -Feature: [autoreplace] allow autoreplacing of train wagons
bjarni
parents:
2965
diff
changeset
|
938 |
} |
842 | 939 |
break; |
940 |
} |
|
867
dffd33233237
(svn r1348) -Feature: resizable windows. Read the comment in window.h to find out
truelight
parents:
845
diff
changeset
|
941 |
|
842 | 942 |
case VEH_Road: { |
943 |
int num = NUM_ROAD_ENGINES; |
|
2630 | 944 |
const Engine* e = GetEngine(ROAD_ENGINES_INDEX); |
2477
225b2916fe2a
(svn r3003) Change int, uint, uin16 and byte to EngineID where appropriate, plus some related changes (mostly casts)
tron
parents:
2466
diff
changeset
|
945 |
EngineID engine_id = ROAD_ENGINES_INDEX; |
842 | 946 |
|
4999
faf734a9311f
(svn r7009) - Fix (r1323, r1326): In the replace vehicle window, the left vehicle list was not drawn when an engine was not selected.
peter1138
parents:
4938
diff
changeset
|
947 |
do { |
faf734a9311f
(svn r7009) - Fix (r1323, r1326): In the replace vehicle window, the left vehicle list was not drawn when an engine was not selected.
peter1138
parents:
4938
diff
changeset
|
948 |
if (p->num_engines[engine_id] > 0 || EngineHasReplacementForPlayer(p, engine_id)) { |
faf734a9311f
(svn r7009) - Fix (r1323, r1326): In the replace vehicle window, the left vehicle list was not drawn when an engine was not selected.
peter1138
parents:
4938
diff
changeset
|
949 |
if (IS_INT_INSIDE(--pos, -w->vscroll.cap, 0)) { |
faf734a9311f
(svn r7009) - Fix (r1323, r1326): In the replace vehicle window, the left vehicle list was not drawn when an engine was not selected.
peter1138
parents:
4938
diff
changeset
|
950 |
DrawString(x+59, y+2, GetCustomEngineName(engine_id), sel[0]==0 ? 0xC : 0x10); |
faf734a9311f
(svn r7009) - Fix (r1323, r1326): In the replace vehicle window, the left vehicle list was not drawn when an engine was not selected.
peter1138
parents:
4938
diff
changeset
|
951 |
DrawRoadVehEngine(x+29, y+6, engine_id, p->num_engines[engine_id] > 0 ? GetEnginePalette(engine_id, _local_player) : PALETTE_CRASH); |
faf734a9311f
(svn r7009) - Fix (r1323, r1326): In the replace vehicle window, the left vehicle list was not drawn when an engine was not selected.
peter1138
parents:
4938
diff
changeset
|
952 |
SetDParam(0, p->num_engines[engine_id]); |
faf734a9311f
(svn r7009) - Fix (r1323, r1326): In the replace vehicle window, the left vehicle list was not drawn when an engine was not selected.
peter1138
parents:
4938
diff
changeset
|
953 |
DrawStringRightAligned(213, y+5, STR_TINY_BLACK, 0); |
faf734a9311f
(svn r7009) - Fix (r1323, r1326): In the replace vehicle window, the left vehicle list was not drawn when an engine was not selected.
peter1138
parents:
4938
diff
changeset
|
954 |
y += 14; |
1128
ca7f860db7ac
(svn r1629) added a counter to tell how many engines you have of each type to the autoreplace vehicle windows and made them show only the vehicles you actually have in the left list.
bjarni
parents:
1093
diff
changeset
|
955 |
} |
4999
faf734a9311f
(svn r7009) - Fix (r1323, r1326): In the replace vehicle window, the left vehicle list was not drawn when an engine was not selected.
peter1138
parents:
4938
diff
changeset
|
956 |
sel[0]--; |
faf734a9311f
(svn r7009) - Fix (r1323, r1326): In the replace vehicle window, the left vehicle list was not drawn when an engine was not selected.
peter1138
parents:
4938
diff
changeset
|
957 |
} |
faf734a9311f
(svn r7009) - Fix (r1323, r1326): In the replace vehicle window, the left vehicle list was not drawn when an engine was not selected.
peter1138
parents:
4938
diff
changeset
|
958 |
|
faf734a9311f
(svn r7009) - Fix (r1323, r1326): In the replace vehicle window, the left vehicle list was not drawn when an engine was not selected.
peter1138
parents:
4938
diff
changeset
|
959 |
if (selected_id[0] != INVALID_ENGINE) { |
faf734a9311f
(svn r7009) - Fix (r1323, r1326): In the replace vehicle window, the left vehicle list was not drawn when an engine was not selected.
peter1138
parents:
4938
diff
changeset
|
960 |
byte cargo = RoadVehInfo(selected_id[0])->cargo_type; |
867
dffd33233237
(svn r1348) -Feature: resizable windows. Read the comment in window.h to find out
truelight
parents:
845
diff
changeset
|
961 |
|
2639 | 962 |
if (RoadVehInfo(engine_id)->cargo_type == cargo && HASBIT(e->player_avail, _local_player)) { |
1128
ca7f860db7ac
(svn r1629) added a counter to tell how many engines you have of each type to the autoreplace vehicle windows and made them show only the vehicles you actually have in the left list.
bjarni
parents:
1093
diff
changeset
|
963 |
if (IS_INT_INSIDE(--pos2, -w->vscroll.cap, 0) && RoadVehInfo(engine_id)->cargo_type == cargo) { |
ca7f860db7ac
(svn r1629) added a counter to tell how many engines you have of each type to the autoreplace vehicle windows and made them show only the vehicles you actually have in the left list.
bjarni
parents:
1093
diff
changeset
|
964 |
DrawString(x2+59, y2+2, GetCustomEngineName(engine_id), sel[1]==0 ? 0xC : 0x10); |
3040
7043c0de7c6d
(svn r3620) - 2cc: Replace use of macro to determine colour map with a function call for drawing of vehicles.
peter1138
parents:
3030
diff
changeset
|
965 |
DrawRoadVehEngine(x2+29, y2+6, engine_id, GetEnginePalette(engine_id, _local_player)); |
1128
ca7f860db7ac
(svn r1629) added a counter to tell how many engines you have of each type to the autoreplace vehicle windows and made them show only the vehicles you actually have in the left list.
bjarni
parents:
1093
diff
changeset
|
966 |
y2 += 14; |
845
4960e265d25b
(svn r1326) fixed compiler warnings in vehicle_gui.c and widget.c
bjarni
parents:
843
diff
changeset
|
967 |
} |
1128
ca7f860db7ac
(svn r1629) added a counter to tell how many engines you have of each type to the autoreplace vehicle windows and made them show only the vehicles you actually have in the left list.
bjarni
parents:
1093
diff
changeset
|
968 |
sel[1]--; |
842 | 969 |
} |
4999
faf734a9311f
(svn r7009) - Fix (r1323, r1326): In the replace vehicle window, the left vehicle list was not drawn when an engine was not selected.
peter1138
parents:
4938
diff
changeset
|
970 |
} |
faf734a9311f
(svn r7009) - Fix (r1323, r1326): In the replace vehicle window, the left vehicle list was not drawn when an engine was not selected.
peter1138
parents:
4938
diff
changeset
|
971 |
} while (++engine_id, ++e,--num); |
842 | 972 |
break; |
973 |
} |
|
867
dffd33233237
(svn r1348) -Feature: resizable windows. Read the comment in window.h to find out
truelight
parents:
845
diff
changeset
|
974 |
|
842 | 975 |
case VEH_Ship: { |
976 |
int num = NUM_SHIP_ENGINES; |
|
2630 | 977 |
const Engine* e = GetEngine(SHIP_ENGINES_INDEX); |
2477
225b2916fe2a
(svn r3003) Change int, uint, uin16 and byte to EngineID where appropriate, plus some related changes (mostly casts)
tron
parents:
2466
diff
changeset
|
978 |
EngineID engine_id = SHIP_ENGINES_INDEX; |
867
dffd33233237
(svn r1348) -Feature: resizable windows. Read the comment in window.h to find out
truelight
parents:
845
diff
changeset
|
979 |
|
4999
faf734a9311f
(svn r7009) - Fix (r1323, r1326): In the replace vehicle window, the left vehicle list was not drawn when an engine was not selected.
peter1138
parents:
4938
diff
changeset
|
980 |
do { |
faf734a9311f
(svn r7009) - Fix (r1323, r1326): In the replace vehicle window, the left vehicle list was not drawn when an engine was not selected.
peter1138
parents:
4938
diff
changeset
|
981 |
if (p->num_engines[engine_id] > 0 || EngineHasReplacementForPlayer(p, engine_id)) { |
faf734a9311f
(svn r7009) - Fix (r1323, r1326): In the replace vehicle window, the left vehicle list was not drawn when an engine was not selected.
peter1138
parents:
4938
diff
changeset
|
982 |
if (IS_INT_INSIDE(--pos, -w->vscroll.cap, 0)) { |
faf734a9311f
(svn r7009) - Fix (r1323, r1326): In the replace vehicle window, the left vehicle list was not drawn when an engine was not selected.
peter1138
parents:
4938
diff
changeset
|
983 |
DrawString(x+75, y+7, GetCustomEngineName(engine_id), sel[0]==0 ? 0xC : 0x10); |
faf734a9311f
(svn r7009) - Fix (r1323, r1326): In the replace vehicle window, the left vehicle list was not drawn when an engine was not selected.
peter1138
parents:
4938
diff
changeset
|
984 |
DrawShipEngine(x+35, y+10, engine_id, p->num_engines[engine_id] > 0 ? GetEnginePalette(engine_id, _local_player) : PALETTE_CRASH); |
faf734a9311f
(svn r7009) - Fix (r1323, r1326): In the replace vehicle window, the left vehicle list was not drawn when an engine was not selected.
peter1138
parents:
4938
diff
changeset
|
985 |
SetDParam(0, p->num_engines[engine_id]); |
faf734a9311f
(svn r7009) - Fix (r1323, r1326): In the replace vehicle window, the left vehicle list was not drawn when an engine was not selected.
peter1138
parents:
4938
diff
changeset
|
986 |
DrawStringRightAligned(213, y+15, STR_TINY_BLACK, 0); |
faf734a9311f
(svn r7009) - Fix (r1323, r1326): In the replace vehicle window, the left vehicle list was not drawn when an engine was not selected.
peter1138
parents:
4938
diff
changeset
|
987 |
y += 24; |
1128
ca7f860db7ac
(svn r1629) added a counter to tell how many engines you have of each type to the autoreplace vehicle windows and made them show only the vehicles you actually have in the left list.
bjarni
parents:
1093
diff
changeset
|
988 |
} |
4999
faf734a9311f
(svn r7009) - Fix (r1323, r1326): In the replace vehicle window, the left vehicle list was not drawn when an engine was not selected.
peter1138
parents:
4938
diff
changeset
|
989 |
sel[0]--; |
faf734a9311f
(svn r7009) - Fix (r1323, r1326): In the replace vehicle window, the left vehicle list was not drawn when an engine was not selected.
peter1138
parents:
4938
diff
changeset
|
990 |
} |
faf734a9311f
(svn r7009) - Fix (r1323, r1326): In the replace vehicle window, the left vehicle list was not drawn when an engine was not selected.
peter1138
parents:
4938
diff
changeset
|
991 |
|
faf734a9311f
(svn r7009) - Fix (r1323, r1326): In the replace vehicle window, the left vehicle list was not drawn when an engine was not selected.
peter1138
parents:
4938
diff
changeset
|
992 |
if (selected_id[0] != INVALID_ENGINE) { |
faf734a9311f
(svn r7009) - Fix (r1323, r1326): In the replace vehicle window, the left vehicle list was not drawn when an engine was not selected.
peter1138
parents:
4938
diff
changeset
|
993 |
CargoID cargo = ShipVehInfo(selected_id[0])->cargo_type; |
faf734a9311f
(svn r7009) - Fix (r1323, r1326): In the replace vehicle window, the left vehicle list was not drawn when an engine was not selected.
peter1138
parents:
4938
diff
changeset
|
994 |
bool refittable = ShipVehInfo(selected_id[0])->refittable; |
faf734a9311f
(svn r7009) - Fix (r1323, r1326): In the replace vehicle window, the left vehicle list was not drawn when an engine was not selected.
peter1138
parents:
4938
diff
changeset
|
995 |
|
faf734a9311f
(svn r7009) - Fix (r1323, r1326): In the replace vehicle window, the left vehicle list was not drawn when an engine was not selected.
peter1138
parents:
4938
diff
changeset
|
996 |
if (HASBIT(e->player_avail, _local_player) && ( cargo == ShipVehInfo(engine_id)->cargo_type || refittable & ShipVehInfo(engine_id)->refittable)) { |
faf734a9311f
(svn r7009) - Fix (r1323, r1326): In the replace vehicle window, the left vehicle list was not drawn when an engine was not selected.
peter1138
parents:
4938
diff
changeset
|
997 |
if (IS_INT_INSIDE(--pos2, -w->vscroll.cap, 0)) { |
faf734a9311f
(svn r7009) - Fix (r1323, r1326): In the replace vehicle window, the left vehicle list was not drawn when an engine was not selected.
peter1138
parents:
4938
diff
changeset
|
998 |
DrawString(x2+75, y2+7, GetCustomEngineName(engine_id), sel[1]==0 ? 0xC : 0x10); |
faf734a9311f
(svn r7009) - Fix (r1323, r1326): In the replace vehicle window, the left vehicle list was not drawn when an engine was not selected.
peter1138
parents:
4938
diff
changeset
|
999 |
DrawShipEngine(x2+35, y2+10, engine_id, GetEnginePalette(engine_id, _local_player)); |
faf734a9311f
(svn r7009) - Fix (r1323, r1326): In the replace vehicle window, the left vehicle list was not drawn when an engine was not selected.
peter1138
parents:
4938
diff
changeset
|
1000 |
y2 += 24; |
845
4960e265d25b
(svn r1326) fixed compiler warnings in vehicle_gui.c and widget.c
bjarni
parents:
843
diff
changeset
|
1001 |
} |
4999
faf734a9311f
(svn r7009) - Fix (r1323, r1326): In the replace vehicle window, the left vehicle list was not drawn when an engine was not selected.
peter1138
parents:
4938
diff
changeset
|
1002 |
sel[1]--; |
842 | 1003 |
} |
4999
faf734a9311f
(svn r7009) - Fix (r1323, r1326): In the replace vehicle window, the left vehicle list was not drawn when an engine was not selected.
peter1138
parents:
4938
diff
changeset
|
1004 |
} |
faf734a9311f
(svn r7009) - Fix (r1323, r1326): In the replace vehicle window, the left vehicle list was not drawn when an engine was not selected.
peter1138
parents:
4938
diff
changeset
|
1005 |
} while (++engine_id, ++e, --num); |
845
4960e265d25b
(svn r1326) fixed compiler warnings in vehicle_gui.c and widget.c
bjarni
parents:
843
diff
changeset
|
1006 |
break; |
842 | 1007 |
} //end of ship |
867
dffd33233237
(svn r1348) -Feature: resizable windows. Read the comment in window.h to find out
truelight
parents:
845
diff
changeset
|
1008 |
|
842 | 1009 |
case VEH_Aircraft: { |
4999
faf734a9311f
(svn r7009) - Fix (r1323, r1326): In the replace vehicle window, the left vehicle list was not drawn when an engine was not selected.
peter1138
parents:
4938
diff
changeset
|
1010 |
int num = NUM_AIRCRAFT_ENGINES; |
faf734a9311f
(svn r7009) - Fix (r1323, r1326): In the replace vehicle window, the left vehicle list was not drawn when an engine was not selected.
peter1138
parents:
4938
diff
changeset
|
1011 |
const Engine* e = GetEngine(AIRCRAFT_ENGINES_INDEX); |
faf734a9311f
(svn r7009) - Fix (r1323, r1326): In the replace vehicle window, the left vehicle list was not drawn when an engine was not selected.
peter1138
parents:
4938
diff
changeset
|
1012 |
EngineID engine_id = AIRCRAFT_ENGINES_INDEX; |
842 | 1013 |
|
4999
faf734a9311f
(svn r7009) - Fix (r1323, r1326): In the replace vehicle window, the left vehicle list was not drawn when an engine was not selected.
peter1138
parents:
4938
diff
changeset
|
1014 |
do { |
faf734a9311f
(svn r7009) - Fix (r1323, r1326): In the replace vehicle window, the left vehicle list was not drawn when an engine was not selected.
peter1138
parents:
4938
diff
changeset
|
1015 |
if (p->num_engines[engine_id] > 0 || EngineHasReplacementForPlayer(p, engine_id)) { |
faf734a9311f
(svn r7009) - Fix (r1323, r1326): In the replace vehicle window, the left vehicle list was not drawn when an engine was not selected.
peter1138
parents:
4938
diff
changeset
|
1016 |
if (sel[0] == 0) selected_id[0] = engine_id; |
faf734a9311f
(svn r7009) - Fix (r1323, r1326): In the replace vehicle window, the left vehicle list was not drawn when an engine was not selected.
peter1138
parents:
4938
diff
changeset
|
1017 |
if (IS_INT_INSIDE(--pos, -w->vscroll.cap, 0)) { |
faf734a9311f
(svn r7009) - Fix (r1323, r1326): In the replace vehicle window, the left vehicle list was not drawn when an engine was not selected.
peter1138
parents:
4938
diff
changeset
|
1018 |
DrawString(x+62, y+7, GetCustomEngineName(engine_id), sel[0]==0 ? 0xC : 0x10); |
faf734a9311f
(svn r7009) - Fix (r1323, r1326): In the replace vehicle window, the left vehicle list was not drawn when an engine was not selected.
peter1138
parents:
4938
diff
changeset
|
1019 |
DrawAircraftEngine(x+29, y+10, engine_id, p->num_engines[engine_id] > 0 ? GetEnginePalette(engine_id, _local_player) : PALETTE_CRASH); |
faf734a9311f
(svn r7009) - Fix (r1323, r1326): In the replace vehicle window, the left vehicle list was not drawn when an engine was not selected.
peter1138
parents:
4938
diff
changeset
|
1020 |
SetDParam(0, p->num_engines[engine_id]); |
faf734a9311f
(svn r7009) - Fix (r1323, r1326): In the replace vehicle window, the left vehicle list was not drawn when an engine was not selected.
peter1138
parents:
4938
diff
changeset
|
1021 |
DrawStringRightAligned(213, y+15, STR_TINY_BLACK, 0); |
faf734a9311f
(svn r7009) - Fix (r1323, r1326): In the replace vehicle window, the left vehicle list was not drawn when an engine was not selected.
peter1138
parents:
4938
diff
changeset
|
1022 |
y += 24; |
1128
ca7f860db7ac
(svn r1629) added a counter to tell how many engines you have of each type to the autoreplace vehicle windows and made them show only the vehicles you actually have in the left list.
bjarni
parents:
1093
diff
changeset
|
1023 |
} |
4999
faf734a9311f
(svn r7009) - Fix (r1323, r1326): In the replace vehicle window, the left vehicle list was not drawn when an engine was not selected.
peter1138
parents:
4938
diff
changeset
|
1024 |
sel[0]--; |
faf734a9311f
(svn r7009) - Fix (r1323, r1326): In the replace vehicle window, the left vehicle list was not drawn when an engine was not selected.
peter1138
parents:
4938
diff
changeset
|
1025 |
} |
faf734a9311f
(svn r7009) - Fix (r1323, r1326): In the replace vehicle window, the left vehicle list was not drawn when an engine was not selected.
peter1138
parents:
4938
diff
changeset
|
1026 |
|
faf734a9311f
(svn r7009) - Fix (r1323, r1326): In the replace vehicle window, the left vehicle list was not drawn when an engine was not selected.
peter1138
parents:
4938
diff
changeset
|
1027 |
if (selected_id[0] != INVALID_ENGINE) { |
faf734a9311f
(svn r7009) - Fix (r1323, r1326): In the replace vehicle window, the left vehicle list was not drawn when an engine was not selected.
peter1138
parents:
4938
diff
changeset
|
1028 |
byte subtype = AircraftVehInfo(selected_id[0])->subtype; |
faf734a9311f
(svn r7009) - Fix (r1323, r1326): In the replace vehicle window, the left vehicle list was not drawn when an engine was not selected.
peter1138
parents:
4938
diff
changeset
|
1029 |
|
4023
5d84c056a2b1
(svn r5262) Add symbolic names for the aircraft subtypes. not perfect, but better than raw numbers
tron
parents:
3650
diff
changeset
|
1030 |
if ((subtype & AIR_CTOL) == (AircraftVehInfo(engine_id)->subtype & AIR_CTOL) && |
2639 | 1031 |
HASBIT(e->player_avail, _local_player)) { |
1032 |
if (sel[1] == 0) selected_id[1] = engine_id; |
|
1128
ca7f860db7ac
(svn r1629) added a counter to tell how many engines you have of each type to the autoreplace vehicle windows and made them show only the vehicles you actually have in the left list.
bjarni
parents:
1093
diff
changeset
|
1033 |
if (IS_INT_INSIDE(--pos2, -w->vscroll.cap, 0)) { |
ca7f860db7ac
(svn r1629) added a counter to tell how many engines you have of each type to the autoreplace vehicle windows and made them show only the vehicles you actually have in the left list.
bjarni
parents:
1093
diff
changeset
|
1034 |
DrawString(x2+62, y2+7, GetCustomEngineName(engine_id), sel[1]==0 ? 0xC : 0x10); |
3040
7043c0de7c6d
(svn r3620) - 2cc: Replace use of macro to determine colour map with a function call for drawing of vehicles.
peter1138
parents:
3030
diff
changeset
|
1035 |
DrawAircraftEngine(x2+29, y2+10, engine_id, GetEnginePalette(engine_id, _local_player)); |
1128
ca7f860db7ac
(svn r1629) added a counter to tell how many engines you have of each type to the autoreplace vehicle windows and made them show only the vehicles you actually have in the left list.
bjarni
parents:
1093
diff
changeset
|
1036 |
y2 += 24; |
ca7f860db7ac
(svn r1629) added a counter to tell how many engines you have of each type to the autoreplace vehicle windows and made them show only the vehicles you actually have in the left list.
bjarni
parents:
1093
diff
changeset
|
1037 |
} |
842 | 1038 |
sel[1]--; |
1039 |
} |
|
4999
faf734a9311f
(svn r7009) - Fix (r1323, r1326): In the replace vehicle window, the left vehicle list was not drawn when an engine was not selected.
peter1138
parents:
4938
diff
changeset
|
1040 |
} |
faf734a9311f
(svn r7009) - Fix (r1323, r1326): In the replace vehicle window, the left vehicle list was not drawn when an engine was not selected.
peter1138
parents:
4938
diff
changeset
|
1041 |
} while (++engine_id, ++e,--num); |
842 | 1042 |
break; |
1043 |
} // end of aircraft |
|
1044 |
} |
|
2639 | 1045 |
} |
842 | 1046 |
|
4930
708801d486c6
(svn r6910) - Codechange: Supply width of area when drawing purchase info instead of using hardcoded values. (mart3p)
peter1138
parents:
4929
diff
changeset
|
1047 |
static void DrawVehiclePurchaseInfo(const int x, const int y, uint w, const EngineID engine_number) |
4578
308afd09d2cd
(svn r6428) -Codechange: [autoreplace] removed duplicated code to draw the info text in the autoreplace window
bjarni
parents:
4574
diff
changeset
|
1048 |
{ |
308afd09d2cd
(svn r6428) -Codechange: [autoreplace] removed duplicated code to draw the info text in the autoreplace window
bjarni
parents:
4574
diff
changeset
|
1049 |
switch (GetEngine(engine_number)->type) { |
308afd09d2cd
(svn r6428) -Codechange: [autoreplace] removed duplicated code to draw the info text in the autoreplace window
bjarni
parents:
4574
diff
changeset
|
1050 |
case VEH_Train: |
4929
5253a78cee3f
(svn r6909) - Codechange: Base the decision to draw rail engine or wagon purchase information on the rail vehicle type, not an arbitrary value.
peter1138
parents:
4928
diff
changeset
|
1051 |
if ((RailVehInfo(engine_number)->flags & RVI_WAGON) == 0) { |
4930
708801d486c6
(svn r6910) - Codechange: Supply width of area when drawing purchase info instead of using hardcoded values. (mart3p)
peter1138
parents:
4929
diff
changeset
|
1052 |
DrawTrainEnginePurchaseInfo(x, y, w, engine_number); |
4578
308afd09d2cd
(svn r6428) -Codechange: [autoreplace] removed duplicated code to draw the info text in the autoreplace window
bjarni
parents:
4574
diff
changeset
|
1053 |
} else { |
4930
708801d486c6
(svn r6910) - Codechange: Supply width of area when drawing purchase info instead of using hardcoded values. (mart3p)
peter1138
parents:
4929
diff
changeset
|
1054 |
DrawTrainWagonPurchaseInfo(x, y, w, engine_number); |
4578
308afd09d2cd
(svn r6428) -Codechange: [autoreplace] removed duplicated code to draw the info text in the autoreplace window
bjarni
parents:
4574
diff
changeset
|
1055 |
} |
308afd09d2cd
(svn r6428) -Codechange: [autoreplace] removed duplicated code to draw the info text in the autoreplace window
bjarni
parents:
4574
diff
changeset
|
1056 |
break; |
308afd09d2cd
(svn r6428) -Codechange: [autoreplace] removed duplicated code to draw the info text in the autoreplace window
bjarni
parents:
4574
diff
changeset
|
1057 |
|
4930
708801d486c6
(svn r6910) - Codechange: Supply width of area when drawing purchase info instead of using hardcoded values. (mart3p)
peter1138
parents:
4929
diff
changeset
|
1058 |
case VEH_Road: DrawRoadVehPurchaseInfo(x, y, w, engine_number); break; |
708801d486c6
(svn r6910) - Codechange: Supply width of area when drawing purchase info instead of using hardcoded values. (mart3p)
peter1138
parents:
4929
diff
changeset
|
1059 |
case VEH_Ship: DrawShipPurchaseInfo(x, y, w, engine_number); break; |
708801d486c6
(svn r6910) - Codechange: Supply width of area when drawing purchase info instead of using hardcoded values. (mart3p)
peter1138
parents:
4929
diff
changeset
|
1060 |
case VEH_Aircraft: DrawAircraftPurchaseInfo(x, y, w, engine_number); break; |
4578
308afd09d2cd
(svn r6428) -Codechange: [autoreplace] removed duplicated code to draw the info text in the autoreplace window
bjarni
parents:
4574
diff
changeset
|
1061 |
default: NOT_REACHED(); |
308afd09d2cd
(svn r6428) -Codechange: [autoreplace] removed duplicated code to draw the info text in the autoreplace window
bjarni
parents:
4574
diff
changeset
|
1062 |
} |
308afd09d2cd
(svn r6428) -Codechange: [autoreplace] removed duplicated code to draw the info text in the autoreplace window
bjarni
parents:
4574
diff
changeset
|
1063 |
} |
2639 | 1064 |
|
842 | 1065 |
static void ReplaceVehicleWndProc(Window *w, WindowEvent *e) |
1066 |
{ |
|
2639 | 1067 |
static const StringID _vehicle_type_names[] = { |
1068 |
STR_019F_TRAIN, |
|
1069 |
STR_019C_ROAD_VEHICLE, |
|
1070 |
STR_019E_SHIP, |
|
1071 |
STR_019D_AIRCRAFT |
|
1072 |
}; |
|
842 | 1073 |
|
2375
8cb43bb74d0e
(svn r2901) Refix 'replace window' with wrong string-etc. coordinates. Also clean up, and make window-title a bit more meaningful (specify vehicle type replaced)
Darkvater
parents:
2354
diff
changeset
|
1074 |
switch (e->event) { |
8cb43bb74d0e
(svn r2901) Refix 'replace window' with wrong string-etc. coordinates. Also clean up, and make window-title a bit more meaningful (specify vehicle type replaced)
Darkvater
parents:
2354
diff
changeset
|
1075 |
case WE_PAINT: { |
4574
61a17f80cfb9
(svn r6424) -Codechange: [autoreplace] removed a loop though all vehicles from each time the window is redrawn
bjarni
parents:
4569
diff
changeset
|
1076 |
Player *p = GetPlayer(_local_player); |
842 | 1077 |
int pos = w->vscroll.pos; |
2746
47c6e734556e
(svn r3291) - Codechange, Autoreplace: Replace int with EngineID and -1 with INVALID_ENGINE, as appropriate.
peter1138
parents:
2725
diff
changeset
|
1078 |
EngineID selected_id[2] = { INVALID_ENGINE, INVALID_ENGINE }; |
842 | 1079 |
int x = 1; |
1080 |
int y = 15; |
|
1081 |
int pos2 = w->vscroll2.pos; |
|
1082 |
int x2 = 1 + 228; |
|
1083 |
int y2 = 15; |
|
912
a5fb6ad68d80
(svn r1399) -Fix: Fixes for compiling with Watcom C/C++ (ie, OS/2 port). (orudge)
truelight
parents:
907
diff
changeset
|
1084 |
int sel[2]; |
4581
dc199e2d1622
(svn r6431) -Fix r6424: removed a declaration after statement in ReplaceVehicleWndProc()
bjarni
parents:
4579
diff
changeset
|
1085 |
byte i; |
912
a5fb6ad68d80
(svn r1399) -Fix: Fixes for compiling with Watcom C/C++ (ie, OS/2 port). (orudge)
truelight
parents:
907
diff
changeset
|
1086 |
sel[0] = WP(w,replaceveh_d).sel_index[0]; |
a5fb6ad68d80
(svn r1399) -Fix: Fixes for compiling with Watcom C/C++ (ie, OS/2 port). (orudge)
truelight
parents:
907
diff
changeset
|
1087 |
sel[1] = WP(w,replaceveh_d).sel_index[1]; |
867
dffd33233237
(svn r1348) -Feature: resizable windows. Read the comment in window.h to find out
truelight
parents:
845
diff
changeset
|
1088 |
|
842 | 1089 |
SetupScrollStuffForReplaceWindow(w); |
867
dffd33233237
(svn r1348) -Feature: resizable windows. Read the comment in window.h to find out
truelight
parents:
845
diff
changeset
|
1090 |
|
842 | 1091 |
selected_id[0] = WP(w,replaceveh_d).sel_engine[0]; |
1092 |
selected_id[1] = WP(w,replaceveh_d).sel_engine[1]; |
|
867
dffd33233237
(svn r1348) -Feature: resizable windows. Read the comment in window.h to find out
truelight
parents:
845
diff
changeset
|
1093 |
|
2556
c7fab9ee6335
(svn r3089) Fix possible issue with out-of-bounds array access in replace vehicle gui, and add brief commenting.
peter1138
parents:
2553
diff
changeset
|
1094 |
// Disable the "Start Replacing" button if: |
c7fab9ee6335
(svn r3089) Fix possible issue with out-of-bounds array access in replace vehicle gui, and add brief commenting.
peter1138
parents:
2553
diff
changeset
|
1095 |
// Either list is empty |
c7fab9ee6335
(svn r3089) Fix possible issue with out-of-bounds array access in replace vehicle gui, and add brief commenting.
peter1138
parents:
2553
diff
changeset
|
1096 |
// or Both lists have the same vehicle selected |
2747
7a233d41e9c4
(svn r3292) - Autoreplace: Disallow replacing to an engine type that already has a replacement set up; this stops loops being set up.
peter1138
parents:
2746
diff
changeset
|
1097 |
// or The selected replacement engine has a replacement (to prevent loops) |
2556
c7fab9ee6335
(svn r3089) Fix possible issue with out-of-bounds array access in replace vehicle gui, and add brief commenting.
peter1138
parents:
2553
diff
changeset
|
1098 |
// or The right list (new replacement) has the existing replacement vehicle selected |
4709
a81ab800c25b
(svn r6619) -Codechange: Use accessors for disabled_state.
belugas
parents:
4705
diff
changeset
|
1099 |
SetWindowWidgetDisabledState(w, 4, |
a81ab800c25b
(svn r6619) -Codechange: Use accessors for disabled_state.
belugas
parents:
4705
diff
changeset
|
1100 |
selected_id[0] == INVALID_ENGINE || |
2746
47c6e734556e
(svn r3291) - Codechange, Autoreplace: Replace int with EngineID and -1 with INVALID_ENGINE, as appropriate.
peter1138
parents:
2725
diff
changeset
|
1101 |
selected_id[1] == INVALID_ENGINE || |
2556
c7fab9ee6335
(svn r3089) Fix possible issue with out-of-bounds array access in replace vehicle gui, and add brief commenting.
peter1138
parents:
2553
diff
changeset
|
1102 |
selected_id[0] == selected_id[1] || |
2848 | 1103 |
EngineReplacementForPlayer(p, selected_id[1]) != INVALID_ENGINE || |
4709
a81ab800c25b
(svn r6619) -Codechange: Use accessors for disabled_state.
belugas
parents:
4705
diff
changeset
|
1104 |
EngineReplacementForPlayer(p, selected_id[0]) == selected_id[1]); |
867
dffd33233237
(svn r1348) -Feature: resizable windows. Read the comment in window.h to find out
truelight
parents:
845
diff
changeset
|
1105 |
|
2556
c7fab9ee6335
(svn r3089) Fix possible issue with out-of-bounds array access in replace vehicle gui, and add brief commenting.
peter1138
parents:
2553
diff
changeset
|
1106 |
// Disable the "Stop Replacing" button if: |
c7fab9ee6335
(svn r3089) Fix possible issue with out-of-bounds array access in replace vehicle gui, and add brief commenting.
peter1138
parents:
2553
diff
changeset
|
1107 |
// The left list (existing vehicle) is empty |
c7fab9ee6335
(svn r3089) Fix possible issue with out-of-bounds array access in replace vehicle gui, and add brief commenting.
peter1138
parents:
2553
diff
changeset
|
1108 |
// or The selected vehicle has no replacement set up |
4709
a81ab800c25b
(svn r6619) -Codechange: Use accessors for disabled_state.
belugas
parents:
4705
diff
changeset
|
1109 |
SetWindowWidgetDisabledState(w, 6, |
a81ab800c25b
(svn r6619) -Codechange: Use accessors for disabled_state.
belugas
parents:
4705
diff
changeset
|
1110 |
selected_id[0] == INVALID_ENGINE || |
a81ab800c25b
(svn r6619) -Codechange: Use accessors for disabled_state.
belugas
parents:
4705
diff
changeset
|
1111 |
!EngineHasReplacementForPlayer(p, selected_id[0])); |
867
dffd33233237
(svn r1348) -Feature: resizable windows. Read the comment in window.h to find out
truelight
parents:
845
diff
changeset
|
1112 |
|
842 | 1113 |
// now the actual drawing of the window itself takes place |
2375
8cb43bb74d0e
(svn r2901) Refix 'replace window' with wrong string-etc. coordinates. Also clean up, and make window-title a bit more meaningful (specify vehicle type replaced)
Darkvater
parents:
2354
diff
changeset
|
1114 |
SetDParam(0, _vehicle_type_names[WP(w, replaceveh_d).vehicletype - VEH_Train]); |
2617
03120a0b1e39
(svn r3155) -Feature: [autoreplace] autoreplace can now remove cars from too long trains
bjarni
parents:
2611
diff
changeset
|
1115 |
|
03120a0b1e39
(svn r3155) -Feature: [autoreplace] autoreplace can now remove cars from too long trains
bjarni
parents:
2611
diff
changeset
|
1116 |
if (WP(w, replaceveh_d).vehicletype == VEH_Train) { |
03120a0b1e39
(svn r3155) -Feature: [autoreplace] autoreplace can now remove cars from too long trains
bjarni
parents:
2611
diff
changeset
|
1117 |
// set on/off for renew_keep_length |
03120a0b1e39
(svn r3155) -Feature: [autoreplace] autoreplace can now remove cars from too long trains
bjarni
parents:
2611
diff
changeset
|
1118 |
SetDParam(1, p->renew_keep_length ? STR_CONFIG_PATCHES_ON : STR_CONFIG_PATCHES_OFF); |
2970
3b9380f10074
(svn r3535) -Feature: [autoreplace] allow autoreplacing of train wagons
bjarni
parents:
2965
diff
changeset
|
1119 |
|
3b9380f10074
(svn r3535) -Feature: [autoreplace] allow autoreplacing of train wagons
bjarni
parents:
2965
diff
changeset
|
1120 |
// set wagon/engine button |
3b9380f10074
(svn r3535) -Feature: [autoreplace] allow autoreplacing of train wagons
bjarni
parents:
2965
diff
changeset
|
1121 |
SetDParam(2, WP(w, replaceveh_d).wagon_btnstate ? STR_ENGINES : STR_WAGONS); |
2617
03120a0b1e39
(svn r3155) -Feature: [autoreplace] autoreplace can now remove cars from too long trains
bjarni
parents:
2611
diff
changeset
|
1122 |
} |
03120a0b1e39
(svn r3155) -Feature: [autoreplace] autoreplace can now remove cars from too long trains
bjarni
parents:
2611
diff
changeset
|
1123 |
|
842 | 1124 |
DrawWindowWidgets(w); |
867
dffd33233237
(svn r1348) -Feature: resizable windows. Read the comment in window.h to find out
truelight
parents:
845
diff
changeset
|
1125 |
|
842 | 1126 |
// sets up the string for the vehicle that is being replaced to |
2746
47c6e734556e
(svn r3291) - Codechange, Autoreplace: Replace int with EngineID and -1 with INVALID_ENGINE, as appropriate.
peter1138
parents:
2725
diff
changeset
|
1127 |
if (selected_id[0] != INVALID_ENGINE) { |
2848 | 1128 |
if (!EngineHasReplacementForPlayer(p, selected_id[0])) { |
842 | 1129 |
SetDParam(0, STR_NOT_REPLACING); |
2639 | 1130 |
} else { |
2848 | 1131 |
SetDParam(0, GetCustomEngineName(EngineReplacementForPlayer(p, selected_id[0]))); |
2639 | 1132 |
} |
842 | 1133 |
} else { |
1134 |
SetDParam(0, STR_NOT_REPLACING_VEHICLE_SELECTED); |
|
1135 |
} |
|
867
dffd33233237
(svn r1348) -Feature: resizable windows. Read the comment in window.h to find out
truelight
parents:
845
diff
changeset
|
1136 |
|
4930
708801d486c6
(svn r6910) - Codechange: Supply width of area when drawing purchase info instead of using hardcoded values. (mart3p)
peter1138
parents:
4929
diff
changeset
|
1137 |
DrawString(145, w->widget[5].top + 1, STR_02BD, 0x10); |
867
dffd33233237
(svn r1348) -Feature: resizable windows. Read the comment in window.h to find out
truelight
parents:
845
diff
changeset
|
1138 |
|
4434
a08cb4b5c179
(svn r6204) -Cleanup: replace non-indentation with spaces; like '}<TAB>else {' -> '} else {', tabs between code and comment, etc.
rubidium
parents:
4432
diff
changeset
|
1139 |
/* now we draw the two arrays according to what we just counted */ |
842 | 1140 |
DrawEngineArrayInReplaceWindow(w, x, y, x2, y2, pos, pos2, sel[0], sel[1], selected_id[0], selected_id[1]); |
867
dffd33233237
(svn r1348) -Feature: resizable windows. Read the comment in window.h to find out
truelight
parents:
845
diff
changeset
|
1141 |
|
842 | 1142 |
WP(w,replaceveh_d).sel_engine[0] = selected_id[0]; |
1143 |
WP(w,replaceveh_d).sel_engine[1] = selected_id[1]; |
|
1144 |
/* now we draw the info about the vehicles we selected */ |
|
4578
308afd09d2cd
(svn r6428) -Codechange: [autoreplace] removed duplicated code to draw the info text in the autoreplace window
bjarni
parents:
4574
diff
changeset
|
1145 |
for (i = 0 ; i < 2 ; i++) { |
308afd09d2cd
(svn r6428) -Codechange: [autoreplace] removed duplicated code to draw the info text in the autoreplace window
bjarni
parents:
4574
diff
changeset
|
1146 |
if (selected_id[i] != INVALID_ENGINE) { |
4930
708801d486c6
(svn r6910) - Codechange: Supply width of area when drawing purchase info instead of using hardcoded values. (mart3p)
peter1138
parents:
4929
diff
changeset
|
1147 |
const Widget *wi = &w->widget[i == 0 ? 3 : 11]; |
708801d486c6
(svn r6910) - Codechange: Supply width of area when drawing purchase info instead of using hardcoded values. (mart3p)
peter1138
parents:
4929
diff
changeset
|
1148 |
DrawVehiclePurchaseInfo(wi->left + 2 , wi->top + 1, wi->right - wi->left - 2, selected_id[i]); |
4578
308afd09d2cd
(svn r6428) -Codechange: [autoreplace] removed duplicated code to draw the info text in the autoreplace window
bjarni
parents:
4574
diff
changeset
|
1149 |
} |
842 | 1150 |
} |
1462
a81f217b9cb6
(svn r1966) - Fix: [ 1110437 ] Replace Vehicles GUI gets random clicks. Breaks people! Don't forget the breaks in switch() statements!!
Darkvater
parents:
1363
diff
changeset
|
1151 |
} break; // end of paint |
842 | 1152 |
|
1153 |
case WE_CLICK: { |
|
2375
8cb43bb74d0e
(svn r2901) Refix 'replace window' with wrong string-etc. coordinates. Also clean up, and make window-title a bit more meaningful (specify vehicle type replaced)
Darkvater
parents:
2354
diff
changeset
|
1154 |
// these 3 variables is used if any of the lists is clicked |
8cb43bb74d0e
(svn r2901) Refix 'replace window' with wrong string-etc. coordinates. Also clean up, and make window-title a bit more meaningful (specify vehicle type replaced)
Darkvater
parents:
2354
diff
changeset
|
1155 |
uint16 click_scroll_pos = w->vscroll2.pos; |
8cb43bb74d0e
(svn r2901) Refix 'replace window' with wrong string-etc. coordinates. Also clean up, and make window-title a bit more meaningful (specify vehicle type replaced)
Darkvater
parents:
2354
diff
changeset
|
1156 |
uint16 click_scroll_cap = w->vscroll2.cap; |
8cb43bb74d0e
(svn r2901) Refix 'replace window' with wrong string-etc. coordinates. Also clean up, and make window-title a bit more meaningful (specify vehicle type replaced)
Darkvater
parents:
2354
diff
changeset
|
1157 |
byte click_side = 1; |
8cb43bb74d0e
(svn r2901) Refix 'replace window' with wrong string-etc. coordinates. Also clean up, and make window-title a bit more meaningful (specify vehicle type replaced)
Darkvater
parents:
2354
diff
changeset
|
1158 |
|
4634
07699ac2bf37
(svn r6499) -Codechange: Finally, got "byte event" outside of the union WindowEvent, which is now a struct
belugas
parents:
4581
diff
changeset
|
1159 |
switch (e->we.click.widget) { |
2989 | 1160 |
case 12: |
1161 |
WP(w, replaceveh_d).wagon_btnstate = !(WP(w, replaceveh_d).wagon_btnstate); |
|
1162 |
SetWindowDirty(w); |
|
1163 |
break; |
|
1164 |
||
1165 |
case 14: |
|
1166 |
case 15: /* Railtype selection dropdown menu */ |
|
2448
1a07657c9f9a
(svn r2974) -Fix: Drag and drop selection on drop down boxes didn't select correct item when some items were hidden.
peter1138
parents:
2436
diff
changeset
|
1167 |
ShowDropDownMenu(w, _rail_types_list, _railtype_selected_in_replace_gui, 15, 0, ~GetPlayer(_local_player)->avail_railtypes); |
869 | 1168 |
break; |
2989 | 1169 |
|
1170 |
case 17: /* toggle renew_keep_length */ |
|
4661
89c3cbba9846
(svn r6544) - Codechange: Rename CmdReplaceVehicle to CmdSetAutoReplace, to reflect what it does.
peter1138
parents:
4643
diff
changeset
|
1171 |
DoCommandP(0, 5, GetPlayer(_local_player)->renew_keep_length ? 0 : 1, NULL, CMD_SET_AUTOREPLACE); |
2989 | 1172 |
break; |
1173 |
||
2293
b48192aec903
(svn r2817) -Codechange: [autoreplace]: moved autoreplace and autorenew to serverside
bjarni
parents:
2288
diff
changeset
|
1174 |
case 4: { /* Start replacing */ |
b48192aec903
(svn r2817) -Codechange: [autoreplace]: moved autoreplace and autorenew to serverside
bjarni
parents:
2288
diff
changeset
|
1175 |
EngineID veh_from = WP(w, replaceveh_d).sel_engine[0]; |
b48192aec903
(svn r2817) -Codechange: [autoreplace]: moved autoreplace and autorenew to serverside
bjarni
parents:
2288
diff
changeset
|
1176 |
EngineID veh_to = WP(w, replaceveh_d).sel_engine[1]; |
4661
89c3cbba9846
(svn r6544) - Codechange: Rename CmdReplaceVehicle to CmdSetAutoReplace, to reflect what it does.
peter1138
parents:
4643
diff
changeset
|
1177 |
DoCommandP(0, 3, veh_from + (veh_to << 16), NULL, CMD_SET_AUTOREPLACE); |
842 | 1178 |
break; |
1179 |
} |
|
867
dffd33233237
(svn r1348) -Feature: resizable windows. Read the comment in window.h to find out
truelight
parents:
845
diff
changeset
|
1180 |
|
2293
b48192aec903
(svn r2817) -Codechange: [autoreplace]: moved autoreplace and autorenew to serverside
bjarni
parents:
2288
diff
changeset
|
1181 |
case 6: { /* Stop replacing */ |
b48192aec903
(svn r2817) -Codechange: [autoreplace]: moved autoreplace and autorenew to serverside
bjarni
parents:
2288
diff
changeset
|
1182 |
EngineID veh_from = WP(w, replaceveh_d).sel_engine[0]; |
4661
89c3cbba9846
(svn r6544) - Codechange: Rename CmdReplaceVehicle to CmdSetAutoReplace, to reflect what it does.
peter1138
parents:
4643
diff
changeset
|
1183 |
DoCommandP(0, 3, veh_from + (INVALID_ENGINE << 16), NULL, CMD_SET_AUTOREPLACE); |
842 | 1184 |
break; |
1185 |
} |
|
867
dffd33233237
(svn r1348) -Feature: resizable windows. Read the comment in window.h to find out
truelight
parents:
845
diff
changeset
|
1186 |
|
dffd33233237
(svn r1348) -Feature: resizable windows. Read the comment in window.h to find out
truelight
parents:
845
diff
changeset
|
1187 |
case 7: |
842 | 1188 |
// sets up that the left one was clicked. The default values are for the right one (9) |
1189 |
// this way, the code for 9 handles both sides |
|
1190 |
click_scroll_pos = w->vscroll.pos; |
|
1191 |
click_scroll_cap = w->vscroll.cap; |
|
1192 |
click_side = 0; |
|
2989 | 1193 |
/* FALL THROUGH */ |
1194 |
||
842 | 1195 |
case 9: { |
4634
07699ac2bf37
(svn r6499) -Codechange: Finally, got "byte event" outside of the union WindowEvent, which is now a struct
belugas
parents:
4581
diff
changeset
|
1196 |
uint i = (e->we.click.pt.y - 14) / w->resize.step_height; |
842 | 1197 |
if (i < click_scroll_cap) { |
1198 |
WP(w,replaceveh_d).sel_index[click_side] = i + click_scroll_pos; |
|
1199 |
SetWindowDirty(w); |
|
1200 |
} |
|
2989 | 1201 |
break; |
1202 |
} |
|
842 | 1203 |
} |
2989 | 1204 |
break; |
1205 |
} |
|
867
dffd33233237
(svn r1348) -Feature: resizable windows. Read the comment in window.h to find out
truelight
parents:
845
diff
changeset
|
1206 |
|
2989 | 1207 |
case WE_DROPDOWN_SELECT: /* we have selected a dropdown item in the list */ |
4634
07699ac2bf37
(svn r6499) -Codechange: Finally, got "byte event" outside of the union WindowEvent, which is now a struct
belugas
parents:
4581
diff
changeset
|
1208 |
_railtype_selected_in_replace_gui = e->we.dropdown.index; |
3414
d728e3793041
(svn r4229) [elrail & autoreplace] Always show compatible rail vehicles in the left list, and only the selected rail type in the right list, to
peter1138
parents:
3393
diff
changeset
|
1209 |
/* Reset scrollbar positions */ |
d728e3793041
(svn r4229) [elrail & autoreplace] Always show compatible rail vehicles in the left list, and only the selected rail type in the right list, to
peter1138
parents:
3393
diff
changeset
|
1210 |
w->vscroll.pos = 0; |
d728e3793041
(svn r4229) [elrail & autoreplace] Always show compatible rail vehicles in the left list, and only the selected rail type in the right list, to
peter1138
parents:
3393
diff
changeset
|
1211 |
w->vscroll2.pos = 0; |
842 | 1212 |
SetWindowDirty(w); |
2989 | 1213 |
break; |
867
dffd33233237
(svn r1348) -Feature: resizable windows. Read the comment in window.h to find out
truelight
parents:
845
diff
changeset
|
1214 |
|
2989 | 1215 |
case WE_RESIZE: |
4634
07699ac2bf37
(svn r6499) -Codechange: Finally, got "byte event" outside of the union WindowEvent, which is now a struct
belugas
parents:
4581
diff
changeset
|
1216 |
w->vscroll.cap += e->we.sizing.diff.y / (int)w->resize.step_height; |
07699ac2bf37
(svn r6499) -Codechange: Finally, got "byte event" outside of the union WindowEvent, which is now a struct
belugas
parents:
4581
diff
changeset
|
1217 |
w->vscroll2.cap += e->we.sizing.diff.y / (int)w->resize.step_height; |
867
dffd33233237
(svn r1348) -Feature: resizable windows. Read the comment in window.h to find out
truelight
parents:
845
diff
changeset
|
1218 |
|
4547
d37c2d172ad4
(svn r6379) -Codechange: cast 'remove babel' on widget's unkA and rename it to 'data'.
Darkvater
parents:
4546
diff
changeset
|
1219 |
w->widget[7].data = (w->vscroll.cap << 8) + 1; |
d37c2d172ad4
(svn r6379) -Codechange: cast 'remove babel' on widget's unkA and rename it to 'data'.
Darkvater
parents:
4546
diff
changeset
|
1220 |
w->widget[9].data = (w->vscroll2.cap << 8) + 1; |
2989 | 1221 |
break; |
842 | 1222 |
} |
1223 |
} |
|
1224 |
||
1225 |
static const Widget _replace_rail_vehicle_widgets[] = { |
|
1465
e595fff78af2
(svn r1969) - GUI: Replace vehicle dropdown menu now looks a bit more comform the ones used throughout the game.
Darkvater
parents:
1462
diff
changeset
|
1226 |
{ WWT_CLOSEBOX, RESIZE_NONE, 14, 0, 10, 0, 13, STR_00C5, STR_018B_CLOSE_WINDOW}, |
869 | 1227 |
{ WWT_CAPTION, RESIZE_NONE, 14, 11, 443, 0, 13, STR_REPLACE_VEHICLES_WHITE, STR_018C_WINDOW_TITLE_DRAG_THIS}, |
2375
8cb43bb74d0e
(svn r2901) Refix 'replace window' with wrong string-etc. coordinates. Also clean up, and make window-title a bit more meaningful (specify vehicle type replaced)
Darkvater
parents:
2354
diff
changeset
|
1228 |
{ WWT_STICKYBOX, RESIZE_NONE, 14, 444, 455, 0, 13, STR_NULL, STR_STICKY_BUTTON}, |
4938
0447845fd1b3
(svn r6925) -Codechange: Be more strict with widget distinctions. WWT_PANEL is only plain panel,
Darkvater
parents:
4933
diff
changeset
|
1229 |
{ WWT_PANEL, RESIZE_TB, 14, 0, 227, 126, 227, 0x0, STR_NULL}, |
4931
c25335d7e99c
(svn r6911) - Codechange: Add extra space to all purchase windows (and the replace window) to allow room for more text. (mart3p)
peter1138
parents:
4930
diff
changeset
|
1230 |
{ WWT_PUSHTXTBTN, RESIZE_TB, 14, 0, 138, 240, 251, STR_REPLACE_VEHICLES_START, STR_REPLACE_HELP_START_BUTTON}, |
4938
0447845fd1b3
(svn r6925) -Codechange: Be more strict with widget distinctions. WWT_PANEL is only plain panel,
Darkvater
parents:
4933
diff
changeset
|
1231 |
{ WWT_PANEL, RESIZE_TB, 14, 139, 316, 228, 239, 0x0, STR_REPLACE_HELP_REPLACE_INFO_TAB}, |
4931
c25335d7e99c
(svn r6911) - Codechange: Add extra space to all purchase windows (and the replace window) to allow room for more text. (mart3p)
peter1138
parents:
4930
diff
changeset
|
1232 |
{ WWT_PUSHTXTBTN, RESIZE_TB, 14, 306, 443, 240, 251, STR_REPLACE_VEHICLES_STOP, STR_REPLACE_HELP_STOP_BUTTON}, |
1465
e595fff78af2
(svn r1969) - GUI: Replace vehicle dropdown menu now looks a bit more comform the ones used throughout the game.
Darkvater
parents:
1462
diff
changeset
|
1233 |
{ WWT_MATRIX, RESIZE_BOTTOM, 14, 0, 215, 14, 125, 0x801, STR_REPLACE_HELP_LEFT_ARRAY}, |
2375
8cb43bb74d0e
(svn r2901) Refix 'replace window' with wrong string-etc. coordinates. Also clean up, and make window-title a bit more meaningful (specify vehicle type replaced)
Darkvater
parents:
2354
diff
changeset
|
1234 |
{ WWT_SCROLLBAR, RESIZE_BOTTOM, 14, 216, 227, 14, 125, STR_NULL, STR_0190_SCROLL_BAR_SCROLLS_LIST}, |
1465
e595fff78af2
(svn r1969) - GUI: Replace vehicle dropdown menu now looks a bit more comform the ones used throughout the game.
Darkvater
parents:
1462
diff
changeset
|
1235 |
{ WWT_MATRIX, RESIZE_BOTTOM, 14, 228, 443, 14, 125, 0x801, STR_REPLACE_HELP_RIGHT_ARRAY}, |
2375
8cb43bb74d0e
(svn r2901) Refix 'replace window' with wrong string-etc. coordinates. Also clean up, and make window-title a bit more meaningful (specify vehicle type replaced)
Darkvater
parents:
2354
diff
changeset
|
1236 |
{ WWT_SCROLL2BAR, RESIZE_BOTTOM, 14, 444, 455, 14, 125, STR_NULL, STR_0190_SCROLL_BAR_SCROLLS_LIST}, |
4938
0447845fd1b3
(svn r6925) -Codechange: Be more strict with widget distinctions. WWT_PANEL is only plain panel,
Darkvater
parents:
4933
diff
changeset
|
1237 |
{ WWT_PANEL, RESIZE_TB, 14, 228, 455, 126, 227, 0x0, STR_NULL}, |
869 | 1238 |
// train specific stuff |
4931
c25335d7e99c
(svn r6911) - Codechange: Add extra space to all purchase windows (and the replace window) to allow room for more text. (mart3p)
peter1138
parents:
4930
diff
changeset
|
1239 |
{ WWT_PUSHTXTBTN, RESIZE_TB, 14, 0, 138, 228, 239, STR_REPLACE_ENGINE_WAGON_SELECT, STR_REPLACE_ENGINE_WAGON_SELECT_HELP}, // widget 12 |
4938
0447845fd1b3
(svn r6925) -Codechange: Be more strict with widget distinctions. WWT_PANEL is only plain panel,
Darkvater
parents:
4933
diff
changeset
|
1240 |
{ WWT_PANEL, RESIZE_TB, 14, 139, 153, 240, 251, 0x0, STR_NULL}, |
0447845fd1b3
(svn r6925) -Codechange: Be more strict with widget distinctions. WWT_PANEL is only plain panel,
Darkvater
parents:
4933
diff
changeset
|
1241 |
{ WWT_PANEL, RESIZE_TB, 14, 154, 277, 240, 251, 0x0, STR_REPLACE_HELP_RAILTYPE}, |
4931
c25335d7e99c
(svn r6911) - Codechange: Add extra space to all purchase windows (and the replace window) to allow room for more text. (mart3p)
peter1138
parents:
4930
diff
changeset
|
1242 |
{ WWT_TEXTBTN, RESIZE_TB, 14, 278, 289, 240, 251, STR_0225, STR_REPLACE_HELP_RAILTYPE}, |
4938
0447845fd1b3
(svn r6925) -Codechange: Be more strict with widget distinctions. WWT_PANEL is only plain panel,
Darkvater
parents:
4933
diff
changeset
|
1243 |
{ WWT_PANEL, RESIZE_TB, 14, 290, 305, 240, 251, 0x0, STR_NULL}, |
4931
c25335d7e99c
(svn r6911) - Codechange: Add extra space to all purchase windows (and the replace window) to allow room for more text. (mart3p)
peter1138
parents:
4930
diff
changeset
|
1244 |
{ WWT_PUSHTXTBTN, RESIZE_TB, 14, 317, 455, 228, 239, STR_REPLACE_REMOVE_WAGON, STR_REPLACE_REMOVE_WAGON_HELP}, |
869 | 1245 |
// end of train specific stuff |
4931
c25335d7e99c
(svn r6911) - Codechange: Add extra space to all purchase windows (and the replace window) to allow room for more text. (mart3p)
peter1138
parents:
4930
diff
changeset
|
1246 |
{ WWT_RESIZEBOX, RESIZE_TB, 14, 444, 455, 240, 251, STR_NULL, STR_RESIZE_BUTTON}, |
842 | 1247 |
{ WIDGETS_END}, |
1248 |
}; |
|
1249 |
||
1250 |
static const Widget _replace_road_vehicle_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:
4280
diff
changeset
|
1251 |
{ WWT_CLOSEBOX, RESIZE_NONE, 14, 0, 10, 0, 13, STR_00C5, STR_018B_CLOSE_WINDOW}, |
1465
e595fff78af2
(svn r1969) - GUI: Replace vehicle dropdown menu now looks a bit more comform the ones used throughout the game.
Darkvater
parents:
1462
diff
changeset
|
1252 |
{ WWT_CAPTION, RESIZE_NONE, 14, 11, 443, 0, 13, STR_REPLACE_VEHICLES_WHITE, STR_018C_WINDOW_TITLE_DRAG_THIS}, |
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:
4280
diff
changeset
|
1253 |
{ WWT_STICKYBOX, RESIZE_NONE, 14, 444, 455, 0, 13, STR_NULL, STR_STICKY_BUTTON}, |
4938
0447845fd1b3
(svn r6925) -Codechange: Be more strict with widget distinctions. WWT_PANEL is only plain panel,
Darkvater
parents:
4933
diff
changeset
|
1254 |
{ WWT_PANEL, RESIZE_TB, 14, 0, 227, 126, 217, 0x0, STR_NULL}, |
4931
c25335d7e99c
(svn r6911) - Codechange: Add extra space to all purchase windows (and the replace window) to allow room for more text. (mart3p)
peter1138
parents:
4930
diff
changeset
|
1255 |
{ WWT_PUSHTXTBTN, RESIZE_TB, 14, 0, 138, 218, 229, STR_REPLACE_VEHICLES_START, STR_REPLACE_HELP_START_BUTTON}, |
4938
0447845fd1b3
(svn r6925) -Codechange: Be more strict with widget distinctions. WWT_PANEL is only plain panel,
Darkvater
parents:
4933
diff
changeset
|
1256 |
{ WWT_PANEL, RESIZE_TB, 14, 139, 305, 218, 229, 0x0, STR_REPLACE_HELP_REPLACE_INFO_TAB}, |
4931
c25335d7e99c
(svn r6911) - Codechange: Add extra space to all purchase windows (and the replace window) to allow room for more text. (mart3p)
peter1138
parents:
4930
diff
changeset
|
1257 |
{ WWT_PUSHTXTBTN, RESIZE_TB, 14, 306, 443, 218, 229, STR_REPLACE_VEHICLES_STOP, STR_REPLACE_HELP_STOP_BUTTON}, |
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:
4280
diff
changeset
|
1258 |
{ WWT_MATRIX, RESIZE_BOTTOM, 14, 0, 215, 14, 125, 0x801, STR_REPLACE_HELP_LEFT_ARRAY}, |
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:
4280
diff
changeset
|
1259 |
{ WWT_SCROLLBAR, RESIZE_BOTTOM, 14, 216, 227, 14, 125, STR_NULL, 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:
4280
diff
changeset
|
1260 |
{ WWT_MATRIX, RESIZE_BOTTOM, 14, 228, 443, 14, 125, 0x801, STR_REPLACE_HELP_RIGHT_ARRAY}, |
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:
4280
diff
changeset
|
1261 |
{ WWT_SCROLL2BAR, RESIZE_BOTTOM, 14, 444, 455, 14, 125, STR_NULL, STR_0190_SCROLL_BAR_SCROLLS_LIST}, |
4938
0447845fd1b3
(svn r6925) -Codechange: Be more strict with widget distinctions. WWT_PANEL is only plain panel,
Darkvater
parents:
4933
diff
changeset
|
1262 |
{ WWT_PANEL, RESIZE_TB, 14, 228, 455, 126, 217, 0x0, STR_NULL}, |
4931
c25335d7e99c
(svn r6911) - Codechange: Add extra space to all purchase windows (and the replace window) to allow room for more text. (mart3p)
peter1138
parents:
4930
diff
changeset
|
1263 |
{ WWT_RESIZEBOX, RESIZE_TB, 14, 444, 455, 218, 229, STR_NULL, STR_RESIZE_BUTTON}, |
842 | 1264 |
{ WIDGETS_END}, |
1265 |
}; |
|
1266 |
||
1267 |
static const Widget _replace_ship_aircraft_vehicle_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:
4280
diff
changeset
|
1268 |
{ WWT_CLOSEBOX, RESIZE_NONE, 14, 0, 10, 0, 13, STR_00C5, STR_018B_CLOSE_WINDOW}, |
1465
e595fff78af2
(svn r1969) - GUI: Replace vehicle dropdown menu now looks a bit more comform the ones used throughout the game.
Darkvater
parents:
1462
diff
changeset
|
1269 |
{ WWT_CAPTION, RESIZE_NONE, 14, 11, 443, 0, 13, STR_REPLACE_VEHICLES_WHITE, STR_018C_WINDOW_TITLE_DRAG_THIS}, |
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:
4280
diff
changeset
|
1270 |
{ WWT_STICKYBOX, RESIZE_NONE, 14, 444, 455, 0, 13, STR_NULL, STR_STICKY_BUTTON}, |
4938
0447845fd1b3
(svn r6925) -Codechange: Be more strict with widget distinctions. WWT_PANEL is only plain panel,
Darkvater
parents:
4933
diff
changeset
|
1271 |
{ WWT_PANEL, RESIZE_TB, 14, 0, 227, 110, 201, 0x0, STR_NULL}, |
4931
c25335d7e99c
(svn r6911) - Codechange: Add extra space to all purchase windows (and the replace window) to allow room for more text. (mart3p)
peter1138
parents:
4930
diff
changeset
|
1272 |
{ WWT_PUSHTXTBTN, RESIZE_TB, 14, 0, 138, 202, 213, STR_REPLACE_VEHICLES_START, STR_REPLACE_HELP_START_BUTTON}, |
4938
0447845fd1b3
(svn r6925) -Codechange: Be more strict with widget distinctions. WWT_PANEL is only plain panel,
Darkvater
parents:
4933
diff
changeset
|
1273 |
{ WWT_PANEL, RESIZE_TB, 14, 139, 305, 202, 213, 0x0, STR_REPLACE_HELP_REPLACE_INFO_TAB}, |
4931
c25335d7e99c
(svn r6911) - Codechange: Add extra space to all purchase windows (and the replace window) to allow room for more text. (mart3p)
peter1138
parents:
4930
diff
changeset
|
1274 |
{ WWT_PUSHTXTBTN, RESIZE_TB, 14, 306, 443, 202, 213, STR_REPLACE_VEHICLES_STOP, STR_REPLACE_HELP_STOP_BUTTON}, |
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:
4280
diff
changeset
|
1275 |
{ WWT_MATRIX, RESIZE_BOTTOM, 14, 0, 215, 14, 109, 0x401, STR_REPLACE_HELP_LEFT_ARRAY}, |
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:
4280
diff
changeset
|
1276 |
{ WWT_SCROLLBAR, RESIZE_BOTTOM, 14, 216, 227, 14, 109, STR_NULL, 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:
4280
diff
changeset
|
1277 |
{ WWT_MATRIX, RESIZE_BOTTOM, 14, 228, 443, 14, 109, 0x401, STR_REPLACE_HELP_RIGHT_ARRAY}, |
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:
4280
diff
changeset
|
1278 |
{ WWT_SCROLL2BAR, RESIZE_BOTTOM, 14, 444, 455, 14, 109, STR_NULL, STR_0190_SCROLL_BAR_SCROLLS_LIST}, |
4938
0447845fd1b3
(svn r6925) -Codechange: Be more strict with widget distinctions. WWT_PANEL is only plain panel,
Darkvater
parents:
4933
diff
changeset
|
1279 |
{ WWT_PANEL, RESIZE_TB, 14, 228, 455, 110, 201, 0x0, STR_NULL}, |
4931
c25335d7e99c
(svn r6911) - Codechange: Add extra space to all purchase windows (and the replace window) to allow room for more text. (mart3p)
peter1138
parents:
4930
diff
changeset
|
1280 |
{ WWT_RESIZEBOX, RESIZE_TB, 14, 444, 455, 202, 213, STR_NULL, STR_RESIZE_BUTTON}, |
842 | 1281 |
{ WIDGETS_END}, |
1282 |
}; |
|
1283 |
||
1284 |
static const WindowDesc _replace_rail_vehicle_desc = { |
|
5070
7f5b13b7e728
(svn r7128) -Codechange: Replace magic numbers by magic enums (windowdesc positioning WDP_AUTO = -1)
Darkvater
parents:
5005
diff
changeset
|
1285 |
WDP_AUTO, WDP_AUTO, 456, 252, |
842 | 1286 |
WC_REPLACE_VEHICLE,0, |
867
dffd33233237
(svn r1348) -Feature: resizable windows. Read the comment in window.h to find out
truelight
parents:
845
diff
changeset
|
1287 |
WDF_STD_TOOLTIPS | WDF_STD_BTN | WDF_DEF_WIDGET | WDF_UNCLICK_BUTTONS | WDF_STICKY_BUTTON | WDF_RESIZABLE, |
842 | 1288 |
_replace_rail_vehicle_widgets, |
1289 |
ReplaceVehicleWndProc |
|
1290 |
}; |
|
1291 |
||
1292 |
static const WindowDesc _replace_road_vehicle_desc = { |
|
5070
7f5b13b7e728
(svn r7128) -Codechange: Replace magic numbers by magic enums (windowdesc positioning WDP_AUTO = -1)
Darkvater
parents:
5005
diff
changeset
|
1293 |
WDP_AUTO, WDP_AUTO, 456, 230, |
842 | 1294 |
WC_REPLACE_VEHICLE,0, |
867
dffd33233237
(svn r1348) -Feature: resizable windows. Read the comment in window.h to find out
truelight
parents:
845
diff
changeset
|
1295 |
WDF_STD_TOOLTIPS | WDF_STD_BTN | WDF_DEF_WIDGET | WDF_UNCLICK_BUTTONS | WDF_STICKY_BUTTON | WDF_RESIZABLE, |
842 | 1296 |
_replace_road_vehicle_widgets, |
1297 |
ReplaceVehicleWndProc |
|
1298 |
}; |
|
1299 |
||
1300 |
static const WindowDesc _replace_ship_aircraft_vehicle_desc = { |
|
5070
7f5b13b7e728
(svn r7128) -Codechange: Replace magic numbers by magic enums (windowdesc positioning WDP_AUTO = -1)
Darkvater
parents:
5005
diff
changeset
|
1301 |
WDP_AUTO, WDP_AUTO, 456, 214, |
842 | 1302 |
WC_REPLACE_VEHICLE,0, |
867
dffd33233237
(svn r1348) -Feature: resizable windows. Read the comment in window.h to find out
truelight
parents:
845
diff
changeset
|
1303 |
WDF_STD_TOOLTIPS | WDF_STD_BTN | WDF_DEF_WIDGET | WDF_UNCLICK_BUTTONS | WDF_STICKY_BUTTON | WDF_RESIZABLE, |
842 | 1304 |
_replace_ship_aircraft_vehicle_widgets, |
1305 |
ReplaceVehicleWndProc |
|
1306 |
}; |
|
1307 |
||
1308 |
||
4542
f42ecc669275
(svn r6372) -Codechange: static, unneeded decleration in headers, superfluous header includes
Darkvater
parents:
4541
diff
changeset
|
1309 |
static void ShowReplaceVehicleWindow(byte vehicletype) |
842 | 1310 |
{ |
1311 |
Window *w; |
|
867
dffd33233237
(svn r1348) -Feature: resizable windows. Read the comment in window.h to find out
truelight
parents:
845
diff
changeset
|
1312 |
|
2549 | 1313 |
DeleteWindowById(WC_REPLACE_VEHICLE, vehicletype); |
867
dffd33233237
(svn r1348) -Feature: resizable windows. Read the comment in window.h to find out
truelight
parents:
845
diff
changeset
|
1314 |
|
842 | 1315 |
switch (vehicletype) { |
1316 |
case VEH_Train: |
|
1317 |
w = AllocateWindowDescFront(&_replace_rail_vehicle_desc, vehicletype); |
|
1318 |
w->vscroll.cap = 8; |
|
867
dffd33233237
(svn r1348) -Feature: resizable windows. Read the comment in window.h to find out
truelight
parents:
845
diff
changeset
|
1319 |
w->resize.step_height = 14; |
2970
3b9380f10074
(svn r3535) -Feature: [autoreplace] allow autoreplacing of train wagons
bjarni
parents:
2965
diff
changeset
|
1320 |
WP(w, replaceveh_d).wagon_btnstate = true; |
842 | 1321 |
break; |
1322 |
case VEH_Road: |
|
1323 |
w = AllocateWindowDescFront(&_replace_road_vehicle_desc, vehicletype); |
|
1324 |
w->vscroll.cap = 8; |
|
867
dffd33233237
(svn r1348) -Feature: resizable windows. Read the comment in window.h to find out
truelight
parents:
845
diff
changeset
|
1325 |
w->resize.step_height = 14; |
842 | 1326 |
break; |
2549 | 1327 |
case VEH_Ship: |
1328 |
case VEH_Aircraft: |
|
842 | 1329 |
w = AllocateWindowDescFront(&_replace_ship_aircraft_vehicle_desc, vehicletype); |
1330 |
w->vscroll.cap = 4; |
|
867
dffd33233237
(svn r1348) -Feature: resizable windows. Read the comment in window.h to find out
truelight
parents:
845
diff
changeset
|
1331 |
w->resize.step_height = 24; |
842 | 1332 |
break; |
845
4960e265d25b
(svn r1326) fixed compiler warnings in vehicle_gui.c and widget.c
bjarni
parents:
843
diff
changeset
|
1333 |
default: return; |
842 | 1334 |
} |
4542
f42ecc669275
(svn r6372) -Codechange: static, unneeded decleration in headers, superfluous header includes
Darkvater
parents:
4541
diff
changeset
|
1335 |
|
869 | 1336 |
w->caption_color = _local_player; |
4542
f42ecc669275
(svn r6372) -Codechange: static, unneeded decleration in headers, superfluous header includes
Darkvater
parents:
4541
diff
changeset
|
1337 |
WP(w, replaceveh_d).vehicletype = vehicletype; |
842 | 1338 |
w->vscroll2.cap = w->vscroll.cap; // these two are always the same |
1339 |
} |
|
1246
eb66ff34348f
(svn r1750) - Feature: [ 1093261 ] Saving vehicle sorting criteria for each vehicle type (bociusz)
darkvater
parents:
1191
diff
changeset
|
1340 |
|
eb66ff34348f
(svn r1750) - Feature: [ 1093261 ] Saving vehicle sorting criteria for each vehicle type (bociusz)
darkvater
parents:
1191
diff
changeset
|
1341 |
void InitializeGUI(void) |
eb66ff34348f
(svn r1750) - Feature: [ 1093261 ] Saving vehicle sorting criteria for each vehicle type (bociusz)
darkvater
parents:
1191
diff
changeset
|
1342 |
{ |
eb66ff34348f
(svn r1750) - Feature: [ 1093261 ] Saving vehicle sorting criteria for each vehicle type (bociusz)
darkvater
parents:
1191
diff
changeset
|
1343 |
memset(&_sorting, 0, sizeof(_sorting)); |
eb66ff34348f
(svn r1750) - Feature: [ 1093261 ] Saving vehicle sorting criteria for each vehicle type (bociusz)
darkvater
parents:
1191
diff
changeset
|
1344 |
} |
2552
5b586a545665
(svn r3081) -Codechange: [autoreplace] complete rewrite of autoreplace
bjarni
parents:
2549
diff
changeset
|
1345 |
|
5b586a545665
(svn r3081) -Codechange: [autoreplace] complete rewrite of autoreplace
bjarni
parents:
2549
diff
changeset
|
1346 |
/** Assigns an already open vehicle window to a new vehicle. |
2639 | 1347 |
* Assigns an already open vehicle window to a new vehicle. If the vehicle got |
1348 |
* any sub window open (orders and so on) it will change owner too. |
|
1349 |
* @param *from_v the current owner of the window |
|
1350 |
* @param *to_v the new owner of the window |
|
1351 |
*/ |
|
2552
5b586a545665
(svn r3081) -Codechange: [autoreplace] complete rewrite of autoreplace
bjarni
parents:
2549
diff
changeset
|
1352 |
void ChangeVehicleViewWindow(const Vehicle *from_v, const Vehicle *to_v) |
5b586a545665
(svn r3081) -Codechange: [autoreplace] complete rewrite of autoreplace
bjarni
parents:
2549
diff
changeset
|
1353 |
{ |
5b586a545665
(svn r3081) -Codechange: [autoreplace] complete rewrite of autoreplace
bjarni
parents:
2549
diff
changeset
|
1354 |
Window *w; |
5b586a545665
(svn r3081) -Codechange: [autoreplace] complete rewrite of autoreplace
bjarni
parents:
2549
diff
changeset
|
1355 |
|
5b586a545665
(svn r3081) -Codechange: [autoreplace] complete rewrite of autoreplace
bjarni
parents:
2549
diff
changeset
|
1356 |
w = FindWindowById(WC_VEHICLE_VIEW, from_v->index); |
5b586a545665
(svn r3081) -Codechange: [autoreplace] complete rewrite of autoreplace
bjarni
parents:
2549
diff
changeset
|
1357 |
if (w != NULL) { |
5b586a545665
(svn r3081) -Codechange: [autoreplace] complete rewrite of autoreplace
bjarni
parents:
2549
diff
changeset
|
1358 |
w->window_number = to_v->index; |
2639 | 1359 |
WP(w, vp_d).follow_vehicle = to_v->index; |
2552
5b586a545665
(svn r3081) -Codechange: [autoreplace] complete rewrite of autoreplace
bjarni
parents:
2549
diff
changeset
|
1360 |
SetWindowDirty(w); |
5b586a545665
(svn r3081) -Codechange: [autoreplace] complete rewrite of autoreplace
bjarni
parents:
2549
diff
changeset
|
1361 |
|
5b586a545665
(svn r3081) -Codechange: [autoreplace] complete rewrite of autoreplace
bjarni
parents:
2549
diff
changeset
|
1362 |
w = FindWindowById(WC_VEHICLE_ORDERS, from_v->index); |
5b586a545665
(svn r3081) -Codechange: [autoreplace] complete rewrite of autoreplace
bjarni
parents:
2549
diff
changeset
|
1363 |
if (w != NULL) { |
5b586a545665
(svn r3081) -Codechange: [autoreplace] complete rewrite of autoreplace
bjarni
parents:
2549
diff
changeset
|
1364 |
w->window_number = to_v->index; |
5b586a545665
(svn r3081) -Codechange: [autoreplace] complete rewrite of autoreplace
bjarni
parents:
2549
diff
changeset
|
1365 |
SetWindowDirty(w); |
5b586a545665
(svn r3081) -Codechange: [autoreplace] complete rewrite of autoreplace
bjarni
parents:
2549
diff
changeset
|
1366 |
} |
5b586a545665
(svn r3081) -Codechange: [autoreplace] complete rewrite of autoreplace
bjarni
parents:
2549
diff
changeset
|
1367 |
|
5b586a545665
(svn r3081) -Codechange: [autoreplace] complete rewrite of autoreplace
bjarni
parents:
2549
diff
changeset
|
1368 |
w = FindWindowById(WC_VEHICLE_REFIT, from_v->index); |
5b586a545665
(svn r3081) -Codechange: [autoreplace] complete rewrite of autoreplace
bjarni
parents:
2549
diff
changeset
|
1369 |
if (w != NULL) { |
5b586a545665
(svn r3081) -Codechange: [autoreplace] complete rewrite of autoreplace
bjarni
parents:
2549
diff
changeset
|
1370 |
w->window_number = to_v->index; |
5b586a545665
(svn r3081) -Codechange: [autoreplace] complete rewrite of autoreplace
bjarni
parents:
2549
diff
changeset
|
1371 |
SetWindowDirty(w); |
5b586a545665
(svn r3081) -Codechange: [autoreplace] complete rewrite of autoreplace
bjarni
parents:
2549
diff
changeset
|
1372 |
} |
5b586a545665
(svn r3081) -Codechange: [autoreplace] complete rewrite of autoreplace
bjarni
parents:
2549
diff
changeset
|
1373 |
|
5b586a545665
(svn r3081) -Codechange: [autoreplace] complete rewrite of autoreplace
bjarni
parents:
2549
diff
changeset
|
1374 |
w = FindWindowById(WC_VEHICLE_DETAILS, from_v->index); |
5b586a545665
(svn r3081) -Codechange: [autoreplace] complete rewrite of autoreplace
bjarni
parents:
2549
diff
changeset
|
1375 |
if (w != NULL) { |
5b586a545665
(svn r3081) -Codechange: [autoreplace] complete rewrite of autoreplace
bjarni
parents:
2549
diff
changeset
|
1376 |
w->window_number = to_v->index; |
5b586a545665
(svn r3081) -Codechange: [autoreplace] complete rewrite of autoreplace
bjarni
parents:
2549
diff
changeset
|
1377 |
SetWindowDirty(w); |
5b586a545665
(svn r3081) -Codechange: [autoreplace] complete rewrite of autoreplace
bjarni
parents:
2549
diff
changeset
|
1378 |
} |
5b586a545665
(svn r3081) -Codechange: [autoreplace] complete rewrite of autoreplace
bjarni
parents:
2549
diff
changeset
|
1379 |
} |
5b586a545665
(svn r3081) -Codechange: [autoreplace] complete rewrite of autoreplace
bjarni
parents:
2549
diff
changeset
|
1380 |
} |
4442
9f8bb348d58f
(svn r6215) -Codechange: [vehicle list windows] unified Player(vehicle)WndProc into PlayerVehWndProc
bjarni
parents:
4434
diff
changeset
|
1381 |
|
4665
d58f13102cc3
(svn r6559) -Codechange: [vehicle list windows] moved creation and drawing code into two new functions to make it easier to see what goes on where
bjarni
parents:
4661
diff
changeset
|
1382 |
/* |
d58f13102cc3
(svn r6559) -Codechange: [vehicle list windows] moved creation and drawing code into two new functions to make it easier to see what goes on where
bjarni
parents:
4661
diff
changeset
|
1383 |
* Start of functions regarding vehicle list windows |
d58f13102cc3
(svn r6559) -Codechange: [vehicle list windows] moved creation and drawing code into two new functions to make it easier to see what goes on where
bjarni
parents:
4661
diff
changeset
|
1384 |
*/ |
d58f13102cc3
(svn r6559) -Codechange: [vehicle list windows] moved creation and drawing code into two new functions to make it easier to see what goes on where
bjarni
parents:
4661
diff
changeset
|
1385 |
|
4545
138a9195009a
(svn r6377) -Codechange: Set up the widgets in the WE_CREATE instead of on every WE_PAINT
Darkvater
parents:
4542
diff
changeset
|
1386 |
enum { |
138a9195009a
(svn r6377) -Codechange: Set up the widgets in the WE_CREATE instead of on every WE_PAINT
Darkvater
parents:
4542
diff
changeset
|
1387 |
PLY_WND_PRC__OFFSET_TOP_WIDGET = 26, |
138a9195009a
(svn r6377) -Codechange: Set up the widgets in the WE_CREATE instead of on every WE_PAINT
Darkvater
parents:
4542
diff
changeset
|
1388 |
PLY_WND_PRC__SIZE_OF_ROW_SMALL = 26, |
138a9195009a
(svn r6377) -Codechange: Set up the widgets in the WE_CREATE instead of on every WE_PAINT
Darkvater
parents:
4542
diff
changeset
|
1389 |
PLY_WND_PRC__SIZE_OF_ROW_BIG = 36, |
138a9195009a
(svn r6377) -Codechange: Set up the widgets in the WE_CREATE instead of on every WE_PAINT
Darkvater
parents:
4542
diff
changeset
|
1390 |
}; |
138a9195009a
(svn r6377) -Codechange: Set up the widgets in the WE_CREATE instead of on every WE_PAINT
Darkvater
parents:
4542
diff
changeset
|
1391 |
|
5269
4b50973b21f6
(svn r7410) -Codechange/Fix: Remove useless and unfollowable programmatic-resize, and implement it
Darkvater
parents:
5125
diff
changeset
|
1392 |
enum VehicleListWindowWidgets { |
4668
f7256d0e7682
(svn r6562) -Codechange: merged the vehicle list window widget arrays
bjarni
parents:
4665
diff
changeset
|
1393 |
VLW_WIDGET_CLOSEBOX = 0, |
f7256d0e7682
(svn r6562) -Codechange: merged the vehicle list window widget arrays
bjarni
parents:
4665
diff
changeset
|
1394 |
VLW_WIDGET_CAPTION, |
f7256d0e7682
(svn r6562) -Codechange: merged the vehicle list window widget arrays
bjarni
parents:
4665
diff
changeset
|
1395 |
VLW_WIDGET_STICKY, |
f7256d0e7682
(svn r6562) -Codechange: merged the vehicle list window widget arrays
bjarni
parents:
4665
diff
changeset
|
1396 |
VLW_WIDGET_SORT_ORDER, |
f7256d0e7682
(svn r6562) -Codechange: merged the vehicle list window widget arrays
bjarni
parents:
4665
diff
changeset
|
1397 |
VLW_WIDGET_SORT_BY_TEXT, |
f7256d0e7682
(svn r6562) -Codechange: merged the vehicle list window widget arrays
bjarni
parents:
4665
diff
changeset
|
1398 |
VLW_WIDGET_SORT_BY_PULLDOWN, |
5274
8bd7e4c00956
(svn r7418) -Codechange/Feature: Put back the 'New Vehicles' button in the vehicle list window. As
Darkvater
parents:
5269
diff
changeset
|
1399 |
VLW_WIDGET_EMPTY_TOP_RIGHT, |
4668
f7256d0e7682
(svn r6562) -Codechange: merged the vehicle list window widget arrays
bjarni
parents:
4665
diff
changeset
|
1400 |
VLW_WIDGET_LIST, |
f7256d0e7682
(svn r6562) -Codechange: merged the vehicle list window widget arrays
bjarni
parents:
4665
diff
changeset
|
1401 |
VLW_WIDGET_SCROLLBAR, |
f7256d0e7682
(svn r6562) -Codechange: merged the vehicle list window widget arrays
bjarni
parents:
4665
diff
changeset
|
1402 |
VLW_WIDGET_OTHER_PLAYER_FILLER, |
5274
8bd7e4c00956
(svn r7418) -Codechange/Feature: Put back the 'New Vehicles' button in the vehicle list window. As
Darkvater
parents:
5269
diff
changeset
|
1403 |
VLW_WIDGET_NEW_VEHICLES, |
8bd7e4c00956
(svn r7418) -Codechange/Feature: Put back the 'New Vehicles' button in the vehicle list window. As
Darkvater
parents:
5269
diff
changeset
|
1404 |
VLW_WIDGET_MANAGE_VEHICLES, |
8bd7e4c00956
(svn r7418) -Codechange/Feature: Put back the 'New Vehicles' button in the vehicle list window. As
Darkvater
parents:
5269
diff
changeset
|
1405 |
VLW_WIDGET_MANAGE_VEHICLES_DROPDOWN, |
4673
3160067b8751
(svn r6570) -Feature: added "start all" and "stop all" buttons to the vehicle lists
bjarni
parents:
4669
diff
changeset
|
1406 |
VLW_WIDGET_STOP_ALL, |
3160067b8751
(svn r6570) -Feature: added "start all" and "stop all" buttons to the vehicle lists
bjarni
parents:
4669
diff
changeset
|
1407 |
VLW_WIDGET_START_ALL, |
5274
8bd7e4c00956
(svn r7418) -Codechange/Feature: Put back the 'New Vehicles' button in the vehicle list window. As
Darkvater
parents:
5269
diff
changeset
|
1408 |
VLW_WIDGET_EMPTY_BOTTOM_RIGHT, |
4668
f7256d0e7682
(svn r6562) -Codechange: merged the vehicle list window widget arrays
bjarni
parents:
4665
diff
changeset
|
1409 |
VLW_WIDGET_RESIZE, |
f7256d0e7682
(svn r6562) -Codechange: merged the vehicle list window widget arrays
bjarni
parents:
4665
diff
changeset
|
1410 |
}; |
f7256d0e7682
(svn r6562) -Codechange: merged the vehicle list window widget arrays
bjarni
parents:
4665
diff
changeset
|
1411 |
|
f7256d0e7682
(svn r6562) -Codechange: merged the vehicle list window widget arrays
bjarni
parents:
4665
diff
changeset
|
1412 |
static const Widget _vehicle_list_widgets[] = { |
f7256d0e7682
(svn r6562) -Codechange: merged the vehicle list window widget arrays
bjarni
parents:
4665
diff
changeset
|
1413 |
{ WWT_CLOSEBOX, RESIZE_NONE, 14, 0, 10, 0, 13, STR_00C5, STR_018B_CLOSE_WINDOW}, |
f7256d0e7682
(svn r6562) -Codechange: merged the vehicle list window widget arrays
bjarni
parents:
4665
diff
changeset
|
1414 |
{ WWT_CAPTION, RESIZE_RIGHT, 14, 11, 247, 0, 13, 0x0, STR_018C_WINDOW_TITLE_DRAG_THIS}, |
f7256d0e7682
(svn r6562) -Codechange: merged the vehicle list window widget arrays
bjarni
parents:
4665
diff
changeset
|
1415 |
{ WWT_STICKYBOX, RESIZE_LR, 14, 248, 259, 0, 13, 0x0, STR_STICKY_BUTTON}, |
f7256d0e7682
(svn r6562) -Codechange: merged the vehicle list window widget arrays
bjarni
parents:
4665
diff
changeset
|
1416 |
{ WWT_PUSHTXTBTN, RESIZE_NONE, 14, 0, 80, 14, 25, STR_SORT_BY, STR_SORT_ORDER_TIP}, |
f7256d0e7682
(svn r6562) -Codechange: merged the vehicle list window widget arrays
bjarni
parents:
4665
diff
changeset
|
1417 |
{ WWT_PANEL, RESIZE_NONE, 14, 81, 235, 14, 25, 0x0, STR_SORT_CRITERIA_TIP}, |
f7256d0e7682
(svn r6562) -Codechange: merged the vehicle list window widget arrays
bjarni
parents:
4665
diff
changeset
|
1418 |
{ WWT_TEXTBTN, RESIZE_NONE, 14, 236, 247, 14, 25, STR_0225, STR_SORT_CRITERIA_TIP}, |
f7256d0e7682
(svn r6562) -Codechange: merged the vehicle list window widget arrays
bjarni
parents:
4665
diff
changeset
|
1419 |
{ WWT_PANEL, RESIZE_RIGHT, 14, 248, 259, 14, 25, 0x0, STR_NULL}, |
f7256d0e7682
(svn r6562) -Codechange: merged the vehicle list window widget arrays
bjarni
parents:
4665
diff
changeset
|
1420 |
{ WWT_MATRIX, RESIZE_RB, 14, 0, 247, 26, 169, 0x0, STR_NULL}, |
f7256d0e7682
(svn r6562) -Codechange: merged the vehicle list window widget arrays
bjarni
parents:
4665
diff
changeset
|
1421 |
{ WWT_SCROLLBAR, RESIZE_LRB, 14, 248, 259, 26, 169, 0x0, STR_0190_SCROLL_BAR_SCROLLS_LIST}, |
5274
8bd7e4c00956
(svn r7418) -Codechange/Feature: Put back the 'New Vehicles' button in the vehicle list window. As
Darkvater
parents:
5269
diff
changeset
|
1422 |
/* Widget to be shown for other players hiding the following 6 widgets */ |
5282
361a10cbf4f3
(svn r7431) -Fix (r7418): GUI glitch when viewing other player's vehicle lists: bottom panel continued behind resize button.
peter1138
parents:
5274
diff
changeset
|
1423 |
{ WWT_PANEL, RESIZE_RTB, 14, 0, 247, 170, 181, 0x0, STR_NULL}, |
5274
8bd7e4c00956
(svn r7418) -Codechange/Feature: Put back the 'New Vehicles' button in the vehicle list window. As
Darkvater
parents:
5269
diff
changeset
|
1424 |
|
8bd7e4c00956
(svn r7418) -Codechange/Feature: Put back the 'New Vehicles' button in the vehicle list window. As
Darkvater
parents:
5269
diff
changeset
|
1425 |
{ WWT_PUSHTXTBTN, RESIZE_TB, 14, 0, 105, 170, 181, 0x0, STR_AVAILABLE_ENGINES_TIP}, |
5286
079e9754c8a9
(svn r7435) -Fix (r7418): Add proper tooltips to the manage list button instead of the sort tip
Darkvater
parents:
5282
diff
changeset
|
1426 |
{ WWT_TEXTBTN, RESIZE_TB, 14, 106, 211, 170, 181, STR_MANAGE_LIST, STR_MANAGE_LIST_TIP}, |
079e9754c8a9
(svn r7435) -Fix (r7418): Add proper tooltips to the manage list button instead of the sort tip
Darkvater
parents:
5282
diff
changeset
|
1427 |
{ WWT_TEXTBTN, RESIZE_TB, 14, 212, 223, 170, 181, STR_0225, STR_MANAGE_LIST_TIP}, |
5274
8bd7e4c00956
(svn r7418) -Codechange/Feature: Put back the 'New Vehicles' button in the vehicle list window. As
Darkvater
parents:
5269
diff
changeset
|
1428 |
|
8bd7e4c00956
(svn r7418) -Codechange/Feature: Put back the 'New Vehicles' button in the vehicle list window. As
Darkvater
parents:
5269
diff
changeset
|
1429 |
{ WWT_PUSHIMGBTN, RESIZE_TB, 14, 224, 235, 170, 181, SPR_FLAG_VEH_STOPPED, STR_MASS_STOP_LIST_TIP}, |
8bd7e4c00956
(svn r7418) -Codechange/Feature: Put back the 'New Vehicles' button in the vehicle list window. As
Darkvater
parents:
5269
diff
changeset
|
1430 |
{ WWT_PUSHIMGBTN, RESIZE_TB, 14, 236, 247, 170, 181, SPR_FLAG_VEH_RUNNING, STR_MASS_START_LIST_TIP}, |
8bd7e4c00956
(svn r7418) -Codechange/Feature: Put back the 'New Vehicles' button in the vehicle list window. As
Darkvater
parents:
5269
diff
changeset
|
1431 |
{ WWT_PANEL, RESIZE_RTB, 14, 248, 247, 170, 181, 0x0, STR_NULL}, |
4668
f7256d0e7682
(svn r6562) -Codechange: merged the vehicle list window widget arrays
bjarni
parents:
4665
diff
changeset
|
1432 |
{ WWT_RESIZEBOX, RESIZE_LRTB, 14, 248, 259, 170, 181, 0x0, STR_RESIZE_BUTTON}, |
f7256d0e7682
(svn r6562) -Codechange: merged the vehicle list window widget arrays
bjarni
parents:
4665
diff
changeset
|
1433 |
{ WIDGETS_END}, |
f7256d0e7682
(svn r6562) -Codechange: merged the vehicle list window widget arrays
bjarni
parents:
4665
diff
changeset
|
1434 |
}; |
f7256d0e7682
(svn r6562) -Codechange: merged the vehicle list window widget arrays
bjarni
parents:
4665
diff
changeset
|
1435 |
|
4665
d58f13102cc3
(svn r6559) -Codechange: [vehicle list windows] moved creation and drawing code into two new functions to make it easier to see what goes on where
bjarni
parents:
4661
diff
changeset
|
1436 |
static void CreateVehicleListWindow(Window *w) |
d58f13102cc3
(svn r6559) -Codechange: [vehicle list windows] moved creation and drawing code into two new functions to make it easier to see what goes on where
bjarni
parents:
4661
diff
changeset
|
1437 |
{ |
d58f13102cc3
(svn r6559) -Codechange: [vehicle list windows] moved creation and drawing code into two new functions to make it easier to see what goes on where
bjarni
parents:
4661
diff
changeset
|
1438 |
vehiclelist_d *vl = &WP(w, vehiclelist_d); |
d58f13102cc3
(svn r6559) -Codechange: [vehicle list windows] moved creation and drawing code into two new functions to make it easier to see what goes on where
bjarni
parents:
4661
diff
changeset
|
1439 |
uint16 window_type = w->window_number & VLW_MASK; |
4668
f7256d0e7682
(svn r6562) -Codechange: merged the vehicle list window widget arrays
bjarni
parents:
4665
diff
changeset
|
1440 |
PlayerID player = GB(w->window_number, 0, 8); |
f7256d0e7682
(svn r6562) -Codechange: merged the vehicle list window widget arrays
bjarni
parents:
4665
diff
changeset
|
1441 |
|
4665
d58f13102cc3
(svn r6559) -Codechange: [vehicle list windows] moved creation and drawing code into two new functions to make it easier to see what goes on where
bjarni
parents:
4661
diff
changeset
|
1442 |
vl->vehicle_type = GB(w->window_number, 11, 5); |
4678
e5fe6e4aca39
(svn r6582) -Codechange: changed GenerateVehicleSortList() to reuse the same allocation over and over if possible (like BuildDepotVehicleList() )
bjarni
parents:
4677
diff
changeset
|
1443 |
vl->length_of_sort_list = 0; |
e5fe6e4aca39
(svn r6582) -Codechange: changed GenerateVehicleSortList() to reuse the same allocation over and over if possible (like BuildDepotVehicleList() )
bjarni
parents:
4677
diff
changeset
|
1444 |
vl->sort_list = NULL; |
4668
f7256d0e7682
(svn r6562) -Codechange: merged the vehicle list window widget arrays
bjarni
parents:
4665
diff
changeset
|
1445 |
w->caption_color = player; |
f7256d0e7682
(svn r6562) -Codechange: merged the vehicle list window widget arrays
bjarni
parents:
4665
diff
changeset
|
1446 |
|
f7256d0e7682
(svn r6562) -Codechange: merged the vehicle list window widget arrays
bjarni
parents:
4665
diff
changeset
|
1447 |
/* Hide the widgets that we will not use in this window |
f7256d0e7682
(svn r6562) -Codechange: merged the vehicle list window widget arrays
bjarni
parents:
4665
diff
changeset
|
1448 |
* Some windows contains actions only fit for the owner */ |
f7256d0e7682
(svn r6562) -Codechange: merged the vehicle list window widget arrays
bjarni
parents:
4665
diff
changeset
|
1449 |
if (player == _local_player) { |
4702
c79e9d9f27b3
(svn r6612) -Codechange: Use accessors for hidden_state.
belugas
parents:
4698
diff
changeset
|
1450 |
HideWindowWidget(w, VLW_WIDGET_OTHER_PLAYER_FILLER); |
5274
8bd7e4c00956
(svn r7418) -Codechange/Feature: Put back the 'New Vehicles' button in the vehicle list window. As
Darkvater
parents:
5269
diff
changeset
|
1451 |
SetWindowWidgetDisabledState(w, VLW_WIDGET_NEW_VEHICLES, window_type != VLW_STANDARD); |
4668
f7256d0e7682
(svn r6562) -Codechange: merged the vehicle list window widget arrays
bjarni
parents:
4665
diff
changeset
|
1452 |
} else { |
4758
090cf0f1b35e
(svn r6672) -Codechange: [depot & vehicle windows] applied SetWindowWidgetsDisabledState() and SetWindowWidgetsHiddenState() to depot and vehicle windows
bjarni
parents:
4753
diff
changeset
|
1453 |
SetWindowWidgetsHiddenState(w, true, |
5274
8bd7e4c00956
(svn r7418) -Codechange/Feature: Put back the 'New Vehicles' button in the vehicle list window. As
Darkvater
parents:
5269
diff
changeset
|
1454 |
VLW_WIDGET_NEW_VEHICLES, |
8bd7e4c00956
(svn r7418) -Codechange/Feature: Put back the 'New Vehicles' button in the vehicle list window. As
Darkvater
parents:
5269
diff
changeset
|
1455 |
VLW_WIDGET_MANAGE_VEHICLES, |
8bd7e4c00956
(svn r7418) -Codechange/Feature: Put back the 'New Vehicles' button in the vehicle list window. As
Darkvater
parents:
5269
diff
changeset
|
1456 |
VLW_WIDGET_MANAGE_VEHICLES_DROPDOWN, |
4758
090cf0f1b35e
(svn r6672) -Codechange: [depot & vehicle windows] applied SetWindowWidgetsDisabledState() and SetWindowWidgetsHiddenState() to depot and vehicle windows
bjarni
parents:
4753
diff
changeset
|
1457 |
VLW_WIDGET_STOP_ALL, |
090cf0f1b35e
(svn r6672) -Codechange: [depot & vehicle windows] applied SetWindowWidgetsDisabledState() and SetWindowWidgetsHiddenState() to depot and vehicle windows
bjarni
parents:
4753
diff
changeset
|
1458 |
VLW_WIDGET_START_ALL, |
5274
8bd7e4c00956
(svn r7418) -Codechange/Feature: Put back the 'New Vehicles' button in the vehicle list window. As
Darkvater
parents:
5269
diff
changeset
|
1459 |
VLW_WIDGET_EMPTY_BOTTOM_RIGHT, |
4758
090cf0f1b35e
(svn r6672) -Codechange: [depot & vehicle windows] applied SetWindowWidgetsDisabledState() and SetWindowWidgetsHiddenState() to depot and vehicle windows
bjarni
parents:
4753
diff
changeset
|
1460 |
WIDGET_LIST_END); |
4668
f7256d0e7682
(svn r6562) -Codechange: merged the vehicle list window widget arrays
bjarni
parents:
4665
diff
changeset
|
1461 |
} |
4665
d58f13102cc3
(svn r6559) -Codechange: [vehicle list windows] moved creation and drawing code into two new functions to make it easier to see what goes on where
bjarni
parents:
4661
diff
changeset
|
1462 |
|
d58f13102cc3
(svn r6559) -Codechange: [vehicle list windows] moved creation and drawing code into two new functions to make it easier to see what goes on where
bjarni
parents:
4661
diff
changeset
|
1463 |
/* Set up the window widgets */ |
4668
f7256d0e7682
(svn r6562) -Codechange: merged the vehicle list window widget arrays
bjarni
parents:
4665
diff
changeset
|
1464 |
switch (vl->vehicle_type) { |
f7256d0e7682
(svn r6562) -Codechange: merged the vehicle list window widget arrays
bjarni
parents:
4665
diff
changeset
|
1465 |
case VEH_Train: |
4686
e438e8b2ab61
(svn r6591) -Codechange: changed strings that used the word "depot" into one for each vehicle type
bjarni
parents:
4681
diff
changeset
|
1466 |
w->widget[VLW_WIDGET_LIST].tooltips = STR_883D_TRAINS_CLICK_ON_TRAIN_FOR; |
5274
8bd7e4c00956
(svn r7418) -Codechange/Feature: Put back the 'New Vehicles' button in the vehicle list window. As
Darkvater
parents:
5269
diff
changeset
|
1467 |
w->widget[VLW_WIDGET_NEW_VEHICLES].data = STR_8815_NEW_VEHICLES; |
4668
f7256d0e7682
(svn r6562) -Codechange: merged the vehicle list window widget arrays
bjarni
parents:
4665
diff
changeset
|
1468 |
break; |
f7256d0e7682
(svn r6562) -Codechange: merged the vehicle list window widget arrays
bjarni
parents:
4665
diff
changeset
|
1469 |
|
f7256d0e7682
(svn r6562) -Codechange: merged the vehicle list window widget arrays
bjarni
parents:
4665
diff
changeset
|
1470 |
case VEH_Road: |
4686
e438e8b2ab61
(svn r6591) -Codechange: changed strings that used the word "depot" into one for each vehicle type
bjarni
parents:
4681
diff
changeset
|
1471 |
w->widget[VLW_WIDGET_LIST].tooltips = STR_901A_ROAD_VEHICLES_CLICK_ON; |
5274
8bd7e4c00956
(svn r7418) -Codechange/Feature: Put back the 'New Vehicles' button in the vehicle list window. As
Darkvater
parents:
5269
diff
changeset
|
1472 |
w->widget[VLW_WIDGET_NEW_VEHICLES].data = STR_9004_NEW_VEHICLES; |
4668
f7256d0e7682
(svn r6562) -Codechange: merged the vehicle list window widget arrays
bjarni
parents:
4665
diff
changeset
|
1473 |
break; |
f7256d0e7682
(svn r6562) -Codechange: merged the vehicle list window widget arrays
bjarni
parents:
4665
diff
changeset
|
1474 |
|
f7256d0e7682
(svn r6562) -Codechange: merged the vehicle list window widget arrays
bjarni
parents:
4665
diff
changeset
|
1475 |
case VEH_Ship: |
4686
e438e8b2ab61
(svn r6591) -Codechange: changed strings that used the word "depot" into one for each vehicle type
bjarni
parents:
4681
diff
changeset
|
1476 |
w->widget[VLW_WIDGET_LIST].tooltips = STR_9823_SHIPS_CLICK_ON_SHIP_FOR; |
5274
8bd7e4c00956
(svn r7418) -Codechange/Feature: Put back the 'New Vehicles' button in the vehicle list window. As
Darkvater
parents:
5269
diff
changeset
|
1477 |
w->widget[VLW_WIDGET_NEW_VEHICLES].data = STR_9804_NEW_SHIPS; |
4668
f7256d0e7682
(svn r6562) -Codechange: merged the vehicle list window widget arrays
bjarni
parents:
4665
diff
changeset
|
1478 |
break; |
f7256d0e7682
(svn r6562) -Codechange: merged the vehicle list window widget arrays
bjarni
parents:
4665
diff
changeset
|
1479 |
|
f7256d0e7682
(svn r6562) -Codechange: merged the vehicle list window widget arrays
bjarni
parents:
4665
diff
changeset
|
1480 |
case VEH_Aircraft: |
4686
e438e8b2ab61
(svn r6591) -Codechange: changed strings that used the word "depot" into one for each vehicle type
bjarni
parents:
4681
diff
changeset
|
1481 |
w->widget[VLW_WIDGET_LIST].tooltips = STR_A01F_AIRCRAFT_CLICK_ON_AIRCRAFT; |
5274
8bd7e4c00956
(svn r7418) -Codechange/Feature: Put back the 'New Vehicles' button in the vehicle list window. As
Darkvater
parents:
5269
diff
changeset
|
1482 |
w->widget[VLW_WIDGET_NEW_VEHICLES].data = STR_A003_NEW_AIRCRAFT; |
4668
f7256d0e7682
(svn r6562) -Codechange: merged the vehicle list window widget arrays
bjarni
parents:
4665
diff
changeset
|
1483 |
break; |
f7256d0e7682
(svn r6562) -Codechange: merged the vehicle list window widget arrays
bjarni
parents:
4665
diff
changeset
|
1484 |
|
5274
8bd7e4c00956
(svn r7418) -Codechange/Feature: Put back the 'New Vehicles' button in the vehicle list window. As
Darkvater
parents:
5269
diff
changeset
|
1485 |
default: NOT_REACHED(); |
4668
f7256d0e7682
(svn r6562) -Codechange: merged the vehicle list window widget arrays
bjarni
parents:
4665
diff
changeset
|
1486 |
} |
f7256d0e7682
(svn r6562) -Codechange: merged the vehicle list window widget arrays
bjarni
parents:
4665
diff
changeset
|
1487 |
|
4665
d58f13102cc3
(svn r6559) -Codechange: [vehicle list windows] moved creation and drawing code into two new functions to make it easier to see what goes on where
bjarni
parents:
4661
diff
changeset
|
1488 |
switch (window_type) { |
d58f13102cc3
(svn r6559) -Codechange: [vehicle list windows] moved creation and drawing code into two new functions to make it easier to see what goes on where
bjarni
parents:
4661
diff
changeset
|
1489 |
case VLW_SHARED_ORDERS: |
4668
f7256d0e7682
(svn r6562) -Codechange: merged the vehicle list window widget arrays
bjarni
parents:
4665
diff
changeset
|
1490 |
w->widget[VLW_WIDGET_CAPTION].data = STR_VEH_WITH_SHARED_ORDERS_LIST; |
4665
d58f13102cc3
(svn r6559) -Codechange: [vehicle list windows] moved creation and drawing code into two new functions to make it easier to see what goes on where
bjarni
parents:
4661
diff
changeset
|
1491 |
break; |
d58f13102cc3
(svn r6559) -Codechange: [vehicle list windows] moved creation and drawing code into two new functions to make it easier to see what goes on where
bjarni
parents:
4661
diff
changeset
|
1492 |
case VLW_STANDARD: /* Company Name - standard widget setup */ |
4668
f7256d0e7682
(svn r6562) -Codechange: merged the vehicle list window widget arrays
bjarni
parents:
4665
diff
changeset
|
1493 |
switch (vl->vehicle_type) { |
f7256d0e7682
(svn r6562) -Codechange: merged the vehicle list window widget arrays
bjarni
parents:
4665
diff
changeset
|
1494 |
case VEH_Train: w->widget[VLW_WIDGET_CAPTION].data = STR_881B_TRAINS; break; |
f7256d0e7682
(svn r6562) -Codechange: merged the vehicle list window widget arrays
bjarni
parents:
4665
diff
changeset
|
1495 |
case VEH_Road: w->widget[VLW_WIDGET_CAPTION].data = STR_9001_ROAD_VEHICLES; break; |
f7256d0e7682
(svn r6562) -Codechange: merged the vehicle list window widget arrays
bjarni
parents:
4665
diff
changeset
|
1496 |
case VEH_Ship: w->widget[VLW_WIDGET_CAPTION].data = STR_9805_SHIPS; break; |
f7256d0e7682
(svn r6562) -Codechange: merged the vehicle list window widget arrays
bjarni
parents:
4665
diff
changeset
|
1497 |
case VEH_Aircraft: w->widget[VLW_WIDGET_CAPTION].data = STR_A009_AIRCRAFT; break; |
f7256d0e7682
(svn r6562) -Codechange: merged the vehicle list window widget arrays
bjarni
parents:
4665
diff
changeset
|
1498 |
default: NOT_REACHED(); break; |
f7256d0e7682
(svn r6562) -Codechange: merged the vehicle list window widget arrays
bjarni
parents:
4665
diff
changeset
|
1499 |
} |
4665
d58f13102cc3
(svn r6559) -Codechange: [vehicle list windows] moved creation and drawing code into two new functions to make it easier to see what goes on where
bjarni
parents:
4661
diff
changeset
|
1500 |
break; |
d58f13102cc3
(svn r6559) -Codechange: [vehicle list windows] moved creation and drawing code into two new functions to make it easier to see what goes on where
bjarni
parents:
4661
diff
changeset
|
1501 |
case VLW_STATION_LIST: /* Station Name */ |
d58f13102cc3
(svn r6559) -Codechange: [vehicle list windows] moved creation and drawing code into two new functions to make it easier to see what goes on where
bjarni
parents:
4661
diff
changeset
|
1502 |
switch (vl->vehicle_type) { |
4668
f7256d0e7682
(svn r6562) -Codechange: merged the vehicle list window widget arrays
bjarni
parents:
4665
diff
changeset
|
1503 |
case VEH_Train: w->widget[VLW_WIDGET_CAPTION].data = STR_SCHEDULED_TRAINS; break; |
f7256d0e7682
(svn r6562) -Codechange: merged the vehicle list window widget arrays
bjarni
parents:
4665
diff
changeset
|
1504 |
case VEH_Road: w->widget[VLW_WIDGET_CAPTION].data = STR_SCHEDULED_ROAD_VEHICLES; break; |
f7256d0e7682
(svn r6562) -Codechange: merged the vehicle list window widget arrays
bjarni
parents:
4665
diff
changeset
|
1505 |
case VEH_Ship: w->widget[VLW_WIDGET_CAPTION].data = STR_SCHEDULED_SHIPS; break; |
f7256d0e7682
(svn r6562) -Codechange: merged the vehicle list window widget arrays
bjarni
parents:
4665
diff
changeset
|
1506 |
case VEH_Aircraft: w->widget[VLW_WIDGET_CAPTION].data = STR_SCHEDULED_AIRCRAFT; break; |
4665
d58f13102cc3
(svn r6559) -Codechange: [vehicle list windows] moved creation and drawing code into two new functions to make it easier to see what goes on where
bjarni
parents:
4661
diff
changeset
|
1507 |
default: NOT_REACHED(); break; |
d58f13102cc3
(svn r6559) -Codechange: [vehicle list windows] moved creation and drawing code into two new functions to make it easier to see what goes on where
bjarni
parents:
4661
diff
changeset
|
1508 |
} |
d58f13102cc3
(svn r6559) -Codechange: [vehicle list windows] moved creation and drawing code into two new functions to make it easier to see what goes on where
bjarni
parents:
4661
diff
changeset
|
1509 |
break; |
4681
bc077405e9a8
(svn r6586) -Feature: [depot window] added a vehicle list window with all vehicles having a certain depot in their orders
bjarni
parents:
4678
diff
changeset
|
1510 |
|
bc077405e9a8
(svn r6586) -Feature: [depot window] added a vehicle list window with all vehicles having a certain depot in their orders
bjarni
parents:
4678
diff
changeset
|
1511 |
case VLW_DEPOT_LIST: |
bc077405e9a8
(svn r6586) -Feature: [depot window] added a vehicle list window with all vehicles having a certain depot in their orders
bjarni
parents:
4678
diff
changeset
|
1512 |
switch (vl->vehicle_type) { |
bc077405e9a8
(svn r6586) -Feature: [depot window] added a vehicle list window with all vehicles having a certain depot in their orders
bjarni
parents:
4678
diff
changeset
|
1513 |
case VEH_Train: w->widget[VLW_WIDGET_CAPTION].data = STR_VEHICLE_LIST_TRAIN_DEPOT; break; |
bc077405e9a8
(svn r6586) -Feature: [depot window] added a vehicle list window with all vehicles having a certain depot in their orders
bjarni
parents:
4678
diff
changeset
|
1514 |
case VEH_Road: w->widget[VLW_WIDGET_CAPTION].data = STR_VEHICLE_LIST_ROADVEH_DEPOT; break; |
bc077405e9a8
(svn r6586) -Feature: [depot window] added a vehicle list window with all vehicles having a certain depot in their orders
bjarni
parents:
4678
diff
changeset
|
1515 |
case VEH_Ship: w->widget[VLW_WIDGET_CAPTION].data = STR_VEHICLE_LIST_SHIP_DEPOT; break; |
bc077405e9a8
(svn r6586) -Feature: [depot window] added a vehicle list window with all vehicles having a certain depot in their orders
bjarni
parents:
4678
diff
changeset
|
1516 |
case VEH_Aircraft: w->widget[VLW_WIDGET_CAPTION].data = STR_VEHICLE_LIST_AIRCRAFT_DEPOT; break; |
bc077405e9a8
(svn r6586) -Feature: [depot window] added a vehicle list window with all vehicles having a certain depot in their orders
bjarni
parents:
4678
diff
changeset
|
1517 |
default: NOT_REACHED(); break; |
bc077405e9a8
(svn r6586) -Feature: [depot window] added a vehicle list window with all vehicles having a certain depot in their orders
bjarni
parents:
4678
diff
changeset
|
1518 |
} |
bc077405e9a8
(svn r6586) -Feature: [depot window] added a vehicle list window with all vehicles having a certain depot in their orders
bjarni
parents:
4678
diff
changeset
|
1519 |
break; |
4665
d58f13102cc3
(svn r6559) -Codechange: [vehicle list windows] moved creation and drawing code into two new functions to make it easier to see what goes on where
bjarni
parents:
4661
diff
changeset
|
1520 |
default: NOT_REACHED(); break; |
d58f13102cc3
(svn r6559) -Codechange: [vehicle list windows] moved creation and drawing code into two new functions to make it easier to see what goes on where
bjarni
parents:
4661
diff
changeset
|
1521 |
} |
d58f13102cc3
(svn r6559) -Codechange: [vehicle list windows] moved creation and drawing code into two new functions to make it easier to see what goes on where
bjarni
parents:
4661
diff
changeset
|
1522 |
|
d58f13102cc3
(svn r6559) -Codechange: [vehicle list windows] moved creation and drawing code into two new functions to make it easier to see what goes on where
bjarni
parents:
4661
diff
changeset
|
1523 |
switch (vl->vehicle_type) { |
d58f13102cc3
(svn r6559) -Codechange: [vehicle list windows] moved creation and drawing code into two new functions to make it easier to see what goes on where
bjarni
parents:
4661
diff
changeset
|
1524 |
case VEH_Train: |
d58f13102cc3
(svn r6559) -Codechange: [vehicle list windows] moved creation and drawing code into two new functions to make it easier to see what goes on where
bjarni
parents:
4661
diff
changeset
|
1525 |
w->resize.step_width = 1; |
d58f13102cc3
(svn r6559) -Codechange: [vehicle list windows] moved creation and drawing code into two new functions to make it easier to see what goes on where
bjarni
parents:
4661
diff
changeset
|
1526 |
/* Fallthrough */ |
d58f13102cc3
(svn r6559) -Codechange: [vehicle list windows] moved creation and drawing code into two new functions to make it easier to see what goes on where
bjarni
parents:
4661
diff
changeset
|
1527 |
case VEH_Road: |
d58f13102cc3
(svn r6559) -Codechange: [vehicle list windows] moved creation and drawing code into two new functions to make it easier to see what goes on where
bjarni
parents:
4661
diff
changeset
|
1528 |
w->vscroll.cap = 7; |
d58f13102cc3
(svn r6559) -Codechange: [vehicle list windows] moved creation and drawing code into two new functions to make it easier to see what goes on where
bjarni
parents:
4661
diff
changeset
|
1529 |
w->resize.step_height = PLY_WND_PRC__SIZE_OF_ROW_SMALL; |
d58f13102cc3
(svn r6559) -Codechange: [vehicle list windows] moved creation and drawing code into two new functions to make it easier to see what goes on where
bjarni
parents:
4661
diff
changeset
|
1530 |
w->resize.height = 220 - (PLY_WND_PRC__SIZE_OF_ROW_SMALL * 3); // Minimum of 4 vehicles |
d58f13102cc3
(svn r6559) -Codechange: [vehicle list windows] moved creation and drawing code into two new functions to make it easier to see what goes on where
bjarni
parents:
4661
diff
changeset
|
1531 |
break; |
d58f13102cc3
(svn r6559) -Codechange: [vehicle list windows] moved creation and drawing code into two new functions to make it easier to see what goes on where
bjarni
parents:
4661
diff
changeset
|
1532 |
case VEH_Ship: |
d58f13102cc3
(svn r6559) -Codechange: [vehicle list windows] moved creation and drawing code into two new functions to make it easier to see what goes on where
bjarni
parents:
4661
diff
changeset
|
1533 |
case VEH_Aircraft: |
d58f13102cc3
(svn r6559) -Codechange: [vehicle list windows] moved creation and drawing code into two new functions to make it easier to see what goes on where
bjarni
parents:
4661
diff
changeset
|
1534 |
w->vscroll.cap = 4; |
d58f13102cc3
(svn r6559) -Codechange: [vehicle list windows] moved creation and drawing code into two new functions to make it easier to see what goes on where
bjarni
parents:
4661
diff
changeset
|
1535 |
w->resize.step_height = PLY_WND_PRC__SIZE_OF_ROW_BIG; |
d58f13102cc3
(svn r6559) -Codechange: [vehicle list windows] moved creation and drawing code into two new functions to make it easier to see what goes on where
bjarni
parents:
4661
diff
changeset
|
1536 |
break; |
d58f13102cc3
(svn r6559) -Codechange: [vehicle list windows] moved creation and drawing code into two new functions to make it easier to see what goes on where
bjarni
parents:
4661
diff
changeset
|
1537 |
default: NOT_REACHED(); |
d58f13102cc3
(svn r6559) -Codechange: [vehicle list windows] moved creation and drawing code into two new functions to make it easier to see what goes on where
bjarni
parents:
4661
diff
changeset
|
1538 |
} |
d58f13102cc3
(svn r6559) -Codechange: [vehicle list windows] moved creation and drawing code into two new functions to make it easier to see what goes on where
bjarni
parents:
4661
diff
changeset
|
1539 |
|
4668
f7256d0e7682
(svn r6562) -Codechange: merged the vehicle list window widget arrays
bjarni
parents:
4665
diff
changeset
|
1540 |
w->widget[VLW_WIDGET_LIST].data = (w->vscroll.cap << 8) + 1; |
4665
d58f13102cc3
(svn r6559) -Codechange: [vehicle list windows] moved creation and drawing code into two new functions to make it easier to see what goes on where
bjarni
parents:
4661
diff
changeset
|
1541 |
|
d58f13102cc3
(svn r6559) -Codechange: [vehicle list windows] moved creation and drawing code into two new functions to make it easier to see what goes on where
bjarni
parents:
4661
diff
changeset
|
1542 |
/* Set up sorting. Make the window-specific _sorting variable |
d58f13102cc3
(svn r6559) -Codechange: [vehicle list windows] moved creation and drawing code into two new functions to make it easier to see what goes on where
bjarni
parents:
4661
diff
changeset
|
1543 |
* point to the correct global _sorting struct so we are freed |
d58f13102cc3
(svn r6559) -Codechange: [vehicle list windows] moved creation and drawing code into two new functions to make it easier to see what goes on where
bjarni
parents:
4661
diff
changeset
|
1544 |
* from having conditionals during window operation */ |
d58f13102cc3
(svn r6559) -Codechange: [vehicle list windows] moved creation and drawing code into two new functions to make it easier to see what goes on where
bjarni
parents:
4661
diff
changeset
|
1545 |
switch (vl->vehicle_type) { |
d58f13102cc3
(svn r6559) -Codechange: [vehicle list windows] moved creation and drawing code into two new functions to make it easier to see what goes on where
bjarni
parents:
4661
diff
changeset
|
1546 |
case VEH_Train: vl->_sorting = &_sorting.train; break; |
d58f13102cc3
(svn r6559) -Codechange: [vehicle list windows] moved creation and drawing code into two new functions to make it easier to see what goes on where
bjarni
parents:
4661
diff
changeset
|
1547 |
case VEH_Road: vl->_sorting = &_sorting.roadveh; break; |
d58f13102cc3
(svn r6559) -Codechange: [vehicle list windows] moved creation and drawing code into two new functions to make it easier to see what goes on where
bjarni
parents:
4661
diff
changeset
|
1548 |
case VEH_Ship: vl->_sorting = &_sorting.ship; break; |
d58f13102cc3
(svn r6559) -Codechange: [vehicle list windows] moved creation and drawing code into two new functions to make it easier to see what goes on where
bjarni
parents:
4661
diff
changeset
|
1549 |
case VEH_Aircraft: vl->_sorting = &_sorting.aircraft; break; |
d58f13102cc3
(svn r6559) -Codechange: [vehicle list windows] moved creation and drawing code into two new functions to make it easier to see what goes on where
bjarni
parents:
4661
diff
changeset
|
1550 |
default: NOT_REACHED(); break; |
d58f13102cc3
(svn r6559) -Codechange: [vehicle list windows] moved creation and drawing code into two new functions to make it easier to see what goes on where
bjarni
parents:
4661
diff
changeset
|
1551 |
} |
d58f13102cc3
(svn r6559) -Codechange: [vehicle list windows] moved creation and drawing code into two new functions to make it easier to see what goes on where
bjarni
parents:
4661
diff
changeset
|
1552 |
|
d58f13102cc3
(svn r6559) -Codechange: [vehicle list windows] moved creation and drawing code into two new functions to make it easier to see what goes on where
bjarni
parents:
4661
diff
changeset
|
1553 |
vl->l.flags = VL_REBUILD | (vl->_sorting->order << (VL_DESC - 1)); |
d58f13102cc3
(svn r6559) -Codechange: [vehicle list windows] moved creation and drawing code into two new functions to make it easier to see what goes on where
bjarni
parents:
4661
diff
changeset
|
1554 |
vl->l.sort_type = vl->_sorting->criteria; |
d58f13102cc3
(svn r6559) -Codechange: [vehicle list windows] moved creation and drawing code into two new functions to make it easier to see what goes on where
bjarni
parents:
4661
diff
changeset
|
1555 |
vl->sort_list = NULL; |
d58f13102cc3
(svn r6559) -Codechange: [vehicle list windows] moved creation and drawing code into two new functions to make it easier to see what goes on where
bjarni
parents:
4661
diff
changeset
|
1556 |
vl->l.resort_timer = DAY_TICKS * PERIODIC_RESORT_DAYS; // Set up resort timer |
d58f13102cc3
(svn r6559) -Codechange: [vehicle list windows] moved creation and drawing code into two new functions to make it easier to see what goes on where
bjarni
parents:
4661
diff
changeset
|
1557 |
} |
d58f13102cc3
(svn r6559) -Codechange: [vehicle list windows] moved creation and drawing code into two new functions to make it easier to see what goes on where
bjarni
parents:
4661
diff
changeset
|
1558 |
|
4734
24b34218c5ce
(svn r6646) -Codechange: [vehicle list window] Cleaned up the drawing code
bjarni
parents:
4726
diff
changeset
|
1559 |
static void DrawSmallOrderList(const Vehicle *v, int x, int y) |
24b34218c5ce
(svn r6646) -Codechange: [vehicle list window] Cleaned up the drawing code
bjarni
parents:
4726
diff
changeset
|
1560 |
{ |
24b34218c5ce
(svn r6646) -Codechange: [vehicle list window] Cleaned up the drawing code
bjarni
parents:
4726
diff
changeset
|
1561 |
const Order *order; |
24b34218c5ce
(svn r6646) -Codechange: [vehicle list window] Cleaned up the drawing code
bjarni
parents:
4726
diff
changeset
|
1562 |
int sel, i = 0; |
24b34218c5ce
(svn r6646) -Codechange: [vehicle list window] Cleaned up the drawing code
bjarni
parents:
4726
diff
changeset
|
1563 |
|
24b34218c5ce
(svn r6646) -Codechange: [vehicle list window] Cleaned up the drawing code
bjarni
parents:
4726
diff
changeset
|
1564 |
sel = v->cur_order_index; |
24b34218c5ce
(svn r6646) -Codechange: [vehicle list window] Cleaned up the drawing code
bjarni
parents:
4726
diff
changeset
|
1565 |
|
24b34218c5ce
(svn r6646) -Codechange: [vehicle list window] Cleaned up the drawing code
bjarni
parents:
4726
diff
changeset
|
1566 |
FOR_VEHICLE_ORDERS(v, order) { |
24b34218c5ce
(svn r6646) -Codechange: [vehicle list window] Cleaned up the drawing code
bjarni
parents:
4726
diff
changeset
|
1567 |
if (sel == 0) DrawString(x - 6, y, STR_SMALL_RIGHT_ARROW, 16); |
24b34218c5ce
(svn r6646) -Codechange: [vehicle list window] Cleaned up the drawing code
bjarni
parents:
4726
diff
changeset
|
1568 |
sel--; |
24b34218c5ce
(svn r6646) -Codechange: [vehicle list window] Cleaned up the drawing code
bjarni
parents:
4726
diff
changeset
|
1569 |
|
24b34218c5ce
(svn r6646) -Codechange: [vehicle list window] Cleaned up the drawing code
bjarni
parents:
4726
diff
changeset
|
1570 |
if (order->type == OT_GOTO_STATION) { |
24b34218c5ce
(svn r6646) -Codechange: [vehicle list window] Cleaned up the drawing code
bjarni
parents:
4726
diff
changeset
|
1571 |
if (v->type == VEH_Ship && IsBuoy(GetStation(order->dest))) continue; |
24b34218c5ce
(svn r6646) -Codechange: [vehicle list window] Cleaned up the drawing code
bjarni
parents:
4726
diff
changeset
|
1572 |
|
24b34218c5ce
(svn r6646) -Codechange: [vehicle list window] Cleaned up the drawing code
bjarni
parents:
4726
diff
changeset
|
1573 |
SetDParam(0, order->dest); |
24b34218c5ce
(svn r6646) -Codechange: [vehicle list window] Cleaned up the drawing code
bjarni
parents:
4726
diff
changeset
|
1574 |
DrawString(x, y, STR_A036, 0); |
24b34218c5ce
(svn r6646) -Codechange: [vehicle list window] Cleaned up the drawing code
bjarni
parents:
4726
diff
changeset
|
1575 |
|
24b34218c5ce
(svn r6646) -Codechange: [vehicle list window] Cleaned up the drawing code
bjarni
parents:
4726
diff
changeset
|
1576 |
y += 6; |
24b34218c5ce
(svn r6646) -Codechange: [vehicle list window] Cleaned up the drawing code
bjarni
parents:
4726
diff
changeset
|
1577 |
if (++i == 4) break; |
24b34218c5ce
(svn r6646) -Codechange: [vehicle list window] Cleaned up the drawing code
bjarni
parents:
4726
diff
changeset
|
1578 |
} |
24b34218c5ce
(svn r6646) -Codechange: [vehicle list window] Cleaned up the drawing code
bjarni
parents:
4726
diff
changeset
|
1579 |
} |
24b34218c5ce
(svn r6646) -Codechange: [vehicle list window] Cleaned up the drawing code
bjarni
parents:
4726
diff
changeset
|
1580 |
} |
24b34218c5ce
(svn r6646) -Codechange: [vehicle list window] Cleaned up the drawing code
bjarni
parents:
4726
diff
changeset
|
1581 |
|
4665
d58f13102cc3
(svn r6559) -Codechange: [vehicle list windows] moved creation and drawing code into two new functions to make it easier to see what goes on where
bjarni
parents:
4661
diff
changeset
|
1582 |
static void DrawVehicleListWindow(Window *w) |
d58f13102cc3
(svn r6559) -Codechange: [vehicle list windows] moved creation and drawing code into two new functions to make it easier to see what goes on where
bjarni
parents:
4661
diff
changeset
|
1583 |
{ |
d58f13102cc3
(svn r6559) -Codechange: [vehicle list windows] moved creation and drawing code into two new functions to make it easier to see what goes on where
bjarni
parents:
4661
diff
changeset
|
1584 |
vehiclelist_d *vl = &WP(w, vehiclelist_d); |
d58f13102cc3
(svn r6559) -Codechange: [vehicle list windows] moved creation and drawing code into two new functions to make it easier to see what goes on where
bjarni
parents:
4661
diff
changeset
|
1585 |
int x = 2; |
d58f13102cc3
(svn r6559) -Codechange: [vehicle list windows] moved creation and drawing code into two new functions to make it easier to see what goes on where
bjarni
parents:
4661
diff
changeset
|
1586 |
int y = PLY_WND_PRC__OFFSET_TOP_WIDGET; |
d58f13102cc3
(svn r6559) -Codechange: [vehicle list windows] moved creation and drawing code into two new functions to make it easier to see what goes on where
bjarni
parents:
4661
diff
changeset
|
1587 |
int max; |
d58f13102cc3
(svn r6559) -Codechange: [vehicle list windows] moved creation and drawing code into two new functions to make it easier to see what goes on where
bjarni
parents:
4661
diff
changeset
|
1588 |
int i; |
d58f13102cc3
(svn r6559) -Codechange: [vehicle list windows] moved creation and drawing code into two new functions to make it easier to see what goes on where
bjarni
parents:
4661
diff
changeset
|
1589 |
const PlayerID owner = (PlayerID)w->caption_color; |
d58f13102cc3
(svn r6559) -Codechange: [vehicle list windows] moved creation and drawing code into two new functions to make it easier to see what goes on where
bjarni
parents:
4661
diff
changeset
|
1590 |
const Player *p = GetPlayer(owner); |
d58f13102cc3
(svn r6559) -Codechange: [vehicle list windows] moved creation and drawing code into two new functions to make it easier to see what goes on where
bjarni
parents:
4661
diff
changeset
|
1591 |
const uint16 window_type = w->window_number & VLW_MASK; |
4681
bc077405e9a8
(svn r6586) -Feature: [depot window] added a vehicle list window with all vehicles having a certain depot in their orders
bjarni
parents:
4678
diff
changeset
|
1592 |
const StationID station = (window_type == VLW_STATION_LIST) ? GB(w->window_number, 16, 16) : INVALID_STATION; |
bc077405e9a8
(svn r6586) -Feature: [depot window] added a vehicle list window with all vehicles having a certain depot in their orders
bjarni
parents:
4678
diff
changeset
|
1593 |
const OrderID order = (window_type == VLW_SHARED_ORDERS) ? GB(w->window_number, 16, 16) : INVALID_ORDER; |
bc077405e9a8
(svn r6586) -Feature: [depot window] added a vehicle list window with all vehicles having a certain depot in their orders
bjarni
parents:
4678
diff
changeset
|
1594 |
const uint16 depot_airport_index = (window_type == VLW_DEPOT_LIST) ? GB(w->window_number, 16, 16) : INVALID_STATION; |
4665
d58f13102cc3
(svn r6559) -Codechange: [vehicle list windows] moved creation and drawing code into two new functions to make it easier to see what goes on where
bjarni
parents:
4661
diff
changeset
|
1595 |
|
4681
bc077405e9a8
(svn r6586) -Feature: [depot window] added a vehicle list window with all vehicles having a certain depot in their orders
bjarni
parents:
4678
diff
changeset
|
1596 |
BuildVehicleList(vl, owner, station, order, depot_airport_index, window_type); |
4665
d58f13102cc3
(svn r6559) -Codechange: [vehicle list windows] moved creation and drawing code into two new functions to make it easier to see what goes on where
bjarni
parents:
4661
diff
changeset
|
1597 |
SortVehicleList(vl); |
d58f13102cc3
(svn r6559) -Codechange: [vehicle list windows] moved creation and drawing code into two new functions to make it easier to see what goes on where
bjarni
parents:
4661
diff
changeset
|
1598 |
SetVScrollCount(w, vl->l.list_length); |
d58f13102cc3
(svn r6559) -Codechange: [vehicle list windows] moved creation and drawing code into two new functions to make it easier to see what goes on where
bjarni
parents:
4661
diff
changeset
|
1599 |
|
d58f13102cc3
(svn r6559) -Codechange: [vehicle list windows] moved creation and drawing code into two new functions to make it easier to see what goes on where
bjarni
parents:
4661
diff
changeset
|
1600 |
/* draw the widgets */ |
d58f13102cc3
(svn r6559) -Codechange: [vehicle list windows] moved creation and drawing code into two new functions to make it easier to see what goes on where
bjarni
parents:
4661
diff
changeset
|
1601 |
switch (window_type) { |
d58f13102cc3
(svn r6559) -Codechange: [vehicle list windows] moved creation and drawing code into two new functions to make it easier to see what goes on where
bjarni
parents:
4661
diff
changeset
|
1602 |
case VLW_SHARED_ORDERS: /* Shared Orders */ |
d58f13102cc3
(svn r6559) -Codechange: [vehicle list windows] moved creation and drawing code into two new functions to make it easier to see what goes on where
bjarni
parents:
4661
diff
changeset
|
1603 |
if (vl->l.list_length == 0) { |
4735
632bb67a4c50
(svn r6647) -Fix: [vehicle list windows] Lists of shared orders are now no longer closed by a window event if the list is empty
bjarni
parents:
4734
diff
changeset
|
1604 |
/* We can't open this window without vehicles using this order |
632bb67a4c50
(svn r6647) -Fix: [vehicle list windows] Lists of shared orders are now no longer closed by a window event if the list is empty
bjarni
parents:
4734
diff
changeset
|
1605 |
* and we should close the window when deleting the order */ |
632bb67a4c50
(svn r6647) -Fix: [vehicle list windows] Lists of shared orders are now no longer closed by a window event if the list is empty
bjarni
parents:
4734
diff
changeset
|
1606 |
NOT_REACHED(); |
4665
d58f13102cc3
(svn r6559) -Codechange: [vehicle list windows] moved creation and drawing code into two new functions to make it easier to see what goes on where
bjarni
parents:
4661
diff
changeset
|
1607 |
} |
d58f13102cc3
(svn r6559) -Codechange: [vehicle list windows] moved creation and drawing code into two new functions to make it easier to see what goes on where
bjarni
parents:
4661
diff
changeset
|
1608 |
SetDParam(0, w->vscroll.count); |
d58f13102cc3
(svn r6559) -Codechange: [vehicle list windows] moved creation and drawing code into two new functions to make it easier to see what goes on where
bjarni
parents:
4661
diff
changeset
|
1609 |
break; |
d58f13102cc3
(svn r6559) -Codechange: [vehicle list windows] moved creation and drawing code into two new functions to make it easier to see what goes on where
bjarni
parents:
4661
diff
changeset
|
1610 |
|
d58f13102cc3
(svn r6559) -Codechange: [vehicle list windows] moved creation and drawing code into two new functions to make it easier to see what goes on where
bjarni
parents:
4661
diff
changeset
|
1611 |
case VLW_STANDARD: /* Company Name */ |
d58f13102cc3
(svn r6559) -Codechange: [vehicle list windows] moved creation and drawing code into two new functions to make it easier to see what goes on where
bjarni
parents:
4661
diff
changeset
|
1612 |
SetDParam(0, p->name_1); |
4668
f7256d0e7682
(svn r6562) -Codechange: merged the vehicle list window widget arrays
bjarni
parents:
4665
diff
changeset
|
1613 |
SetDParam(1, p->name_2); |
f7256d0e7682
(svn r6562) -Codechange: merged the vehicle list window widget arrays
bjarni
parents:
4665
diff
changeset
|
1614 |
SetDParam(2, w->vscroll.count); |
f7256d0e7682
(svn r6562) -Codechange: merged the vehicle list window widget arrays
bjarni
parents:
4665
diff
changeset
|
1615 |
break; |
4665
d58f13102cc3
(svn r6559) -Codechange: [vehicle list windows] moved creation and drawing code into two new functions to make it easier to see what goes on where
bjarni
parents:
4661
diff
changeset
|
1616 |
|
4668
f7256d0e7682
(svn r6562) -Codechange: merged the vehicle list window widget arrays
bjarni
parents:
4665
diff
changeset
|
1617 |
case VLW_STATION_LIST: /* Station Name */ |
f7256d0e7682
(svn r6562) -Codechange: merged the vehicle list window widget arrays
bjarni
parents:
4665
diff
changeset
|
1618 |
SetDParam(0, station); |
f7256d0e7682
(svn r6562) -Codechange: merged the vehicle list window widget arrays
bjarni
parents:
4665
diff
changeset
|
1619 |
SetDParam(1, w->vscroll.count); |
f7256d0e7682
(svn r6562) -Codechange: merged the vehicle list window widget arrays
bjarni
parents:
4665
diff
changeset
|
1620 |
break; |
4681
bc077405e9a8
(svn r6586) -Feature: [depot window] added a vehicle list window with all vehicles having a certain depot in their orders
bjarni
parents:
4678
diff
changeset
|
1621 |
|
bc077405e9a8
(svn r6586) -Feature: [depot window] added a vehicle list window with all vehicles having a certain depot in their orders
bjarni
parents:
4678
diff
changeset
|
1622 |
case VLW_DEPOT_LIST: |
bc077405e9a8
(svn r6586) -Feature: [depot window] added a vehicle list window with all vehicles having a certain depot in their orders
bjarni
parents:
4678
diff
changeset
|
1623 |
switch (vl->vehicle_type) { |
bc077405e9a8
(svn r6586) -Feature: [depot window] added a vehicle list window with all vehicles having a certain depot in their orders
bjarni
parents:
4678
diff
changeset
|
1624 |
case VEH_Train: SetDParam(0, STR_8800_TRAIN_DEPOT); break; |
bc077405e9a8
(svn r6586) -Feature: [depot window] added a vehicle list window with all vehicles having a certain depot in their orders
bjarni
parents:
4678
diff
changeset
|
1625 |
case VEH_Road: SetDParam(0, STR_9003_ROAD_VEHICLE_DEPOT); break; |
bc077405e9a8
(svn r6586) -Feature: [depot window] added a vehicle list window with all vehicles having a certain depot in their orders
bjarni
parents:
4678
diff
changeset
|
1626 |
case VEH_Ship: SetDParam(0, STR_9803_SHIP_DEPOT); break; |
bc077405e9a8
(svn r6586) -Feature: [depot window] added a vehicle list window with all vehicles having a certain depot in their orders
bjarni
parents:
4678
diff
changeset
|
1627 |
case VEH_Aircraft: SetDParam(0, STR_A002_AIRCRAFT_HANGAR); break; |
bc077405e9a8
(svn r6586) -Feature: [depot window] added a vehicle list window with all vehicles having a certain depot in their orders
bjarni
parents:
4678
diff
changeset
|
1628 |
default: NOT_REACHED(); break; |
bc077405e9a8
(svn r6586) -Feature: [depot window] added a vehicle list window with all vehicles having a certain depot in their orders
bjarni
parents:
4678
diff
changeset
|
1629 |
} |
bc077405e9a8
(svn r6586) -Feature: [depot window] added a vehicle list window with all vehicles having a certain depot in their orders
bjarni
parents:
4678
diff
changeset
|
1630 |
if (vl->vehicle_type == VEH_Aircraft) { |
bc077405e9a8
(svn r6586) -Feature: [depot window] added a vehicle list window with all vehicles having a certain depot in their orders
bjarni
parents:
4678
diff
changeset
|
1631 |
SetDParam(1, depot_airport_index); // Airport name |
bc077405e9a8
(svn r6586) -Feature: [depot window] added a vehicle list window with all vehicles having a certain depot in their orders
bjarni
parents:
4678
diff
changeset
|
1632 |
} else { |
bc077405e9a8
(svn r6586) -Feature: [depot window] added a vehicle list window with all vehicles having a certain depot in their orders
bjarni
parents:
4678
diff
changeset
|
1633 |
SetDParam(1, GetDepot(depot_airport_index)->town_index); |
bc077405e9a8
(svn r6586) -Feature: [depot window] added a vehicle list window with all vehicles having a certain depot in their orders
bjarni
parents:
4678
diff
changeset
|
1634 |
} |
bc077405e9a8
(svn r6586) -Feature: [depot window] added a vehicle list window with all vehicles having a certain depot in their orders
bjarni
parents:
4678
diff
changeset
|
1635 |
SetDParam(2, w->vscroll.count); |
bc077405e9a8
(svn r6586) -Feature: [depot window] added a vehicle list window with all vehicles having a certain depot in their orders
bjarni
parents:
4678
diff
changeset
|
1636 |
break; |
4668
f7256d0e7682
(svn r6562) -Codechange: merged the vehicle list window widget arrays
bjarni
parents:
4665
diff
changeset
|
1637 |
default: NOT_REACHED(); break; |
4665
d58f13102cc3
(svn r6559) -Codechange: [vehicle list windows] moved creation and drawing code into two new functions to make it easier to see what goes on where
bjarni
parents:
4661
diff
changeset
|
1638 |
} |
d58f13102cc3
(svn r6559) -Codechange: [vehicle list windows] moved creation and drawing code into two new functions to make it easier to see what goes on where
bjarni
parents:
4661
diff
changeset
|
1639 |
|
4758
090cf0f1b35e
(svn r6672) -Codechange: [depot & vehicle windows] applied SetWindowWidgetsDisabledState() and SetWindowWidgetsHiddenState() to depot and vehicle windows
bjarni
parents:
4753
diff
changeset
|
1640 |
SetWindowWidgetsDisabledState(w, vl->l.list_length == 0, |
5274
8bd7e4c00956
(svn r7418) -Codechange/Feature: Put back the 'New Vehicles' button in the vehicle list window. As
Darkvater
parents:
5269
diff
changeset
|
1641 |
VLW_WIDGET_MANAGE_VEHICLES, |
8bd7e4c00956
(svn r7418) -Codechange/Feature: Put back the 'New Vehicles' button in the vehicle list window. As
Darkvater
parents:
5269
diff
changeset
|
1642 |
VLW_WIDGET_MANAGE_VEHICLES_DROPDOWN, |
4758
090cf0f1b35e
(svn r6672) -Codechange: [depot & vehicle windows] applied SetWindowWidgetsDisabledState() and SetWindowWidgetsHiddenState() to depot and vehicle windows
bjarni
parents:
4753
diff
changeset
|
1643 |
VLW_WIDGET_STOP_ALL, |
090cf0f1b35e
(svn r6672) -Codechange: [depot & vehicle windows] applied SetWindowWidgetsDisabledState() and SetWindowWidgetsHiddenState() to depot and vehicle windows
bjarni
parents:
4753
diff
changeset
|
1644 |
VLW_WIDGET_START_ALL, |
090cf0f1b35e
(svn r6672) -Codechange: [depot & vehicle windows] applied SetWindowWidgetsDisabledState() and SetWindowWidgetsHiddenState() to depot and vehicle windows
bjarni
parents:
4753
diff
changeset
|
1645 |
WIDGET_LIST_END); |
4722
c9efab0020b9
(svn r6634) -Fix(r6377): Do not change a widget state after a DrawWindowWidgets, as it is a bit useless
belugas
parents:
4712
diff
changeset
|
1646 |
|
4665
d58f13102cc3
(svn r6559) -Codechange: [vehicle list windows] moved creation and drawing code into two new functions to make it easier to see what goes on where
bjarni
parents:
4661
diff
changeset
|
1647 |
DrawWindowWidgets(w); |
d58f13102cc3
(svn r6559) -Codechange: [vehicle list windows] moved creation and drawing code into two new functions to make it easier to see what goes on where
bjarni
parents:
4661
diff
changeset
|
1648 |
|
d58f13102cc3
(svn r6559) -Codechange: [vehicle list windows] moved creation and drawing code into two new functions to make it easier to see what goes on where
bjarni
parents:
4661
diff
changeset
|
1649 |
/* draw sorting criteria string */ |
d58f13102cc3
(svn r6559) -Codechange: [vehicle list windows] moved creation and drawing code into two new functions to make it easier to see what goes on where
bjarni
parents:
4661
diff
changeset
|
1650 |
DrawString(85, 15, _vehicle_sort_listing[vl->l.sort_type], 0x10); |
d58f13102cc3
(svn r6559) -Codechange: [vehicle list windows] moved creation and drawing code into two new functions to make it easier to see what goes on where
bjarni
parents:
4661
diff
changeset
|
1651 |
/* draw arrow pointing up/down for ascending/descending sorting */ |
d58f13102cc3
(svn r6559) -Codechange: [vehicle list windows] moved creation and drawing code into two new functions to make it easier to see what goes on where
bjarni
parents:
4661
diff
changeset
|
1652 |
DoDrawString(vl->l.flags & VL_DESC ? DOWNARROW : UPARROW, 69, 15, 0x10); |
d58f13102cc3
(svn r6559) -Codechange: [vehicle list windows] moved creation and drawing code into two new functions to make it easier to see what goes on where
bjarni
parents:
4661
diff
changeset
|
1653 |
|
d58f13102cc3
(svn r6559) -Codechange: [vehicle list windows] moved creation and drawing code into two new functions to make it easier to see what goes on where
bjarni
parents:
4661
diff
changeset
|
1654 |
max = min(w->vscroll.pos + w->vscroll.cap, vl->l.list_length); |
d58f13102cc3
(svn r6559) -Codechange: [vehicle list windows] moved creation and drawing code into two new functions to make it easier to see what goes on where
bjarni
parents:
4661
diff
changeset
|
1655 |
for (i = w->vscroll.pos; i < max; ++i) { |
d58f13102cc3
(svn r6559) -Codechange: [vehicle list windows] moved creation and drawing code into two new functions to make it easier to see what goes on where
bjarni
parents:
4661
diff
changeset
|
1656 |
const Vehicle *v = vl->sort_list[i]; |
4734
24b34218c5ce
(svn r6646) -Codechange: [vehicle list window] Cleaned up the drawing code
bjarni
parents:
4726
diff
changeset
|
1657 |
StringID str; |
4665
d58f13102cc3
(svn r6559) -Codechange: [vehicle list windows] moved creation and drawing code into two new functions to make it easier to see what goes on where
bjarni
parents:
4661
diff
changeset
|
1658 |
|
d58f13102cc3
(svn r6559) -Codechange: [vehicle list windows] moved creation and drawing code into two new functions to make it easier to see what goes on where
bjarni
parents:
4661
diff
changeset
|
1659 |
SetDParam(0, v->profit_this_year); |
d58f13102cc3
(svn r6559) -Codechange: [vehicle list windows] moved creation and drawing code into two new functions to make it easier to see what goes on where
bjarni
parents:
4661
diff
changeset
|
1660 |
SetDParam(1, v->profit_last_year); |
d58f13102cc3
(svn r6559) -Codechange: [vehicle list windows] moved creation and drawing code into two new functions to make it easier to see what goes on where
bjarni
parents:
4661
diff
changeset
|
1661 |
|
4753
58daf74cb14f
(svn r6667) - Codechange: The vehicle list has no horizontal scroll bar, so don't use it to store data; instead, just get the widget's width.
peter1138
parents:
4740
diff
changeset
|
1662 |
DrawVehicleImage(v, x + 19, y + 6, w->widget[VLW_WIDGET_LIST].right - w->widget[VLW_WIDGET_LIST].left - 20, 0, INVALID_VEHICLE); |
4734
24b34218c5ce
(svn r6646) -Codechange: [vehicle list window] Cleaned up the drawing code
bjarni
parents:
4726
diff
changeset
|
1663 |
DrawString(x + 19, y + w->resize.step_height - 8, STR_0198_PROFIT_THIS_YEAR_LAST_YEAR, 0); |
4665
d58f13102cc3
(svn r6559) -Codechange: [vehicle list windows] moved creation and drawing code into two new functions to make it easier to see what goes on where
bjarni
parents:
4661
diff
changeset
|
1664 |
|
4734
24b34218c5ce
(svn r6646) -Codechange: [vehicle list window] Cleaned up the drawing code
bjarni
parents:
4726
diff
changeset
|
1665 |
if ((v->type == VEH_Train && v->string_id != STR_SV_TRAIN_NAME) || |
24b34218c5ce
(svn r6646) -Codechange: [vehicle list window] Cleaned up the drawing code
bjarni
parents:
4726
diff
changeset
|
1666 |
(v->type == VEH_Road && v->string_id != STR_SV_ROADVEH_NAME) || |
24b34218c5ce
(svn r6646) -Codechange: [vehicle list window] Cleaned up the drawing code
bjarni
parents:
4726
diff
changeset
|
1667 |
(v->type == VEH_Ship && v->string_id != STR_SV_SHIP_NAME) || |
24b34218c5ce
(svn r6646) -Codechange: [vehicle list window] Cleaned up the drawing code
bjarni
parents:
4726
diff
changeset
|
1668 |
(v->type == VEH_Aircraft && v->string_id != STR_SV_AIRCRAFT_NAME)) { |
4665
d58f13102cc3
(svn r6559) -Codechange: [vehicle list windows] moved creation and drawing code into two new functions to make it easier to see what goes on where
bjarni
parents:
4661
diff
changeset
|
1669 |
|
4734
24b34218c5ce
(svn r6646) -Codechange: [vehicle list window] Cleaned up the drawing code
bjarni
parents:
4726
diff
changeset
|
1670 |
/* The vehicle got a name so we will print it */ |
24b34218c5ce
(svn r6646) -Codechange: [vehicle list window] Cleaned up the drawing code
bjarni
parents:
4726
diff
changeset
|
1671 |
SetDParam(0, v->string_id); |
24b34218c5ce
(svn r6646) -Codechange: [vehicle list window] Cleaned up the drawing code
bjarni
parents:
4726
diff
changeset
|
1672 |
DrawString(x + 19, y, STR_01AB, 0); |
24b34218c5ce
(svn r6646) -Codechange: [vehicle list window] Cleaned up the drawing code
bjarni
parents:
4726
diff
changeset
|
1673 |
} |
4665
d58f13102cc3
(svn r6559) -Codechange: [vehicle list windows] moved creation and drawing code into two new functions to make it easier to see what goes on where
bjarni
parents:
4661
diff
changeset
|
1674 |
|
4734
24b34218c5ce
(svn r6646) -Codechange: [vehicle list window] Cleaned up the drawing code
bjarni
parents:
4726
diff
changeset
|
1675 |
if (w->resize.step_height == PLY_WND_PRC__SIZE_OF_ROW_BIG) DrawSmallOrderList(v, x + 138, y); |
4665
d58f13102cc3
(svn r6559) -Codechange: [vehicle list windows] moved creation and drawing code into two new functions to make it easier to see what goes on where
bjarni
parents:
4661
diff
changeset
|
1676 |
|
4734
24b34218c5ce
(svn r6646) -Codechange: [vehicle list window] Cleaned up the drawing code
bjarni
parents:
4726
diff
changeset
|
1677 |
if (IsVehicleInDepot(v)) { |
24b34218c5ce
(svn r6646) -Codechange: [vehicle list window] Cleaned up the drawing code
bjarni
parents:
4726
diff
changeset
|
1678 |
str = STR_021F; |
24b34218c5ce
(svn r6646) -Codechange: [vehicle list window] Cleaned up the drawing code
bjarni
parents:
4726
diff
changeset
|
1679 |
} else { |
24b34218c5ce
(svn r6646) -Codechange: [vehicle list window] Cleaned up the drawing code
bjarni
parents:
4726
diff
changeset
|
1680 |
str = (v->age > v->max_age - 366) ? STR_00E3 : STR_00E2; |
24b34218c5ce
(svn r6646) -Codechange: [vehicle list window] Cleaned up the drawing code
bjarni
parents:
4726
diff
changeset
|
1681 |
} |
4665
d58f13102cc3
(svn r6559) -Codechange: [vehicle list windows] moved creation and drawing code into two new functions to make it easier to see what goes on where
bjarni
parents:
4661
diff
changeset
|
1682 |
|
d58f13102cc3
(svn r6559) -Codechange: [vehicle list windows] moved creation and drawing code into two new functions to make it easier to see what goes on where
bjarni
parents:
4661
diff
changeset
|
1683 |
SetDParam(0, v->unitnumber); |
d58f13102cc3
(svn r6559) -Codechange: [vehicle list windows] moved creation and drawing code into two new functions to make it easier to see what goes on where
bjarni
parents:
4661
diff
changeset
|
1684 |
DrawString(x, y + 2, str, 0); |
d58f13102cc3
(svn r6559) -Codechange: [vehicle list windows] moved creation and drawing code into two new functions to make it easier to see what goes on where
bjarni
parents:
4661
diff
changeset
|
1685 |
|
d58f13102cc3
(svn r6559) -Codechange: [vehicle list windows] moved creation and drawing code into two new functions to make it easier to see what goes on where
bjarni
parents:
4661
diff
changeset
|
1686 |
DrawVehicleProfitButton(v, x, y + 13); |
d58f13102cc3
(svn r6559) -Codechange: [vehicle list windows] moved creation and drawing code into two new functions to make it easier to see what goes on where
bjarni
parents:
4661
diff
changeset
|
1687 |
|
d58f13102cc3
(svn r6559) -Codechange: [vehicle list windows] moved creation and drawing code into two new functions to make it easier to see what goes on where
bjarni
parents:
4661
diff
changeset
|
1688 |
y += w->resize.step_height; |
d58f13102cc3
(svn r6559) -Codechange: [vehicle list windows] moved creation and drawing code into two new functions to make it easier to see what goes on where
bjarni
parents:
4661
diff
changeset
|
1689 |
} |
d58f13102cc3
(svn r6559) -Codechange: [vehicle list windows] moved creation and drawing code into two new functions to make it easier to see what goes on where
bjarni
parents:
4661
diff
changeset
|
1690 |
} |
d58f13102cc3
(svn r6559) -Codechange: [vehicle list windows] moved creation and drawing code into two new functions to make it easier to see what goes on where
bjarni
parents:
4661
diff
changeset
|
1691 |
|
4449
820974aaa4a6
(svn r6227) -Codechange: added window type flags to use with PlayerVehWndProc
bjarni
parents:
4442
diff
changeset
|
1692 |
/* |
820974aaa4a6
(svn r6227) -Codechange: added window type flags to use with PlayerVehWndProc
bjarni
parents:
4442
diff
changeset
|
1693 |
* bitmask for w->window_number |
820974aaa4a6
(svn r6227) -Codechange: added window type flags to use with PlayerVehWndProc
bjarni
parents:
4442
diff
changeset
|
1694 |
* 0-7 PlayerID (owner) |
820974aaa4a6
(svn r6227) -Codechange: added window type flags to use with PlayerVehWndProc
bjarni
parents:
4442
diff
changeset
|
1695 |
* 8-10 window type (use flags in vehicle_gui.h) |
820974aaa4a6
(svn r6227) -Codechange: added window type flags to use with PlayerVehWndProc
bjarni
parents:
4442
diff
changeset
|
1696 |
* 11-15 vehicle type (using VEH_, but can be compressed to fewer bytes if needed) |
820974aaa4a6
(svn r6227) -Codechange: added window type flags to use with PlayerVehWndProc
bjarni
parents:
4442
diff
changeset
|
1697 |
* 16-31 StationID or OrderID depending on window type (bit 8-10) |
820974aaa4a6
(svn r6227) -Codechange: added window type flags to use with PlayerVehWndProc
bjarni
parents:
4442
diff
changeset
|
1698 |
**/ |
4442
9f8bb348d58f
(svn r6215) -Codechange: [vehicle list windows] unified Player(vehicle)WndProc into PlayerVehWndProc
bjarni
parents:
4434
diff
changeset
|
1699 |
void PlayerVehWndProc(Window *w, WindowEvent *e) |
9f8bb348d58f
(svn r6215) -Codechange: [vehicle list windows] unified Player(vehicle)WndProc into PlayerVehWndProc
bjarni
parents:
4434
diff
changeset
|
1700 |
{ |
9f8bb348d58f
(svn r6215) -Codechange: [vehicle list windows] unified Player(vehicle)WndProc into PlayerVehWndProc
bjarni
parents:
4434
diff
changeset
|
1701 |
vehiclelist_d *vl = &WP(w, vehiclelist_d); |
9f8bb348d58f
(svn r6215) -Codechange: [vehicle list windows] unified Player(vehicle)WndProc into PlayerVehWndProc
bjarni
parents:
4434
diff
changeset
|
1702 |
|
9f8bb348d58f
(svn r6215) -Codechange: [vehicle list windows] unified Player(vehicle)WndProc into PlayerVehWndProc
bjarni
parents:
4434
diff
changeset
|
1703 |
switch (e->event) { |
4665
d58f13102cc3
(svn r6559) -Codechange: [vehicle list windows] moved creation and drawing code into two new functions to make it easier to see what goes on where
bjarni
parents:
4661
diff
changeset
|
1704 |
case WE_CREATE: |
d58f13102cc3
(svn r6559) -Codechange: [vehicle list windows] moved creation and drawing code into two new functions to make it easier to see what goes on where
bjarni
parents:
4661
diff
changeset
|
1705 |
CreateVehicleListWindow(w); |
d58f13102cc3
(svn r6559) -Codechange: [vehicle list windows] moved creation and drawing code into two new functions to make it easier to see what goes on where
bjarni
parents:
4661
diff
changeset
|
1706 |
break; |
4442
9f8bb348d58f
(svn r6215) -Codechange: [vehicle list windows] unified Player(vehicle)WndProc into PlayerVehWndProc
bjarni
parents:
4434
diff
changeset
|
1707 |
|
4665
d58f13102cc3
(svn r6559) -Codechange: [vehicle list windows] moved creation and drawing code into two new functions to make it easier to see what goes on where
bjarni
parents:
4661
diff
changeset
|
1708 |
case WE_PAINT: |
d58f13102cc3
(svn r6559) -Codechange: [vehicle list windows] moved creation and drawing code into two new functions to make it easier to see what goes on where
bjarni
parents:
4661
diff
changeset
|
1709 |
DrawVehicleListWindow(w); |
d58f13102cc3
(svn r6559) -Codechange: [vehicle list windows] moved creation and drawing code into two new functions to make it easier to see what goes on where
bjarni
parents:
4661
diff
changeset
|
1710 |
break; |
4442
9f8bb348d58f
(svn r6215) -Codechange: [vehicle list windows] unified Player(vehicle)WndProc into PlayerVehWndProc
bjarni
parents:
4434
diff
changeset
|
1711 |
|
9f8bb348d58f
(svn r6215) -Codechange: [vehicle list windows] unified Player(vehicle)WndProc into PlayerVehWndProc
bjarni
parents:
4434
diff
changeset
|
1712 |
case WE_CLICK: { |
4634
07699ac2bf37
(svn r6499) -Codechange: Finally, got "byte event" outside of the union WindowEvent, which is now a struct
belugas
parents:
4581
diff
changeset
|
1713 |
switch (e->we.click.widget) { |
4668
f7256d0e7682
(svn r6562) -Codechange: merged the vehicle list window widget arrays
bjarni
parents:
4665
diff
changeset
|
1714 |
case VLW_WIDGET_SORT_ORDER: /* Flip sorting method ascending/descending */ |
4545
138a9195009a
(svn r6377) -Codechange: Set up the widgets in the WE_CREATE instead of on every WE_PAINT
Darkvater
parents:
4542
diff
changeset
|
1715 |
vl->l.flags ^= VL_DESC; |
138a9195009a
(svn r6377) -Codechange: Set up the widgets in the WE_CREATE instead of on every WE_PAINT
Darkvater
parents:
4542
diff
changeset
|
1716 |
vl->l.flags |= VL_RESORT; |
4442
9f8bb348d58f
(svn r6215) -Codechange: [vehicle list windows] unified Player(vehicle)WndProc into PlayerVehWndProc
bjarni
parents:
4434
diff
changeset
|
1717 |
|
4545
138a9195009a
(svn r6377) -Codechange: Set up the widgets in the WE_CREATE instead of on every WE_PAINT
Darkvater
parents:
4542
diff
changeset
|
1718 |
vl->_sorting->order = !!(vl->l.flags & VL_DESC); |
4442
9f8bb348d58f
(svn r6215) -Codechange: [vehicle list windows] unified Player(vehicle)WndProc into PlayerVehWndProc
bjarni
parents:
4434
diff
changeset
|
1719 |
SetWindowDirty(w); |
9f8bb348d58f
(svn r6215) -Codechange: [vehicle list windows] unified Player(vehicle)WndProc into PlayerVehWndProc
bjarni
parents:
4434
diff
changeset
|
1720 |
break; |
4668
f7256d0e7682
(svn r6562) -Codechange: merged the vehicle list window widget arrays
bjarni
parents:
4665
diff
changeset
|
1721 |
case VLW_WIDGET_SORT_BY_TEXT: case VLW_WIDGET_SORT_BY_PULLDOWN:/* Select sorting criteria dropdown menu */ |
f7256d0e7682
(svn r6562) -Codechange: merged the vehicle list window widget arrays
bjarni
parents:
4665
diff
changeset
|
1722 |
ShowDropDownMenu(w, _vehicle_sort_listing, vl->l.sort_type, VLW_WIDGET_SORT_BY_PULLDOWN, 0, 0); |
4442
9f8bb348d58f
(svn r6215) -Codechange: [vehicle list windows] unified Player(vehicle)WndProc into PlayerVehWndProc
bjarni
parents:
4434
diff
changeset
|
1723 |
return; |
4668
f7256d0e7682
(svn r6562) -Codechange: merged the vehicle list window widget arrays
bjarni
parents:
4665
diff
changeset
|
1724 |
case VLW_WIDGET_LIST: { /* Matrix to show vehicles */ |
4634
07699ac2bf37
(svn r6499) -Codechange: Finally, got "byte event" outside of the union WindowEvent, which is now a struct
belugas
parents:
4581
diff
changeset
|
1725 |
uint32 id_v = (e->we.click.pt.y - PLY_WND_PRC__OFFSET_TOP_WIDGET) / w->resize.step_height; |
4442
9f8bb348d58f
(svn r6215) -Codechange: [vehicle list windows] unified Player(vehicle)WndProc into PlayerVehWndProc
bjarni
parents:
4434
diff
changeset
|
1726 |
const Vehicle *v; |
9f8bb348d58f
(svn r6215) -Codechange: [vehicle list windows] unified Player(vehicle)WndProc into PlayerVehWndProc
bjarni
parents:
4434
diff
changeset
|
1727 |
|
9f8bb348d58f
(svn r6215) -Codechange: [vehicle list windows] unified Player(vehicle)WndProc into PlayerVehWndProc
bjarni
parents:
4434
diff
changeset
|
1728 |
if (id_v >= w->vscroll.cap) return; // click out of bounds |
9f8bb348d58f
(svn r6215) -Codechange: [vehicle list windows] unified Player(vehicle)WndProc into PlayerVehWndProc
bjarni
parents:
4434
diff
changeset
|
1729 |
|
9f8bb348d58f
(svn r6215) -Codechange: [vehicle list windows] unified Player(vehicle)WndProc into PlayerVehWndProc
bjarni
parents:
4434
diff
changeset
|
1730 |
id_v += w->vscroll.pos; |
9f8bb348d58f
(svn r6215) -Codechange: [vehicle list windows] unified Player(vehicle)WndProc into PlayerVehWndProc
bjarni
parents:
4434
diff
changeset
|
1731 |
|
4545
138a9195009a
(svn r6377) -Codechange: Set up the widgets in the WE_CREATE instead of on every WE_PAINT
Darkvater
parents:
4542
diff
changeset
|
1732 |
if (id_v >= vl->l.list_length) return; // click out of list bound |
4442
9f8bb348d58f
(svn r6215) -Codechange: [vehicle list windows] unified Player(vehicle)WndProc into PlayerVehWndProc
bjarni
parents:
4434
diff
changeset
|
1733 |
|
9f8bb348d58f
(svn r6215) -Codechange: [vehicle list windows] unified Player(vehicle)WndProc into PlayerVehWndProc
bjarni
parents:
4434
diff
changeset
|
1734 |
v = vl->sort_list[id_v]; |
9f8bb348d58f
(svn r6215) -Codechange: [vehicle list windows] unified Player(vehicle)WndProc into PlayerVehWndProc
bjarni
parents:
4434
diff
changeset
|
1735 |
|
4545
138a9195009a
(svn r6377) -Codechange: Set up the widgets in the WE_CREATE instead of on every WE_PAINT
Darkvater
parents:
4542
diff
changeset
|
1736 |
switch (vl->vehicle_type) { |
4442
9f8bb348d58f
(svn r6215) -Codechange: [vehicle list windows] unified Player(vehicle)WndProc into PlayerVehWndProc
bjarni
parents:
4434
diff
changeset
|
1737 |
case VEH_Train: ShowTrainViewWindow(v); break; |
9f8bb348d58f
(svn r6215) -Codechange: [vehicle list windows] unified Player(vehicle)WndProc into PlayerVehWndProc
bjarni
parents:
4434
diff
changeset
|
1738 |
case VEH_Road: ShowRoadVehViewWindow(v); break; |
9f8bb348d58f
(svn r6215) -Codechange: [vehicle list windows] unified Player(vehicle)WndProc into PlayerVehWndProc
bjarni
parents:
4434
diff
changeset
|
1739 |
case VEH_Ship: ShowShipViewWindow(v); break; |
9f8bb348d58f
(svn r6215) -Codechange: [vehicle list windows] unified Player(vehicle)WndProc into PlayerVehWndProc
bjarni
parents:
4434
diff
changeset
|
1740 |
case VEH_Aircraft: ShowAircraftViewWindow(v); break; |
9f8bb348d58f
(svn r6215) -Codechange: [vehicle list windows] unified Player(vehicle)WndProc into PlayerVehWndProc
bjarni
parents:
4434
diff
changeset
|
1741 |
default: NOT_REACHED(); break; |
9f8bb348d58f
(svn r6215) -Codechange: [vehicle list windows] unified Player(vehicle)WndProc into PlayerVehWndProc
bjarni
parents:
4434
diff
changeset
|
1742 |
} |
9f8bb348d58f
(svn r6215) -Codechange: [vehicle list windows] unified Player(vehicle)WndProc into PlayerVehWndProc
bjarni
parents:
4434
diff
changeset
|
1743 |
} break; |
9f8bb348d58f
(svn r6215) -Codechange: [vehicle list windows] unified Player(vehicle)WndProc into PlayerVehWndProc
bjarni
parents:
4434
diff
changeset
|
1744 |
|
5274
8bd7e4c00956
(svn r7418) -Codechange/Feature: Put back the 'New Vehicles' button in the vehicle list window. As
Darkvater
parents:
5269
diff
changeset
|
1745 |
case VLW_WIDGET_NEW_VEHICLES: |
8bd7e4c00956
(svn r7418) -Codechange/Feature: Put back the 'New Vehicles' button in the vehicle list window. As
Darkvater
parents:
5269
diff
changeset
|
1746 |
switch (vl->vehicle_type) { |
8bd7e4c00956
(svn r7418) -Codechange/Feature: Put back the 'New Vehicles' button in the vehicle list window. As
Darkvater
parents:
5269
diff
changeset
|
1747 |
case VEH_Train: ShowBuildTrainWindow(0); break; |
8bd7e4c00956
(svn r7418) -Codechange/Feature: Put back the 'New Vehicles' button in the vehicle list window. As
Darkvater
parents:
5269
diff
changeset
|
1748 |
case VEH_Road: ShowBuildRoadVehWindow(0); break; |
8bd7e4c00956
(svn r7418) -Codechange/Feature: Put back the 'New Vehicles' button in the vehicle list window. As
Darkvater
parents:
5269
diff
changeset
|
1749 |
case VEH_Ship: ShowBuildShipWindow(0); break; |
8bd7e4c00956
(svn r7418) -Codechange/Feature: Put back the 'New Vehicles' button in the vehicle list window. As
Darkvater
parents:
5269
diff
changeset
|
1750 |
case VEH_Aircraft: ShowBuildVehicleWindow(0, vl->vehicle_type); break; |
8bd7e4c00956
(svn r7418) -Codechange/Feature: Put back the 'New Vehicles' button in the vehicle list window. As
Darkvater
parents:
5269
diff
changeset
|
1751 |
} |
4506
e6a56518135c
(svn r6291) -Feature: Vehicle lists from the station window now also got the goto depot button
bjarni
parents:
4498
diff
changeset
|
1752 |
break; |
4465
262c344f6f3d
(svn r6249) -Fix: fixed assert when pressing goto depot in an empty list (forgot to disable the button in this condition)
bjarni
parents:
4463
diff
changeset
|
1753 |
|
5274
8bd7e4c00956
(svn r7418) -Codechange/Feature: Put back the 'New Vehicles' button in the vehicle list window. As
Darkvater
parents:
5269
diff
changeset
|
1754 |
case VLW_WIDGET_MANAGE_VEHICLES: |
8bd7e4c00956
(svn r7418) -Codechange/Feature: Put back the 'New Vehicles' button in the vehicle list window. As
Darkvater
parents:
5269
diff
changeset
|
1755 |
case VLW_WIDGET_MANAGE_VEHICLES_DROPDOWN: { |
8bd7e4c00956
(svn r7418) -Codechange/Feature: Put back the 'New Vehicles' button in the vehicle list window. As
Darkvater
parents:
5269
diff
changeset
|
1756 |
static StringID action_str[] = { |
8bd7e4c00956
(svn r7418) -Codechange/Feature: Put back the 'New Vehicles' button in the vehicle list window. As
Darkvater
parents:
5269
diff
changeset
|
1757 |
STR_REPLACE_VEHICLES, |
8bd7e4c00956
(svn r7418) -Codechange/Feature: Put back the 'New Vehicles' button in the vehicle list window. As
Darkvater
parents:
5269
diff
changeset
|
1758 |
STR_SEND_FOR_SERVICING, |
8bd7e4c00956
(svn r7418) -Codechange/Feature: Put back the 'New Vehicles' button in the vehicle list window. As
Darkvater
parents:
5269
diff
changeset
|
1759 |
STR_NULL, |
8bd7e4c00956
(svn r7418) -Codechange/Feature: Put back the 'New Vehicles' button in the vehicle list window. As
Darkvater
parents:
5269
diff
changeset
|
1760 |
INVALID_STRING_ID |
8bd7e4c00956
(svn r7418) -Codechange/Feature: Put back the 'New Vehicles' button in the vehicle list window. As
Darkvater
parents:
5269
diff
changeset
|
1761 |
}; |
8bd7e4c00956
(svn r7418) -Codechange/Feature: Put back the 'New Vehicles' button in the vehicle list window. As
Darkvater
parents:
5269
diff
changeset
|
1762 |
|
8bd7e4c00956
(svn r7418) -Codechange/Feature: Put back the 'New Vehicles' button in the vehicle list window. As
Darkvater
parents:
5269
diff
changeset
|
1763 |
static const StringID depot_name[] = { |
8bd7e4c00956
(svn r7418) -Codechange/Feature: Put back the 'New Vehicles' button in the vehicle list window. As
Darkvater
parents:
5269
diff
changeset
|
1764 |
STR_SEND_TRAIN_TO_DEPOT, |
8bd7e4c00956
(svn r7418) -Codechange/Feature: Put back the 'New Vehicles' button in the vehicle list window. As
Darkvater
parents:
5269
diff
changeset
|
1765 |
STR_SEND_ROAD_VEHICLE_TO_DEPOT, |
8bd7e4c00956
(svn r7418) -Codechange/Feature: Put back the 'New Vehicles' button in the vehicle list window. As
Darkvater
parents:
5269
diff
changeset
|
1766 |
STR_SEND_SHIP_TO_DEPOT, |
8bd7e4c00956
(svn r7418) -Codechange/Feature: Put back the 'New Vehicles' button in the vehicle list window. As
Darkvater
parents:
5269
diff
changeset
|
1767 |
STR_SEND_AIRCRAFT_TO_HANGAR |
8bd7e4c00956
(svn r7418) -Codechange/Feature: Put back the 'New Vehicles' button in the vehicle list window. As
Darkvater
parents:
5269
diff
changeset
|
1768 |
}; |
8bd7e4c00956
(svn r7418) -Codechange/Feature: Put back the 'New Vehicles' button in the vehicle list window. As
Darkvater
parents:
5269
diff
changeset
|
1769 |
|
8bd7e4c00956
(svn r7418) -Codechange/Feature: Put back the 'New Vehicles' button in the vehicle list window. As
Darkvater
parents:
5269
diff
changeset
|
1770 |
/* XXX - Substite string since the dropdown cannot handle dynamic strings */ |
8bd7e4c00956
(svn r7418) -Codechange/Feature: Put back the 'New Vehicles' button in the vehicle list window. As
Darkvater
parents:
5269
diff
changeset
|
1771 |
action_str[2] = depot_name[vl->vehicle_type - VEH_Train]; |
8bd7e4c00956
(svn r7418) -Codechange/Feature: Put back the 'New Vehicles' button in the vehicle list window. As
Darkvater
parents:
5269
diff
changeset
|
1772 |
ShowDropDownMenu(w, action_str, 0, VLW_WIDGET_MANAGE_VEHICLES_DROPDOWN, 0, 0); |
4442
9f8bb348d58f
(svn r6215) -Codechange: [vehicle list windows] unified Player(vehicle)WndProc into PlayerVehWndProc
bjarni
parents:
4434
diff
changeset
|
1773 |
break; |
5274
8bd7e4c00956
(svn r7418) -Codechange/Feature: Put back the 'New Vehicles' button in the vehicle list window. As
Darkvater
parents:
5269
diff
changeset
|
1774 |
} |
4673
3160067b8751
(svn r6570) -Feature: added "start all" and "stop all" buttons to the vehicle lists
bjarni
parents:
4669
diff
changeset
|
1775 |
|
3160067b8751
(svn r6570) -Feature: added "start all" and "stop all" buttons to the vehicle lists
bjarni
parents:
4669
diff
changeset
|
1776 |
case VLW_WIDGET_STOP_ALL: |
3160067b8751
(svn r6570) -Feature: added "start all" and "stop all" buttons to the vehicle lists
bjarni
parents:
4669
diff
changeset
|
1777 |
case VLW_WIDGET_START_ALL: |
4762
771ccf746531
(svn r6676) -Fix: [vehicle list windows] mass start/stop now works correctly in shared orders and station lists
bjarni
parents:
4758
diff
changeset
|
1778 |
DoCommandP(0, GB(w->window_number, 16, 16), (w->window_number & VLW_MASK) | (1 << 6) | (e->we.click.widget == VLW_WIDGET_START_ALL ? (1 << 5) : 0) | vl->vehicle_type, NULL, CMD_MASS_START_STOP); |
4673
3160067b8751
(svn r6570) -Feature: added "start all" and "stop all" buttons to the vehicle lists
bjarni
parents:
4669
diff
changeset
|
1779 |
break; |
4442
9f8bb348d58f
(svn r6215) -Codechange: [vehicle list windows] unified Player(vehicle)WndProc into PlayerVehWndProc
bjarni
parents:
4434
diff
changeset
|
1780 |
} |
9f8bb348d58f
(svn r6215) -Codechange: [vehicle list windows] unified Player(vehicle)WndProc into PlayerVehWndProc
bjarni
parents:
4434
diff
changeset
|
1781 |
} break; |
9f8bb348d58f
(svn r6215) -Codechange: [vehicle list windows] unified Player(vehicle)WndProc into PlayerVehWndProc
bjarni
parents:
4434
diff
changeset
|
1782 |
|
9f8bb348d58f
(svn r6215) -Codechange: [vehicle list windows] unified Player(vehicle)WndProc into PlayerVehWndProc
bjarni
parents:
4434
diff
changeset
|
1783 |
case WE_DROPDOWN_SELECT: /* we have selected a dropdown item in the list */ |
5274
8bd7e4c00956
(svn r7418) -Codechange/Feature: Put back the 'New Vehicles' button in the vehicle list window. As
Darkvater
parents:
5269
diff
changeset
|
1784 |
switch (e->we.dropdown.button) { |
8bd7e4c00956
(svn r7418) -Codechange/Feature: Put back the 'New Vehicles' button in the vehicle list window. As
Darkvater
parents:
5269
diff
changeset
|
1785 |
case VLW_WIDGET_SORT_BY_PULLDOWN: |
8bd7e4c00956
(svn r7418) -Codechange/Feature: Put back the 'New Vehicles' button in the vehicle list window. As
Darkvater
parents:
5269
diff
changeset
|
1786 |
if (vl->l.sort_type != e->we.dropdown.index) { |
8bd7e4c00956
(svn r7418) -Codechange/Feature: Put back the 'New Vehicles' button in the vehicle list window. As
Darkvater
parents:
5269
diff
changeset
|
1787 |
// value has changed -> resort |
8bd7e4c00956
(svn r7418) -Codechange/Feature: Put back the 'New Vehicles' button in the vehicle list window. As
Darkvater
parents:
5269
diff
changeset
|
1788 |
vl->l.flags |= VL_RESORT; |
8bd7e4c00956
(svn r7418) -Codechange/Feature: Put back the 'New Vehicles' button in the vehicle list window. As
Darkvater
parents:
5269
diff
changeset
|
1789 |
vl->l.sort_type = e->we.dropdown.index; |
8bd7e4c00956
(svn r7418) -Codechange/Feature: Put back the 'New Vehicles' button in the vehicle list window. As
Darkvater
parents:
5269
diff
changeset
|
1790 |
vl->_sorting->criteria = vl->l.sort_type; |
8bd7e4c00956
(svn r7418) -Codechange/Feature: Put back the 'New Vehicles' button in the vehicle list window. As
Darkvater
parents:
5269
diff
changeset
|
1791 |
} |
8bd7e4c00956
(svn r7418) -Codechange/Feature: Put back the 'New Vehicles' button in the vehicle list window. As
Darkvater
parents:
5269
diff
changeset
|
1792 |
break; |
8bd7e4c00956
(svn r7418) -Codechange/Feature: Put back the 'New Vehicles' button in the vehicle list window. As
Darkvater
parents:
5269
diff
changeset
|
1793 |
case VLW_WIDGET_MANAGE_VEHICLES_DROPDOWN: |
8bd7e4c00956
(svn r7418) -Codechange/Feature: Put back the 'New Vehicles' button in the vehicle list window. As
Darkvater
parents:
5269
diff
changeset
|
1794 |
assert(vl->l.list_length != 0); |
8bd7e4c00956
(svn r7418) -Codechange/Feature: Put back the 'New Vehicles' button in the vehicle list window. As
Darkvater
parents:
5269
diff
changeset
|
1795 |
|
8bd7e4c00956
(svn r7418) -Codechange/Feature: Put back the 'New Vehicles' button in the vehicle list window. As
Darkvater
parents:
5269
diff
changeset
|
1796 |
switch (e->we.dropdown.index) { |
8bd7e4c00956
(svn r7418) -Codechange/Feature: Put back the 'New Vehicles' button in the vehicle list window. As
Darkvater
parents:
5269
diff
changeset
|
1797 |
case 0: /* Replace window */ |
8bd7e4c00956
(svn r7418) -Codechange/Feature: Put back the 'New Vehicles' button in the vehicle list window. As
Darkvater
parents:
5269
diff
changeset
|
1798 |
ShowReplaceVehicleWindow(vl->vehicle_type); |
8bd7e4c00956
(svn r7418) -Codechange/Feature: Put back the 'New Vehicles' button in the vehicle list window. As
Darkvater
parents:
5269
diff
changeset
|
1799 |
break; |
8bd7e4c00956
(svn r7418) -Codechange/Feature: Put back the 'New Vehicles' button in the vehicle list window. As
Darkvater
parents:
5269
diff
changeset
|
1800 |
case 1: /* Send for servicing */ |
8bd7e4c00956
(svn r7418) -Codechange/Feature: Put back the 'New Vehicles' button in the vehicle list window. As
Darkvater
parents:
5269
diff
changeset
|
1801 |
DoCommandP(0, GB(w->window_number, 16, 16) /* StationID or OrderID (depending on VLW) */, |
8bd7e4c00956
(svn r7418) -Codechange/Feature: Put back the 'New Vehicles' button in the vehicle list window. As
Darkvater
parents:
5269
diff
changeset
|
1802 |
(w->window_number & VLW_MASK) | DEPOT_MASS_SEND | DEPOT_SERVICE, |
8bd7e4c00956
(svn r7418) -Codechange/Feature: Put back the 'New Vehicles' button in the vehicle list window. As
Darkvater
parents:
5269
diff
changeset
|
1803 |
NULL, |
8bd7e4c00956
(svn r7418) -Codechange/Feature: Put back the 'New Vehicles' button in the vehicle list window. As
Darkvater
parents:
5269
diff
changeset
|
1804 |
CMD_SEND_TO_DEPOT(vl->vehicle_type)); |
8bd7e4c00956
(svn r7418) -Codechange/Feature: Put back the 'New Vehicles' button in the vehicle list window. As
Darkvater
parents:
5269
diff
changeset
|
1805 |
break; |
8bd7e4c00956
(svn r7418) -Codechange/Feature: Put back the 'New Vehicles' button in the vehicle list window. As
Darkvater
parents:
5269
diff
changeset
|
1806 |
case 2: /* Send to Depots */ |
8bd7e4c00956
(svn r7418) -Codechange/Feature: Put back the 'New Vehicles' button in the vehicle list window. As
Darkvater
parents:
5269
diff
changeset
|
1807 |
DoCommandP(0, GB(w->window_number, 16, 16) /* StationID or OrderID (depending on VLW) */, |
8bd7e4c00956
(svn r7418) -Codechange/Feature: Put back the 'New Vehicles' button in the vehicle list window. As
Darkvater
parents:
5269
diff
changeset
|
1808 |
(w->window_number & VLW_MASK) | DEPOT_MASS_SEND, |
8bd7e4c00956
(svn r7418) -Codechange/Feature: Put back the 'New Vehicles' button in the vehicle list window. As
Darkvater
parents:
5269
diff
changeset
|
1809 |
NULL, |
8bd7e4c00956
(svn r7418) -Codechange/Feature: Put back the 'New Vehicles' button in the vehicle list window. As
Darkvater
parents:
5269
diff
changeset
|
1810 |
CMD_SEND_TO_DEPOT(vl->vehicle_type)); |
8bd7e4c00956
(svn r7418) -Codechange/Feature: Put back the 'New Vehicles' button in the vehicle list window. As
Darkvater
parents:
5269
diff
changeset
|
1811 |
break; |
8bd7e4c00956
(svn r7418) -Codechange/Feature: Put back the 'New Vehicles' button in the vehicle list window. As
Darkvater
parents:
5269
diff
changeset
|
1812 |
|
8bd7e4c00956
(svn r7418) -Codechange/Feature: Put back the 'New Vehicles' button in the vehicle list window. As
Darkvater
parents:
5269
diff
changeset
|
1813 |
default: NOT_REACHED(); |
8bd7e4c00956
(svn r7418) -Codechange/Feature: Put back the 'New Vehicles' button in the vehicle list window. As
Darkvater
parents:
5269
diff
changeset
|
1814 |
} |
8bd7e4c00956
(svn r7418) -Codechange/Feature: Put back the 'New Vehicles' button in the vehicle list window. As
Darkvater
parents:
5269
diff
changeset
|
1815 |
break; |
8bd7e4c00956
(svn r7418) -Codechange/Feature: Put back the 'New Vehicles' button in the vehicle list window. As
Darkvater
parents:
5269
diff
changeset
|
1816 |
default: NOT_REACHED(); |
4442
9f8bb348d58f
(svn r6215) -Codechange: [vehicle list windows] unified Player(vehicle)WndProc into PlayerVehWndProc
bjarni
parents:
4434
diff
changeset
|
1817 |
} |
9f8bb348d58f
(svn r6215) -Codechange: [vehicle list windows] unified Player(vehicle)WndProc into PlayerVehWndProc
bjarni
parents:
4434
diff
changeset
|
1818 |
SetWindowDirty(w); |
9f8bb348d58f
(svn r6215) -Codechange: [vehicle list windows] unified Player(vehicle)WndProc into PlayerVehWndProc
bjarni
parents:
4434
diff
changeset
|
1819 |
break; |
9f8bb348d58f
(svn r6215) -Codechange: [vehicle list windows] unified Player(vehicle)WndProc into PlayerVehWndProc
bjarni
parents:
4434
diff
changeset
|
1820 |
|
9f8bb348d58f
(svn r6215) -Codechange: [vehicle list windows] unified Player(vehicle)WndProc into PlayerVehWndProc
bjarni
parents:
4434
diff
changeset
|
1821 |
case WE_DESTROY: |
9f8bb348d58f
(svn r6215) -Codechange: [vehicle list windows] unified Player(vehicle)WndProc into PlayerVehWndProc
bjarni
parents:
4434
diff
changeset
|
1822 |
free((void*)vl->sort_list); |
9f8bb348d58f
(svn r6215) -Codechange: [vehicle list windows] unified Player(vehicle)WndProc into PlayerVehWndProc
bjarni
parents:
4434
diff
changeset
|
1823 |
break; |
9f8bb348d58f
(svn r6215) -Codechange: [vehicle list windows] unified Player(vehicle)WndProc into PlayerVehWndProc
bjarni
parents:
4434
diff
changeset
|
1824 |
|
9f8bb348d58f
(svn r6215) -Codechange: [vehicle list windows] unified Player(vehicle)WndProc into PlayerVehWndProc
bjarni
parents:
4434
diff
changeset
|
1825 |
case WE_TICK: /* resort the list every 20 seconds orso (10 days) */ |
4545
138a9195009a
(svn r6377) -Codechange: Set up the widgets in the WE_CREATE instead of on every WE_PAINT
Darkvater
parents:
4542
diff
changeset
|
1826 |
if (--vl->l.resort_timer == 0) { |
4546
507b7d9bd834
(svn r6378) -Codechange: Rename VLW_FLAGS to VLW_MASK as it is a mask
Darkvater
parents:
4545
diff
changeset
|
1827 |
StationID station = ((w->window_number & VLW_MASK) == VLW_STATION_LIST) ? GB(w->window_number, 16, 16) : INVALID_STATION; |
4545
138a9195009a
(svn r6377) -Codechange: Set up the widgets in the WE_CREATE instead of on every WE_PAINT
Darkvater
parents:
4542
diff
changeset
|
1828 |
PlayerID owner = (PlayerID)w->caption_color; |
138a9195009a
(svn r6377) -Codechange: Set up the widgets in the WE_CREATE instead of on every WE_PAINT
Darkvater
parents:
4542
diff
changeset
|
1829 |
|
5380
8ea58542b6e0
(svn r7565) -Codechange: Rework DEBUG functionality. Look for appropiate debugging levels to
Darkvater
parents:
5297
diff
changeset
|
1830 |
DEBUG(misc, 3, "Periodic resort %d list player %d at station %d", vl->vehicle_type, owner, station); |
4545
138a9195009a
(svn r6377) -Codechange: Set up the widgets in the WE_CREATE instead of on every WE_PAINT
Darkvater
parents:
4542
diff
changeset
|
1831 |
vl->l.resort_timer = DAY_TICKS * PERIODIC_RESORT_DAYS; |
138a9195009a
(svn r6377) -Codechange: Set up the widgets in the WE_CREATE instead of on every WE_PAINT
Darkvater
parents:
4542
diff
changeset
|
1832 |
vl->l.flags |= VL_RESORT; |
4442
9f8bb348d58f
(svn r6215) -Codechange: [vehicle list windows] unified Player(vehicle)WndProc into PlayerVehWndProc
bjarni
parents:
4434
diff
changeset
|
1833 |
SetWindowDirty(w); |
9f8bb348d58f
(svn r6215) -Codechange: [vehicle list windows] unified Player(vehicle)WndProc into PlayerVehWndProc
bjarni
parents:
4434
diff
changeset
|
1834 |
} |
9f8bb348d58f
(svn r6215) -Codechange: [vehicle list windows] unified Player(vehicle)WndProc into PlayerVehWndProc
bjarni
parents:
4434
diff
changeset
|
1835 |
break; |
9f8bb348d58f
(svn r6215) -Codechange: [vehicle list windows] unified Player(vehicle)WndProc into PlayerVehWndProc
bjarni
parents:
4434
diff
changeset
|
1836 |
|
4542
f42ecc669275
(svn r6372) -Codechange: static, unneeded decleration in headers, superfluous header includes
Darkvater
parents:
4541
diff
changeset
|
1837 |
case WE_RESIZE: /* Update the scroll + matrix */ |
4634
07699ac2bf37
(svn r6499) -Codechange: Finally, got "byte event" outside of the union WindowEvent, which is now a struct
belugas
parents:
4581
diff
changeset
|
1838 |
w->vscroll.cap += e->we.sizing.diff.y / (int)w->resize.step_height; |
4668
f7256d0e7682
(svn r6562) -Codechange: merged the vehicle list window widget arrays
bjarni
parents:
4665
diff
changeset
|
1839 |
w->widget[VLW_WIDGET_LIST].data = (w->vscroll.cap << 8) + 1; |
4442
9f8bb348d58f
(svn r6215) -Codechange: [vehicle list windows] unified Player(vehicle)WndProc into PlayerVehWndProc
bjarni
parents:
4434
diff
changeset
|
1840 |
break; |
9f8bb348d58f
(svn r6215) -Codechange: [vehicle list windows] unified Player(vehicle)WndProc into PlayerVehWndProc
bjarni
parents:
4434
diff
changeset
|
1841 |
} |
9f8bb348d58f
(svn r6215) -Codechange: [vehicle list windows] unified Player(vehicle)WndProc into PlayerVehWndProc
bjarni
parents:
4434
diff
changeset
|
1842 |
} |
4668
f7256d0e7682
(svn r6562) -Codechange: merged the vehicle list window widget arrays
bjarni
parents:
4665
diff
changeset
|
1843 |
|
f7256d0e7682
(svn r6562) -Codechange: merged the vehicle list window widget arrays
bjarni
parents:
4665
diff
changeset
|
1844 |
static const WindowDesc _player_vehicle_list_train_desc = { |
5269
4b50973b21f6
(svn r7410) -Codechange/Fix: Remove useless and unfollowable programmatic-resize, and implement it
Darkvater
parents:
5125
diff
changeset
|
1845 |
WDP_AUTO, WDP_AUTO, 260, 182, |
5070
7f5b13b7e728
(svn r7128) -Codechange: Replace magic numbers by magic enums (windowdesc positioning WDP_AUTO = -1)
Darkvater
parents:
5005
diff
changeset
|
1846 |
WC_TRAINS_LIST, 0, |
7f5b13b7e728
(svn r7128) -Codechange: Replace magic numbers by magic enums (windowdesc positioning WDP_AUTO = -1)
Darkvater
parents:
5005
diff
changeset
|
1847 |
WDF_STD_TOOLTIPS | WDF_STD_BTN | WDF_DEF_WIDGET | WDF_UNCLICK_BUTTONS | WDF_STICKY_BUTTON | WDF_RESIZABLE, |
7f5b13b7e728
(svn r7128) -Codechange: Replace magic numbers by magic enums (windowdesc positioning WDP_AUTO = -1)
Darkvater
parents:
5005
diff
changeset
|
1848 |
_vehicle_list_widgets, |
7f5b13b7e728
(svn r7128) -Codechange: Replace magic numbers by magic enums (windowdesc positioning WDP_AUTO = -1)
Darkvater
parents:
5005
diff
changeset
|
1849 |
PlayerVehWndProc |
4668
f7256d0e7682
(svn r6562) -Codechange: merged the vehicle list window widget arrays
bjarni
parents:
4665
diff
changeset
|
1850 |
}; |
f7256d0e7682
(svn r6562) -Codechange: merged the vehicle list window widget arrays
bjarni
parents:
4665
diff
changeset
|
1851 |
|
f7256d0e7682
(svn r6562) -Codechange: merged the vehicle list window widget arrays
bjarni
parents:
4665
diff
changeset
|
1852 |
static const WindowDesc _player_vehicle_list_road_veh_desc = { |
5269
4b50973b21f6
(svn r7410) -Codechange/Fix: Remove useless and unfollowable programmatic-resize, and implement it
Darkvater
parents:
5125
diff
changeset
|
1853 |
WDP_AUTO, WDP_AUTO, 260, 182, |
4726
a609ab3ee4c7
(svn r6638) -Fix r5652: restored each vehicle list type to their type classes, so it's possible to redraw all lists of one vehicle type again (instead of all types)
bjarni
parents:
4723
diff
changeset
|
1854 |
WC_ROADVEH_LIST,0, |
a609ab3ee4c7
(svn r6638) -Fix r5652: restored each vehicle list type to their type classes, so it's possible to redraw all lists of one vehicle type again (instead of all types)
bjarni
parents:
4723
diff
changeset
|
1855 |
WDF_STD_TOOLTIPS | WDF_STD_BTN | WDF_DEF_WIDGET | WDF_UNCLICK_BUTTONS | WDF_STICKY_BUTTON | WDF_RESIZABLE, |
a609ab3ee4c7
(svn r6638) -Fix r5652: restored each vehicle list type to their type classes, so it's possible to redraw all lists of one vehicle type again (instead of all types)
bjarni
parents:
4723
diff
changeset
|
1856 |
_vehicle_list_widgets, |
a609ab3ee4c7
(svn r6638) -Fix r5652: restored each vehicle list type to their type classes, so it's possible to redraw all lists of one vehicle type again (instead of all types)
bjarni
parents:
4723
diff
changeset
|
1857 |
PlayerVehWndProc |
a609ab3ee4c7
(svn r6638) -Fix r5652: restored each vehicle list type to their type classes, so it's possible to redraw all lists of one vehicle type again (instead of all types)
bjarni
parents:
4723
diff
changeset
|
1858 |
}; |
a609ab3ee4c7
(svn r6638) -Fix r5652: restored each vehicle list type to their type classes, so it's possible to redraw all lists of one vehicle type again (instead of all types)
bjarni
parents:
4723
diff
changeset
|
1859 |
|
a609ab3ee4c7
(svn r6638) -Fix r5652: restored each vehicle list type to their type classes, so it's possible to redraw all lists of one vehicle type again (instead of all types)
bjarni
parents:
4723
diff
changeset
|
1860 |
static const WindowDesc _player_vehicle_list_ship_desc = { |
5070
7f5b13b7e728
(svn r7128) -Codechange: Replace magic numbers by magic enums (windowdesc positioning WDP_AUTO = -1)
Darkvater
parents:
5005
diff
changeset
|
1861 |
WDP_AUTO, WDP_AUTO, 260, 182, |
4726
a609ab3ee4c7
(svn r6638) -Fix r5652: restored each vehicle list type to their type classes, so it's possible to redraw all lists of one vehicle type again (instead of all types)
bjarni
parents:
4723
diff
changeset
|
1862 |
WC_SHIPS_LIST,0, |
a609ab3ee4c7
(svn r6638) -Fix r5652: restored each vehicle list type to their type classes, so it's possible to redraw all lists of one vehicle type again (instead of all types)
bjarni
parents:
4723
diff
changeset
|
1863 |
WDF_STD_TOOLTIPS | WDF_STD_BTN | WDF_DEF_WIDGET | WDF_UNCLICK_BUTTONS | WDF_STICKY_BUTTON | WDF_RESIZABLE, |
a609ab3ee4c7
(svn r6638) -Fix r5652: restored each vehicle list type to their type classes, so it's possible to redraw all lists of one vehicle type again (instead of all types)
bjarni
parents:
4723
diff
changeset
|
1864 |
_vehicle_list_widgets, |
a609ab3ee4c7
(svn r6638) -Fix r5652: restored each vehicle list type to their type classes, so it's possible to redraw all lists of one vehicle type again (instead of all types)
bjarni
parents:
4723
diff
changeset
|
1865 |
PlayerVehWndProc |
a609ab3ee4c7
(svn r6638) -Fix r5652: restored each vehicle list type to their type classes, so it's possible to redraw all lists of one vehicle type again (instead of all types)
bjarni
parents:
4723
diff
changeset
|
1866 |
}; |
a609ab3ee4c7
(svn r6638) -Fix r5652: restored each vehicle list type to their type classes, so it's possible to redraw all lists of one vehicle type again (instead of all types)
bjarni
parents:
4723
diff
changeset
|
1867 |
|
a609ab3ee4c7
(svn r6638) -Fix r5652: restored each vehicle list type to their type classes, so it's possible to redraw all lists of one vehicle type again (instead of all types)
bjarni
parents:
4723
diff
changeset
|
1868 |
static const WindowDesc _player_vehicle_list_aircraft_desc = { |
5070
7f5b13b7e728
(svn r7128) -Codechange: Replace magic numbers by magic enums (windowdesc positioning WDP_AUTO = -1)
Darkvater
parents:
5005
diff
changeset
|
1869 |
WDP_AUTO, WDP_AUTO, 260, 182, |
4726
a609ab3ee4c7
(svn r6638) -Fix r5652: restored each vehicle list type to their type classes, so it's possible to redraw all lists of one vehicle type again (instead of all types)
bjarni
parents:
4723
diff
changeset
|
1870 |
WC_AIRCRAFT_LIST,0, |
4668
f7256d0e7682
(svn r6562) -Codechange: merged the vehicle list window widget arrays
bjarni
parents:
4665
diff
changeset
|
1871 |
WDF_STD_TOOLTIPS | WDF_STD_BTN | WDF_DEF_WIDGET | WDF_UNCLICK_BUTTONS | WDF_STICKY_BUTTON | WDF_RESIZABLE, |
f7256d0e7682
(svn r6562) -Codechange: merged the vehicle list window widget arrays
bjarni
parents:
4665
diff
changeset
|
1872 |
_vehicle_list_widgets, |
f7256d0e7682
(svn r6562) -Codechange: merged the vehicle list window widget arrays
bjarni
parents:
4665
diff
changeset
|
1873 |
PlayerVehWndProc |
f7256d0e7682
(svn r6562) -Codechange: merged the vehicle list window widget arrays
bjarni
parents:
4665
diff
changeset
|
1874 |
}; |
f7256d0e7682
(svn r6562) -Codechange: merged the vehicle list window widget arrays
bjarni
parents:
4665
diff
changeset
|
1875 |
|
4681
bc077405e9a8
(svn r6586) -Feature: [depot window] added a vehicle list window with all vehicles having a certain depot in their orders
bjarni
parents:
4678
diff
changeset
|
1876 |
static void ShowVehicleListWindowLocal(PlayerID player, byte vehicle_type, StationID station, OrderID order, uint16 depot_airport_index) |
4668
f7256d0e7682
(svn r6562) -Codechange: merged the vehicle list window widget arrays
bjarni
parents:
4665
diff
changeset
|
1877 |
{ |
f7256d0e7682
(svn r6562) -Codechange: merged the vehicle list window widget arrays
bjarni
parents:
4665
diff
changeset
|
1878 |
Window *w; |
5005
f5086bd3945a
(svn r7022) -Fix [FS#292]: Properly guard against viewing company-sensitive information from
Darkvater
parents:
4999
diff
changeset
|
1879 |
WindowNumber num; |
4668
f7256d0e7682
(svn r6562) -Codechange: merged the vehicle list window widget arrays
bjarni
parents:
4665
diff
changeset
|
1880 |
|
5005
f5086bd3945a
(svn r7022) -Fix [FS#292]: Properly guard against viewing company-sensitive information from
Darkvater
parents:
4999
diff
changeset
|
1881 |
if (!IsValidPlayer(player)) return; |
f5086bd3945a
(svn r7022) -Fix [FS#292]: Properly guard against viewing company-sensitive information from
Darkvater
parents:
4999
diff
changeset
|
1882 |
|
f5086bd3945a
(svn r7022) -Fix [FS#292]: Properly guard against viewing company-sensitive information from
Darkvater
parents:
4999
diff
changeset
|
1883 |
num = (vehicle_type << 11) | player; |
4681
bc077405e9a8
(svn r6586) -Feature: [depot window] added a vehicle list window with all vehicles having a certain depot in their orders
bjarni
parents:
4678
diff
changeset
|
1884 |
if (order != INVALID_ORDER) { |
4668
f7256d0e7682
(svn r6562) -Codechange: merged the vehicle list window widget arrays
bjarni
parents:
4665
diff
changeset
|
1885 |
num |= (order << 16) | VLW_SHARED_ORDERS; |
4681
bc077405e9a8
(svn r6586) -Feature: [depot window] added a vehicle list window with all vehicles having a certain depot in their orders
bjarni
parents:
4678
diff
changeset
|
1886 |
} else if (depot_airport_index != INVALID_STATION) { |
bc077405e9a8
(svn r6586) -Feature: [depot window] added a vehicle list window with all vehicles having a certain depot in their orders
bjarni
parents:
4678
diff
changeset
|
1887 |
num |= (depot_airport_index << 16) | VLW_DEPOT_LIST; |
4668
f7256d0e7682
(svn r6562) -Codechange: merged the vehicle list window widget arrays
bjarni
parents:
4665
diff
changeset
|
1888 |
} else if (station == INVALID_STATION) { |
f7256d0e7682
(svn r6562) -Codechange: merged the vehicle list window widget arrays
bjarni
parents:
4665
diff
changeset
|
1889 |
num |= VLW_STANDARD; |
f7256d0e7682
(svn r6562) -Codechange: merged the vehicle list window widget arrays
bjarni
parents:
4665
diff
changeset
|
1890 |
} else { |
f7256d0e7682
(svn r6562) -Codechange: merged the vehicle list window widget arrays
bjarni
parents:
4665
diff
changeset
|
1891 |
num |= (station << 16) | VLW_STATION_LIST; |
f7256d0e7682
(svn r6562) -Codechange: merged the vehicle list window widget arrays
bjarni
parents:
4665
diff
changeset
|
1892 |
} |
f7256d0e7682
(svn r6562) -Codechange: merged the vehicle list window widget arrays
bjarni
parents:
4665
diff
changeset
|
1893 |
|
5269
4b50973b21f6
(svn r7410) -Codechange/Fix: Remove useless and unfollowable programmatic-resize, and implement it
Darkvater
parents:
5125
diff
changeset
|
1894 |
/* The vehicle list windows have been unified. Just some strings need |
4b50973b21f6
(svn r7410) -Codechange/Fix: Remove useless and unfollowable programmatic-resize, and implement it
Darkvater
parents:
5125
diff
changeset
|
1895 |
* to be changed which happens in the WE_CREATE event and resizing |
4b50973b21f6
(svn r7410) -Codechange/Fix: Remove useless and unfollowable programmatic-resize, and implement it
Darkvater
parents:
5125
diff
changeset
|
1896 |
* some of the windows to the correct size */ |
4726
a609ab3ee4c7
(svn r6638) -Fix r5652: restored each vehicle list type to their type classes, so it's possible to redraw all lists of one vehicle type again (instead of all types)
bjarni
parents:
4723
diff
changeset
|
1897 |
switch (vehicle_type) { |
a609ab3ee4c7
(svn r6638) -Fix r5652: restored each vehicle list type to their type classes, so it's possible to redraw all lists of one vehicle type again (instead of all types)
bjarni
parents:
4723
diff
changeset
|
1898 |
default: NOT_REACHED(); |
5269
4b50973b21f6
(svn r7410) -Codechange/Fix: Remove useless and unfollowable programmatic-resize, and implement it
Darkvater
parents:
5125
diff
changeset
|
1899 |
case VEH_Train: |
4b50973b21f6
(svn r7410) -Codechange/Fix: Remove useless and unfollowable programmatic-resize, and implement it
Darkvater
parents:
5125
diff
changeset
|
1900 |
w = AllocateWindowDescFront(&_player_vehicle_list_train_desc, num); |
4b50973b21f6
(svn r7410) -Codechange/Fix: Remove useless and unfollowable programmatic-resize, and implement it
Darkvater
parents:
5125
diff
changeset
|
1901 |
if (w != NULL) ResizeWindow(w, 65, 38); |
4b50973b21f6
(svn r7410) -Codechange/Fix: Remove useless and unfollowable programmatic-resize, and implement it
Darkvater
parents:
5125
diff
changeset
|
1902 |
break; |
4b50973b21f6
(svn r7410) -Codechange/Fix: Remove useless and unfollowable programmatic-resize, and implement it
Darkvater
parents:
5125
diff
changeset
|
1903 |
case VEH_Road: |
4b50973b21f6
(svn r7410) -Codechange/Fix: Remove useless and unfollowable programmatic-resize, and implement it
Darkvater
parents:
5125
diff
changeset
|
1904 |
w = AllocateWindowDescFront(&_player_vehicle_list_road_veh_desc, num); |
4b50973b21f6
(svn r7410) -Codechange/Fix: Remove useless and unfollowable programmatic-resize, and implement it
Darkvater
parents:
5125
diff
changeset
|
1905 |
if (w != NULL) ResizeWindow(w, 0, 38); |
4b50973b21f6
(svn r7410) -Codechange/Fix: Remove useless and unfollowable programmatic-resize, and implement it
Darkvater
parents:
5125
diff
changeset
|
1906 |
break; |
4b50973b21f6
(svn r7410) -Codechange/Fix: Remove useless and unfollowable programmatic-resize, and implement it
Darkvater
parents:
5125
diff
changeset
|
1907 |
case VEH_Ship: |
4b50973b21f6
(svn r7410) -Codechange/Fix: Remove useless and unfollowable programmatic-resize, and implement it
Darkvater
parents:
5125
diff
changeset
|
1908 |
w = AllocateWindowDescFront(&_player_vehicle_list_ship_desc, num); |
4b50973b21f6
(svn r7410) -Codechange/Fix: Remove useless and unfollowable programmatic-resize, and implement it
Darkvater
parents:
5125
diff
changeset
|
1909 |
break; |
4b50973b21f6
(svn r7410) -Codechange/Fix: Remove useless and unfollowable programmatic-resize, and implement it
Darkvater
parents:
5125
diff
changeset
|
1910 |
case VEH_Aircraft: |
4b50973b21f6
(svn r7410) -Codechange/Fix: Remove useless and unfollowable programmatic-resize, and implement it
Darkvater
parents:
5125
diff
changeset
|
1911 |
w = AllocateWindowDescFront(&_player_vehicle_list_aircraft_desc, num); |
4b50973b21f6
(svn r7410) -Codechange/Fix: Remove useless and unfollowable programmatic-resize, and implement it
Darkvater
parents:
5125
diff
changeset
|
1912 |
break; |
4b50973b21f6
(svn r7410) -Codechange/Fix: Remove useless and unfollowable programmatic-resize, and implement it
Darkvater
parents:
5125
diff
changeset
|
1913 |
} |
4b50973b21f6
(svn r7410) -Codechange/Fix: Remove useless and unfollowable programmatic-resize, and implement it
Darkvater
parents:
5125
diff
changeset
|
1914 |
|
4b50973b21f6
(svn r7410) -Codechange/Fix: Remove useless and unfollowable programmatic-resize, and implement it
Darkvater
parents:
5125
diff
changeset
|
1915 |
if (w != NULL) { |
4b50973b21f6
(svn r7410) -Codechange/Fix: Remove useless and unfollowable programmatic-resize, and implement it
Darkvater
parents:
5125
diff
changeset
|
1916 |
/* Set the minimum window size to the current window size */ |
4b50973b21f6
(svn r7410) -Codechange/Fix: Remove useless and unfollowable programmatic-resize, and implement it
Darkvater
parents:
5125
diff
changeset
|
1917 |
w->resize.width = w->width; |
4b50973b21f6
(svn r7410) -Codechange/Fix: Remove useless and unfollowable programmatic-resize, and implement it
Darkvater
parents:
5125
diff
changeset
|
1918 |
w->resize.height = w->height; |
4668
f7256d0e7682
(svn r6562) -Codechange: merged the vehicle list window widget arrays
bjarni
parents:
4665
diff
changeset
|
1919 |
} |
f7256d0e7682
(svn r6562) -Codechange: merged the vehicle list window widget arrays
bjarni
parents:
4665
diff
changeset
|
1920 |
} |
f7256d0e7682
(svn r6562) -Codechange: merged the vehicle list window widget arrays
bjarni
parents:
4665
diff
changeset
|
1921 |
|
f7256d0e7682
(svn r6562) -Codechange: merged the vehicle list window widget arrays
bjarni
parents:
4665
diff
changeset
|
1922 |
void ShowVehicleListWindow(PlayerID player, StationID station, byte vehicle_type) |
f7256d0e7682
(svn r6562) -Codechange: merged the vehicle list window widget arrays
bjarni
parents:
4665
diff
changeset
|
1923 |
{ |
4681
bc077405e9a8
(svn r6586) -Feature: [depot window] added a vehicle list window with all vehicles having a certain depot in their orders
bjarni
parents:
4678
diff
changeset
|
1924 |
ShowVehicleListWindowLocal(player, vehicle_type, station, INVALID_ORDER, INVALID_STATION); |
4668
f7256d0e7682
(svn r6562) -Codechange: merged the vehicle list window widget arrays
bjarni
parents:
4665
diff
changeset
|
1925 |
} |
f7256d0e7682
(svn r6562) -Codechange: merged the vehicle list window widget arrays
bjarni
parents:
4665
diff
changeset
|
1926 |
|
f7256d0e7682
(svn r6562) -Codechange: merged the vehicle list window widget arrays
bjarni
parents:
4665
diff
changeset
|
1927 |
void ShowVehWithSharedOrders(Vehicle *v, byte vehicle_type) |
f7256d0e7682
(svn r6562) -Codechange: merged the vehicle list window widget arrays
bjarni
parents:
4665
diff
changeset
|
1928 |
{ |
f7256d0e7682
(svn r6562) -Codechange: merged the vehicle list window widget arrays
bjarni
parents:
4665
diff
changeset
|
1929 |
if (v->orders == NULL) return; // no shared list to show |
4681
bc077405e9a8
(svn r6586) -Feature: [depot window] added a vehicle list window with all vehicles having a certain depot in their orders
bjarni
parents:
4678
diff
changeset
|
1930 |
ShowVehicleListWindowLocal(v->owner, vehicle_type, INVALID_STATION, v->orders->index, INVALID_STATION); |
4669
c66d137bdca1
(svn r6565) - Fix (r6562): Missing newline at EOF caused a compiler warning
peter1138
parents:
4668
diff
changeset
|
1931 |
} |
4681
bc077405e9a8
(svn r6586) -Feature: [depot window] added a vehicle list window with all vehicles having a certain depot in their orders
bjarni
parents:
4678
diff
changeset
|
1932 |
|
bc077405e9a8
(svn r6586) -Feature: [depot window] added a vehicle list window with all vehicles having a certain depot in their orders
bjarni
parents:
4678
diff
changeset
|
1933 |
void ShowVehDepotOrders(PlayerID player, byte vehicle_type, TileIndex depot_tile) |
bc077405e9a8
(svn r6586) -Feature: [depot window] added a vehicle list window with all vehicles having a certain depot in their orders
bjarni
parents:
4678
diff
changeset
|
1934 |
{ |
bc077405e9a8
(svn r6586) -Feature: [depot window] added a vehicle list window with all vehicles having a certain depot in their orders
bjarni
parents:
4678
diff
changeset
|
1935 |
uint16 depot_airport_index; |
bc077405e9a8
(svn r6586) -Feature: [depot window] added a vehicle list window with all vehicles having a certain depot in their orders
bjarni
parents:
4678
diff
changeset
|
1936 |
|
bc077405e9a8
(svn r6586) -Feature: [depot window] added a vehicle list window with all vehicles having a certain depot in their orders
bjarni
parents:
4678
diff
changeset
|
1937 |
if (vehicle_type == VEH_Aircraft) { |
bc077405e9a8
(svn r6586) -Feature: [depot window] added a vehicle list window with all vehicles having a certain depot in their orders
bjarni
parents:
4678
diff
changeset
|
1938 |
depot_airport_index = GetStationIndex(depot_tile); |
bc077405e9a8
(svn r6586) -Feature: [depot window] added a vehicle list window with all vehicles having a certain depot in their orders
bjarni
parents:
4678
diff
changeset
|
1939 |
} else { |
bc077405e9a8
(svn r6586) -Feature: [depot window] added a vehicle list window with all vehicles having a certain depot in their orders
bjarni
parents:
4678
diff
changeset
|
1940 |
Depot *depot = GetDepotByTile(depot_tile); |
bc077405e9a8
(svn r6586) -Feature: [depot window] added a vehicle list window with all vehicles having a certain depot in their orders
bjarni
parents:
4678
diff
changeset
|
1941 |
if (depot == NULL) return; // no depot to show |
bc077405e9a8
(svn r6586) -Feature: [depot window] added a vehicle list window with all vehicles having a certain depot in their orders
bjarni
parents:
4678
diff
changeset
|
1942 |
depot_airport_index = depot->index; |
bc077405e9a8
(svn r6586) -Feature: [depot window] added a vehicle list window with all vehicles having a certain depot in their orders
bjarni
parents:
4678
diff
changeset
|
1943 |
} |
bc077405e9a8
(svn r6586) -Feature: [depot window] added a vehicle list window with all vehicles having a certain depot in their orders
bjarni
parents:
4678
diff
changeset
|
1944 |
ShowVehicleListWindowLocal(player, vehicle_type, INVALID_STATION, INVALID_ORDER, depot_airport_index); |
bc077405e9a8
(svn r6586) -Feature: [depot window] added a vehicle list window with all vehicles having a certain depot in their orders
bjarni
parents:
4678
diff
changeset
|
1945 |
} |