author | KUDr |
Fri, 20 Apr 2007 19:43:06 +0000 | |
changeset 6513 | 454347ca3dfb |
parent 6492 | 286a52449b54 |
child 6621 | 441559124aea |
permissions | -rw-r--r-- |
2186 | 1 |
/* $Id$ */ |
2 |
||
6423
8e10e79e0fd1
(svn r9559) -Documentation: doxygen and comment changes: 'U' and 'V' now. Almost done. Yeah. I know, I've already said that...
belugas
parents:
6350
diff
changeset
|
3 |
/** @file vehicle_gui.cpp */ |
8e10e79e0fd1
(svn r9559) -Documentation: doxygen and comment changes: 'U' and 'V' now. Almost done. Yeah. I know, I've already said that...
belugas
parents:
6350
diff
changeset
|
4 |
|
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
|
5 |
#include "stdafx.h" |
1891
862800791170
(svn r2397) - CodeChange: rename all "ttd" files to "openttd" files.
Darkvater
parents:
1859
diff
changeset
|
6 |
#include "openttd.h" |
1299
39c06aba09aa
(svn r1803) Move debugging stuff into files of it's own
tron
parents:
1294
diff
changeset
|
7 |
#include "debug.h" |
2163
b17b313113a0
(svn r2673) Include functions.h directly, not globally via openttd.h
tron
parents:
2159
diff
changeset
|
8 |
#include "functions.h" |
2154
f86c59e73a16
(svn r2664) Remove depedency on player.h from variables.h
tron
parents:
1926
diff
changeset
|
9 |
#include "player.h" |
2466
1aa260b43faa
(svn r2992) Use PlayerID, StationID and INVALID_STATION instead of int, int and -1
tron
parents:
2462
diff
changeset
|
10 |
#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
|
11 |
#include "strings.h" |
1363
775a7ee52369
(svn r1867) Include tables/sprites.h only in files which need it
tron
parents:
1309
diff
changeset
|
12 |
#include "table/sprites.h" |
507
04b5403aaf6b
(svn r815) Include strings.h only in the files which need it.
tron
parents:
505
diff
changeset
|
13 |
#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
|
14 |
#include "vehicle.h" |
588 | 15 |
#include "window.h" |
842 | 16 |
#include "engine.h" |
17 |
#include "gui.h" |
|
18 |
#include "command.h" |
|
19 |
#include "gfx.h" |
|
2159
f6284cf5fab0
(svn r2669) Shuffle some more stuff around to reduce dependencies
tron
parents:
2154
diff
changeset
|
20 |
#include "variables.h" |
f6284cf5fab0
(svn r2669) Shuffle some more stuff around to reduce dependencies
tron
parents:
2154
diff
changeset
|
21 |
#include "vehicle_gui.h" |
2552
5b586a545665
(svn r3081) -Codechange: [autoreplace] complete rewrite of autoreplace
bjarni
parents:
2549
diff
changeset
|
22 |
#include "viewport.h" |
2676
59b65b4fb480
(svn r3218) -Feature: Multiheaded train engines will now stay in the same train
bjarni
parents:
2639
diff
changeset
|
23 |
#include "train.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_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
|
25 |
#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
|
26 |
#include "newgrf_text.h" |
4261
28670f743746
(svn r5887) -Cleanup: move date related functions, defines and variables to date.[ch]
rubidium
parents:
4243
diff
changeset
|
27 |
#include "date.h" |
4442
9f8bb348d58f
(svn r6215) -Codechange: [vehicle list windows] unified Player(vehicle)WndProc into PlayerVehWndProc
bjarni
parents:
4434
diff
changeset
|
28 |
#include "ship.h" |
9f8bb348d58f
(svn r6215) -Codechange: [vehicle list windows] unified Player(vehicle)WndProc into PlayerVehWndProc
bjarni
parents:
4434
diff
changeset
|
29 |
#include "aircraft.h" |
9f8bb348d58f
(svn r6215) -Codechange: [vehicle list windows] unified Player(vehicle)WndProc into PlayerVehWndProc
bjarni
parents:
4434
diff
changeset
|
30 |
#include "roadveh.h" |
9f8bb348d58f
(svn r6215) -Codechange: [vehicle list windows] unified Player(vehicle)WndProc into PlayerVehWndProc
bjarni
parents:
4434
diff
changeset
|
31 |
#include "depot.h" |
5587
167d9a91ef02
(svn r8038) -Merge: the cpp branch. Effort of KUDr, Celestar, glx, Smoovius, stillunknown and pv2b.
rubidium
parents:
5584
diff
changeset
|
32 |
#include "helpers.hpp" |
6091
c8827d9ae04a
(svn r8826) -Codechange: Replace _cargoc's separate arrays with a regular struct array (with accessor) and implement new initialization method using cargo labels.
peter1138
parents:
6056
diff
changeset
|
33 |
#include "cargotype.h" |
2159
f6284cf5fab0
(svn r2669) Shuffle some more stuff around to reduce dependencies
tron
parents:
2154
diff
changeset
|
34 |
|
6248
e4a2ed7e5613
(svn r9051) -Codechange: typedef [enum|struct] Y {} X; -> [enum|struct] X {};
rubidium
parents:
6247
diff
changeset
|
35 |
struct Sorting { |
4542
f42ecc669275
(svn r6372) -Codechange: static, unneeded decleration in headers, superfluous header includes
Darkvater
parents:
4541
diff
changeset
|
36 |
Listing aircraft; |
f42ecc669275
(svn r6372) -Codechange: static, unneeded decleration in headers, superfluous header includes
Darkvater
parents:
4541
diff
changeset
|
37 |
Listing roadveh; |
f42ecc669275
(svn r6372) -Codechange: static, unneeded decleration in headers, superfluous header includes
Darkvater
parents:
4541
diff
changeset
|
38 |
Listing ship; |
f42ecc669275
(svn r6372) -Codechange: static, unneeded decleration in headers, superfluous header includes
Darkvater
parents:
4541
diff
changeset
|
39 |
Listing train; |
6248
e4a2ed7e5613
(svn r9051) -Codechange: typedef [enum|struct] Y {} X; -> [enum|struct] X {};
rubidium
parents:
6247
diff
changeset
|
40 |
}; |
4542
f42ecc669275
(svn r6372) -Codechange: static, unneeded decleration in headers, superfluous header includes
Darkvater
parents:
4541
diff
changeset
|
41 |
|
f42ecc669275
(svn r6372) -Codechange: static, unneeded decleration in headers, superfluous header includes
Darkvater
parents:
4541
diff
changeset
|
42 |
static Sorting _sorting; |
f42ecc669275
(svn r6372) -Codechange: static, unneeded decleration in headers, superfluous header includes
Darkvater
parents:
4541
diff
changeset
|
43 |
|
6248
e4a2ed7e5613
(svn r9051) -Codechange: typedef [enum|struct] Y {} X; -> [enum|struct] X {};
rubidium
parents:
6247
diff
changeset
|
44 |
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
|
45 |
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
|
46 |
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
|
47 |
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
|
48 |
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
|
49 |
list_d l; // General list struct |
6248
e4a2ed7e5613
(svn r9051) -Codechange: typedef [enum|struct] Y {} X; -> [enum|struct] X {};
rubidium
parents:
6247
diff
changeset
|
50 |
}; |
4542
f42ecc669275
(svn r6372) -Codechange: static, unneeded decleration in headers, superfluous header includes
Darkvater
parents:
4541
diff
changeset
|
51 |
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
|
52 |
|
f6284cf5fab0
(svn r2669) Shuffle some more stuff around to reduce dependencies
tron
parents:
2154
diff
changeset
|
53 |
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
|
54 |
|
2462 | 55 |
typedef int CDECL VehicleSortListingTypeFunction(const void*, const void*); |
56 |
||
57 |
static VehicleSortListingTypeFunction VehicleNumberSorter; |
|
58 |
static VehicleSortListingTypeFunction VehicleNameSorter; |
|
59 |
static VehicleSortListingTypeFunction VehicleAgeSorter; |
|
60 |
static VehicleSortListingTypeFunction VehicleProfitThisYearSorter; |
|
61 |
static VehicleSortListingTypeFunction VehicleProfitLastYearSorter; |
|
62 |
static VehicleSortListingTypeFunction VehicleCargoSorter; |
|
63 |
static VehicleSortListingTypeFunction VehicleReliabilitySorter; |
|
64 |
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
|
65 |
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
|
66 |
static VehicleSortListingTypeFunction VehicleValueSorter; |
2462 | 67 |
|
68 |
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
|
69 |
&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
|
70 |
&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
|
71 |
&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
|
72 |
&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
|
73 |
&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
|
74 |
&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
|
75 |
&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
|
76 |
&VehicleMaxSpeedSorter, |
3eb140bd49a3
(svn r3528) - Feature: Allow sorting of vehicle lists by model or value (based on meush's work)
peter1138
parents:
2962
diff
changeset
|
77 |
&VehicleModelSorter, |
3eb140bd49a3
(svn r3528) - Feature: Allow sorting of vehicle lists by model or value (based on meush's work)
peter1138
parents:
2962
diff
changeset
|
78 |
&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
|
79 |
}; |
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
|
80 |
|
4485
567db6062af9
(svn r6270) Remove the "unsorted" vehicle sorter, because it's plain useless
tron
parents:
4484
diff
changeset
|
81 |
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
|
82 |
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
|
83 |
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
|
84 |
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
|
85 |
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
|
86 |
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
|
87 |
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
|
88 |
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
|
89 |
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
|
90 |
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
|
91 |
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
|
92 |
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
|
93 |
}; |
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
|
94 |
|
6247 | 95 |
void RebuildVehicleLists() |
588 | 96 |
{ |
5124
2ca62776430e
(svn r7205) -Fix [FS#350, SF#1560913]: Window allocation and deletion messed with the actual window
Darkvater
parents:
5071
diff
changeset
|
97 |
Window* const *wz; |
588 | 98 |
|
5124
2ca62776430e
(svn r7205) -Fix [FS#350, SF#1560913]: Window allocation and deletion messed with the actual window
Darkvater
parents:
5071
diff
changeset
|
99 |
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
|
100 |
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
|
101 |
|
588 | 102 |
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
|
103 |
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
|
104 |
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
|
105 |
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
|
106 |
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
|
107 |
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
|
108 |
SetWindowDirty(w); |
2ca62776430e
(svn r7205) -Fix [FS#350, SF#1560913]: Window allocation and deletion messed with the actual window
Darkvater
parents:
5071
diff
changeset
|
109 |
break; |
5893
7e431a4abebb
(svn r8511) -Codechange: make WindowClass an enumerated value.
rubidium
parents:
5847
diff
changeset
|
110 |
|
7e431a4abebb
(svn r8511) -Codechange: make WindowClass an enumerated value.
rubidium
parents:
5847
diff
changeset
|
111 |
default: break; |
588 | 112 |
} |
5124
2ca62776430e
(svn r7205) -Fix [FS#350, SF#1560913]: Window allocation and deletion messed with the actual window
Darkvater
parents:
5071
diff
changeset
|
113 |
} |
588 | 114 |
} |
115 |
||
6247 | 116 |
void ResortVehicleLists() |
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 |
Window* const *wz; |
588 | 119 |
|
5124
2ca62776430e
(svn r7205) -Fix [FS#350, SF#1560913]: Window allocation and deletion messed with the actual window
Darkvater
parents:
5071
diff
changeset
|
120 |
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
|
121 |
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
|
122 |
|
588 | 123 |
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
|
124 |
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
|
125 |
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
|
126 |
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
|
127 |
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
|
128 |
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
|
129 |
SetWindowDirty(w); |
2ca62776430e
(svn r7205) -Fix [FS#350, SF#1560913]: Window allocation and deletion messed with the actual window
Darkvater
parents:
5071
diff
changeset
|
130 |
break; |
5893
7e431a4abebb
(svn r8511) -Codechange: make WindowClass an enumerated value.
rubidium
parents:
5847
diff
changeset
|
131 |
|
7e431a4abebb
(svn r8511) -Codechange: make WindowClass an enumerated value.
rubidium
parents:
5847
diff
changeset
|
132 |
default: break; |
588 | 133 |
} |
5124
2ca62776430e
(svn r7205) -Fix [FS#350, SF#1560913]: Window allocation and deletion messed with the actual window
Darkvater
parents:
5071
diff
changeset
|
134 |
} |
588 | 135 |
} |
136 |
||
5747
ba5393ff957a
(svn r8295) -Cleanup: merged arguments station, order and depot_airport_index for GenerateVehicleSortList() and BuildVehicleList() into one uint16 argument
bjarni
parents:
5745
diff
changeset
|
137 |
static void BuildVehicleList(vehiclelist_d* vl, PlayerID owner, uint16 index, uint16 window_type) |
588 | 138 |
{ |
4545
138a9195009a
(svn r6377) -Codechange: Set up the widgets in the WE_CREATE instead of on every WE_PAINT
Darkvater
parents:
4542
diff
changeset
|
139 |
if (!(vl->l.flags & VL_REBUILD)) return; |
588 | 140 |
|
5747
ba5393ff957a
(svn r8295) -Cleanup: merged arguments station, order and depot_airport_index for GenerateVehicleSortList() and BuildVehicleList() into one uint16 argument
bjarni
parents:
5745
diff
changeset
|
141 |
DEBUG(misc, 3, "Building vehicle list for player %d at station %d", owner, index); |
588 | 142 |
|
5747
ba5393ff957a
(svn r8295) -Cleanup: merged arguments station, order and depot_airport_index for GenerateVehicleSortList() and BuildVehicleList() into one uint16 argument
bjarni
parents:
5745
diff
changeset
|
143 |
vl->l.list_length = GenerateVehicleSortList(&vl->sort_list, &vl->length_of_sort_list, vl->vehicle_type, owner, index, window_type); |
588 | 144 |
|
4545
138a9195009a
(svn r6377) -Codechange: Set up the widgets in the WE_CREATE instead of on every WE_PAINT
Darkvater
parents:
4542
diff
changeset
|
145 |
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
|
146 |
vl->l.flags |= VL_RESORT; |
588 | 147 |
} |
148 |
||
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
|
149 |
static void SortVehicleList(vehiclelist_d *vl) |
588 | 150 |
{ |
4545
138a9195009a
(svn r6377) -Codechange: Set up the widgets in the WE_CREATE instead of on every WE_PAINT
Darkvater
parents:
4542
diff
changeset
|
151 |
if (!(vl->l.flags & VL_RESORT)) return; |
588 | 152 |
|
5587
167d9a91ef02
(svn r8038) -Merge: the cpp branch. Effort of KUDr, Celestar, glx, Smoovius, stillunknown and pv2b.
rubidium
parents:
5584
diff
changeset
|
153 |
_internal_sort_order = (vl->l.flags & VL_DESC) != 0; |
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 |
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
|
155 |
_vehicle_sorter[vl->l.sort_type]); |
588 | 156 |
|
4545
138a9195009a
(svn r6377) -Codechange: Set up the widgets in the WE_CREATE instead of on every WE_PAINT
Darkvater
parents:
4542
diff
changeset
|
157 |
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
|
158 |
vl->l.flags &= ~VL_RESORT; |
588 | 159 |
} |
160 |
||
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
|
161 |
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
|
162 |
{ |
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
|
163 |
_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
|
164 |
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
|
165 |
} |
588 | 166 |
|
6423
8e10e79e0fd1
(svn r9559) -Documentation: doxygen and comment changes: 'U' and 'V' now. Almost done. Yeah. I know, I've already said that...
belugas
parents:
6350
diff
changeset
|
167 |
/** 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
|
168 |
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
|
169 |
{ |
5668
36b39f4a9032
(svn r8128) -Codechange: Split sprite and palette remap into separate 32 bit values.
peter1138
parents:
5609
diff
changeset
|
170 |
SpriteID pal; |
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
|
171 |
|
6423
8e10e79e0fd1
(svn r9559) -Documentation: doxygen and comment changes: 'U' and 'V' now. Almost done. Yeah. I know, I've already said that...
belugas
parents:
6350
diff
changeset
|
172 |
/* draw profit-based colored icons */ |
2639 | 173 |
if (v->age <= 365 * 2) { |
5668
36b39f4a9032
(svn r8128) -Codechange: Split sprite and palette remap into separate 32 bit values.
peter1138
parents:
5609
diff
changeset
|
174 |
pal = PALETTE_TO_GREY; |
2639 | 175 |
} else if (v->profit_last_year < 0) { |
5668
36b39f4a9032
(svn r8128) -Codechange: Split sprite and palette remap into separate 32 bit values.
peter1138
parents:
5609
diff
changeset
|
176 |
pal = PALETTE_TO_RED; |
2639 | 177 |
} else if (v->profit_last_year < 10000) { |
5668
36b39f4a9032
(svn r8128) -Codechange: Split sprite and palette remap into separate 32 bit values.
peter1138
parents:
5609
diff
changeset
|
178 |
pal = PALETTE_TO_YELLOW; |
2639 | 179 |
} else { |
5668
36b39f4a9032
(svn r8128) -Codechange: Split sprite and palette remap into separate 32 bit values.
peter1138
parents:
5609
diff
changeset
|
180 |
pal = PALETTE_TO_GREEN; |
2639 | 181 |
} |
5668
36b39f4a9032
(svn r8128) -Codechange: Split sprite and palette remap into separate 32 bit values.
peter1138
parents:
5609
diff
changeset
|
182 |
DrawSprite(SPR_BLOT, pal, 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
|
183 |
} |
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
|
184 |
|
6248
e4a2ed7e5613
(svn r9051) -Codechange: typedef [enum|struct] Y {} X; -> [enum|struct] X {};
rubidium
parents:
6247
diff
changeset
|
185 |
struct RefitOption { |
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
|
186 |
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
|
187 |
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
|
188 |
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
|
189 |
EngineID engine; |
6248
e4a2ed7e5613
(svn r9051) -Codechange: typedef [enum|struct] Y {} X; -> [enum|struct] X {};
rubidium
parents:
6247
diff
changeset
|
190 |
}; |
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
|
191 |
|
6248
e4a2ed7e5613
(svn r9051) -Codechange: typedef [enum|struct] Y {} X; -> [enum|struct] X {};
rubidium
parents:
6247
diff
changeset
|
192 |
struct RefitList { |
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
|
193 |
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
|
194 |
RefitOption *items; |
6248
e4a2ed7e5613
(svn r9051) -Codechange: typedef [enum|struct] Y {} X; -> [enum|struct] X {};
rubidium
parents:
6247
diff
changeset
|
195 |
}; |
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
|
196 |
|
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
|
197 |
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
|
198 |
{ |
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 |
uint max_lines = 256; |
5609
dc6a58930ba4
(svn r8066) - Codechange: MallocT(), CallocT(), ReallocT() now return the pointer to allocated memory instead of modifying the pointer given as parameter
KUDr
parents:
5587
diff
changeset
|
200 |
RefitOption *refit = CallocT<RefitOption>(max_lines); |
dc6a58930ba4
(svn r8066) - Codechange: MallocT(), CallocT(), ReallocT() now return the pointer to allocated memory instead of modifying the pointer given as parameter
KUDr
parents:
5587
diff
changeset
|
201 |
RefitList *list = CallocT<RefitList>(1); |
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
|
202 |
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
|
203 |
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
|
204 |
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
|
205 |
|
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
|
206 |
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
|
207 |
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
|
208 |
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
|
209 |
|
4933
0ae35137aeca
(svn r6920) - Codechange: Ignore refit options of an engine if it has no capacity.
peter1138
parents:
4932
diff
changeset
|
210 |
/* 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
|
211 |
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
|
212 |
|
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
|
213 |
/* Loop through all cargos in the refit mask */ |
6350
04b19f551aec
(svn r9388) -Codechange: variable scope and type, and standardify all CargoID loops.
peter1138
parents:
6259
diff
changeset
|
214 |
for (CargoID cid = 0; cid < NUM_CARGO && num_lines < max_lines; cid++) { |
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
|
215 |
/* Skip cargo type if it's not listed */ |
6148
5247b66aad19
(svn r8891) -Codechange: Remove remains of global cargo scheme. All cargo mapping is now dealt with only in NewGRF code, on load where possible.
peter1138
parents:
6113
diff
changeset
|
216 |
if (!HASBIT(cmask, cid)) continue; |
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
|
217 |
|
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
|
218 |
/* 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
|
219 |
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
|
220 |
/* 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
|
221 |
* 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
|
222 |
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
|
223 |
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
|
224 |
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
|
225 |
|
6113
a10ede03ac58
(svn r8849) -Codechange: Replace hardcoded global/climate cargo mapping tables with dynamically generated data. Change associated code to use new functions.
peter1138
parents:
6091
diff
changeset
|
226 |
u->cargo_type = cid; |
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 |
|
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 |
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
|
229 |
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
|
230 |
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
|
231 |
|
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
|
232 |
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
|
233 |
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
|
234 |
|
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 |
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
|
236 |
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
|
237 |
|
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 |
/* 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
|
239 |
for (i = 0; i < num_lines && !duplicate; i++) { |
6113
a10ede03ac58
(svn r8849) -Codechange: Replace hardcoded global/climate cargo mapping tables with dynamically generated data. Change associated code to use new functions.
peter1138
parents:
6091
diff
changeset
|
240 |
if (refit[i].cargo == cid && 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
|
241 |
} |
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 |
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
|
244 |
|
6113
a10ede03ac58
(svn r8849) -Codechange: Replace hardcoded global/climate cargo mapping tables with dynamically generated data. Change associated code to use new functions.
peter1138
parents:
6091
diff
changeset
|
245 |
refit[num_lines].cargo = cid; |
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
|
246 |
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
|
247 |
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
|
248 |
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
|
249 |
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
|
250 |
} |
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 |
|
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 |
/* 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
|
253 |
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
|
254 |
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
|
255 |
} 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
|
256 |
/* 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
|
257 |
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
|
258 |
|
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 |
for (i = 0; i < num_lines && !duplicate; i++) { |
6113
a10ede03ac58
(svn r8849) -Codechange: Replace hardcoded global/climate cargo mapping tables with dynamically generated data. Change associated code to use new functions.
peter1138
parents:
6091
diff
changeset
|
260 |
if (refit[i].cargo == cid && 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
|
261 |
} |
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 |
|
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 |
if (!duplicate) { |
6113
a10ede03ac58
(svn r8849) -Codechange: Replace hardcoded global/climate cargo mapping tables with dynamically generated data. Change associated code to use new functions.
peter1138
parents:
6091
diff
changeset
|
264 |
refit[num_lines].cargo = cid; |
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
|
265 |
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
|
266 |
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
|
267 |
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
|
268 |
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
|
269 |
} |
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 |
} |
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 |
} |
6259
471b91a4b1d8
(svn r9068) -Codechange: capitalize the VEH_Train etc. enums to match the coding style (and rest of the code).
rubidium
parents:
6248
diff
changeset
|
272 |
} 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
|
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 |
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
|
275 |
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
|
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 |
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
|
278 |
} |
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
|
279 |
|
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
|
280 |
/** 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
|
281 |
* Draw the list and highlight the selected refit option (if any) |
6484
79156627e1ba
(svn r9665) -Documentation: Doxygen corrections,errors, corrections of corrections...
belugas
parents:
6423
diff
changeset
|
282 |
* @param *list 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
|
283 |
* @param sel selected refit cargo-type in the window |
6484
79156627e1ba
(svn r9665) -Documentation: Doxygen corrections,errors, corrections of corrections...
belugas
parents:
6423
diff
changeset
|
284 |
* @param pos position of the selected item in caller widow |
79156627e1ba
(svn r9665) -Documentation: Doxygen corrections,errors, corrections of corrections...
belugas
parents:
6423
diff
changeset
|
285 |
* @param rows number of rows(capacity) in caller window |
79156627e1ba
(svn r9665) -Documentation: Doxygen corrections,errors, corrections of corrections...
belugas
parents:
6423
diff
changeset
|
286 |
* @param delta step height in caller 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
|
287 |
* @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
|
288 |
*/ |
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
|
289 |
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
|
290 |
{ |
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
|
291 |
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
|
292 |
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
|
293 |
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
|
294 |
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
|
295 |
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
|
296 |
|
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
|
297 |
/* 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
|
298 |
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
|
299 |
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
|
300 |
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
|
301 |
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
|
302 |
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
|
303 |
} |
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
|
304 |
|
4697
67032d30eab0
(svn r6607) - Fix (r6601): Fix selection of refit type when the list is scrolled.
peter1138
parents:
4695
diff
changeset
|
305 |
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
|
306 |
/* Draw the cargo name */ |
6091
c8827d9ae04a
(svn r8826) -Codechange: Replace _cargoc's separate arrays with a regular struct array (with accessor) and implement new initialization method using cargo labels.
peter1138
parents:
6056
diff
changeset
|
307 |
int last_x = DrawString(2, y, GetCargo(refit[i].cargo)->name, 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
|
308 |
|
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 |
/* 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
|
310 |
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
|
311 |
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
|
312 |
} |
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
|
313 |
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
|
314 |
} |
3025
9e60c370415c
(svn r3605) - Remove silly macro and fix indenting in DrawVehicleRefitWindow()
peter1138
parents:
2989
diff
changeset
|
315 |
|
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
|
316 |
sel--; |
3025
9e60c370415c
(svn r3605) - Remove silly macro and fix indenting in DrawVehicleRefitWindow()
peter1138
parents:
2989
diff
changeset
|
317 |
} |
9e60c370415c
(svn r3605) - Remove silly macro and fix indenting in DrawVehicleRefitWindow()
peter1138
parents:
2989
diff
changeset
|
318 |
|
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
|
319 |
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
|
320 |
} |
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
|
321 |
|
4642
e27b0f7e89e9
(svn r6518) -Codechange: unified the vehicle refit windows
bjarni
parents:
4634
diff
changeset
|
322 |
static void VehicleRefitWndProc(Window *w, WindowEvent *e) |
e27b0f7e89e9
(svn r6518) -Codechange: unified the vehicle refit windows
bjarni
parents:
4634
diff
changeset
|
323 |
{ |
e27b0f7e89e9
(svn r6518) -Codechange: unified the vehicle refit windows
bjarni
parents:
4634
diff
changeset
|
324 |
switch (e->event) { |
e27b0f7e89e9
(svn r6518) -Codechange: unified the vehicle refit windows
bjarni
parents:
4634
diff
changeset
|
325 |
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
|
326 |
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
|
327 |
|
6259
471b91a4b1d8
(svn r9068) -Codechange: capitalize the VEH_Train etc. enums to match the coding style (and rest of the code).
rubidium
parents:
6248
diff
changeset
|
328 |
if (v->type == VEH_TRAIN) { |
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
|
329 |
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
|
330 |
|
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
|
331 |
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
|
332 |
/* 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
|
333 |
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
|
334 |
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
|
335 |
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
|
336 |
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
|
337 |
} |
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 |
} |
4642
e27b0f7e89e9
(svn r6518) -Codechange: unified the vehicle refit windows
bjarni
parents:
4634
diff
changeset
|
339 |
|
4698
b787a418296f
(svn r6608) - Fix (r6601): The scroll bar could fall out of the window... more gui-fu needed...
peter1138
parents:
4697
diff
changeset
|
340 |
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
|
341 |
|
4642
e27b0f7e89e9
(svn r6518) -Codechange: unified the vehicle refit windows
bjarni
parents:
4634
diff
changeset
|
342 |
SetDParam(0, v->string_id); |
e27b0f7e89e9
(svn r6518) -Codechange: unified the vehicle refit windows
bjarni
parents:
4634
diff
changeset
|
343 |
SetDParam(1, v->unitnumber); |
e27b0f7e89e9
(svn r6518) -Codechange: unified the vehicle refit windows
bjarni
parents:
4634
diff
changeset
|
344 |
DrawWindowWidgets(w); |
e27b0f7e89e9
(svn r6518) -Codechange: unified the vehicle refit windows
bjarni
parents:
4634
diff
changeset
|
345 |
|
6491
00dc414c909d
(svn r9672) -Cleanup: lots of coding style fixes around operands.
rubidium
parents:
6484
diff
changeset
|
346 |
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
|
347 |
|
6491
00dc414c909d
(svn r9672) -Cleanup: lots of coding style fixes around operands.
rubidium
parents:
6484
diff
changeset
|
348 |
if (WP(w, refit_d).cargo != NULL) { |
6056
56f51abb3b91
(svn r8786) -Cleanup: replaced a switch-case to get the right refit command for a certain vehicle type. We have a function to do that
bjarni
parents:
5955
diff
changeset
|
349 |
int32 cost; |
4642
e27b0f7e89e9
(svn r6518) -Codechange: unified the vehicle refit windows
bjarni
parents:
4634
diff
changeset
|
350 |
|
6491
00dc414c909d
(svn r9672) -Cleanup: lots of coding style fixes around operands.
rubidium
parents:
6484
diff
changeset
|
351 |
cost = DoCommand(v->tile, v->index, WP(w, refit_d).cargo->cargo | WP(w, refit_d).cargo->subtype << 8, |
6056
56f51abb3b91
(svn r8786) -Cleanup: replaced a switch-case to get the right refit command for a certain vehicle type. We have a function to do that
bjarni
parents:
5955
diff
changeset
|
352 |
DC_QUERY_COST, GetCmdRefitVeh(GetVehicle(w->window_number)->type)); |
56f51abb3b91
(svn r8786) -Cleanup: replaced a switch-case to get the right refit command for a certain vehicle type. We have a function to do that
bjarni
parents:
5955
diff
changeset
|
353 |
|
4642
e27b0f7e89e9
(svn r6518) -Codechange: unified the vehicle refit windows
bjarni
parents:
4634
diff
changeset
|
354 |
if (!CmdFailed(cost)) { |
6491
00dc414c909d
(svn r9672) -Cleanup: lots of coding style fixes around operands.
rubidium
parents:
6484
diff
changeset
|
355 |
SetDParam(0, WP(w, refit_d).cargo->cargo); |
4642
e27b0f7e89e9
(svn r6518) -Codechange: unified the vehicle refit windows
bjarni
parents:
4634
diff
changeset
|
356 |
SetDParam(1, _returned_refit_capacity); |
e27b0f7e89e9
(svn r6518) -Codechange: unified the vehicle refit windows
bjarni
parents:
4634
diff
changeset
|
357 |
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
|
358 |
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
|
359 |
} |
e27b0f7e89e9
(svn r6518) -Codechange: unified the vehicle refit windows
bjarni
parents:
4634
diff
changeset
|
360 |
} |
6492
286a52449b54
(svn r9673) -Cleanup: remove spaces before tabs and replace non-indenting tabs with spaces.
rubidium
parents:
6491
diff
changeset
|
361 |
} break; |
4642
e27b0f7e89e9
(svn r6518) -Codechange: unified the vehicle refit windows
bjarni
parents:
4634
diff
changeset
|
362 |
|
e27b0f7e89e9
(svn r6518) -Codechange: unified the vehicle refit windows
bjarni
parents:
4634
diff
changeset
|
363 |
case WE_CLICK: |
e27b0f7e89e9
(svn r6518) -Codechange: unified the vehicle refit windows
bjarni
parents:
4634
diff
changeset
|
364 |
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
|
365 |
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
|
366 |
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
|
367 |
if (y >= 0) { |
6491
00dc414c909d
(svn r9672) -Cleanup: lots of coding style fixes around operands.
rubidium
parents:
6484
diff
changeset
|
368 |
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
|
369 |
SetWindowDirty(w); |
e27b0f7e89e9
(svn r6518) -Codechange: unified the vehicle refit windows
bjarni
parents:
4634
diff
changeset
|
370 |
} |
e27b0f7e89e9
(svn r6518) -Codechange: unified the vehicle refit windows
bjarni
parents:
4634
diff
changeset
|
371 |
} 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
|
372 |
case 6: // refit button |
6491
00dc414c909d
(svn r9672) -Cleanup: lots of coding style fixes around operands.
rubidium
parents:
6484
diff
changeset
|
373 |
if (WP(w, refit_d).cargo != NULL) { |
4642
e27b0f7e89e9
(svn r6518) -Codechange: unified the vehicle refit windows
bjarni
parents:
4634
diff
changeset
|
374 |
const Vehicle *v = GetVehicle(w->window_number); |
e27b0f7e89e9
(svn r6518) -Codechange: unified the vehicle refit windows
bjarni
parents:
4634
diff
changeset
|
375 |
|
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
|
376 |
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
|
377 |
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
|
378 |
|
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
|
379 |
switch (v->type) { |
6259
471b91a4b1d8
(svn r9068) -Codechange: capitalize the VEH_Train etc. enums to match the coding style (and rest of the code).
rubidium
parents:
6248
diff
changeset
|
380 |
case VEH_TRAIN: command = CMD_REFIT_RAIL_VEHICLE | CMD_MSG(STR_RAIL_CAN_T_REFIT_VEHICLE); break; |
471b91a4b1d8
(svn r9068) -Codechange: capitalize the VEH_Train etc. enums to match the coding style (and rest of the code).
rubidium
parents:
6248
diff
changeset
|
381 |
case VEH_ROAD: command = CMD_REFIT_ROAD_VEH | CMD_MSG(STR_REFIT_ROAD_VEHICLE_CAN_T); break; |
471b91a4b1d8
(svn r9068) -Codechange: capitalize the VEH_Train etc. enums to match the coding style (and rest of the code).
rubidium
parents:
6248
diff
changeset
|
382 |
case VEH_SHIP: command = CMD_REFIT_SHIP | CMD_MSG(STR_9841_CAN_T_REFIT_SHIP); break; |
471b91a4b1d8
(svn r9068) -Codechange: capitalize the VEH_Train etc. enums to match the coding style (and rest of the code).
rubidium
parents:
6248
diff
changeset
|
383 |
case VEH_AIRCRAFT: command = CMD_REFIT_AIRCRAFT | CMD_MSG(STR_A042_CAN_T_REFIT_AIRCRAFT); break; |
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
|
384 |
} |
6491
00dc414c909d
(svn r9672) -Cleanup: lots of coding style fixes around operands.
rubidium
parents:
6484
diff
changeset
|
385 |
if (DoCommandP(v->tile, v->index, WP(w, refit_d).cargo->cargo | WP(w, refit_d).cargo->subtype << 8, NULL, command)) DeleteWindow(w); |
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
|
386 |
} else { |
6491
00dc414c909d
(svn r9672) -Cleanup: lots of coding style fixes around operands.
rubidium
parents:
6484
diff
changeset
|
387 |
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
|
388 |
} |
e27b0f7e89e9
(svn r6518) -Codechange: unified the vehicle refit windows
bjarni
parents:
4634
diff
changeset
|
389 |
} |
e27b0f7e89e9
(svn r6518) -Codechange: unified the vehicle refit windows
bjarni
parents:
4634
diff
changeset
|
390 |
break; |
e27b0f7e89e9
(svn r6518) -Codechange: unified the vehicle refit windows
bjarni
parents:
4634
diff
changeset
|
391 |
} |
e27b0f7e89e9
(svn r6518) -Codechange: unified the vehicle refit windows
bjarni
parents:
4634
diff
changeset
|
392 |
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
|
393 |
|
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
|
394 |
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
|
395 |
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
|
396 |
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
|
397 |
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
|
398 |
|
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
|
399 |
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
|
400 |
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
|
401 |
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
|
402 |
break; |
4642
e27b0f7e89e9
(svn r6518) -Codechange: unified the vehicle refit windows
bjarni
parents:
4634
diff
changeset
|
403 |
} |
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 |
|
e27b0f7e89e9
(svn r6518) -Codechange: unified the vehicle refit windows
bjarni
parents:
4634
diff
changeset
|
407 |
static const Widget _vehicle_refit_widgets[] = { |
e27b0f7e89e9
(svn r6518) -Codechange: unified the vehicle refit windows
bjarni
parents:
4634
diff
changeset
|
408 |
{ 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
|
409 |
{ 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
|
410 |
{ 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
|
411 |
{ 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
|
412 |
{ 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
|
413 |
{ 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
|
414 |
{ 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
|
415 |
{ 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
|
416 |
{ WIDGETS_END}, |
e27b0f7e89e9
(svn r6518) -Codechange: unified the vehicle refit windows
bjarni
parents:
4634
diff
changeset
|
417 |
}; |
e27b0f7e89e9
(svn r6518) -Codechange: unified the vehicle refit windows
bjarni
parents:
4634
diff
changeset
|
418 |
|
e27b0f7e89e9
(svn r6518) -Codechange: unified the vehicle refit windows
bjarni
parents:
4634
diff
changeset
|
419 |
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
|
420 |
WDP_AUTO, WDP_AUTO, 240, 174, |
6491
00dc414c909d
(svn r9672) -Cleanup: lots of coding style fixes around operands.
rubidium
parents:
6484
diff
changeset
|
421 |
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
|
422 |
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
|
423 |
_vehicle_refit_widgets, |
e27b0f7e89e9
(svn r6518) -Codechange: unified the vehicle refit windows
bjarni
parents:
4634
diff
changeset
|
424 |
VehicleRefitWndProc, |
e27b0f7e89e9
(svn r6518) -Codechange: unified the vehicle refit windows
bjarni
parents:
4634
diff
changeset
|
425 |
}; |
e27b0f7e89e9
(svn r6518) -Codechange: unified the vehicle refit windows
bjarni
parents:
4634
diff
changeset
|
426 |
|
e27b0f7e89e9
(svn r6518) -Codechange: unified the vehicle refit windows
bjarni
parents:
4634
diff
changeset
|
427 |
/** Show the refit window for a vehicle |
e27b0f7e89e9
(svn r6518) -Codechange: unified the vehicle refit windows
bjarni
parents:
4634
diff
changeset
|
428 |
* @param *v The vehicle to show the refit window for |
6491
00dc414c909d
(svn r9672) -Cleanup: lots of coding style fixes around operands.
rubidium
parents:
6484
diff
changeset
|
429 |
* @param order of the vehicle ( ? ) |
4642
e27b0f7e89e9
(svn r6518) -Codechange: unified the vehicle refit windows
bjarni
parents:
4634
diff
changeset
|
430 |
*/ |
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
|
431 |
void ShowVehicleRefitWindow(const Vehicle *v, VehicleOrderID order) |
4642
e27b0f7e89e9
(svn r6518) -Codechange: unified the vehicle refit windows
bjarni
parents:
4634
diff
changeset
|
432 |
{ |
e27b0f7e89e9
(svn r6518) -Codechange: unified the vehicle refit windows
bjarni
parents:
4634
diff
changeset
|
433 |
Window *w; |
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 |
DeleteWindowById(WC_VEHICLE_REFIT, v->index); |
e27b0f7e89e9
(svn r6518) -Codechange: unified the vehicle refit windows
bjarni
parents:
4634
diff
changeset
|
436 |
|
5071
e28106dfcb6f
(svn r7129) -Codechange: Get rid of a global variable that only sets a window's number.
Darkvater
parents:
5070
diff
changeset
|
437 |
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
|
438 |
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
|
439 |
|
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
|
440 |
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
|
441 |
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
|
442 |
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
|
443 |
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
|
444 |
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
|
445 |
WP(w, refit_d).list = BuildRefitList(v); |
6259
471b91a4b1d8
(svn r9068) -Codechange: capitalize the VEH_Train etc. enums to match the coding style (and rest of the code).
rubidium
parents:
6248
diff
changeset
|
446 |
if (v->type == VEH_TRAIN) WP(w, refit_d).length = CountVehiclesInChain(v); |
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
|
447 |
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
|
448 |
|
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
|
449 |
switch (v->type) { |
6259
471b91a4b1d8
(svn r9068) -Codechange: capitalize the VEH_Train etc. enums to match the coding style (and rest of the code).
rubidium
parents:
6248
diff
changeset
|
450 |
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
|
451 |
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
|
452 |
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
|
453 |
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
|
454 |
break; |
6259
471b91a4b1d8
(svn r9068) -Codechange: capitalize the VEH_Train etc. enums to match the coding style (and rest of the code).
rubidium
parents:
6248
diff
changeset
|
455 |
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
|
456 |
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
|
457 |
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
|
458 |
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
|
459 |
break; |
6259
471b91a4b1d8
(svn r9068) -Codechange: capitalize the VEH_Train etc. enums to match the coding style (and rest of the code).
rubidium
parents:
6248
diff
changeset
|
460 |
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
|
461 |
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
|
462 |
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
|
463 |
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
|
464 |
break; |
6259
471b91a4b1d8
(svn r9068) -Codechange: capitalize the VEH_Train etc. enums to match the coding style (and rest of the code).
rubidium
parents:
6248
diff
changeset
|
465 |
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
|
466 |
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
|
467 |
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
|
468 |
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
|
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 |
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
|
471 |
} |
4642
e27b0f7e89e9
(svn r6518) -Codechange: unified the vehicle refit windows
bjarni
parents:
4634
diff
changeset
|
472 |
} |
e27b0f7e89e9
(svn r6518) -Codechange: unified the vehicle refit windows
bjarni
parents:
4634
diff
changeset
|
473 |
} |
e27b0f7e89e9
(svn r6518) -Codechange: unified the vehicle refit windows
bjarni
parents:
4634
diff
changeset
|
474 |
|
6423
8e10e79e0fd1
(svn r9559) -Documentation: doxygen and comment changes: 'U' and 'V' now. Almost done. Yeah. I know, I've already said that...
belugas
parents:
6350
diff
changeset
|
475 |
/** 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
|
476 |
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
|
477 |
{ |
4dd8517bdcf6
(svn r4561) - NewGRF: implement most of callback 0x23: additional text in vehicle purchase windows.
peter1138
parents:
3492
diff
changeset
|
478 |
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
|
479 |
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
|
480 |
|
6423
8e10e79e0fd1
(svn r9559) -Documentation: doxygen and comment changes: 'U' and 'V' now. Almost done. Yeah. I know, I've already said that...
belugas
parents:
6350
diff
changeset
|
481 |
/* STR_02BD is used to start the string with {BLACK} */ |
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
|
482 |
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
|
483 |
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
|
484 |
} |
4dd8517bdcf6
(svn r4561) - NewGRF: implement most of callback 0x23: additional text in vehicle purchase windows.
peter1138
parents:
3492
diff
changeset
|
485 |
|
6423
8e10e79e0fd1
(svn r9559) -Documentation: doxygen and comment changes: 'U' and 'V' now. Almost done. Yeah. I know, I've already said that...
belugas
parents:
6350
diff
changeset
|
486 |
/** Count the number of bits that are set in a mask */ |
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
|
487 |
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
|
488 |
{ |
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
|
489 |
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
|
490 |
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
|
491 |
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
|
492 |
} |
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
|
493 |
|
6423
8e10e79e0fd1
(svn r9559) -Documentation: doxygen and comment changes: 'U' and 'V' now. Almost done. Yeah. I know, I've already said that...
belugas
parents:
6350
diff
changeset
|
494 |
/** Display list of cargo types of the engine, for 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
|
495 |
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
|
496 |
{ |
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
|
497 |
/* 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
|
498 |
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
|
499 |
/* List of cargo types available in this climate */ |
6113
a10ede03ac58
(svn r8849) -Codechange: Replace hardcoded global/climate cargo mapping tables with dynamically generated data. Change associated code to use new functions.
peter1138
parents:
6091
diff
changeset
|
500 |
uint32 lmask = _cargo_mask; |
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 |
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
|
502 |
|
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 |
/* 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
|
504 |
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
|
505 |
|
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 |
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
|
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 |
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
|
509 |
/* 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
|
510 |
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
|
511 |
} 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
|
512 |
/* 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
|
513 |
* 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
|
514 |
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
|
515 |
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
|
516 |
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
|
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 |
|
6113
a10ede03ac58
(svn r8849) -Codechange: Replace hardcoded global/climate cargo mapping tables with dynamically generated data. Change associated code to use new functions.
peter1138
parents:
6091
diff
changeset
|
519 |
bool first = true; |
a10ede03ac58
(svn r8849) -Codechange: Replace hardcoded global/climate cargo mapping tables with dynamically generated data. Change associated code to use new functions.
peter1138
parents:
6091
diff
changeset
|
520 |
|
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
|
521 |
/* Add each cargo type to the list */ |
6113
a10ede03ac58
(svn r8849) -Codechange: Replace hardcoded global/climate cargo mapping tables with dynamically generated data. Change associated code to use new functions.
peter1138
parents:
6091
diff
changeset
|
522 |
for (CargoID cid = 0; cid < NUM_CARGO; cid++) { |
6148
5247b66aad19
(svn r8891) -Codechange: Remove remains of global cargo scheme. All cargo mapping is now dealt with only in NewGRF code, on load where possible.
peter1138
parents:
6113
diff
changeset
|
523 |
if (!HASBIT(cmask, cid)) continue; |
6113
a10ede03ac58
(svn r8849) -Codechange: Replace hardcoded global/climate cargo mapping tables with dynamically generated data. Change associated code to use new functions.
peter1138
parents:
6091
diff
changeset
|
524 |
|
a10ede03ac58
(svn r8849) -Codechange: Replace hardcoded global/climate cargo mapping tables with dynamically generated data. Change associated code to use new functions.
peter1138
parents:
6091
diff
changeset
|
525 |
if (!first) b = strecpy(b, ", ", lastof(_userstring)); |
a10ede03ac58
(svn r8849) -Codechange: Replace hardcoded global/climate cargo mapping tables with dynamically generated data. Change associated code to use new functions.
peter1138
parents:
6091
diff
changeset
|
526 |
first = false; |
a10ede03ac58
(svn r8849) -Codechange: Replace hardcoded global/climate cargo mapping tables with dynamically generated data. Change associated code to use new functions.
peter1138
parents:
6091
diff
changeset
|
527 |
|
a10ede03ac58
(svn r8849) -Codechange: Replace hardcoded global/climate cargo mapping tables with dynamically generated data. Change associated code to use new functions.
peter1138
parents:
6091
diff
changeset
|
528 |
b = InlineString(b, GetCargo(cid)->name); |
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
|
529 |
} |
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 |
} |
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 |
|
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 |
/* 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
|
533 |
*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
|
534 |
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
|
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 |
|
168
79f9ed5b23e6
(svn r169) -Fix: move around sort-widgets a bit so it looks more natural
darkvater
parents:
164
diff
changeset
|
537 |
|
6423
8e10e79e0fd1
(svn r9559) -Documentation: doxygen and comment changes: 'U' and 'V' now. Almost done. Yeah. I know, I've already said that...
belugas
parents:
6350
diff
changeset
|
538 |
/* if the sorting criteria had the same value, sort vehicle by unitnumber */ |
243
9a40daa560ae
(svn r244) -Fix: Stations were not sorted for non-player-0 players
darkvater
parents:
193
diff
changeset
|
539 |
#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
|
540 |
|
2462 | 541 |
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
|
542 |
{ |
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
|
543 |
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
|
544 |
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
|
545 |
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
|
546 |
|
79f9ed5b23e6
(svn r169) -Fix: move around sort-widgets a bit so it looks more natural
darkvater
parents:
164
diff
changeset
|
547 |
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
|
548 |
} |
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
|
549 |
|
2462 | 550 |
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
|
551 |
{ |
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
|
552 |
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
|
553 |
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
|
554 |
|
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
|
555 |
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
|
556 |
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
|
557 |
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
|
558 |
|
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
|
559 |
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
|
560 |
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
|
561 |
if (IsCustomName(va->string_id)) { |
4912
0f51b47cb983
(svn r6884) -Codechange: Add strict bounds checking in string formatting system.
Darkvater
parents:
4896
diff
changeset
|
562 |
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
|
563 |
} 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
|
564 |
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
|
565 |
} |
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
|
566 |
} |
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
|
567 |
|
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
|
568 |
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
|
569 |
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
|
570 |
if (IsCustomName(vb->string_id)) { |
4912
0f51b47cb983
(svn r6884) -Codechange: Add strict bounds checking in string formatting system.
Darkvater
parents:
4896
diff
changeset
|
571 |
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
|
572 |
} 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
|
573 |
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
|
574 |
} |
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
|
575 |
} |
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 |
|
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 |
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
|
578 |
|
243
9a40daa560ae
(svn r244) -Fix: Stations were not sorted for non-player-0 players
darkvater
parents:
193
diff
changeset
|
579 |
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
|
580 |
|
79f9ed5b23e6
(svn r169) -Fix: move around sort-widgets a bit so it looks more natural
darkvater
parents:
164
diff
changeset
|
581 |
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
|
582 |
} |
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
|
583 |
|
2462 | 584 |
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
|
585 |
{ |
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
|
586 |
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
|
587 |
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
|
588 |
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
|
589 |
|
243
9a40daa560ae
(svn r244) -Fix: Stations were not sorted for non-player-0 players
darkvater
parents:
193
diff
changeset
|
590 |
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
|
591 |
|
79f9ed5b23e6
(svn r169) -Fix: move around sort-widgets a bit so it looks more natural
darkvater
parents:
164
diff
changeset
|
592 |
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
|
593 |
} |
79f9ed5b23e6
(svn r169) -Fix: move around sort-widgets a bit so it looks more natural
darkvater
parents:
164
diff
changeset
|
594 |
|
2462 | 595 |
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
|
596 |
{ |
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
|
597 |
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
|
598 |
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
|
599 |
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
|
600 |
|
243
9a40daa560ae
(svn r244) -Fix: Stations were not sorted for non-player-0 players
darkvater
parents:
193
diff
changeset
|
601 |
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
|
602 |
|
79f9ed5b23e6
(svn r169) -Fix: move around sort-widgets a bit so it looks more natural
darkvater
parents:
164
diff
changeset
|
603 |
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
|
604 |
} |
79f9ed5b23e6
(svn r169) -Fix: move around sort-widgets a bit so it looks more natural
darkvater
parents:
164
diff
changeset
|
605 |
|
2462 | 606 |
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
|
607 |
{ |
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
|
608 |
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
|
609 |
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
|
610 |
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
|
611 |
|
243
9a40daa560ae
(svn r244) -Fix: Stations were not sorted for non-player-0 players
darkvater
parents:
193
diff
changeset
|
612 |
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
|
613 |
|
79f9ed5b23e6
(svn r169) -Fix: move around sort-widgets a bit so it looks more natural
darkvater
parents:
164
diff
changeset
|
614 |
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
|
615 |
} |
79f9ed5b23e6
(svn r169) -Fix: move around sort-widgets a bit so it looks more natural
darkvater
parents:
164
diff
changeset
|
616 |
|
2462 | 617 |
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
|
618 |
{ |
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
|
619 |
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
|
620 |
const Vehicle* vb = *(const Vehicle**)b; |
2549 | 621 |
const Vehicle* v; |
622 |
AcceptedCargo cargoa; |
|
623 |
AcceptedCargo cargob; |
|
168
79f9ed5b23e6
(svn r169) -Fix: move around sort-widgets a bit so it looks more natural
darkvater
parents:
164
diff
changeset
|
624 |
int r = 0; |
79f9ed5b23e6
(svn r169) -Fix: move around sort-widgets a bit so it looks more natural
darkvater
parents:
164
diff
changeset
|
625 |
|
2549 | 626 |
memset(cargoa, 0, sizeof(cargoa)); |
627 |
memset(cargob, 0, sizeof(cargob)); |
|
628 |
for (v = va; v != NULL; v = v->next) cargoa[v->cargo_type] += v->cargo_cap; |
|
629 |
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
|
630 |
|
6350
04b19f551aec
(svn r9388) -Codechange: variable scope and type, and standardify all CargoID loops.
peter1138
parents:
6259
diff
changeset
|
631 |
for (CargoID i = 0; i < NUM_CARGO; i++) { |
2549 | 632 |
r = cargoa[i] - cargob[i]; |
633 |
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
|
634 |
} |
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
|
635 |
|
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
|
636 |
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
|
637 |
|
168
79f9ed5b23e6
(svn r169) -Fix: move around sort-widgets a bit so it looks more natural
darkvater
parents:
164
diff
changeset
|
638 |
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
|
639 |
} |
168
79f9ed5b23e6
(svn r169) -Fix: move around sort-widgets a bit so it looks more natural
darkvater
parents:
164
diff
changeset
|
640 |
|
2462 | 641 |
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
|
642 |
{ |
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
|
643 |
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
|
644 |
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
|
645 |
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
|
646 |
|
243
9a40daa560ae
(svn r244) -Fix: Stations were not sorted for non-player-0 players
darkvater
parents:
193
diff
changeset
|
647 |
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
|
648 |
|
79f9ed5b23e6
(svn r169) -Fix: move around sort-widgets a bit so it looks more natural
darkvater
parents:
164
diff
changeset
|
649 |
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
|
650 |
} |
79f9ed5b23e6
(svn r169) -Fix: move around sort-widgets a bit so it looks more natural
darkvater
parents:
164
diff
changeset
|
651 |
|
2462 | 652 |
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
|
653 |
{ |
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
|
654 |
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
|
655 |
const Vehicle* vb = *(const Vehicle**)b; |
1179
ce0a75460808
(svn r1681) -Feature: New realistic acceleration.
celestar
parents:
1178
diff
changeset
|
656 |
int max_speed_a = 0xFFFF, max_speed_b = 0xFFFF; |
ce0a75460808
(svn r1681) -Feature: New realistic acceleration.
celestar
parents:
1178
diff
changeset
|
657 |
int r; |
ce0a75460808
(svn r1681) -Feature: New realistic acceleration.
celestar
parents:
1178
diff
changeset
|
658 |
const Vehicle *ua = va, *ub = vb; |
ce0a75460808
(svn r1681) -Feature: New realistic acceleration.
celestar
parents:
1178
diff
changeset
|
659 |
|
6259
471b91a4b1d8
(svn r9068) -Codechange: capitalize the VEH_Train etc. enums to match the coding style (and rest of the code).
rubidium
parents:
6248
diff
changeset
|
660 |
if (va->type == VEH_TRAIN && vb->type == VEH_TRAIN) { |
1191
dc46f04aab3a
(svn r1695) -Fix: I broke maximum speed sorting for anything but trains with the new acceleration. Sorry
Celestar
parents:
1182
diff
changeset
|
661 |
do { |
dc46f04aab3a
(svn r1695) -Fix: I broke maximum speed sorting for anything but trains with the new acceleration. Sorry
Celestar
parents:
1182
diff
changeset
|
662 |
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
|
663 |
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
|
664 |
} while ((ua = ua->next) != NULL); |
1179
ce0a75460808
(svn r1681) -Feature: New realistic acceleration.
celestar
parents:
1178
diff
changeset
|
665 |
|
1191
dc46f04aab3a
(svn r1695) -Fix: I broke maximum speed sorting for anything but trains with the new acceleration. Sorry
Celestar
parents:
1182
diff
changeset
|
666 |
do { |
dc46f04aab3a
(svn r1695) -Fix: I broke maximum speed sorting for anything but trains with the new acceleration. Sorry
Celestar
parents:
1182
diff
changeset
|
667 |
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
|
668 |
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
|
669 |
} 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
|
670 |
|
dc46f04aab3a
(svn r1695) -Fix: I broke maximum speed sorting for anything but trains with the new acceleration. Sorry
Celestar
parents:
1182
diff
changeset
|
671 |
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
|
672 |
} else { |
dc46f04aab3a
(svn r1695) -Fix: I broke maximum speed sorting for anything but trains with the new acceleration. Sorry
Celestar
parents:
1182
diff
changeset
|
673 |
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
|
674 |
} |
168
79f9ed5b23e6
(svn r169) -Fix: move around sort-widgets a bit so it looks more natural
darkvater
parents:
164
diff
changeset
|
675 |
|
243
9a40daa560ae
(svn r244) -Fix: Stations were not sorted for non-player-0 players
darkvater
parents:
193
diff
changeset
|
676 |
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
|
677 |
|
79f9ed5b23e6
(svn r169) -Fix: move around sort-widgets a bit so it looks more natural
darkvater
parents:
164
diff
changeset
|
678 |
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
|
679 |
} |
842 | 680 |
|
2965
3eb140bd49a3
(svn r3528) - Feature: Allow sorting of vehicle lists by model or value (based on meush's work)
peter1138
parents:
2962
diff
changeset
|
681 |
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
|
682 |
{ |
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
|
683 |
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
|
684 |
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
|
685 |
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
|
686 |
|
3eb140bd49a3
(svn r3528) - Feature: Allow sorting of vehicle lists by model or value (based on meush's work)
peter1138
parents:
2962
diff
changeset
|
687 |
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
|
688 |
|
3eb140bd49a3
(svn r3528) - Feature: Allow sorting of vehicle lists by model or value (based on meush's work)
peter1138
parents:
2962
diff
changeset
|
689 |
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
|
690 |
} |
3eb140bd49a3
(svn r3528) - Feature: Allow sorting of vehicle lists by model or value (based on meush's work)
peter1138
parents:
2962
diff
changeset
|
691 |
|
3eb140bd49a3
(svn r3528) - Feature: Allow sorting of vehicle lists by model or value (based on meush's work)
peter1138
parents:
2962
diff
changeset
|
692 |
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
|
693 |
{ |
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
|
694 |
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
|
695 |
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
|
696 |
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
|
697 |
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
|
698 |
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
|
699 |
|
3eb140bd49a3
(svn r3528) - Feature: Allow sorting of vehicle lists by model or value (based on meush's work)
peter1138
parents:
2962
diff
changeset
|
700 |
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
|
701 |
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
|
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 |
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
|
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 |
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
|
706 |
|
3eb140bd49a3
(svn r3528) - Feature: Allow sorting of vehicle lists by model or value (based on meush's work)
peter1138
parents:
2962
diff
changeset
|
707 |
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
|
708 |
} |
3eb140bd49a3
(svn r3528) - Feature: Allow sorting of vehicle lists by model or value (based on meush's work)
peter1138
parents:
2962
diff
changeset
|
709 |
|
6247 | 710 |
void InitializeGUI() |
1246
eb66ff34348f
(svn r1750) - Feature: [ 1093261 ] Saving vehicle sorting criteria for each vehicle type (bociusz)
darkvater
parents:
1191
diff
changeset
|
711 |
{ |
eb66ff34348f
(svn r1750) - Feature: [ 1093261 ] Saving vehicle sorting criteria for each vehicle type (bociusz)
darkvater
parents:
1191
diff
changeset
|
712 |
memset(&_sorting, 0, sizeof(_sorting)); |
eb66ff34348f
(svn r1750) - Feature: [ 1093261 ] Saving vehicle sorting criteria for each vehicle type (bociusz)
darkvater
parents:
1191
diff
changeset
|
713 |
} |
2552
5b586a545665
(svn r3081) -Codechange: [autoreplace] complete rewrite of autoreplace
bjarni
parents:
2549
diff
changeset
|
714 |
|
5b586a545665
(svn r3081) -Codechange: [autoreplace] complete rewrite of autoreplace
bjarni
parents:
2549
diff
changeset
|
715 |
/** Assigns an already open vehicle window to a new vehicle. |
2639 | 716 |
* Assigns an already open vehicle window to a new vehicle. If the vehicle got |
717 |
* any sub window open (orders and so on) it will change owner too. |
|
718 |
* @param *from_v the current owner of the window |
|
719 |
* @param *to_v the new owner of the window |
|
720 |
*/ |
|
2552
5b586a545665
(svn r3081) -Codechange: [autoreplace] complete rewrite of autoreplace
bjarni
parents:
2549
diff
changeset
|
721 |
void ChangeVehicleViewWindow(const Vehicle *from_v, const Vehicle *to_v) |
5b586a545665
(svn r3081) -Codechange: [autoreplace] complete rewrite of autoreplace
bjarni
parents:
2549
diff
changeset
|
722 |
{ |
5b586a545665
(svn r3081) -Codechange: [autoreplace] complete rewrite of autoreplace
bjarni
parents:
2549
diff
changeset
|
723 |
Window *w; |
5b586a545665
(svn r3081) -Codechange: [autoreplace] complete rewrite of autoreplace
bjarni
parents:
2549
diff
changeset
|
724 |
|
5b586a545665
(svn r3081) -Codechange: [autoreplace] complete rewrite of autoreplace
bjarni
parents:
2549
diff
changeset
|
725 |
w = FindWindowById(WC_VEHICLE_VIEW, from_v->index); |
5b586a545665
(svn r3081) -Codechange: [autoreplace] complete rewrite of autoreplace
bjarni
parents:
2549
diff
changeset
|
726 |
if (w != NULL) { |
5b586a545665
(svn r3081) -Codechange: [autoreplace] complete rewrite of autoreplace
bjarni
parents:
2549
diff
changeset
|
727 |
w->window_number = to_v->index; |
2639 | 728 |
WP(w, vp_d).follow_vehicle = to_v->index; |
2552
5b586a545665
(svn r3081) -Codechange: [autoreplace] complete rewrite of autoreplace
bjarni
parents:
2549
diff
changeset
|
729 |
SetWindowDirty(w); |
5b586a545665
(svn r3081) -Codechange: [autoreplace] complete rewrite of autoreplace
bjarni
parents:
2549
diff
changeset
|
730 |
|
5b586a545665
(svn r3081) -Codechange: [autoreplace] complete rewrite of autoreplace
bjarni
parents:
2549
diff
changeset
|
731 |
w = FindWindowById(WC_VEHICLE_ORDERS, from_v->index); |
5b586a545665
(svn r3081) -Codechange: [autoreplace] complete rewrite of autoreplace
bjarni
parents:
2549
diff
changeset
|
732 |
if (w != NULL) { |
5b586a545665
(svn r3081) -Codechange: [autoreplace] complete rewrite of autoreplace
bjarni
parents:
2549
diff
changeset
|
733 |
w->window_number = to_v->index; |
5b586a545665
(svn r3081) -Codechange: [autoreplace] complete rewrite of autoreplace
bjarni
parents:
2549
diff
changeset
|
734 |
SetWindowDirty(w); |
5b586a545665
(svn r3081) -Codechange: [autoreplace] complete rewrite of autoreplace
bjarni
parents:
2549
diff
changeset
|
735 |
} |
5b586a545665
(svn r3081) -Codechange: [autoreplace] complete rewrite of autoreplace
bjarni
parents:
2549
diff
changeset
|
736 |
|
5b586a545665
(svn r3081) -Codechange: [autoreplace] complete rewrite of autoreplace
bjarni
parents:
2549
diff
changeset
|
737 |
w = FindWindowById(WC_VEHICLE_REFIT, from_v->index); |
5b586a545665
(svn r3081) -Codechange: [autoreplace] complete rewrite of autoreplace
bjarni
parents:
2549
diff
changeset
|
738 |
if (w != NULL) { |
5b586a545665
(svn r3081) -Codechange: [autoreplace] complete rewrite of autoreplace
bjarni
parents:
2549
diff
changeset
|
739 |
w->window_number = to_v->index; |
5b586a545665
(svn r3081) -Codechange: [autoreplace] complete rewrite of autoreplace
bjarni
parents:
2549
diff
changeset
|
740 |
SetWindowDirty(w); |
5b586a545665
(svn r3081) -Codechange: [autoreplace] complete rewrite of autoreplace
bjarni
parents:
2549
diff
changeset
|
741 |
} |
5b586a545665
(svn r3081) -Codechange: [autoreplace] complete rewrite of autoreplace
bjarni
parents:
2549
diff
changeset
|
742 |
|
5b586a545665
(svn r3081) -Codechange: [autoreplace] complete rewrite of autoreplace
bjarni
parents:
2549
diff
changeset
|
743 |
w = FindWindowById(WC_VEHICLE_DETAILS, from_v->index); |
5b586a545665
(svn r3081) -Codechange: [autoreplace] complete rewrite of autoreplace
bjarni
parents:
2549
diff
changeset
|
744 |
if (w != NULL) { |
5b586a545665
(svn r3081) -Codechange: [autoreplace] complete rewrite of autoreplace
bjarni
parents:
2549
diff
changeset
|
745 |
w->window_number = to_v->index; |
5b586a545665
(svn r3081) -Codechange: [autoreplace] complete rewrite of autoreplace
bjarni
parents:
2549
diff
changeset
|
746 |
SetWindowDirty(w); |
5b586a545665
(svn r3081) -Codechange: [autoreplace] complete rewrite of autoreplace
bjarni
parents:
2549
diff
changeset
|
747 |
} |
5b586a545665
(svn r3081) -Codechange: [autoreplace] complete rewrite of autoreplace
bjarni
parents:
2549
diff
changeset
|
748 |
} |
5b586a545665
(svn r3081) -Codechange: [autoreplace] complete rewrite of autoreplace
bjarni
parents:
2549
diff
changeset
|
749 |
} |
4442
9f8bb348d58f
(svn r6215) -Codechange: [vehicle list windows] unified Player(vehicle)WndProc into PlayerVehWndProc
bjarni
parents:
4434
diff
changeset
|
750 |
|
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
|
751 |
/* |
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
|
752 |
* 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
|
753 |
*/ |
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
|
754 |
|
4545
138a9195009a
(svn r6377) -Codechange: Set up the widgets in the WE_CREATE instead of on every WE_PAINT
Darkvater
parents:
4542
diff
changeset
|
755 |
enum { |
138a9195009a
(svn r6377) -Codechange: Set up the widgets in the WE_CREATE instead of on every WE_PAINT
Darkvater
parents:
4542
diff
changeset
|
756 |
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
|
757 |
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
|
758 |
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
|
759 |
}; |
138a9195009a
(svn r6377) -Codechange: Set up the widgets in the WE_CREATE instead of on every WE_PAINT
Darkvater
parents:
4542
diff
changeset
|
760 |
|
5269
4b50973b21f6
(svn r7410) -Codechange/Fix: Remove useless and unfollowable programmatic-resize, and implement it
Darkvater
parents:
5125
diff
changeset
|
761 |
enum VehicleListWindowWidgets { |
4668
f7256d0e7682
(svn r6562) -Codechange: merged the vehicle list window widget arrays
bjarni
parents:
4665
diff
changeset
|
762 |
VLW_WIDGET_CLOSEBOX = 0, |
f7256d0e7682
(svn r6562) -Codechange: merged the vehicle list window widget arrays
bjarni
parents:
4665
diff
changeset
|
763 |
VLW_WIDGET_CAPTION, |
f7256d0e7682
(svn r6562) -Codechange: merged the vehicle list window widget arrays
bjarni
parents:
4665
diff
changeset
|
764 |
VLW_WIDGET_STICKY, |
f7256d0e7682
(svn r6562) -Codechange: merged the vehicle list window widget arrays
bjarni
parents:
4665
diff
changeset
|
765 |
VLW_WIDGET_SORT_ORDER, |
f7256d0e7682
(svn r6562) -Codechange: merged the vehicle list window widget arrays
bjarni
parents:
4665
diff
changeset
|
766 |
VLW_WIDGET_SORT_BY_TEXT, |
f7256d0e7682
(svn r6562) -Codechange: merged the vehicle list window widget arrays
bjarni
parents:
4665
diff
changeset
|
767 |
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
|
768 |
VLW_WIDGET_EMPTY_TOP_RIGHT, |
4668
f7256d0e7682
(svn r6562) -Codechange: merged the vehicle list window widget arrays
bjarni
parents:
4665
diff
changeset
|
769 |
VLW_WIDGET_LIST, |
f7256d0e7682
(svn r6562) -Codechange: merged the vehicle list window widget arrays
bjarni
parents:
4665
diff
changeset
|
770 |
VLW_WIDGET_SCROLLBAR, |
f7256d0e7682
(svn r6562) -Codechange: merged the vehicle list window widget arrays
bjarni
parents:
4665
diff
changeset
|
771 |
VLW_WIDGET_OTHER_PLAYER_FILLER, |
5846
b4a666d80c88
(svn r8420) -Codechange (r7418): Rename the 'New <vehtype>' button of the global vehicle lists to 'Available <vehtype>' as it is a view-only list, not one from which you can purchase (rolling) stock.
Darkvater
parents:
5809
diff
changeset
|
772 |
VLW_WIDGET_AVAILABLE_VEHICLES, |
5274
8bd7e4c00956
(svn r7418) -Codechange/Feature: Put back the 'New Vehicles' button in the vehicle list window. As
Darkvater
parents:
5269
diff
changeset
|
773 |
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
|
774 |
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
|
775 |
VLW_WIDGET_STOP_ALL, |
3160067b8751
(svn r6570) -Feature: added "start all" and "stop all" buttons to the vehicle lists
bjarni
parents:
4669
diff
changeset
|
776 |
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
|
777 |
VLW_WIDGET_EMPTY_BOTTOM_RIGHT, |
4668
f7256d0e7682
(svn r6562) -Codechange: merged the vehicle list window widget arrays
bjarni
parents:
4665
diff
changeset
|
778 |
VLW_WIDGET_RESIZE, |
f7256d0e7682
(svn r6562) -Codechange: merged the vehicle list window widget arrays
bjarni
parents:
4665
diff
changeset
|
779 |
}; |
f7256d0e7682
(svn r6562) -Codechange: merged the vehicle list window widget arrays
bjarni
parents:
4665
diff
changeset
|
780 |
|
f7256d0e7682
(svn r6562) -Codechange: merged the vehicle list window widget arrays
bjarni
parents:
4665
diff
changeset
|
781 |
static const Widget _vehicle_list_widgets[] = { |
f7256d0e7682
(svn r6562) -Codechange: merged the vehicle list window widget arrays
bjarni
parents:
4665
diff
changeset
|
782 |
{ 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
|
783 |
{ 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
|
784 |
{ 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
|
785 |
{ 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
|
786 |
{ 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
|
787 |
{ 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
|
788 |
{ 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
|
789 |
{ 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
|
790 |
{ 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
|
791 |
/* 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
|
792 |
{ 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
|
793 |
|
8bd7e4c00956
(svn r7418) -Codechange/Feature: Put back the 'New Vehicles' button in the vehicle list window. As
Darkvater
parents:
5269
diff
changeset
|
794 |
{ 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
|
795 |
{ 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
|
796 |
{ 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
|
797 |
|
8bd7e4c00956
(svn r7418) -Codechange/Feature: Put back the 'New Vehicles' button in the vehicle list window. As
Darkvater
parents:
5269
diff
changeset
|
798 |
{ 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
|
799 |
{ 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
|
800 |
{ 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
|
801 |
{ 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
|
802 |
{ WIDGETS_END}, |
f7256d0e7682
(svn r6562) -Codechange: merged the vehicle list window widget arrays
bjarni
parents:
4665
diff
changeset
|
803 |
}; |
f7256d0e7682
(svn r6562) -Codechange: merged the vehicle list window widget arrays
bjarni
parents:
4665
diff
changeset
|
804 |
|
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
|
805 |
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
|
806 |
{ |
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
|
807 |
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
|
808 |
uint16 window_type = w->window_number & VLW_MASK; |
5587
167d9a91ef02
(svn r8038) -Merge: the cpp branch. Effort of KUDr, Celestar, glx, Smoovius, stillunknown and pv2b.
rubidium
parents:
5584
diff
changeset
|
809 |
PlayerID player = (PlayerID)GB(w->window_number, 0, 8); |
4668
f7256d0e7682
(svn r6562) -Codechange: merged the vehicle list window widget arrays
bjarni
parents:
4665
diff
changeset
|
810 |
|
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
|
811 |
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
|
812 |
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
|
813 |
vl->sort_list = NULL; |
4668
f7256d0e7682
(svn r6562) -Codechange: merged the vehicle list window widget arrays
bjarni
parents:
4665
diff
changeset
|
814 |
w->caption_color = player; |
f7256d0e7682
(svn r6562) -Codechange: merged the vehicle list window widget arrays
bjarni
parents:
4665
diff
changeset
|
815 |
|
f7256d0e7682
(svn r6562) -Codechange: merged the vehicle list window widget arrays
bjarni
parents:
4665
diff
changeset
|
816 |
/* 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
|
817 |
* 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
|
818 |
if (player == _local_player) { |
4702
c79e9d9f27b3
(svn r6612) -Codechange: Use accessors for hidden_state.
belugas
parents:
4698
diff
changeset
|
819 |
HideWindowWidget(w, VLW_WIDGET_OTHER_PLAYER_FILLER); |
5846
b4a666d80c88
(svn r8420) -Codechange (r7418): Rename the 'New <vehtype>' button of the global vehicle lists to 'Available <vehtype>' as it is a view-only list, not one from which you can purchase (rolling) stock.
Darkvater
parents:
5809
diff
changeset
|
820 |
SetWindowWidgetDisabledState(w, VLW_WIDGET_AVAILABLE_VEHICLES, window_type != VLW_STANDARD); |
4668
f7256d0e7682
(svn r6562) -Codechange: merged the vehicle list window widget arrays
bjarni
parents:
4665
diff
changeset
|
821 |
} else { |
4758
090cf0f1b35e
(svn r6672) -Codechange: [depot & vehicle windows] applied SetWindowWidgetsDisabledState() and SetWindowWidgetsHiddenState() to depot and vehicle windows
bjarni
parents:
4753
diff
changeset
|
822 |
SetWindowWidgetsHiddenState(w, true, |
5846
b4a666d80c88
(svn r8420) -Codechange (r7418): Rename the 'New <vehtype>' button of the global vehicle lists to 'Available <vehtype>' as it is a view-only list, not one from which you can purchase (rolling) stock.
Darkvater
parents:
5809
diff
changeset
|
823 |
VLW_WIDGET_AVAILABLE_VEHICLES, |
5274
8bd7e4c00956
(svn r7418) -Codechange/Feature: Put back the 'New Vehicles' button in the vehicle list window. As
Darkvater
parents:
5269
diff
changeset
|
824 |
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
|
825 |
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
|
826 |
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
|
827 |
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
|
828 |
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
|
829 |
WIDGET_LIST_END); |
4668
f7256d0e7682
(svn r6562) -Codechange: merged the vehicle list window widget arrays
bjarni
parents:
4665
diff
changeset
|
830 |
} |
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
|
831 |
|
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
|
832 |
/* Set up the window widgets */ |
4668
f7256d0e7682
(svn r6562) -Codechange: merged the vehicle list window widget arrays
bjarni
parents:
4665
diff
changeset
|
833 |
switch (vl->vehicle_type) { |
6259
471b91a4b1d8
(svn r9068) -Codechange: capitalize the VEH_Train etc. enums to match the coding style (and rest of the code).
rubidium
parents:
6248
diff
changeset
|
834 |
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
|
835 |
w->widget[VLW_WIDGET_LIST].tooltips = STR_883D_TRAINS_CLICK_ON_TRAIN_FOR; |
5846
b4a666d80c88
(svn r8420) -Codechange (r7418): Rename the 'New <vehtype>' button of the global vehicle lists to 'Available <vehtype>' as it is a view-only list, not one from which you can purchase (rolling) stock.
Darkvater
parents:
5809
diff
changeset
|
836 |
w->widget[VLW_WIDGET_AVAILABLE_VEHICLES].data = STR_AVAILABLE_TRAINS; |
4668
f7256d0e7682
(svn r6562) -Codechange: merged the vehicle list window widget arrays
bjarni
parents:
4665
diff
changeset
|
837 |
break; |
f7256d0e7682
(svn r6562) -Codechange: merged the vehicle list window widget arrays
bjarni
parents:
4665
diff
changeset
|
838 |
|
6259
471b91a4b1d8
(svn r9068) -Codechange: capitalize the VEH_Train etc. enums to match the coding style (and rest of the code).
rubidium
parents:
6248
diff
changeset
|
839 |
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
|
840 |
w->widget[VLW_WIDGET_LIST].tooltips = STR_901A_ROAD_VEHICLES_CLICK_ON; |
5847
96a8cef53137
(svn r8421) -Codechange (r8420): rename STR_AVAILABLE_VEHICLES to STR_AVAILABLE_ROAD_VEHICLES for clarificaton (Tron)
Darkvater
parents:
5846
diff
changeset
|
841 |
w->widget[VLW_WIDGET_AVAILABLE_VEHICLES].data = STR_AVAILABLE_ROAD_VEHICLES; |
4668
f7256d0e7682
(svn r6562) -Codechange: merged the vehicle list window widget arrays
bjarni
parents:
4665
diff
changeset
|
842 |
break; |
f7256d0e7682
(svn r6562) -Codechange: merged the vehicle list window widget arrays
bjarni
parents:
4665
diff
changeset
|
843 |
|
6259
471b91a4b1d8
(svn r9068) -Codechange: capitalize the VEH_Train etc. enums to match the coding style (and rest of the code).
rubidium
parents:
6248
diff
changeset
|
844 |
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
|
845 |
w->widget[VLW_WIDGET_LIST].tooltips = STR_9823_SHIPS_CLICK_ON_SHIP_FOR; |
5846
b4a666d80c88
(svn r8420) -Codechange (r7418): Rename the 'New <vehtype>' button of the global vehicle lists to 'Available <vehtype>' as it is a view-only list, not one from which you can purchase (rolling) stock.
Darkvater
parents:
5809
diff
changeset
|
846 |
w->widget[VLW_WIDGET_AVAILABLE_VEHICLES].data = STR_AVAILABLE_SHIPS; |
4668
f7256d0e7682
(svn r6562) -Codechange: merged the vehicle list window widget arrays
bjarni
parents:
4665
diff
changeset
|
847 |
break; |
f7256d0e7682
(svn r6562) -Codechange: merged the vehicle list window widget arrays
bjarni
parents:
4665
diff
changeset
|
848 |
|
6259
471b91a4b1d8
(svn r9068) -Codechange: capitalize the VEH_Train etc. enums to match the coding style (and rest of the code).
rubidium
parents:
6248
diff
changeset
|
849 |
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
|
850 |
w->widget[VLW_WIDGET_LIST].tooltips = STR_A01F_AIRCRAFT_CLICK_ON_AIRCRAFT; |
5846
b4a666d80c88
(svn r8420) -Codechange (r7418): Rename the 'New <vehtype>' button of the global vehicle lists to 'Available <vehtype>' as it is a view-only list, not one from which you can purchase (rolling) stock.
Darkvater
parents:
5809
diff
changeset
|
851 |
w->widget[VLW_WIDGET_AVAILABLE_VEHICLES].data = STR_AVAILABLE_AIRCRAFT; |
4668
f7256d0e7682
(svn r6562) -Codechange: merged the vehicle list window widget arrays
bjarni
parents:
4665
diff
changeset
|
852 |
break; |
f7256d0e7682
(svn r6562) -Codechange: merged the vehicle list window widget arrays
bjarni
parents:
4665
diff
changeset
|
853 |
|
5274
8bd7e4c00956
(svn r7418) -Codechange/Feature: Put back the 'New Vehicles' button in the vehicle list window. As
Darkvater
parents:
5269
diff
changeset
|
854 |
default: NOT_REACHED(); |
4668
f7256d0e7682
(svn r6562) -Codechange: merged the vehicle list window widget arrays
bjarni
parents:
4665
diff
changeset
|
855 |
} |
f7256d0e7682
(svn r6562) -Codechange: merged the vehicle list window widget arrays
bjarni
parents:
4665
diff
changeset
|
856 |
|
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
|
857 |
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
|
858 |
case VLW_SHARED_ORDERS: |
4668
f7256d0e7682
(svn r6562) -Codechange: merged the vehicle list window widget arrays
bjarni
parents:
4665
diff
changeset
|
859 |
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
|
860 |
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
|
861 |
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
|
862 |
switch (vl->vehicle_type) { |
6259
471b91a4b1d8
(svn r9068) -Codechange: capitalize the VEH_Train etc. enums to match the coding style (and rest of the code).
rubidium
parents:
6248
diff
changeset
|
863 |
case VEH_TRAIN: w->widget[VLW_WIDGET_CAPTION].data = STR_881B_TRAINS; break; |
471b91a4b1d8
(svn r9068) -Codechange: capitalize the VEH_Train etc. enums to match the coding style (and rest of the code).
rubidium
parents:
6248
diff
changeset
|
864 |
case VEH_ROAD: w->widget[VLW_WIDGET_CAPTION].data = STR_9001_ROAD_VEHICLES; break; |
471b91a4b1d8
(svn r9068) -Codechange: capitalize the VEH_Train etc. enums to match the coding style (and rest of the code).
rubidium
parents:
6248
diff
changeset
|
865 |
case VEH_SHIP: w->widget[VLW_WIDGET_CAPTION].data = STR_9805_SHIPS; break; |
471b91a4b1d8
(svn r9068) -Codechange: capitalize the VEH_Train etc. enums to match the coding style (and rest of the code).
rubidium
parents:
6248
diff
changeset
|
866 |
case VEH_AIRCRAFT: w->widget[VLW_WIDGET_CAPTION].data = STR_A009_AIRCRAFT; break; |
4668
f7256d0e7682
(svn r6562) -Codechange: merged the vehicle list window widget arrays
bjarni
parents:
4665
diff
changeset
|
867 |
default: NOT_REACHED(); break; |
f7256d0e7682
(svn r6562) -Codechange: merged the vehicle list window widget arrays
bjarni
parents:
4665
diff
changeset
|
868 |
} |
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
|
869 |
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
|
870 |
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
|
871 |
switch (vl->vehicle_type) { |
6259
471b91a4b1d8
(svn r9068) -Codechange: capitalize the VEH_Train etc. enums to match the coding style (and rest of the code).
rubidium
parents:
6248
diff
changeset
|
872 |
case VEH_TRAIN: w->widget[VLW_WIDGET_CAPTION].data = STR_SCHEDULED_TRAINS; break; |
471b91a4b1d8
(svn r9068) -Codechange: capitalize the VEH_Train etc. enums to match the coding style (and rest of the code).
rubidium
parents:
6248
diff
changeset
|
873 |
case VEH_ROAD: w->widget[VLW_WIDGET_CAPTION].data = STR_SCHEDULED_ROAD_VEHICLES; break; |
471b91a4b1d8
(svn r9068) -Codechange: capitalize the VEH_Train etc. enums to match the coding style (and rest of the code).
rubidium
parents:
6248
diff
changeset
|
874 |
case VEH_SHIP: w->widget[VLW_WIDGET_CAPTION].data = STR_SCHEDULED_SHIPS; break; |
471b91a4b1d8
(svn r9068) -Codechange: capitalize the VEH_Train etc. enums to match the coding style (and rest of the code).
rubidium
parents:
6248
diff
changeset
|
875 |
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
|
876 |
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
|
877 |
} |
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
|
878 |
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
|
879 |
|
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
|
880 |
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
|
881 |
switch (vl->vehicle_type) { |
6259
471b91a4b1d8
(svn r9068) -Codechange: capitalize the VEH_Train etc. enums to match the coding style (and rest of the code).
rubidium
parents:
6248
diff
changeset
|
882 |
case VEH_TRAIN: w->widget[VLW_WIDGET_CAPTION].data = STR_VEHICLE_LIST_TRAIN_DEPOT; break; |
471b91a4b1d8
(svn r9068) -Codechange: capitalize the VEH_Train etc. enums to match the coding style (and rest of the code).
rubidium
parents:
6248
diff
changeset
|
883 |
case VEH_ROAD: w->widget[VLW_WIDGET_CAPTION].data = STR_VEHICLE_LIST_ROADVEH_DEPOT; break; |
471b91a4b1d8
(svn r9068) -Codechange: capitalize the VEH_Train etc. enums to match the coding style (and rest of the code).
rubidium
parents:
6248
diff
changeset
|
884 |
case VEH_SHIP: w->widget[VLW_WIDGET_CAPTION].data = STR_VEHICLE_LIST_SHIP_DEPOT; break; |
471b91a4b1d8
(svn r9068) -Codechange: capitalize the VEH_Train etc. enums to match the coding style (and rest of the code).
rubidium
parents:
6248
diff
changeset
|
885 |
case VEH_AIRCRAFT: w->widget[VLW_WIDGET_CAPTION].data = STR_VEHICLE_LIST_AIRCRAFT_DEPOT; 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
|
886 |
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
|
887 |
} |
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
|
888 |
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
|
889 |
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
|
890 |
} |
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
|
891 |
|
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
|
892 |
switch (vl->vehicle_type) { |
6259
471b91a4b1d8
(svn r9068) -Codechange: capitalize the VEH_Train etc. enums to match the coding style (and rest of the code).
rubidium
parents:
6248
diff
changeset
|
893 |
case VEH_TRAIN: |
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
|
894 |
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
|
895 |
/* Fallthrough */ |
6259
471b91a4b1d8
(svn r9068) -Codechange: capitalize the VEH_Train etc. enums to match the coding style (and rest of the code).
rubidium
parents:
6248
diff
changeset
|
896 |
case VEH_ROAD: |
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
|
897 |
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
|
898 |
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
|
899 |
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
|
900 |
break; |
6259
471b91a4b1d8
(svn r9068) -Codechange: capitalize the VEH_Train etc. enums to match the coding style (and rest of the code).
rubidium
parents:
6248
diff
changeset
|
901 |
case VEH_SHIP: |
471b91a4b1d8
(svn r9068) -Codechange: capitalize the VEH_Train etc. enums to match the coding style (and rest of the code).
rubidium
parents:
6248
diff
changeset
|
902 |
case VEH_AIRCRAFT: |
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
|
903 |
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
|
904 |
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
|
905 |
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
|
906 |
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
|
907 |
} |
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
|
908 |
|
4668
f7256d0e7682
(svn r6562) -Codechange: merged the vehicle list window widget arrays
bjarni
parents:
4665
diff
changeset
|
909 |
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
|
910 |
|
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
|
911 |
/* 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
|
912 |
* 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
|
913 |
* 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
|
914 |
switch (vl->vehicle_type) { |
6259
471b91a4b1d8
(svn r9068) -Codechange: capitalize the VEH_Train etc. enums to match the coding style (and rest of the code).
rubidium
parents:
6248
diff
changeset
|
915 |
case VEH_TRAIN: vl->_sorting = &_sorting.train; break; |
471b91a4b1d8
(svn r9068) -Codechange: capitalize the VEH_Train etc. enums to match the coding style (and rest of the code).
rubidium
parents:
6248
diff
changeset
|
916 |
case VEH_ROAD: vl->_sorting = &_sorting.roadveh; break; |
471b91a4b1d8
(svn r9068) -Codechange: capitalize the VEH_Train etc. enums to match the coding style (and rest of the code).
rubidium
parents:
6248
diff
changeset
|
917 |
case VEH_SHIP: vl->_sorting = &_sorting.ship; break; |
471b91a4b1d8
(svn r9068) -Codechange: capitalize the VEH_Train etc. enums to match the coding style (and rest of the code).
rubidium
parents:
6248
diff
changeset
|
918 |
case VEH_AIRCRAFT: vl->_sorting = &_sorting.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
|
919 |
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
|
920 |
} |
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
|
921 |
|
5587
167d9a91ef02
(svn r8038) -Merge: the cpp branch. Effort of KUDr, Celestar, glx, Smoovius, stillunknown and pv2b.
rubidium
parents:
5584
diff
changeset
|
922 |
vl->l.flags = VL_REBUILD | (vl->_sorting->order ? VL_DESC : VL_NONE); |
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
|
923 |
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
|
924 |
vl->sort_list = NULL; |
6492
286a52449b54
(svn r9673) -Cleanup: remove spaces before tabs and replace non-indenting tabs with spaces.
rubidium
parents:
6491
diff
changeset
|
925 |
vl->l.resort_timer = DAY_TICKS * PERIODIC_RESORT_DAYS; // Set up resort timer |
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
|
926 |
} |
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
|
927 |
|
4734
24b34218c5ce
(svn r6646) -Codechange: [vehicle list window] Cleaned up the drawing code
bjarni
parents:
4726
diff
changeset
|
928 |
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
|
929 |
{ |
24b34218c5ce
(svn r6646) -Codechange: [vehicle list window] Cleaned up the drawing code
bjarni
parents:
4726
diff
changeset
|
930 |
const Order *order; |
24b34218c5ce
(svn r6646) -Codechange: [vehicle list window] Cleaned up the drawing code
bjarni
parents:
4726
diff
changeset
|
931 |
int sel, i = 0; |
24b34218c5ce
(svn r6646) -Codechange: [vehicle list window] Cleaned up the drawing code
bjarni
parents:
4726
diff
changeset
|
932 |
|
24b34218c5ce
(svn r6646) -Codechange: [vehicle list window] Cleaned up the drawing code
bjarni
parents:
4726
diff
changeset
|
933 |
sel = v->cur_order_index; |
24b34218c5ce
(svn r6646) -Codechange: [vehicle list window] Cleaned up the drawing code
bjarni
parents:
4726
diff
changeset
|
934 |
|
24b34218c5ce
(svn r6646) -Codechange: [vehicle list window] Cleaned up the drawing code
bjarni
parents:
4726
diff
changeset
|
935 |
FOR_VEHICLE_ORDERS(v, order) { |
24b34218c5ce
(svn r6646) -Codechange: [vehicle list window] Cleaned up the drawing code
bjarni
parents:
4726
diff
changeset
|
936 |
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
|
937 |
sel--; |
24b34218c5ce
(svn r6646) -Codechange: [vehicle list window] Cleaned up the drawing code
bjarni
parents:
4726
diff
changeset
|
938 |
|
24b34218c5ce
(svn r6646) -Codechange: [vehicle list window] Cleaned up the drawing code
bjarni
parents:
4726
diff
changeset
|
939 |
if (order->type == OT_GOTO_STATION) { |
6259
471b91a4b1d8
(svn r9068) -Codechange: capitalize the VEH_Train etc. enums to match the coding style (and rest of the code).
rubidium
parents:
6248
diff
changeset
|
940 |
if (v->type == VEH_SHIP && GetStation(order->dest)->IsBuoy()) continue; |
4734
24b34218c5ce
(svn r6646) -Codechange: [vehicle list window] Cleaned up the drawing code
bjarni
parents:
4726
diff
changeset
|
941 |
|
24b34218c5ce
(svn r6646) -Codechange: [vehicle list window] Cleaned up the drawing code
bjarni
parents:
4726
diff
changeset
|
942 |
SetDParam(0, order->dest); |
24b34218c5ce
(svn r6646) -Codechange: [vehicle list window] Cleaned up the drawing code
bjarni
parents:
4726
diff
changeset
|
943 |
DrawString(x, y, STR_A036, 0); |
24b34218c5ce
(svn r6646) -Codechange: [vehicle list window] Cleaned up the drawing code
bjarni
parents:
4726
diff
changeset
|
944 |
|
24b34218c5ce
(svn r6646) -Codechange: [vehicle list window] Cleaned up the drawing code
bjarni
parents:
4726
diff
changeset
|
945 |
y += 6; |
24b34218c5ce
(svn r6646) -Codechange: [vehicle list window] Cleaned up the drawing code
bjarni
parents:
4726
diff
changeset
|
946 |
if (++i == 4) break; |
24b34218c5ce
(svn r6646) -Codechange: [vehicle list window] Cleaned up the drawing code
bjarni
parents:
4726
diff
changeset
|
947 |
} |
24b34218c5ce
(svn r6646) -Codechange: [vehicle list window] Cleaned up the drawing code
bjarni
parents:
4726
diff
changeset
|
948 |
} |
24b34218c5ce
(svn r6646) -Codechange: [vehicle list window] Cleaned up the drawing code
bjarni
parents:
4726
diff
changeset
|
949 |
} |
24b34218c5ce
(svn r6646) -Codechange: [vehicle list window] Cleaned up the drawing code
bjarni
parents:
4726
diff
changeset
|
950 |
|
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
|
951 |
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
|
952 |
{ |
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
|
953 |
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
|
954 |
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
|
955 |
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
|
956 |
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
|
957 |
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
|
958 |
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
|
959 |
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
|
960 |
const uint16 window_type = w->window_number & VLW_MASK; |
5747
ba5393ff957a
(svn r8295) -Cleanup: merged arguments station, order and depot_airport_index for GenerateVehicleSortList() and BuildVehicleList() into one uint16 argument
bjarni
parents:
5745
diff
changeset
|
961 |
const uint16 index = GB(w->window_number, 16, 16); |
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
|
962 |
|
5747
ba5393ff957a
(svn r8295) -Cleanup: merged arguments station, order and depot_airport_index for GenerateVehicleSortList() and BuildVehicleList() into one uint16 argument
bjarni
parents:
5745
diff
changeset
|
963 |
BuildVehicleList(vl, owner, 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
|
964 |
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
|
965 |
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
|
966 |
|
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
|
967 |
/* 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
|
968 |
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
|
969 |
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
|
970 |
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
|
971 |
/* 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
|
972 |
* 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
|
973 |
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
|
974 |
} |
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
|
975 |
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
|
976 |
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
|
977 |
|
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
|
978 |
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
|
979 |
SetDParam(0, p->name_1); |
4668
f7256d0e7682
(svn r6562) -Codechange: merged the vehicle list window widget arrays
bjarni
parents:
4665
diff
changeset
|
980 |
SetDParam(1, p->name_2); |
f7256d0e7682
(svn r6562) -Codechange: merged the vehicle list window widget arrays
bjarni
parents:
4665
diff
changeset
|
981 |
SetDParam(2, w->vscroll.count); |
f7256d0e7682
(svn r6562) -Codechange: merged the vehicle list window widget arrays
bjarni
parents:
4665
diff
changeset
|
982 |
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
|
983 |
|
4668
f7256d0e7682
(svn r6562) -Codechange: merged the vehicle list window widget arrays
bjarni
parents:
4665
diff
changeset
|
984 |
case VLW_STATION_LIST: /* Station Name */ |
5747
ba5393ff957a
(svn r8295) -Cleanup: merged arguments station, order and depot_airport_index for GenerateVehicleSortList() and BuildVehicleList() into one uint16 argument
bjarni
parents:
5745
diff
changeset
|
985 |
SetDParam(0, index); |
4668
f7256d0e7682
(svn r6562) -Codechange: merged the vehicle list window widget arrays
bjarni
parents:
4665
diff
changeset
|
986 |
SetDParam(1, w->vscroll.count); |
f7256d0e7682
(svn r6562) -Codechange: merged the vehicle list window widget arrays
bjarni
parents:
4665
diff
changeset
|
987 |
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
|
988 |
|
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
|
989 |
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
|
990 |
switch (vl->vehicle_type) { |
6259
471b91a4b1d8
(svn r9068) -Codechange: capitalize the VEH_Train etc. enums to match the coding style (and rest of the code).
rubidium
parents:
6248
diff
changeset
|
991 |
case VEH_TRAIN: SetDParam(0, STR_8800_TRAIN_DEPOT); break; |
471b91a4b1d8
(svn r9068) -Codechange: capitalize the VEH_Train etc. enums to match the coding style (and rest of the code).
rubidium
parents:
6248
diff
changeset
|
992 |
case VEH_ROAD: SetDParam(0, STR_9003_ROAD_VEHICLE_DEPOT); break; |
471b91a4b1d8
(svn r9068) -Codechange: capitalize the VEH_Train etc. enums to match the coding style (and rest of the code).
rubidium
parents:
6248
diff
changeset
|
993 |
case VEH_SHIP: SetDParam(0, STR_9803_SHIP_DEPOT); break; |
471b91a4b1d8
(svn r9068) -Codechange: capitalize the VEH_Train etc. enums to match the coding style (and rest of the code).
rubidium
parents:
6248
diff
changeset
|
994 |
case VEH_AIRCRAFT: SetDParam(0, STR_A002_AIRCRAFT_HANGAR); 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
|
995 |
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
|
996 |
} |
6259
471b91a4b1d8
(svn r9068) -Codechange: capitalize the VEH_Train etc. enums to match the coding style (and rest of the code).
rubidium
parents:
6248
diff
changeset
|
997 |
if (vl->vehicle_type == VEH_AIRCRAFT) { |
5747
ba5393ff957a
(svn r8295) -Cleanup: merged arguments station, order and depot_airport_index for GenerateVehicleSortList() and BuildVehicleList() into one uint16 argument
bjarni
parents:
5745
diff
changeset
|
998 |
SetDParam(1, index); // Airport name |
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
|
999 |
} else { |
5747
ba5393ff957a
(svn r8295) -Cleanup: merged arguments station, order and depot_airport_index for GenerateVehicleSortList() and BuildVehicleList() into one uint16 argument
bjarni
parents:
5745
diff
changeset
|
1000 |
SetDParam(1, GetDepot(index)->town_index); |
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
|
1001 |
} |
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
|
1002 |
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
|
1003 |
break; |
4668
f7256d0e7682
(svn r6562) -Codechange: merged the vehicle list window widget arrays
bjarni
parents:
4665
diff
changeset
|
1004 |
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
|
1005 |
} |
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
|
1006 |
|
4758
090cf0f1b35e
(svn r6672) -Codechange: [depot & vehicle windows] applied SetWindowWidgetsDisabledState() and SetWindowWidgetsHiddenState() to depot and vehicle windows
bjarni
parents:
4753
diff
changeset
|
1007 |
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
|
1008 |
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
|
1009 |
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
|
1010 |
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
|
1011 |
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
|
1012 |
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
|
1013 |
|
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
|
1014 |
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
|
1015 |
|
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
|
1016 |
/* 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
|
1017 |
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
|
1018 |
/* 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
|
1019 |
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
|
1020 |
|
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
|
1021 |
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
|
1022 |
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
|
1023 |
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
|
1024 |
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
|
1025 |
|
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
|
1026 |
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
|
1027 |
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
|
1028 |
|
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
|
1029 |
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
|
1030 |
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
|
1031 |
|
6259
471b91a4b1d8
(svn r9068) -Codechange: capitalize the VEH_Train etc. enums to match the coding style (and rest of the code).
rubidium
parents:
6248
diff
changeset
|
1032 |
if ((v->type == VEH_TRAIN && v->string_id != STR_SV_TRAIN_NAME) || |
471b91a4b1d8
(svn r9068) -Codechange: capitalize the VEH_Train etc. enums to match the coding style (and rest of the code).
rubidium
parents:
6248
diff
changeset
|
1033 |
(v->type == VEH_ROAD && v->string_id != STR_SV_ROADVEH_NAME) || |
471b91a4b1d8
(svn r9068) -Codechange: capitalize the VEH_Train etc. enums to match the coding style (and rest of the code).
rubidium
parents:
6248
diff
changeset
|
1034 |
(v->type == VEH_SHIP && v->string_id != STR_SV_SHIP_NAME) || |
471b91a4b1d8
(svn r9068) -Codechange: capitalize the VEH_Train etc. enums to match the coding style (and rest of the code).
rubidium
parents:
6248
diff
changeset
|
1035 |
(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
|
1036 |
|
4734
24b34218c5ce
(svn r6646) -Codechange: [vehicle list window] Cleaned up the drawing code
bjarni
parents:
4726
diff
changeset
|
1037 |
/* 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
|
1038 |
SetDParam(0, v->string_id); |
24b34218c5ce
(svn r6646) -Codechange: [vehicle list window] Cleaned up the drawing code
bjarni
parents:
4726
diff
changeset
|
1039 |
DrawString(x + 19, y, STR_01AB, 0); |
24b34218c5ce
(svn r6646) -Codechange: [vehicle list window] Cleaned up the drawing code
bjarni
parents:
4726
diff
changeset
|
1040 |
} |
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
|
1041 |
|
4734
24b34218c5ce
(svn r6646) -Codechange: [vehicle list window] Cleaned up the drawing code
bjarni
parents:
4726
diff
changeset
|
1042 |
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
|
1043 |
|
4734
24b34218c5ce
(svn r6646) -Codechange: [vehicle list window] Cleaned up the drawing code
bjarni
parents:
4726
diff
changeset
|
1044 |
if (IsVehicleInDepot(v)) { |
24b34218c5ce
(svn r6646) -Codechange: [vehicle list window] Cleaned up the drawing code
bjarni
parents:
4726
diff
changeset
|
1045 |
str = STR_021F; |
24b34218c5ce
(svn r6646) -Codechange: [vehicle list window] Cleaned up the drawing code
bjarni
parents:
4726
diff
changeset
|
1046 |
} else { |
24b34218c5ce
(svn r6646) -Codechange: [vehicle list window] Cleaned up the drawing code
bjarni
parents:
4726
diff
changeset
|
1047 |
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
|
1048 |
} |
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
|
1049 |
|
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
|
1050 |
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
|
1051 |
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
|
1052 |
|
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
|
1053 |
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
|
1054 |
|
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
|
1055 |
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
|
1056 |
} |
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
|
1057 |
} |
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
|
1058 |
|
4449
820974aaa4a6
(svn r6227) -Codechange: added window type flags to use with PlayerVehWndProc
bjarni
parents:
4442
diff
changeset
|
1059 |
/* |
820974aaa4a6
(svn r6227) -Codechange: added window type flags to use with PlayerVehWndProc
bjarni
parents:
4442
diff
changeset
|
1060 |
* bitmask for w->window_number |
820974aaa4a6
(svn r6227) -Codechange: added window type flags to use with PlayerVehWndProc
bjarni
parents:
4442
diff
changeset
|
1061 |
* 0-7 PlayerID (owner) |
820974aaa4a6
(svn r6227) -Codechange: added window type flags to use with PlayerVehWndProc
bjarni
parents:
4442
diff
changeset
|
1062 |
* 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
|
1063 |
* 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
|
1064 |
* 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
|
1065 |
**/ |
4442
9f8bb348d58f
(svn r6215) -Codechange: [vehicle list windows] unified Player(vehicle)WndProc into PlayerVehWndProc
bjarni
parents:
4434
diff
changeset
|
1066 |
void PlayerVehWndProc(Window *w, WindowEvent *e) |
9f8bb348d58f
(svn r6215) -Codechange: [vehicle list windows] unified Player(vehicle)WndProc into PlayerVehWndProc
bjarni
parents:
4434
diff
changeset
|
1067 |
{ |
9f8bb348d58f
(svn r6215) -Codechange: [vehicle list windows] unified Player(vehicle)WndProc into PlayerVehWndProc
bjarni
parents:
4434
diff
changeset
|
1068 |
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
|
1069 |
|
9f8bb348d58f
(svn r6215) -Codechange: [vehicle list windows] unified Player(vehicle)WndProc into PlayerVehWndProc
bjarni
parents:
4434
diff
changeset
|
1070 |
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
|
1071 |
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
|
1072 |
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
|
1073 |
break; |
4442
9f8bb348d58f
(svn r6215) -Codechange: [vehicle list windows] unified Player(vehicle)WndProc into PlayerVehWndProc
bjarni
parents:
4434
diff
changeset
|
1074 |
|
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
|
1075 |
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
|
1076 |
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
|
1077 |
break; |
4442
9f8bb348d58f
(svn r6215) -Codechange: [vehicle list windows] unified Player(vehicle)WndProc into PlayerVehWndProc
bjarni
parents:
4434
diff
changeset
|
1078 |
|
9f8bb348d58f
(svn r6215) -Codechange: [vehicle list windows] unified Player(vehicle)WndProc into PlayerVehWndProc
bjarni
parents:
4434
diff
changeset
|
1079 |
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
|
1080 |
switch (e->we.click.widget) { |
4668
f7256d0e7682
(svn r6562) -Codechange: merged the vehicle list window widget arrays
bjarni
parents:
4665
diff
changeset
|
1081 |
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
|
1082 |
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
|
1083 |
vl->l.flags |= VL_RESORT; |
4442
9f8bb348d58f
(svn r6215) -Codechange: [vehicle list windows] unified Player(vehicle)WndProc into PlayerVehWndProc
bjarni
parents:
4434
diff
changeset
|
1084 |
|
4545
138a9195009a
(svn r6377) -Codechange: Set up the widgets in the WE_CREATE instead of on every WE_PAINT
Darkvater
parents:
4542
diff
changeset
|
1085 |
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
|
1086 |
SetWindowDirty(w); |
9f8bb348d58f
(svn r6215) -Codechange: [vehicle list windows] unified Player(vehicle)WndProc into PlayerVehWndProc
bjarni
parents:
4434
diff
changeset
|
1087 |
break; |
4668
f7256d0e7682
(svn r6562) -Codechange: merged the vehicle list window widget arrays
bjarni
parents:
4665
diff
changeset
|
1088 |
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
|
1089 |
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
|
1090 |
return; |
4668
f7256d0e7682
(svn r6562) -Codechange: merged the vehicle list window widget arrays
bjarni
parents:
4665
diff
changeset
|
1091 |
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
|
1092 |
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
|
1093 |
const Vehicle *v; |
9f8bb348d58f
(svn r6215) -Codechange: [vehicle list windows] unified Player(vehicle)WndProc into PlayerVehWndProc
bjarni
parents:
4434
diff
changeset
|
1094 |
|
9f8bb348d58f
(svn r6215) -Codechange: [vehicle list windows] unified Player(vehicle)WndProc into PlayerVehWndProc
bjarni
parents:
4434
diff
changeset
|
1095 |
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
|
1096 |
|
9f8bb348d58f
(svn r6215) -Codechange: [vehicle list windows] unified Player(vehicle)WndProc into PlayerVehWndProc
bjarni
parents:
4434
diff
changeset
|
1097 |
id_v += w->vscroll.pos; |
9f8bb348d58f
(svn r6215) -Codechange: [vehicle list windows] unified Player(vehicle)WndProc into PlayerVehWndProc
bjarni
parents:
4434
diff
changeset
|
1098 |
|
4545
138a9195009a
(svn r6377) -Codechange: Set up the widgets in the WE_CREATE instead of on every WE_PAINT
Darkvater
parents:
4542
diff
changeset
|
1099 |
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
|
1100 |
|
9f8bb348d58f
(svn r6215) -Codechange: [vehicle list windows] unified Player(vehicle)WndProc into PlayerVehWndProc
bjarni
parents:
4434
diff
changeset
|
1101 |
v = vl->sort_list[id_v]; |
9f8bb348d58f
(svn r6215) -Codechange: [vehicle list windows] unified Player(vehicle)WndProc into PlayerVehWndProc
bjarni
parents:
4434
diff
changeset
|
1102 |
|
4545
138a9195009a
(svn r6377) -Codechange: Set up the widgets in the WE_CREATE instead of on every WE_PAINT
Darkvater
parents:
4542
diff
changeset
|
1103 |
switch (vl->vehicle_type) { |
6259
471b91a4b1d8
(svn r9068) -Codechange: capitalize the VEH_Train etc. enums to match the coding style (and rest of the code).
rubidium
parents:
6248
diff
changeset
|
1104 |
case VEH_TRAIN: ShowTrainViewWindow(v); break; |
471b91a4b1d8
(svn r9068) -Codechange: capitalize the VEH_Train etc. enums to match the coding style (and rest of the code).
rubidium
parents:
6248
diff
changeset
|
1105 |
case VEH_ROAD: ShowRoadVehViewWindow(v); break; |
471b91a4b1d8
(svn r9068) -Codechange: capitalize the VEH_Train etc. enums to match the coding style (and rest of the code).
rubidium
parents:
6248
diff
changeset
|
1106 |
case VEH_SHIP: ShowShipViewWindow(v); break; |
471b91a4b1d8
(svn r9068) -Codechange: capitalize the VEH_Train etc. enums to match the coding style (and rest of the code).
rubidium
parents:
6248
diff
changeset
|
1107 |
case VEH_AIRCRAFT: ShowAircraftViewWindow(v); break; |
4442
9f8bb348d58f
(svn r6215) -Codechange: [vehicle list windows] unified Player(vehicle)WndProc into PlayerVehWndProc
bjarni
parents:
4434
diff
changeset
|
1108 |
default: NOT_REACHED(); break; |
9f8bb348d58f
(svn r6215) -Codechange: [vehicle list windows] unified Player(vehicle)WndProc into PlayerVehWndProc
bjarni
parents:
4434
diff
changeset
|
1109 |
} |
9f8bb348d58f
(svn r6215) -Codechange: [vehicle list windows] unified Player(vehicle)WndProc into PlayerVehWndProc
bjarni
parents:
4434
diff
changeset
|
1110 |
} break; |
9f8bb348d58f
(svn r6215) -Codechange: [vehicle list windows] unified Player(vehicle)WndProc into PlayerVehWndProc
bjarni
parents:
4434
diff
changeset
|
1111 |
|
5846
b4a666d80c88
(svn r8420) -Codechange (r7418): Rename the 'New <vehtype>' button of the global vehicle lists to 'Available <vehtype>' as it is a view-only list, not one from which you can purchase (rolling) stock.
Darkvater
parents:
5809
diff
changeset
|
1112 |
case VLW_WIDGET_AVAILABLE_VEHICLES: |
5786
9bbd2d7f2a30
(svn r8338) -Codechange: merged road vehicle build window into the other ones
bjarni
parents:
5783
diff
changeset
|
1113 |
ShowBuildVehicleWindow(0, vl->vehicle_type); |
4506
e6a56518135c
(svn r6291) -Feature: Vehicle lists from the station window now also got the goto depot button
bjarni
parents:
4498
diff
changeset
|
1114 |
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
|
1115 |
|
5274
8bd7e4c00956
(svn r7418) -Codechange/Feature: Put back the 'New Vehicles' button in the vehicle list window. As
Darkvater
parents:
5269
diff
changeset
|
1116 |
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
|
1117 |
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
|
1118 |
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
|
1119 |
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
|
1120 |
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
|
1121 |
STR_NULL, |
8bd7e4c00956
(svn r7418) -Codechange/Feature: Put back the 'New Vehicles' button in the vehicle list window. As
Darkvater
parents:
5269
diff
changeset
|
1122 |
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
|
1123 |
}; |
8bd7e4c00956
(svn r7418) -Codechange/Feature: Put back the 'New Vehicles' button in the vehicle list window. As
Darkvater
parents:
5269
diff
changeset
|
1124 |
|
8bd7e4c00956
(svn r7418) -Codechange/Feature: Put back the 'New Vehicles' button in the vehicle list window. As
Darkvater
parents:
5269
diff
changeset
|
1125 |
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
|
1126 |
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
|
1127 |
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
|
1128 |
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
|
1129 |
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
|
1130 |
}; |
8bd7e4c00956
(svn r7418) -Codechange/Feature: Put back the 'New Vehicles' button in the vehicle list window. As
Darkvater
parents:
5269
diff
changeset
|
1131 |
|
8bd7e4c00956
(svn r7418) -Codechange/Feature: Put back the 'New Vehicles' button in the vehicle list window. As
Darkvater
parents:
5269
diff
changeset
|
1132 |
/* XXX - Substite string since the dropdown cannot handle dynamic strings */ |
5955
fe61588d5188
(svn r8621) -Codechange: assigned new numbers to the VEH_(type) enum so that VEH_Train is 0, VEH_Road is 1 and so on
bjarni
parents:
5896
diff
changeset
|
1133 |
action_str[2] = depot_name[vl->vehicle_type]; |
5274
8bd7e4c00956
(svn r7418) -Codechange/Feature: Put back the 'New Vehicles' button in the vehicle list window. As
Darkvater
parents:
5269
diff
changeset
|
1134 |
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
|
1135 |
break; |
5274
8bd7e4c00956
(svn r7418) -Codechange/Feature: Put back the 'New Vehicles' button in the vehicle list window. As
Darkvater
parents:
5269
diff
changeset
|
1136 |
} |
4673
3160067b8751
(svn r6570) -Feature: added "start all" and "stop all" buttons to the vehicle lists
bjarni
parents:
4669
diff
changeset
|
1137 |
|
3160067b8751
(svn r6570) -Feature: added "start all" and "stop all" buttons to the vehicle lists
bjarni
parents:
4669
diff
changeset
|
1138 |
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
|
1139 |
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
|
1140 |
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
|
1141 |
break; |
4442
9f8bb348d58f
(svn r6215) -Codechange: [vehicle list windows] unified Player(vehicle)WndProc into PlayerVehWndProc
bjarni
parents:
4434
diff
changeset
|
1142 |
} |
6492
286a52449b54
(svn r9673) -Cleanup: remove spaces before tabs and replace non-indenting tabs with spaces.
rubidium
parents:
6491
diff
changeset
|
1143 |
} break; |
4442
9f8bb348d58f
(svn r6215) -Codechange: [vehicle list windows] unified Player(vehicle)WndProc into PlayerVehWndProc
bjarni
parents:
4434
diff
changeset
|
1144 |
|
9f8bb348d58f
(svn r6215) -Codechange: [vehicle list windows] unified Player(vehicle)WndProc into PlayerVehWndProc
bjarni
parents:
4434
diff
changeset
|
1145 |
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
|
1146 |
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
|
1147 |
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
|
1148 |
if (vl->l.sort_type != e->we.dropdown.index) { |
6423
8e10e79e0fd1
(svn r9559) -Documentation: doxygen and comment changes: 'U' and 'V' now. Almost done. Yeah. I know, I've already said that...
belugas
parents:
6350
diff
changeset
|
1149 |
/* value has changed -> resort */ |
5274
8bd7e4c00956
(svn r7418) -Codechange/Feature: Put back the 'New Vehicles' button in the vehicle list window. As
Darkvater
parents:
5269
diff
changeset
|
1150 |
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
|
1151 |
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
|
1152 |
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
|
1153 |
} |
8bd7e4c00956
(svn r7418) -Codechange/Feature: Put back the 'New Vehicles' button in the vehicle list window. As
Darkvater
parents:
5269
diff
changeset
|
1154 |
break; |
8bd7e4c00956
(svn r7418) -Codechange/Feature: Put back the 'New Vehicles' button in the vehicle list window. As
Darkvater
parents:
5269
diff
changeset
|
1155 |
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
|
1156 |
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
|
1157 |
|
8bd7e4c00956
(svn r7418) -Codechange/Feature: Put back the 'New Vehicles' button in the vehicle list window. As
Darkvater
parents:
5269
diff
changeset
|
1158 |
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
|
1159 |
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
|
1160 |
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
|
1161 |
break; |
8bd7e4c00956
(svn r7418) -Codechange/Feature: Put back the 'New Vehicles' button in the vehicle list window. As
Darkvater
parents:
5269
diff
changeset
|
1162 |
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
|
1163 |
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
|
1164 |
(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
|
1165 |
NULL, |
5792
c4dad358b30b
(svn r8349) -Codechange: replaced CMD_REFIT_VEH() and similar defines with real static inline functions
bjarni
parents:
5786
diff
changeset
|
1166 |
GetCmdSendToDepot(vl->vehicle_type)); |
5274
8bd7e4c00956
(svn r7418) -Codechange/Feature: Put back the 'New Vehicles' button in the vehicle list window. As
Darkvater
parents:
5269
diff
changeset
|
1167 |
break; |
8bd7e4c00956
(svn r7418) -Codechange/Feature: Put back the 'New Vehicles' button in the vehicle list window. As
Darkvater
parents:
5269
diff
changeset
|
1168 |
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
|
1169 |
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
|
1170 |
(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
|
1171 |
NULL, |
5792
c4dad358b30b
(svn r8349) -Codechange: replaced CMD_REFIT_VEH() and similar defines with real static inline functions
bjarni
parents:
5786
diff
changeset
|
1172 |
GetCmdSendToDepot(vl->vehicle_type)); |
5274
8bd7e4c00956
(svn r7418) -Codechange/Feature: Put back the 'New Vehicles' button in the vehicle list window. As
Darkvater
parents:
5269
diff
changeset
|
1173 |
break; |
8bd7e4c00956
(svn r7418) -Codechange/Feature: Put back the 'New Vehicles' button in the vehicle list window. As
Darkvater
parents:
5269
diff
changeset
|
1174 |
|
8bd7e4c00956
(svn r7418) -Codechange/Feature: Put back the 'New Vehicles' button in the vehicle list window. As
Darkvater
parents:
5269
diff
changeset
|
1175 |
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
|
1176 |
} |
8bd7e4c00956
(svn r7418) -Codechange/Feature: Put back the 'New Vehicles' button in the vehicle list window. As
Darkvater
parents:
5269
diff
changeset
|
1177 |
break; |
8bd7e4c00956
(svn r7418) -Codechange/Feature: Put back the 'New Vehicles' button in the vehicle list window. As
Darkvater
parents:
5269
diff
changeset
|
1178 |
default: NOT_REACHED(); |
4442
9f8bb348d58f
(svn r6215) -Codechange: [vehicle list windows] unified Player(vehicle)WndProc into PlayerVehWndProc
bjarni
parents:
4434
diff
changeset
|
1179 |
} |
9f8bb348d58f
(svn r6215) -Codechange: [vehicle list windows] unified Player(vehicle)WndProc into PlayerVehWndProc
bjarni
parents:
4434
diff
changeset
|
1180 |
SetWindowDirty(w); |
9f8bb348d58f
(svn r6215) -Codechange: [vehicle list windows] unified Player(vehicle)WndProc into PlayerVehWndProc
bjarni
parents:
4434
diff
changeset
|
1181 |
break; |
9f8bb348d58f
(svn r6215) -Codechange: [vehicle list windows] unified Player(vehicle)WndProc into PlayerVehWndProc
bjarni
parents:
4434
diff
changeset
|
1182 |
|
9f8bb348d58f
(svn r6215) -Codechange: [vehicle list windows] unified Player(vehicle)WndProc into PlayerVehWndProc
bjarni
parents:
4434
diff
changeset
|
1183 |
case WE_DESTROY: |
9f8bb348d58f
(svn r6215) -Codechange: [vehicle list windows] unified Player(vehicle)WndProc into PlayerVehWndProc
bjarni
parents:
4434
diff
changeset
|
1184 |
free((void*)vl->sort_list); |
9f8bb348d58f
(svn r6215) -Codechange: [vehicle list windows] unified Player(vehicle)WndProc into PlayerVehWndProc
bjarni
parents:
4434
diff
changeset
|
1185 |
break; |
9f8bb348d58f
(svn r6215) -Codechange: [vehicle list windows] unified Player(vehicle)WndProc into PlayerVehWndProc
bjarni
parents:
4434
diff
changeset
|
1186 |
|
9f8bb348d58f
(svn r6215) -Codechange: [vehicle list windows] unified Player(vehicle)WndProc into PlayerVehWndProc
bjarni
parents:
4434
diff
changeset
|
1187 |
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
|
1188 |
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
|
1189 |
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
|
1190 |
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
|
1191 |
|
5380
8ea58542b6e0
(svn r7565) -Codechange: Rework DEBUG functionality. Look for appropiate debugging levels to
Darkvater
parents:
5297
diff
changeset
|
1192 |
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
|
1193 |
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
|
1194 |
vl->l.flags |= VL_RESORT; |
4442
9f8bb348d58f
(svn r6215) -Codechange: [vehicle list windows] unified Player(vehicle)WndProc into PlayerVehWndProc
bjarni
parents:
4434
diff
changeset
|
1195 |
SetWindowDirty(w); |
9f8bb348d58f
(svn r6215) -Codechange: [vehicle list windows] unified Player(vehicle)WndProc into PlayerVehWndProc
bjarni
parents:
4434
diff
changeset
|
1196 |
} |
9f8bb348d58f
(svn r6215) -Codechange: [vehicle list windows] unified Player(vehicle)WndProc into PlayerVehWndProc
bjarni
parents:
4434
diff
changeset
|
1197 |
break; |
9f8bb348d58f
(svn r6215) -Codechange: [vehicle list windows] unified Player(vehicle)WndProc into PlayerVehWndProc
bjarni
parents:
4434
diff
changeset
|
1198 |
|
4542
f42ecc669275
(svn r6372) -Codechange: static, unneeded decleration in headers, superfluous header includes
Darkvater
parents:
4541
diff
changeset
|
1199 |
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
|
1200 |
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
|
1201 |
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
|
1202 |
break; |
9f8bb348d58f
(svn r6215) -Codechange: [vehicle list windows] unified Player(vehicle)WndProc into PlayerVehWndProc
bjarni
parents:
4434
diff
changeset
|
1203 |
} |
9f8bb348d58f
(svn r6215) -Codechange: [vehicle list windows] unified Player(vehicle)WndProc into PlayerVehWndProc
bjarni
parents:
4434
diff
changeset
|
1204 |
} |
4668
f7256d0e7682
(svn r6562) -Codechange: merged the vehicle list window widget arrays
bjarni
parents:
4665
diff
changeset
|
1205 |
|
f7256d0e7682
(svn r6562) -Codechange: merged the vehicle list window widget arrays
bjarni
parents:
4665
diff
changeset
|
1206 |
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
|
1207 |
WDP_AUTO, WDP_AUTO, 260, 182, |
5893
7e431a4abebb
(svn r8511) -Codechange: make WindowClass an enumerated value.
rubidium
parents:
5847
diff
changeset
|
1208 |
WC_TRAINS_LIST, WC_NONE, |
5070
7f5b13b7e728
(svn r7128) -Codechange: Replace magic numbers by magic enums (windowdesc positioning WDP_AUTO = -1)
Darkvater
parents:
5005
diff
changeset
|
1209 |
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
|
1210 |
_vehicle_list_widgets, |
7f5b13b7e728
(svn r7128) -Codechange: Replace magic numbers by magic enums (windowdesc positioning WDP_AUTO = -1)
Darkvater
parents:
5005
diff
changeset
|
1211 |
PlayerVehWndProc |
4668
f7256d0e7682
(svn r6562) -Codechange: merged the vehicle list window widget arrays
bjarni
parents:
4665
diff
changeset
|
1212 |
}; |
f7256d0e7682
(svn r6562) -Codechange: merged the vehicle list window widget arrays
bjarni
parents:
4665
diff
changeset
|
1213 |
|
f7256d0e7682
(svn r6562) -Codechange: merged the vehicle list window widget arrays
bjarni
parents:
4665
diff
changeset
|
1214 |
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
|
1215 |
WDP_AUTO, WDP_AUTO, 260, 182, |
5893
7e431a4abebb
(svn r8511) -Codechange: make WindowClass an enumerated value.
rubidium
parents:
5847
diff
changeset
|
1216 |
WC_ROADVEH_LIST, WC_NONE, |
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
|
1217 |
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
|
1218 |
_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
|
1219 |
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
|
1220 |
}; |
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
|
1221 |
|
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
|
1222 |
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
|
1223 |
WDP_AUTO, WDP_AUTO, 260, 182, |
5893
7e431a4abebb
(svn r8511) -Codechange: make WindowClass an enumerated value.
rubidium
parents:
5847
diff
changeset
|
1224 |
WC_SHIPS_LIST, WC_NONE, |
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
|
1225 |
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
|
1226 |
_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
|
1227 |
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
|
1228 |
}; |
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
|
1229 |
|
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
|
1230 |
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
|
1231 |
WDP_AUTO, WDP_AUTO, 260, 182, |
5893
7e431a4abebb
(svn r8511) -Codechange: make WindowClass an enumerated value.
rubidium
parents:
5847
diff
changeset
|
1232 |
WC_AIRCRAFT_LIST, WC_NONE, |
4668
f7256d0e7682
(svn r6562) -Codechange: merged the vehicle list window widget arrays
bjarni
parents:
4665
diff
changeset
|
1233 |
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
|
1234 |
_vehicle_list_widgets, |
f7256d0e7682
(svn r6562) -Codechange: merged the vehicle list window widget arrays
bjarni
parents:
4665
diff
changeset
|
1235 |
PlayerVehWndProc |
f7256d0e7682
(svn r6562) -Codechange: merged the vehicle list window widget arrays
bjarni
parents:
4665
diff
changeset
|
1236 |
}; |
f7256d0e7682
(svn r6562) -Codechange: merged the vehicle list window widget arrays
bjarni
parents:
4665
diff
changeset
|
1237 |
|
5745
c8069ea3af5d
(svn r8293) -Codechange: overloaded ShowVehicleListWindow() so it can open all types of vehicle lists (depending on arguments)
bjarni
parents:
5668
diff
changeset
|
1238 |
static void ShowVehicleListWindowLocal(PlayerID player, uint16 VLW_flag, byte vehicle_type, uint16 unique_number) |
4668
f7256d0e7682
(svn r6562) -Codechange: merged the vehicle list window widget arrays
bjarni
parents:
4665
diff
changeset
|
1239 |
{ |
f7256d0e7682
(svn r6562) -Codechange: merged the vehicle list window widget arrays
bjarni
parents:
4665
diff
changeset
|
1240 |
Window *w; |
5005
f5086bd3945a
(svn r7022) -Fix [FS#292]: Properly guard against viewing company-sensitive information from
Darkvater
parents:
4999
diff
changeset
|
1241 |
WindowNumber num; |
4668
f7256d0e7682
(svn r6562) -Codechange: merged the vehicle list window widget arrays
bjarni
parents:
4665
diff
changeset
|
1242 |
|
5005
f5086bd3945a
(svn r7022) -Fix [FS#292]: Properly guard against viewing company-sensitive information from
Darkvater
parents:
4999
diff
changeset
|
1243 |
if (!IsValidPlayer(player)) return; |
f5086bd3945a
(svn r7022) -Fix [FS#292]: Properly guard against viewing company-sensitive information from
Darkvater
parents:
4999
diff
changeset
|
1244 |
|
5745
c8069ea3af5d
(svn r8293) -Codechange: overloaded ShowVehicleListWindow() so it can open all types of vehicle lists (depending on arguments)
bjarni
parents:
5668
diff
changeset
|
1245 |
num = (unique_number << 16) | (vehicle_type << 11) | VLW_flag | player; |
4668
f7256d0e7682
(svn r6562) -Codechange: merged the vehicle list window widget arrays
bjarni
parents:
4665
diff
changeset
|
1246 |
|
5269
4b50973b21f6
(svn r7410) -Codechange/Fix: Remove useless and unfollowable programmatic-resize, and implement it
Darkvater
parents:
5125
diff
changeset
|
1247 |
/* 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
|
1248 |
* 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
|
1249 |
* 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
|
1250 |
switch (vehicle_type) { |
5752
dc401d3f5e71
(svn r8303) -Codechange (r8293): default is moved to the front of the switch in ShowVehicleListWindowLocal()
bjarni
parents:
5747
diff
changeset
|
1251 |
default: NOT_REACHED(); |
6259
471b91a4b1d8
(svn r9068) -Codechange: capitalize the VEH_Train etc. enums to match the coding style (and rest of the code).
rubidium
parents:
6248
diff
changeset
|
1252 |
case VEH_TRAIN: |
5269
4b50973b21f6
(svn r7410) -Codechange/Fix: Remove useless and unfollowable programmatic-resize, and implement it
Darkvater
parents:
5125
diff
changeset
|
1253 |
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
|
1254 |
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
|
1255 |
break; |
6259
471b91a4b1d8
(svn r9068) -Codechange: capitalize the VEH_Train etc. enums to match the coding style (and rest of the code).
rubidium
parents:
6248
diff
changeset
|
1256 |
case VEH_ROAD: |
5269
4b50973b21f6
(svn r7410) -Codechange/Fix: Remove useless and unfollowable programmatic-resize, and implement it
Darkvater
parents:
5125
diff
changeset
|
1257 |
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
|
1258 |
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
|
1259 |
break; |
6259
471b91a4b1d8
(svn r9068) -Codechange: capitalize the VEH_Train etc. enums to match the coding style (and rest of the code).
rubidium
parents:
6248
diff
changeset
|
1260 |
case VEH_SHIP: |
5269
4b50973b21f6
(svn r7410) -Codechange/Fix: Remove useless and unfollowable programmatic-resize, and implement it
Darkvater
parents:
5125
diff
changeset
|
1261 |
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
|
1262 |
break; |
6259
471b91a4b1d8
(svn r9068) -Codechange: capitalize the VEH_Train etc. enums to match the coding style (and rest of the code).
rubidium
parents:
6248
diff
changeset
|
1263 |
case VEH_AIRCRAFT: |
5269
4b50973b21f6
(svn r7410) -Codechange/Fix: Remove useless and unfollowable programmatic-resize, and implement it
Darkvater
parents:
5125
diff
changeset
|
1264 |
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
|
1265 |
break; |
4b50973b21f6
(svn r7410) -Codechange/Fix: Remove useless and unfollowable programmatic-resize, and implement it
Darkvater
parents:
5125
diff
changeset
|
1266 |
} |
4b50973b21f6
(svn r7410) -Codechange/Fix: Remove useless and unfollowable programmatic-resize, and implement it
Darkvater
parents:
5125
diff
changeset
|
1267 |
|
4b50973b21f6
(svn r7410) -Codechange/Fix: Remove useless and unfollowable programmatic-resize, and implement it
Darkvater
parents:
5125
diff
changeset
|
1268 |
if (w != NULL) { |
4b50973b21f6
(svn r7410) -Codechange/Fix: Remove useless and unfollowable programmatic-resize, and implement it
Darkvater
parents:
5125
diff
changeset
|
1269 |
/* 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
|
1270 |
w->resize.width = w->width; |
4b50973b21f6
(svn r7410) -Codechange/Fix: Remove useless and unfollowable programmatic-resize, and implement it
Darkvater
parents:
5125
diff
changeset
|
1271 |
w->resize.height = w->height; |
4668
f7256d0e7682
(svn r6562) -Codechange: merged the vehicle list window widget arrays
bjarni
parents:
4665
diff
changeset
|
1272 |
} |
f7256d0e7682
(svn r6562) -Codechange: merged the vehicle list window widget arrays
bjarni
parents:
4665
diff
changeset
|
1273 |
} |
f7256d0e7682
(svn r6562) -Codechange: merged the vehicle list window widget arrays
bjarni
parents:
4665
diff
changeset
|
1274 |
|
5745
c8069ea3af5d
(svn r8293) -Codechange: overloaded ShowVehicleListWindow() so it can open all types of vehicle lists (depending on arguments)
bjarni
parents:
5668
diff
changeset
|
1275 |
void ShowVehicleListWindow(PlayerID player, byte vehicle_type) |
4668
f7256d0e7682
(svn r6562) -Codechange: merged the vehicle list window widget arrays
bjarni
parents:
4665
diff
changeset
|
1276 |
{ |
5745
c8069ea3af5d
(svn r8293) -Codechange: overloaded ShowVehicleListWindow() so it can open all types of vehicle lists (depending on arguments)
bjarni
parents:
5668
diff
changeset
|
1277 |
ShowVehicleListWindowLocal(player, VLW_STANDARD, vehicle_type, 0); |
4668
f7256d0e7682
(svn r6562) -Codechange: merged the vehicle list window widget arrays
bjarni
parents:
4665
diff
changeset
|
1278 |
} |
f7256d0e7682
(svn r6562) -Codechange: merged the vehicle list window widget arrays
bjarni
parents:
4665
diff
changeset
|
1279 |
|
5745
c8069ea3af5d
(svn r8293) -Codechange: overloaded ShowVehicleListWindow() so it can open all types of vehicle lists (depending on arguments)
bjarni
parents:
5668
diff
changeset
|
1280 |
void ShowVehicleListWindow(const Vehicle *v) |
4668
f7256d0e7682
(svn r6562) -Codechange: merged the vehicle list window widget arrays
bjarni
parents:
4665
diff
changeset
|
1281 |
{ |
f7256d0e7682
(svn r6562) -Codechange: merged the vehicle list window widget arrays
bjarni
parents:
4665
diff
changeset
|
1282 |
if (v->orders == NULL) return; // no shared list to show |
5745
c8069ea3af5d
(svn r8293) -Codechange: overloaded ShowVehicleListWindow() so it can open all types of vehicle lists (depending on arguments)
bjarni
parents:
5668
diff
changeset
|
1283 |
ShowVehicleListWindowLocal(v->owner, VLW_SHARED_ORDERS, v->type, v->orders->index); |
4669
c66d137bdca1
(svn r6565) - Fix (r6562): Missing newline at EOF caused a compiler warning
peter1138
parents:
4668
diff
changeset
|
1284 |
} |
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
|
1285 |
|
5745
c8069ea3af5d
(svn r8293) -Codechange: overloaded ShowVehicleListWindow() so it can open all types of vehicle lists (depending on arguments)
bjarni
parents:
5668
diff
changeset
|
1286 |
void ShowVehicleListWindow(PlayerID player, byte vehicle_type, StationID station) |
c8069ea3af5d
(svn r8293) -Codechange: overloaded ShowVehicleListWindow() so it can open all types of vehicle lists (depending on arguments)
bjarni
parents:
5668
diff
changeset
|
1287 |
{ |
c8069ea3af5d
(svn r8293) -Codechange: overloaded ShowVehicleListWindow() so it can open all types of vehicle lists (depending on arguments)
bjarni
parents:
5668
diff
changeset
|
1288 |
ShowVehicleListWindowLocal(player, VLW_STATION_LIST, vehicle_type, station); |
c8069ea3af5d
(svn r8293) -Codechange: overloaded ShowVehicleListWindow() so it can open all types of vehicle lists (depending on arguments)
bjarni
parents:
5668
diff
changeset
|
1289 |
} |
c8069ea3af5d
(svn r8293) -Codechange: overloaded ShowVehicleListWindow() so it can open all types of vehicle lists (depending on arguments)
bjarni
parents:
5668
diff
changeset
|
1290 |
|
c8069ea3af5d
(svn r8293) -Codechange: overloaded ShowVehicleListWindow() so it can open all types of vehicle lists (depending on arguments)
bjarni
parents:
5668
diff
changeset
|
1291 |
void ShowVehicleListWindow(PlayerID player, byte vehicle_type, TileIndex depot_tile) |
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
|
1292 |
{ |
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
|
1293 |
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
|
1294 |
|
6259
471b91a4b1d8
(svn r9068) -Codechange: capitalize the VEH_Train etc. enums to match the coding style (and rest of the code).
rubidium
parents:
6248
diff
changeset
|
1295 |
if (vehicle_type == VEH_AIRCRAFT) { |
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
|
1296 |
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
|
1297 |
} 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
|
1298 |
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
|
1299 |
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
|
1300 |
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
|
1301 |
} |
5745
c8069ea3af5d
(svn r8293) -Codechange: overloaded ShowVehicleListWindow() so it can open all types of vehicle lists (depending on arguments)
bjarni
parents:
5668
diff
changeset
|
1302 |
ShowVehicleListWindowLocal(player, VLW_DEPOT_LIST, vehicle_type, depot_airport_index); |
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
|
1303 |
} |