author | peter1138 |
Fri, 09 Jun 2006 16:35:07 +0000 | |
changeset 3997 | 29c77eab14a4 |
parent 3650 | 92a3f5cae745 |
child 4023 | b65af90447d2 |
permissions | -rw-r--r-- |
2186 | 1 |
/* $Id$ */ |
2 |
||
164
0cbdf3c9bde1
(svn r165) -Feature: Option to sort vehicles in vehicle-list window by different criteria. Total independent sort for all types and players. Periodic resort of list every 10 TTD days. Thank you for your graphical inspiration follow and buxo (since none of you provided any code).
darkvater
parents:
diff
changeset
|
3 |
#include "stdafx.h" |
1891
92a3b0aa0946
(svn r2397) - CodeChange: rename all "ttd" files to "openttd" files.
Darkvater
parents:
1859
diff
changeset
|
4 |
#include "openttd.h" |
1299
0a6510cc889b
(svn r1803) Move debugging stuff into files of it's own
tron
parents:
1294
diff
changeset
|
5 |
#include "debug.h" |
2163
637ec3c361f5
(svn r2673) Include functions.h directly, not globally via openttd.h
tron
parents:
2159
diff
changeset
|
6 |
#include "functions.h" |
2154
63a6b880b4c0
(svn r2664) Remove depedency on player.h from variables.h
tron
parents:
1926
diff
changeset
|
7 |
#include "player.h" |
2466
2774132ebb9a
(svn r2992) Use PlayerID, StationID and INVALID_STATION instead of int, int and -1
tron
parents:
2462
diff
changeset
|
8 |
#include "station.h" |
1309
dab90d4cbf2d
(svn r1813) Declare functions implemented in strings.c in their own shiny new header (though i think some of these function don't belong into strings.c)
tron
parents:
1299
diff
changeset
|
9 |
#include "strings.h" |
1363
01d3de5d8039
(svn r1867) Include tables/sprites.h only in files which need it
tron
parents:
1309
diff
changeset
|
10 |
#include "table/sprites.h" |
507
8aa8100b0b22
(svn r815) Include strings.h only in the files which need it.
tron
parents:
505
diff
changeset
|
11 |
#include "table/strings.h" |
164
0cbdf3c9bde1
(svn r165) -Feature: Option to sort vehicles in vehicle-list window by different criteria. Total independent sort for all types and players. Periodic resort of list every 10 TTD days. Thank you for your graphical inspiration follow and buxo (since none of you provided any code).
darkvater
parents:
diff
changeset
|
12 |
#include "vehicle.h" |
588 | 13 |
#include "window.h" |
842 | 14 |
#include "engine.h" |
15 |
#include "gui.h" |
|
16 |
#include "command.h" |
|
17 |
#include "gfx.h" |
|
2159
3b634157c3b2
(svn r2669) Shuffle some more stuff around to reduce dependencies
tron
parents:
2154
diff
changeset
|
18 |
#include "variables.h" |
3b634157c3b2
(svn r2669) Shuffle some more stuff around to reduce dependencies
tron
parents:
2154
diff
changeset
|
19 |
#include "vehicle_gui.h" |
2552
fb174febb0b1
(svn r3081) -Codechange: [autoreplace] complete rewrite of autoreplace
bjarni
parents:
2549
diff
changeset
|
20 |
#include "viewport.h" |
2676
2ba71e034d97
(svn r3218) -Feature: Multiheaded train engines will now stay in the same train
bjarni
parents:
2639
diff
changeset
|
21 |
#include "train.h" |
3650
92a3f5cae745
(svn r4561) - NewGRF: implement most of callback 0x23: additional text in vehicle purchase windows.
peter1138
parents:
3492
diff
changeset
|
22 |
#include "newgrf_callbacks.h" |
2962
dbd168a4703a
(svn r3524) - Split newgrf features from engine.[ch] into newgrf_engine.[ch], and add the new files to project files.
peter1138
parents:
2951
diff
changeset
|
23 |
#include "newgrf_engine.h" |
3650
92a3f5cae745
(svn r4561) - NewGRF: implement most of callback 0x23: additional text in vehicle purchase windows.
peter1138
parents:
3492
diff
changeset
|
24 |
#include "newgrf_text.h" |
2159
3b634157c3b2
(svn r2669) Shuffle some more stuff around to reduce dependencies
tron
parents:
2154
diff
changeset
|
25 |
|
3b634157c3b2
(svn r2669) Shuffle some more stuff around to reduce dependencies
tron
parents:
2154
diff
changeset
|
26 |
Sorting _sorting; |
3b634157c3b2
(svn r2669) Shuffle some more stuff around to reduce dependencies
tron
parents:
2154
diff
changeset
|
27 |
|
3b634157c3b2
(svn r2669) Shuffle some more stuff around to reduce dependencies
tron
parents:
2154
diff
changeset
|
28 |
static uint32 _internal_name_sorter_id; // internal StringID for default vehicle-names |
3b634157c3b2
(svn r2669) Shuffle some more stuff around to reduce dependencies
tron
parents:
2154
diff
changeset
|
29 |
static uint32 _last_vehicle_idx; // cached index to hopefully speed up name-sorting |
3b634157c3b2
(svn r2669) Shuffle some more stuff around to reduce dependencies
tron
parents:
2154
diff
changeset
|
30 |
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
|
31 |
|
2569
2851becf6330
(svn r3106) -Autoreplace feature: Continue to show old vehicles in replace window after all player's vehicles of that type have been replaced. This allows the replacement to be removed. These vehicles are shown in grey instead of the player's colour.
peter1138
parents:
2556
diff
changeset
|
32 |
static uint16 _player_num_engines[TOTAL_NUM_ENGINES]; |
2520
75eb66d6e371
(svn r3049) Replace byte/int/uint by RailType where appropriate
tron
parents:
2519
diff
changeset
|
33 |
static RailType _railtype_selected_in_replace_gui; |
2288
57af8e0506f2
(svn r2812) Move variables, which only vehicle_gui.c needs to know about, there
tron
parents:
2206
diff
changeset
|
34 |
|
2462 | 35 |
|
36 |
typedef int CDECL VehicleSortListingTypeFunction(const void*, const void*); |
|
37 |
||
38 |
static VehicleSortListingTypeFunction VehicleUnsortedSorter; |
|
39 |
static VehicleSortListingTypeFunction VehicleNumberSorter; |
|
40 |
static VehicleSortListingTypeFunction VehicleNameSorter; |
|
41 |
static VehicleSortListingTypeFunction VehicleAgeSorter; |
|
42 |
static VehicleSortListingTypeFunction VehicleProfitThisYearSorter; |
|
43 |
static VehicleSortListingTypeFunction VehicleProfitLastYearSorter; |
|
44 |
static VehicleSortListingTypeFunction VehicleCargoSorter; |
|
45 |
static VehicleSortListingTypeFunction VehicleReliabilitySorter; |
|
46 |
static VehicleSortListingTypeFunction VehicleMaxSpeedSorter; |
|
2965
edaa999a25dd
(svn r3528) - Feature: Allow sorting of vehicle lists by model or value (based on meush's work)
peter1138
parents:
2962
diff
changeset
|
47 |
static VehicleSortListingTypeFunction VehicleModelSorter; |
edaa999a25dd
(svn r3528) - Feature: Allow sorting of vehicle lists by model or value (based on meush's work)
peter1138
parents:
2962
diff
changeset
|
48 |
static VehicleSortListingTypeFunction VehicleValueSorter; |
2462 | 49 |
|
50 |
static VehicleSortListingTypeFunction* const _vehicle_sorter[] = { |
|
505
11582dcada49
(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
|
51 |
&VehicleUnsortedSorter, |
11582dcada49
(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
|
52 |
&VehicleNumberSorter, |
11582dcada49
(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
|
53 |
&VehicleNameSorter, |
11582dcada49
(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
|
54 |
&VehicleAgeSorter, |
11582dcada49
(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
|
55 |
&VehicleProfitThisYearSorter, |
11582dcada49
(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
|
56 |
&VehicleProfitLastYearSorter, |
11582dcada49
(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
|
57 |
&VehicleCargoSorter, |
11582dcada49
(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
|
58 |
&VehicleReliabilitySorter, |
2965
edaa999a25dd
(svn r3528) - Feature: Allow sorting of vehicle lists by model or value (based on meush's work)
peter1138
parents:
2962
diff
changeset
|
59 |
&VehicleMaxSpeedSorter, |
edaa999a25dd
(svn r3528) - Feature: Allow sorting of vehicle lists by model or value (based on meush's work)
peter1138
parents:
2962
diff
changeset
|
60 |
&VehicleModelSorter, |
edaa999a25dd
(svn r3528) - Feature: Allow sorting of vehicle lists by model or value (based on meush's work)
peter1138
parents:
2962
diff
changeset
|
61 |
&VehicleValueSorter, |
505
11582dcada49
(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
|
62 |
}; |
11582dcada49
(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
|
63 |
|
11582dcada49
(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
|
64 |
const StringID _vehicle_sort_listing[] = { |
11582dcada49
(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
|
65 |
STR_SORT_BY_UNSORTED, |
11582dcada49
(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
|
66 |
STR_SORT_BY_NUMBER, |
11582dcada49
(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
|
67 |
STR_SORT_BY_DROPDOWN_NAME, |
11582dcada49
(svn r813) Push two tables from vehicle_gui.h into vehicle_gui.c - they were in the binary 48 (!) times.
tron
parents:
243
diff
changeset
|
68 |
STR_SORT_BY_AGE, |
11582dcada49
(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 |
STR_SORT_BY_PROFIT_THIS_YEAR, |
11582dcada49
(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 |
STR_SORT_BY_PROFIT_LAST_YEAR, |
11582dcada49
(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 |
STR_SORT_BY_TOTAL_CAPACITY_PER_CARGOTYPE, |
11582dcada49
(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 |
STR_SORT_BY_RELIABILITY, |
11582dcada49
(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 |
STR_SORT_BY_MAX_SPEED, |
2965
edaa999a25dd
(svn r3528) - Feature: Allow sorting of vehicle lists by model or value (based on meush's work)
peter1138
parents:
2962
diff
changeset
|
74 |
STR_SORT_BY_MODEL, |
edaa999a25dd
(svn r3528) - Feature: Allow sorting of vehicle lists by model or value (based on meush's work)
peter1138
parents:
2962
diff
changeset
|
75 |
STR_SORT_BY_VALUE, |
505
11582dcada49
(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
|
76 |
INVALID_STRING_ID |
11582dcada49
(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
|
77 |
}; |
11582dcada49
(svn r813) Push two tables from vehicle_gui.h into vehicle_gui.c - they were in the binary 48 (!) times.
tron
parents:
243
diff
changeset
|
78 |
|
2462 | 79 |
static const StringID _rail_types_list[] = { |
842 | 80 |
STR_RAIL_VEHICLES, |
3355
a653b8e47f27
(svn r4150) -Feature: Merged elrails into trunk. Thanks to Tron for lots of code and proofreading, thanks to peter1138 for another lot of code and ideas.
celestar
parents:
3040
diff
changeset
|
81 |
STR_ELRAIL_VEHICLES, |
842 | 82 |
STR_MONORAIL_VEHICLES, |
83 |
STR_MAGLEV_VEHICLES, |
|
84 |
INVALID_STRING_ID |
|
85 |
}; |
|
86 |
||
588 | 87 |
void RebuildVehicleLists(void) |
88 |
{ |
|
89 |
Window *w; |
|
90 |
||
91 |
for (w = _windows; w != _last_window; ++w) |
|
92 |
switch (w->window_class) { |
|
967
cd64c19d3de4
(svn r1460) -Fix: [1099225] Bug Fix - Vehicle Lists not updated at Acqusition (thx tamlin and mpetrov) This also fixes some bug but can't find i right now.
darkvater
parents:
945
diff
changeset
|
93 |
case WC_TRAINS_LIST: case WC_ROADVEH_LIST: |
cd64c19d3de4
(svn r1460) -Fix: [1099225] Bug Fix - Vehicle Lists not updated at Acqusition (thx tamlin and mpetrov) This also fixes some bug but can't find i right now.
darkvater
parents:
945
diff
changeset
|
94 |
case WC_SHIPS_LIST: case WC_AIRCRAFT_LIST: |
cd64c19d3de4
(svn r1460) -Fix: [1099225] Bug Fix - Vehicle Lists not updated at Acqusition (thx tamlin and mpetrov) This also fixes some bug but can't find i right now.
darkvater
parents:
945
diff
changeset
|
95 |
WP(w, vehiclelist_d).flags |= VL_REBUILD; |
cd64c19d3de4
(svn r1460) -Fix: [1099225] Bug Fix - Vehicle Lists not updated at Acqusition (thx tamlin and mpetrov) This also fixes some bug but can't find i right now.
darkvater
parents:
945
diff
changeset
|
96 |
SetWindowDirty(w); |
cd64c19d3de4
(svn r1460) -Fix: [1099225] Bug Fix - Vehicle Lists not updated at Acqusition (thx tamlin and mpetrov) This also fixes some bug but can't find i right now.
darkvater
parents:
945
diff
changeset
|
97 |
break; |
cd64c19d3de4
(svn r1460) -Fix: [1099225] Bug Fix - Vehicle Lists not updated at Acqusition (thx tamlin and mpetrov) This also fixes some bug but can't find i right now.
darkvater
parents:
945
diff
changeset
|
98 |
default: break; |
588 | 99 |
} |
100 |
} |
|
101 |
||
102 |
void ResortVehicleLists(void) |
|
103 |
{ |
|
104 |
Window *w; |
|
105 |
||
106 |
for (w = _windows; w != _last_window; ++w) |
|
107 |
switch (w->window_class) { |
|
967
cd64c19d3de4
(svn r1460) -Fix: [1099225] Bug Fix - Vehicle Lists not updated at Acqusition (thx tamlin and mpetrov) This also fixes some bug but can't find i right now.
darkvater
parents:
945
diff
changeset
|
108 |
case WC_TRAINS_LIST: case WC_ROADVEH_LIST: |
cd64c19d3de4
(svn r1460) -Fix: [1099225] Bug Fix - Vehicle Lists not updated at Acqusition (thx tamlin and mpetrov) This also fixes some bug but can't find i right now.
darkvater
parents:
945
diff
changeset
|
109 |
case WC_SHIPS_LIST: case WC_AIRCRAFT_LIST: |
cd64c19d3de4
(svn r1460) -Fix: [1099225] Bug Fix - Vehicle Lists not updated at Acqusition (thx tamlin and mpetrov) This also fixes some bug but can't find i right now.
darkvater
parents:
945
diff
changeset
|
110 |
WP(w, vehiclelist_d).flags |= VL_RESORT; |
cd64c19d3de4
(svn r1460) -Fix: [1099225] Bug Fix - Vehicle Lists not updated at Acqusition (thx tamlin and mpetrov) This also fixes some bug but can't find i right now.
darkvater
parents:
945
diff
changeset
|
111 |
SetWindowDirty(w); |
cd64c19d3de4
(svn r1460) -Fix: [1099225] Bug Fix - Vehicle Lists not updated at Acqusition (thx tamlin and mpetrov) This also fixes some bug but can't find i right now.
darkvater
parents:
945
diff
changeset
|
112 |
break; |
cd64c19d3de4
(svn r1460) -Fix: [1099225] Bug Fix - Vehicle Lists not updated at Acqusition (thx tamlin and mpetrov) This also fixes some bug but can't find i right now.
darkvater
parents:
945
diff
changeset
|
113 |
default: break; |
588 | 114 |
} |
115 |
} |
|
116 |
||
2466
2774132ebb9a
(svn r2992) Use PlayerID, StationID and INVALID_STATION instead of int, int and -1
tron
parents:
2462
diff
changeset
|
117 |
void BuildVehicleList(vehiclelist_d* vl, int type, PlayerID owner, StationID station) |
588 | 118 |
{ |
2818
0694b03580b0
(svn r3366) Make an unnecessarily global variable local
tron
parents:
2811
diff
changeset
|
119 |
SortStruct* sort_list; |
2676
2ba71e034d97
(svn r3218) -Feature: Multiheaded train engines will now stay in the same train
bjarni
parents:
2639
diff
changeset
|
120 |
uint subtype = (type != VEH_Aircraft) ? Train_Front : 2; |
2639 | 121 |
uint n = 0; |
122 |
uint i; |
|
588 | 123 |
|
124 |
if (!(vl->flags & VL_REBUILD)) return; |
|
125 |
||
2818
0694b03580b0
(svn r3366) Make an unnecessarily global variable local
tron
parents:
2811
diff
changeset
|
126 |
sort_list = malloc(GetVehiclePoolSize() * sizeof(sort_list[0])); |
2951 | 127 |
if (sort_list == NULL) { |
919
b0d6c7642f99
(svn r1407) -Codechange: changed a lot around _stations, _vehicles, _towns and _industries
truelight
parents:
915
diff
changeset
|
128 |
error("Could not allocate memory for the vehicle-sorting-list"); |
2951 | 129 |
} |
919
b0d6c7642f99
(svn r1407) -Codechange: changed a lot around _stations, _vehicles, _towns and _industries
truelight
parents:
915
diff
changeset
|
130 |
|
588 | 131 |
DEBUG(misc, 1) ("Building vehicle list for player %d station %d...", |
867
581154a08a78
(svn r1348) -Feature: resizable windows. Read the comment in window.h to find out
truelight
parents:
845
diff
changeset
|
132 |
owner, station); |
588 | 133 |
|
2466
2774132ebb9a
(svn r2992) Use PlayerID, StationID and INVALID_STATION instead of int, int and -1
tron
parents:
2462
diff
changeset
|
134 |
if (station != INVALID_STATION) { |
588 | 135 |
const Vehicle *v; |
136 |
FOR_ALL_VEHICLES(v) { |
|
2676
2ba71e034d97
(svn r3218) -Feature: Multiheaded train engines will now stay in the same train
bjarni
parents:
2639
diff
changeset
|
137 |
if (v->type == type && ( |
2951 | 138 |
(type == VEH_Train && IsFrontEngine(v)) || |
139 |
(type != VEH_Train && v->subtype <= subtype) |
|
140 |
)) { |
|
1024
9b06b01490a4
(svn r1525) -Codechange: rewrote the _order_array, now it can be made dynamic.
truelight
parents:
1017
diff
changeset
|
141 |
const Order *order; |
9b06b01490a4
(svn r1525) -Codechange: rewrote the _order_array, now it can be made dynamic.
truelight
parents:
1017
diff
changeset
|
142 |
|
9b06b01490a4
(svn r1525) -Codechange: rewrote the _order_array, now it can be made dynamic.
truelight
parents:
1017
diff
changeset
|
143 |
FOR_VEHICLE_ORDERS(v, order) { |
9b06b01490a4
(svn r1525) -Codechange: rewrote the _order_array, now it can be made dynamic.
truelight
parents:
1017
diff
changeset
|
144 |
if (order->type == OT_GOTO_STATION && order->station == station) { |
2818
0694b03580b0
(svn r3366) Make an unnecessarily global variable local
tron
parents:
2811
diff
changeset
|
145 |
sort_list[n].index = v->index; |
0694b03580b0
(svn r3366) Make an unnecessarily global variable local
tron
parents:
2811
diff
changeset
|
146 |
sort_list[n].owner = v->owner; |
588 | 147 |
++n; |
148 |
break; |
|
149 |
} |
|
1024
9b06b01490a4
(svn r1525) -Codechange: rewrote the _order_array, now it can be made dynamic.
truelight
parents:
1017
diff
changeset
|
150 |
} |
588 | 151 |
} |
152 |
} |
|
153 |
} else { |
|
154 |
const Vehicle *v; |
|
155 |
FOR_ALL_VEHICLES(v) { |
|
2676
2ba71e034d97
(svn r3218) -Feature: Multiheaded train engines will now stay in the same train
bjarni
parents:
2639
diff
changeset
|
156 |
if (v->type == type && v->owner == owner && ( |
2951 | 157 |
(type == VEH_Train && IsFrontEngine(v)) || |
158 |
(type != VEH_Train && v->subtype <= subtype) |
|
159 |
)) { |
|
2818
0694b03580b0
(svn r3366) Make an unnecessarily global variable local
tron
parents:
2811
diff
changeset
|
160 |
sort_list[n].index = v->index; |
0694b03580b0
(svn r3366) Make an unnecessarily global variable local
tron
parents:
2811
diff
changeset
|
161 |
sort_list[n].owner = v->owner; |
588 | 162 |
++n; |
163 |
} |
|
164 |
} |
|
165 |
} |
|
166 |
||
2549 | 167 |
free(vl->sort_list); |
168 |
vl->sort_list = malloc(n * sizeof(vl->sort_list[0])); |
|
2951 | 169 |
if (n != 0 && vl->sort_list == NULL) { |
919
b0d6c7642f99
(svn r1407) -Codechange: changed a lot around _stations, _vehicles, _towns and _industries
truelight
parents:
915
diff
changeset
|
170 |
error("Could not allocate memory for the vehicle-sorting-list"); |
2951 | 171 |
} |
588 | 172 |
vl->list_length = n; |
173 |
||
2818
0694b03580b0
(svn r3366) Make an unnecessarily global variable local
tron
parents:
2811
diff
changeset
|
174 |
for (i = 0; i < n; ++i) vl->sort_list[i] = sort_list[i]; |
0694b03580b0
(svn r3366) Make an unnecessarily global variable local
tron
parents:
2811
diff
changeset
|
175 |
free(sort_list); |
588 | 176 |
|
177 |
vl->flags &= ~VL_REBUILD; |
|
178 |
vl->flags |= VL_RESORT; |
|
179 |
} |
|
180 |
||
181 |
void SortVehicleList(vehiclelist_d *vl) |
|
182 |
{ |
|
183 |
if (!(vl->flags & VL_RESORT)) return; |
|
184 |
||
185 |
_internal_sort_order = vl->flags & VL_DESC; |
|
186 |
_internal_name_sorter_id = STR_SV_TRAIN_NAME; |
|
187 |
_last_vehicle_idx = 0; // used for "cache" in namesorting |
|
188 |
qsort(vl->sort_list, vl->list_length, sizeof(vl->sort_list[0]), |
|
189 |
_vehicle_sorter[vl->sort_type]); |
|
190 |
||
191 |
vl->resort_timer = DAY_TICKS * PERIODIC_RESORT_DAYS; |
|
192 |
vl->flags &= ~VL_RESORT; |
|
193 |
} |
|
194 |
||
195 |
||
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
|
196 |
/* General Vehicle GUI based procedures that are independent of vehicle types */ |
1093
e8d26c7dc42f
(svn r1594) Convert all undefined parameter lists to (void) and add the appropriate warning flags in the Makefile
tron
parents:
1067
diff
changeset
|
197 |
void InitializeVehiclesGuiList(void) |
164
0cbdf3c9bde1
(svn r165) -Feature: Option to sort vehicles in vehicle-list window by different criteria. Total independent sort for all types and players. Periodic resort of list every 10 TTD days. Thank you for your graphical inspiration follow and buxo (since none of you provided any code).
darkvater
parents:
diff
changeset
|
198 |
{ |
2519
67a2d670c17e
(svn r3048) Replace 0/1/2 by RAILTYPE_RAIL/MONO/MAGLEV where appropriate
tron
parents:
2477
diff
changeset
|
199 |
_railtype_selected_in_replace_gui = RAILTYPE_RAIL; |
164
0cbdf3c9bde1
(svn r165) -Feature: Option to sort vehicles in vehicle-list window by different criteria. Total independent sort for all types and players. Periodic resort of list every 10 TTD days. Thank you for your graphical inspiration follow and buxo (since none of you provided any code).
darkvater
parents:
diff
changeset
|
200 |
} |
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
|
201 |
|
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
|
202 |
// draw the vehicle profit button in the vehicle list window. |
2436
177cb6a8339f
(svn r2962) - const correctness for all Get* functions and most Draw* functions that don't change their pointer parameters
Darkvater
parents:
2375
diff
changeset
|
203 |
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
|
204 |
{ |
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
|
205 |
uint32 ormod; |
0cbdf3c9bde1
(svn r165) -Feature: Option to sort vehicles in vehicle-list window by different criteria. Total independent sort for all types and players. Periodic resort of list every 10 TTD days. Thank you for your graphical inspiration follow and buxo (since none of you provided any code).
darkvater
parents:
diff
changeset
|
206 |
|
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
|
207 |
// draw profit-based colored icons |
2639 | 208 |
if (v->age <= 365 * 2) { |
1688
787400219027
(svn r2192) - Add greater control to the 'message options' window. Now you can turn off the telegraphc ticker sound for summarized messages, or turn off news-messages altogether (you get a red blot to notify you though). The [<][>] set the settings in one way, while clicking on the option itself, cycles it. This commit also 'fixes' bugs [1166973], [1121484] and patch [1169930].
Darkvater
parents:
1465
diff
changeset
|
209 |
ormod = PALETTE_TO_GREY; |
2639 | 210 |
} else if (v->profit_last_year < 0) { |
1688
787400219027
(svn r2192) - Add greater control to the 'message options' window. Now you can turn off the telegraphc ticker sound for summarized messages, or turn off news-messages altogether (you get a red blot to notify you though). The [<][>] set the settings in one way, while clicking on the option itself, cycles it. This commit also 'fixes' bugs [1166973], [1121484] and patch [1169930].
Darkvater
parents:
1465
diff
changeset
|
211 |
ormod = PALETTE_TO_RED; |
2639 | 212 |
} else if (v->profit_last_year < 10000) { |
1688
787400219027
(svn r2192) - Add greater control to the 'message options' window. Now you can turn off the telegraphc ticker sound for summarized messages, or turn off news-messages altogether (you get a red blot to notify you though). The [<][>] set the settings in one way, while clicking on the option itself, cycles it. This commit also 'fixes' bugs [1166973], [1121484] and patch [1169930].
Darkvater
parents:
1465
diff
changeset
|
213 |
ormod = PALETTE_TO_YELLOW; |
2639 | 214 |
} else { |
1688
787400219027
(svn r2192) - Add greater control to the 'message options' window. Now you can turn off the telegraphc ticker sound for summarized messages, or turn off news-messages altogether (you get a red blot to notify you though). The [<][>] set the settings in one way, while clicking on the option itself, cycles it. This commit also 'fixes' bugs [1166973], [1121484] and patch [1169930].
Darkvater
parents:
1465
diff
changeset
|
215 |
ormod = PALETTE_TO_GREEN; |
2639 | 216 |
} |
1688
787400219027
(svn r2192) - Add greater control to the 'message options' window. Now you can turn off the telegraphc ticker sound for summarized messages, or turn off news-messages altogether (you get a red blot to notify you though). The [<][>] set the settings in one way, while clicking on the option itself, cycles it. This commit also 'fixes' bugs [1166973], [1121484] and patch [1169930].
Darkvater
parents:
1465
diff
changeset
|
217 |
DrawSprite(SPR_BLOT | ormod, x, y); |
164
0cbdf3c9bde1
(svn r165) -Feature: Option to sort vehicles in vehicle-list window by different criteria. Total independent sort for all types and players. Periodic resort of list every 10 TTD days. Thank you for your graphical inspiration follow and buxo (since none of you provided any code).
darkvater
parents:
diff
changeset
|
218 |
} |
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
|
219 |
|
1859
b3af0081df39
(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
|
220 |
/** Draw the list of available refit options for a consist. |
1802
448f187042d3
(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
|
221 |
* Draw the list and highlight the selected refit option (if any) |
1859
b3af0081df39
(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
|
222 |
* @param *v first vehicle in consist to get the refit-options of |
1802
448f187042d3
(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
|
223 |
* @param sel selected refit cargo-type in the window |
448f187042d3
(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
|
224 |
* @return the cargo type that is hightlighted, CT_INVALID if none |
448f187042d3
(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
|
225 |
*/ |
448f187042d3
(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
|
226 |
CargoID DrawVehicleRefitWindow(const Vehicle *v, int sel) |
448f187042d3
(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
|
227 |
{ |
3025
ec4098b53115
(svn r3605) - Remove silly macro and fix indenting in DrawVehicleRefitWindow()
peter1138
parents:
2989
diff
changeset
|
228 |
uint32 cmask = 0; |
1802
448f187042d3
(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
|
229 |
CargoID cid, cargo = CT_INVALID; |
448f187042d3
(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
|
230 |
int y = 25; |
3025
ec4098b53115
(svn r3605) - Remove silly macro and fix indenting in DrawVehicleRefitWindow()
peter1138
parents:
2989
diff
changeset
|
231 |
const Vehicle* u = v; |
1802
448f187042d3
(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
|
232 |
|
3025
ec4098b53115
(svn r3605) - Remove silly macro and fix indenting in DrawVehicleRefitWindow()
peter1138
parents:
2989
diff
changeset
|
233 |
/* Check if vehicle has custom refit or normal ones, and get its bitmasked value. |
ec4098b53115
(svn r3605) - Remove silly macro and fix indenting in DrawVehicleRefitWindow()
peter1138
parents:
2989
diff
changeset
|
234 |
* If its a train, 'or' this with the refit masks of the wagons. Now just 'and' |
ec4098b53115
(svn r3605) - Remove silly macro and fix indenting in DrawVehicleRefitWindow()
peter1138
parents:
2989
diff
changeset
|
235 |
* it with the bitmask of available cargo on the current landscape, and |
ec4098b53115
(svn r3605) - Remove silly macro and fix indenting in DrawVehicleRefitWindow()
peter1138
parents:
2989
diff
changeset
|
236 |
* where the bits are set: those are available */ |
ec4098b53115
(svn r3605) - Remove silly macro and fix indenting in DrawVehicleRefitWindow()
peter1138
parents:
2989
diff
changeset
|
237 |
do { |
3393
48ce4c723a76
(svn r4201) - Codechange: Do for _engine_info[] what we do for _*_vehicle_info[]; create and use a function to retrieve data, and ensure constness.
peter1138
parents:
3355
diff
changeset
|
238 |
cmask |= EngInfo(u->engine_type)->refit_mask; |
3025
ec4098b53115
(svn r3605) - Remove silly macro and fix indenting in DrawVehicleRefitWindow()
peter1138
parents:
2989
diff
changeset
|
239 |
u = u->next; |
ec4098b53115
(svn r3605) - Remove silly macro and fix indenting in DrawVehicleRefitWindow()
peter1138
parents:
2989
diff
changeset
|
240 |
} while (v->type == VEH_Train && u != NULL); |
1859
b3af0081df39
(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
|
241 |
|
3025
ec4098b53115
(svn r3605) - Remove silly macro and fix indenting in DrawVehicleRefitWindow()
peter1138
parents:
2989
diff
changeset
|
242 |
/* Check which cargo has been selected from the refit window and draw list */ |
ec4098b53115
(svn r3605) - Remove silly macro and fix indenting in DrawVehicleRefitWindow()
peter1138
parents:
2989
diff
changeset
|
243 |
for (cid = 0; cmask != 0; cmask >>= 1, cid++) { |
ec4098b53115
(svn r3605) - Remove silly macro and fix indenting in DrawVehicleRefitWindow()
peter1138
parents:
2989
diff
changeset
|
244 |
if (HASBIT(cmask, 0)) { |
ec4098b53115
(svn r3605) - Remove silly macro and fix indenting in DrawVehicleRefitWindow()
peter1138
parents:
2989
diff
changeset
|
245 |
// vehicle is refittable to this cargo |
ec4098b53115
(svn r3605) - Remove silly macro and fix indenting in DrawVehicleRefitWindow()
peter1138
parents:
2989
diff
changeset
|
246 |
byte colour = 16; |
ec4098b53115
(svn r3605) - Remove silly macro and fix indenting in DrawVehicleRefitWindow()
peter1138
parents:
2989
diff
changeset
|
247 |
if (sel == 0) { |
ec4098b53115
(svn r3605) - Remove silly macro and fix indenting in DrawVehicleRefitWindow()
peter1138
parents:
2989
diff
changeset
|
248 |
cargo = _local_cargo_id_ctype[cid]; |
ec4098b53115
(svn r3605) - Remove silly macro and fix indenting in DrawVehicleRefitWindow()
peter1138
parents:
2989
diff
changeset
|
249 |
colour = 12; |
ec4098b53115
(svn r3605) - Remove silly macro and fix indenting in DrawVehicleRefitWindow()
peter1138
parents:
2989
diff
changeset
|
250 |
} |
ec4098b53115
(svn r3605) - Remove silly macro and fix indenting in DrawVehicleRefitWindow()
peter1138
parents:
2989
diff
changeset
|
251 |
|
ec4098b53115
(svn r3605) - Remove silly macro and fix indenting in DrawVehicleRefitWindow()
peter1138
parents:
2989
diff
changeset
|
252 |
sel--; |
ec4098b53115
(svn r3605) - Remove silly macro and fix indenting in DrawVehicleRefitWindow()
peter1138
parents:
2989
diff
changeset
|
253 |
DrawString(6, y, _cargoc.names_s[_local_cargo_id_ctype[cid]], colour); |
ec4098b53115
(svn r3605) - Remove silly macro and fix indenting in DrawVehicleRefitWindow()
peter1138
parents:
2989
diff
changeset
|
254 |
y += 10; |
1802
448f187042d3
(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
|
255 |
} |
3025
ec4098b53115
(svn r3605) - Remove silly macro and fix indenting in DrawVehicleRefitWindow()
peter1138
parents:
2989
diff
changeset
|
256 |
} |
ec4098b53115
(svn r3605) - Remove silly macro and fix indenting in DrawVehicleRefitWindow()
peter1138
parents:
2989
diff
changeset
|
257 |
|
ec4098b53115
(svn r3605) - Remove silly macro and fix indenting in DrawVehicleRefitWindow()
peter1138
parents:
2989
diff
changeset
|
258 |
return cargo; |
1802
448f187042d3
(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
|
259 |
} |
448f187042d3
(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
|
260 |
|
3650
92a3f5cae745
(svn r4561) - NewGRF: implement most of callback 0x23: additional text in vehicle purchase windows.
peter1138
parents:
3492
diff
changeset
|
261 |
/* Display additional text from NewGRF in the purchase information window */ |
92a3f5cae745
(svn r4561) - NewGRF: implement most of callback 0x23: additional text in vehicle purchase windows.
peter1138
parents:
3492
diff
changeset
|
262 |
int ShowAdditionalText(int x, int y, int w, EngineID engine) |
92a3f5cae745
(svn r4561) - NewGRF: implement most of callback 0x23: additional text in vehicle purchase windows.
peter1138
parents:
3492
diff
changeset
|
263 |
{ |
92a3f5cae745
(svn r4561) - NewGRF: implement most of callback 0x23: additional text in vehicle purchase windows.
peter1138
parents:
3492
diff
changeset
|
264 |
uint16 callback = GetVehicleCallback(CBID_VEHICLE_ADDITIONAL_TEXT, 0, 0, engine, NULL); |
92a3f5cae745
(svn r4561) - NewGRF: implement most of callback 0x23: additional text in vehicle purchase windows.
peter1138
parents:
3492
diff
changeset
|
265 |
if (callback == CALLBACK_FAILED) return 0; |
92a3f5cae745
(svn r4561) - NewGRF: implement most of callback 0x23: additional text in vehicle purchase windows.
peter1138
parents:
3492
diff
changeset
|
266 |
|
92a3f5cae745
(svn r4561) - NewGRF: implement most of callback 0x23: additional text in vehicle purchase windows.
peter1138
parents:
3492
diff
changeset
|
267 |
DrawStringTruncated(x, y, GetGRFStringID(GetEngineGRFID(engine), 0xD000 + callback), 16, w); |
92a3f5cae745
(svn r4561) - NewGRF: implement most of callback 0x23: additional text in vehicle purchase windows.
peter1138
parents:
3492
diff
changeset
|
268 |
return 10; |
92a3f5cae745
(svn r4561) - NewGRF: implement most of callback 0x23: additional text in vehicle purchase windows.
peter1138
parents:
3492
diff
changeset
|
269 |
} |
92a3f5cae745
(svn r4561) - NewGRF: implement most of callback 0x23: additional text in vehicle purchase windows.
peter1138
parents:
3492
diff
changeset
|
270 |
|
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
|
271 |
/************ Sorter functions *****************/ |
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
|
272 |
int CDECL GeneralOwnerSorter(const void *a, const void *b) |
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
|
273 |
{ |
168
79f9ed5b23e6
(svn r169) -Fix: move around sort-widgets a bit so it looks more natural
darkvater
parents:
164
diff
changeset
|
274 |
return (*(const SortStruct*)a).owner - (*(const SortStruct*)b).owner; |
79f9ed5b23e6
(svn r169) -Fix: move around sort-widgets a bit so it looks more natural
darkvater
parents:
164
diff
changeset
|
275 |
} |
79f9ed5b23e6
(svn r169) -Fix: move around sort-widgets a bit so it looks more natural
darkvater
parents:
164
diff
changeset
|
276 |
|
79f9ed5b23e6
(svn r169) -Fix: move around sort-widgets a bit so it looks more natural
darkvater
parents:
164
diff
changeset
|
277 |
/* Variables you need to set before calling this function! |
79f9ed5b23e6
(svn r169) -Fix: move around sort-widgets a bit so it looks more natural
darkvater
parents:
164
diff
changeset
|
278 |
* 1. (byte)_internal_sort_type: sorting criteria to sort on |
79f9ed5b23e6
(svn r169) -Fix: move around sort-widgets a bit so it looks more natural
darkvater
parents:
164
diff
changeset
|
279 |
* 2. (bool)_internal_sort_order: sorting order, descending/ascending |
79f9ed5b23e6
(svn r169) -Fix: move around sort-widgets a bit so it looks more natural
darkvater
parents:
164
diff
changeset
|
280 |
* 3. (uint32)_internal_name_sorter_id: default StringID of the vehicle when no name is set. eg |
79f9ed5b23e6
(svn r169) -Fix: move around sort-widgets a bit so it looks more natural
darkvater
parents:
164
diff
changeset
|
281 |
* STR_SV_TRAIN_NAME for trains or STR_SV_AIRCRAFT_NAME for aircraft |
79f9ed5b23e6
(svn r169) -Fix: move around sort-widgets a bit so it looks more natural
darkvater
parents:
164
diff
changeset
|
282 |
*/ |
2462 | 283 |
static int CDECL VehicleUnsortedSorter(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
|
284 |
{ |
1294
bc831562148e
(svn r1798) GetFoo(i)->index is per definition i, so replace the former with the latter
tron
parents:
1279
diff
changeset
|
285 |
return ((const SortStruct*)a)->index - ((const SortStruct*)b)->index; |
168
79f9ed5b23e6
(svn r169) -Fix: move around sort-widgets a bit so it looks more natural
darkvater
parents:
164
diff
changeset
|
286 |
} |
79f9ed5b23e6
(svn r169) -Fix: move around sort-widgets a bit so it looks more natural
darkvater
parents:
164
diff
changeset
|
287 |
|
243
9a40daa560ae
(svn r244) -Fix: Stations were not sorted for non-player-0 players
darkvater
parents:
193
diff
changeset
|
288 |
// if the sorting criteria had the same value, sort vehicle by unitnumber |
9a40daa560ae
(svn r244) -Fix: Stations were not sorted for non-player-0 players
darkvater
parents:
193
diff
changeset
|
289 |
#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
|
290 |
|
2462 | 291 |
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
|
292 |
{ |
919
b0d6c7642f99
(svn r1407) -Codechange: changed a lot around _stations, _vehicles, _towns and _industries
truelight
parents:
915
diff
changeset
|
293 |
const Vehicle *va = GetVehicle((*(const SortStruct*)a).index); |
b0d6c7642f99
(svn r1407) -Codechange: changed a lot around _stations, _vehicles, _towns and _industries
truelight
parents:
915
diff
changeset
|
294 |
const Vehicle *vb = GetVehicle((*(const SortStruct*)b).index); |
168
79f9ed5b23e6
(svn r169) -Fix: move around sort-widgets a bit so it looks more natural
darkvater
parents:
164
diff
changeset
|
295 |
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
|
296 |
|
79f9ed5b23e6
(svn r169) -Fix: move around sort-widgets a bit so it looks more natural
darkvater
parents:
164
diff
changeset
|
297 |
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
|
298 |
} |
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
|
299 |
|
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
|
300 |
static char _bufcache[64]; // used together with _last_vehicle_idx to hopefully speed up stringsorting |
2462 | 301 |
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
|
302 |
{ |
171 | 303 |
const SortStruct *cmp1 = (const SortStruct*)a; |
304 |
const SortStruct *cmp2 = (const SortStruct*)b; |
|
919
b0d6c7642f99
(svn r1407) -Codechange: changed a lot around _stations, _vehicles, _towns and _industries
truelight
parents:
915
diff
changeset
|
305 |
const Vehicle *va = GetVehicle(cmp1->index); |
b0d6c7642f99
(svn r1407) -Codechange: changed a lot around _stations, _vehicles, _towns and _industries
truelight
parents:
915
diff
changeset
|
306 |
const Vehicle *vb = GetVehicle(cmp2->index); |
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
|
307 |
char buf1[64] = "\0"; |
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
|
308 |
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
|
309 |
|
168
79f9ed5b23e6
(svn r169) -Fix: move around sort-widgets a bit so it looks more natural
darkvater
parents:
164
diff
changeset
|
310 |
if (va->string_id != _internal_name_sorter_id) { |
534
17ab2f22ff74
(svn r901) Small step in the process to clean up the DPARAM mess:
tron
parents:
507
diff
changeset
|
311 |
SetDParam(0, va->string_id); |
1017
608592d4d7a6
(svn r1518) -Fix: server issue where some company names were wrong
darkvater
parents:
967
diff
changeset
|
312 |
GetString(buf1, STR_JUST_STRING); |
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
|
313 |
} |
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
|
314 |
|
2639 | 315 |
if (cmp2->index != _last_vehicle_idx) { |
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
|
316 |
_last_vehicle_idx = cmp2->index; |
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
|
317 |
_bufcache[0] = '\0'; |
168
79f9ed5b23e6
(svn r169) -Fix: move around sort-widgets a bit so it looks more natural
darkvater
parents:
164
diff
changeset
|
318 |
if (vb->string_id != _internal_name_sorter_id) { |
534
17ab2f22ff74
(svn r901) Small step in the process to clean up the DPARAM mess:
tron
parents:
507
diff
changeset
|
319 |
SetDParam(0, vb->string_id); |
1017
608592d4d7a6
(svn r1518) -Fix: server issue where some company names were wrong
darkvater
parents:
967
diff
changeset
|
320 |
GetString(_bufcache, STR_JUST_STRING); |
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
|
321 |
} |
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
|
322 |
} |
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
|
323 |
|
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
|
324 |
r = strcmp(buf1, _bufcache); // sort by name |
193
0a7025304867
(svn r194) -Codechange: stripping trailing-spaces. Please keep this that way!
truelight
parents:
171
diff
changeset
|
325 |
|
243
9a40daa560ae
(svn r244) -Fix: Stations were not sorted for non-player-0 players
darkvater
parents:
193
diff
changeset
|
326 |
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
|
327 |
|
79f9ed5b23e6
(svn r169) -Fix: move around sort-widgets a bit so it looks more natural
darkvater
parents:
164
diff
changeset
|
328 |
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
|
329 |
} |
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
|
330 |
|
2462 | 331 |
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
|
332 |
{ |
919
b0d6c7642f99
(svn r1407) -Codechange: changed a lot around _stations, _vehicles, _towns and _industries
truelight
parents:
915
diff
changeset
|
333 |
const Vehicle *va = GetVehicle((*(const SortStruct*)a).index); |
b0d6c7642f99
(svn r1407) -Codechange: changed a lot around _stations, _vehicles, _towns and _industries
truelight
parents:
915
diff
changeset
|
334 |
const Vehicle *vb = GetVehicle((*(const SortStruct*)b).index); |
168
79f9ed5b23e6
(svn r169) -Fix: move around sort-widgets a bit so it looks more natural
darkvater
parents:
164
diff
changeset
|
335 |
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
|
336 |
|
243
9a40daa560ae
(svn r244) -Fix: Stations were not sorted for non-player-0 players
darkvater
parents:
193
diff
changeset
|
337 |
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
|
338 |
|
79f9ed5b23e6
(svn r169) -Fix: move around sort-widgets a bit so it looks more natural
darkvater
parents:
164
diff
changeset
|
339 |
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
|
340 |
} |
79f9ed5b23e6
(svn r169) -Fix: move around sort-widgets a bit so it looks more natural
darkvater
parents:
164
diff
changeset
|
341 |
|
2462 | 342 |
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
|
343 |
{ |
919
b0d6c7642f99
(svn r1407) -Codechange: changed a lot around _stations, _vehicles, _towns and _industries
truelight
parents:
915
diff
changeset
|
344 |
const Vehicle *va = GetVehicle((*(const SortStruct*)a).index); |
b0d6c7642f99
(svn r1407) -Codechange: changed a lot around _stations, _vehicles, _towns and _industries
truelight
parents:
915
diff
changeset
|
345 |
const Vehicle *vb = GetVehicle((*(const SortStruct*)b).index); |
168
79f9ed5b23e6
(svn r169) -Fix: move around sort-widgets a bit so it looks more natural
darkvater
parents:
164
diff
changeset
|
346 |
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
|
347 |
|
243
9a40daa560ae
(svn r244) -Fix: Stations were not sorted for non-player-0 players
darkvater
parents:
193
diff
changeset
|
348 |
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
|
349 |
|
79f9ed5b23e6
(svn r169) -Fix: move around sort-widgets a bit so it looks more natural
darkvater
parents:
164
diff
changeset
|
350 |
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
|
351 |
} |
79f9ed5b23e6
(svn r169) -Fix: move around sort-widgets a bit so it looks more natural
darkvater
parents:
164
diff
changeset
|
352 |
|
2462 | 353 |
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
|
354 |
{ |
919
b0d6c7642f99
(svn r1407) -Codechange: changed a lot around _stations, _vehicles, _towns and _industries
truelight
parents:
915
diff
changeset
|
355 |
const Vehicle *va = GetVehicle((*(const SortStruct*)a).index); |
b0d6c7642f99
(svn r1407) -Codechange: changed a lot around _stations, _vehicles, _towns and _industries
truelight
parents:
915
diff
changeset
|
356 |
const Vehicle *vb = GetVehicle((*(const SortStruct*)b).index); |
168
79f9ed5b23e6
(svn r169) -Fix: move around sort-widgets a bit so it looks more natural
darkvater
parents:
164
diff
changeset
|
357 |
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
|
358 |
|
243
9a40daa560ae
(svn r244) -Fix: Stations were not sorted for non-player-0 players
darkvater
parents:
193
diff
changeset
|
359 |
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
|
360 |
|
79f9ed5b23e6
(svn r169) -Fix: move around sort-widgets a bit so it looks more natural
darkvater
parents:
164
diff
changeset
|
361 |
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
|
362 |
} |
79f9ed5b23e6
(svn r169) -Fix: move around sort-widgets a bit so it looks more natural
darkvater
parents:
164
diff
changeset
|
363 |
|
2462 | 364 |
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
|
365 |
{ |
2549 | 366 |
const Vehicle* va = GetVehicle(((const SortStruct*)a)->index); |
367 |
const Vehicle* vb = GetVehicle(((const SortStruct*)b)->index); |
|
368 |
const Vehicle* v; |
|
369 |
AcceptedCargo cargoa; |
|
370 |
AcceptedCargo cargob; |
|
168
79f9ed5b23e6
(svn r169) -Fix: move around sort-widgets a bit so it looks more natural
darkvater
parents:
164
diff
changeset
|
371 |
int r = 0; |
79f9ed5b23e6
(svn r169) -Fix: move around sort-widgets a bit so it looks more natural
darkvater
parents:
164
diff
changeset
|
372 |
int i; |
79f9ed5b23e6
(svn r169) -Fix: move around sort-widgets a bit so it looks more natural
darkvater
parents:
164
diff
changeset
|
373 |
|
2549 | 374 |
memset(cargoa, 0, sizeof(cargoa)); |
375 |
memset(cargob, 0, sizeof(cargob)); |
|
376 |
for (v = va; v != NULL; v = v->next) cargoa[v->cargo_type] += v->cargo_cap; |
|
377 |
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
|
378 |
|
79f9ed5b23e6
(svn r169) -Fix: move around sort-widgets a bit so it looks more natural
darkvater
parents:
164
diff
changeset
|
379 |
for (i = 0; i < NUM_CARGO; i++) { |
2549 | 380 |
r = cargoa[i] - cargob[i]; |
381 |
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
|
382 |
} |
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
|
383 |
|
594
81c0d7edfb17
(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
|
384 |
VEHICLEUNITNUMBERSORTER(r, va, vb); |
81c0d7edfb17
(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
|
385 |
|
168
79f9ed5b23e6
(svn r169) -Fix: move around sort-widgets a bit so it looks more natural
darkvater
parents:
164
diff
changeset
|
386 |
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
|
387 |
} |
168
79f9ed5b23e6
(svn r169) -Fix: move around sort-widgets a bit so it looks more natural
darkvater
parents:
164
diff
changeset
|
388 |
|
2462 | 389 |
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
|
390 |
{ |
919
b0d6c7642f99
(svn r1407) -Codechange: changed a lot around _stations, _vehicles, _towns and _industries
truelight
parents:
915
diff
changeset
|
391 |
const Vehicle *va = GetVehicle((*(const SortStruct*)a).index); |
b0d6c7642f99
(svn r1407) -Codechange: changed a lot around _stations, _vehicles, _towns and _industries
truelight
parents:
915
diff
changeset
|
392 |
const Vehicle *vb = GetVehicle((*(const SortStruct*)b).index); |
168
79f9ed5b23e6
(svn r169) -Fix: move around sort-widgets a bit so it looks more natural
darkvater
parents:
164
diff
changeset
|
393 |
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
|
394 |
|
243
9a40daa560ae
(svn r244) -Fix: Stations were not sorted for non-player-0 players
darkvater
parents:
193
diff
changeset
|
395 |
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
|
396 |
|
79f9ed5b23e6
(svn r169) -Fix: move around sort-widgets a bit so it looks more natural
darkvater
parents:
164
diff
changeset
|
397 |
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
|
398 |
} |
79f9ed5b23e6
(svn r169) -Fix: move around sort-widgets a bit so it looks more natural
darkvater
parents:
164
diff
changeset
|
399 |
|
2462 | 400 |
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
|
401 |
{ |
919
b0d6c7642f99
(svn r1407) -Codechange: changed a lot around _stations, _vehicles, _towns and _industries
truelight
parents:
915
diff
changeset
|
402 |
const Vehicle *va = GetVehicle((*(const SortStruct*)a).index); |
b0d6c7642f99
(svn r1407) -Codechange: changed a lot around _stations, _vehicles, _towns and _industries
truelight
parents:
915
diff
changeset
|
403 |
const Vehicle *vb = GetVehicle((*(const SortStruct*)b).index); |
1179
abea5b669f74
(svn r1681) -Feature: New realistic acceleration.
celestar
parents:
1178
diff
changeset
|
404 |
int max_speed_a = 0xFFFF, max_speed_b = 0xFFFF; |
abea5b669f74
(svn r1681) -Feature: New realistic acceleration.
celestar
parents:
1178
diff
changeset
|
405 |
int r; |
abea5b669f74
(svn r1681) -Feature: New realistic acceleration.
celestar
parents:
1178
diff
changeset
|
406 |
const Vehicle *ua = va, *ub = vb; |
abea5b669f74
(svn r1681) -Feature: New realistic acceleration.
celestar
parents:
1178
diff
changeset
|
407 |
|
1191
b680ace4455e
(svn r1695) -Fix: I broke maximum speed sorting for anything but trains with the new acceleration. Sorry
Celestar
parents:
1182
diff
changeset
|
408 |
if (va->type == VEH_Train && vb->type == VEH_Train) { |
b680ace4455e
(svn r1695) -Fix: I broke maximum speed sorting for anything but trains with the new acceleration. Sorry
Celestar
parents:
1182
diff
changeset
|
409 |
do { |
b680ace4455e
(svn r1695) -Fix: I broke maximum speed sorting for anything but trains with the new acceleration. Sorry
Celestar
parents:
1182
diff
changeset
|
410 |
if (RailVehInfo(ua->engine_type)->max_speed != 0) |
b680ace4455e
(svn r1695) -Fix: I broke maximum speed sorting for anything but trains with the new acceleration. Sorry
Celestar
parents:
1182
diff
changeset
|
411 |
max_speed_a = min(max_speed_a, RailVehInfo(ua->engine_type)->max_speed); |
b680ace4455e
(svn r1695) -Fix: I broke maximum speed sorting for anything but trains with the new acceleration. Sorry
Celestar
parents:
1182
diff
changeset
|
412 |
} while ((ua = ua->next) != NULL); |
1179
abea5b669f74
(svn r1681) -Feature: New realistic acceleration.
celestar
parents:
1178
diff
changeset
|
413 |
|
1191
b680ace4455e
(svn r1695) -Fix: I broke maximum speed sorting for anything but trains with the new acceleration. Sorry
Celestar
parents:
1182
diff
changeset
|
414 |
do { |
b680ace4455e
(svn r1695) -Fix: I broke maximum speed sorting for anything but trains with the new acceleration. Sorry
Celestar
parents:
1182
diff
changeset
|
415 |
if (RailVehInfo(ub->engine_type)->max_speed != 0) |
b680ace4455e
(svn r1695) -Fix: I broke maximum speed sorting for anything but trains with the new acceleration. Sorry
Celestar
parents:
1182
diff
changeset
|
416 |
max_speed_b = min(max_speed_b, RailVehInfo(ub->engine_type)->max_speed); |
b680ace4455e
(svn r1695) -Fix: I broke maximum speed sorting for anything but trains with the new acceleration. Sorry
Celestar
parents:
1182
diff
changeset
|
417 |
} while ((ub = ub->next) != NULL); |
b680ace4455e
(svn r1695) -Fix: I broke maximum speed sorting for anything but trains with the new acceleration. Sorry
Celestar
parents:
1182
diff
changeset
|
418 |
|
b680ace4455e
(svn r1695) -Fix: I broke maximum speed sorting for anything but trains with the new acceleration. Sorry
Celestar
parents:
1182
diff
changeset
|
419 |
r = max_speed_a - max_speed_b; |
b680ace4455e
(svn r1695) -Fix: I broke maximum speed sorting for anything but trains with the new acceleration. Sorry
Celestar
parents:
1182
diff
changeset
|
420 |
} else { |
b680ace4455e
(svn r1695) -Fix: I broke maximum speed sorting for anything but trains with the new acceleration. Sorry
Celestar
parents:
1182
diff
changeset
|
421 |
r = va->max_speed - vb->max_speed; |
b680ace4455e
(svn r1695) -Fix: I broke maximum speed sorting for anything but trains with the new acceleration. Sorry
Celestar
parents:
1182
diff
changeset
|
422 |
} |
168
79f9ed5b23e6
(svn r169) -Fix: move around sort-widgets a bit so it looks more natural
darkvater
parents:
164
diff
changeset
|
423 |
|
243
9a40daa560ae
(svn r244) -Fix: Stations were not sorted for non-player-0 players
darkvater
parents:
193
diff
changeset
|
424 |
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
|
425 |
|
79f9ed5b23e6
(svn r169) -Fix: move around sort-widgets a bit so it looks more natural
darkvater
parents:
164
diff
changeset
|
426 |
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
|
427 |
} |
842 | 428 |
|
2965
edaa999a25dd
(svn r3528) - Feature: Allow sorting of vehicle lists by model or value (based on meush's work)
peter1138
parents:
2962
diff
changeset
|
429 |
static int CDECL VehicleModelSorter(const void *a, const void *b) |
edaa999a25dd
(svn r3528) - Feature: Allow sorting of vehicle lists by model or value (based on meush's work)
peter1138
parents:
2962
diff
changeset
|
430 |
{ |
edaa999a25dd
(svn r3528) - Feature: Allow sorting of vehicle lists by model or value (based on meush's work)
peter1138
parents:
2962
diff
changeset
|
431 |
const Vehicle *va = GetVehicle((*(const SortStruct*)a).index); |
edaa999a25dd
(svn r3528) - Feature: Allow sorting of vehicle lists by model or value (based on meush's work)
peter1138
parents:
2962
diff
changeset
|
432 |
const Vehicle *vb = GetVehicle((*(const SortStruct*)b).index); |
edaa999a25dd
(svn r3528) - Feature: Allow sorting of vehicle lists by model or value (based on meush's work)
peter1138
parents:
2962
diff
changeset
|
433 |
int r = va->engine_type - vb->engine_type; |
edaa999a25dd
(svn r3528) - Feature: Allow sorting of vehicle lists by model or value (based on meush's work)
peter1138
parents:
2962
diff
changeset
|
434 |
|
edaa999a25dd
(svn r3528) - Feature: Allow sorting of vehicle lists by model or value (based on meush's work)
peter1138
parents:
2962
diff
changeset
|
435 |
VEHICLEUNITNUMBERSORTER(r, va, vb); |
edaa999a25dd
(svn r3528) - Feature: Allow sorting of vehicle lists by model or value (based on meush's work)
peter1138
parents:
2962
diff
changeset
|
436 |
|
edaa999a25dd
(svn r3528) - Feature: Allow sorting of vehicle lists by model or value (based on meush's work)
peter1138
parents:
2962
diff
changeset
|
437 |
return (_internal_sort_order & 1) ? -r : r; |
edaa999a25dd
(svn r3528) - Feature: Allow sorting of vehicle lists by model or value (based on meush's work)
peter1138
parents:
2962
diff
changeset
|
438 |
} |
edaa999a25dd
(svn r3528) - Feature: Allow sorting of vehicle lists by model or value (based on meush's work)
peter1138
parents:
2962
diff
changeset
|
439 |
|
edaa999a25dd
(svn r3528) - Feature: Allow sorting of vehicle lists by model or value (based on meush's work)
peter1138
parents:
2962
diff
changeset
|
440 |
static int CDECL VehicleValueSorter(const void *a, const void *b) |
edaa999a25dd
(svn r3528) - Feature: Allow sorting of vehicle lists by model or value (based on meush's work)
peter1138
parents:
2962
diff
changeset
|
441 |
{ |
edaa999a25dd
(svn r3528) - Feature: Allow sorting of vehicle lists by model or value (based on meush's work)
peter1138
parents:
2962
diff
changeset
|
442 |
const Vehicle *va = GetVehicle((*(const SortStruct*)a).index); |
edaa999a25dd
(svn r3528) - Feature: Allow sorting of vehicle lists by model or value (based on meush's work)
peter1138
parents:
2962
diff
changeset
|
443 |
const Vehicle *vb = GetVehicle((*(const SortStruct*)b).index); |
edaa999a25dd
(svn r3528) - Feature: Allow sorting of vehicle lists by model or value (based on meush's work)
peter1138
parents:
2962
diff
changeset
|
444 |
const Vehicle *u; |
edaa999a25dd
(svn r3528) - Feature: Allow sorting of vehicle lists by model or value (based on meush's work)
peter1138
parents:
2962
diff
changeset
|
445 |
int valuea = 0, valueb = 0; |
edaa999a25dd
(svn r3528) - Feature: Allow sorting of vehicle lists by model or value (based on meush's work)
peter1138
parents:
2962
diff
changeset
|
446 |
int r; |
edaa999a25dd
(svn r3528) - Feature: Allow sorting of vehicle lists by model or value (based on meush's work)
peter1138
parents:
2962
diff
changeset
|
447 |
|
edaa999a25dd
(svn r3528) - Feature: Allow sorting of vehicle lists by model or value (based on meush's work)
peter1138
parents:
2962
diff
changeset
|
448 |
for (u = va; u != NULL; u = u->next) valuea += u->value; |
edaa999a25dd
(svn r3528) - Feature: Allow sorting of vehicle lists by model or value (based on meush's work)
peter1138
parents:
2962
diff
changeset
|
449 |
for (u = vb; u != NULL; u = u->next) valueb += u->value; |
edaa999a25dd
(svn r3528) - Feature: Allow sorting of vehicle lists by model or value (based on meush's work)
peter1138
parents:
2962
diff
changeset
|
450 |
|
edaa999a25dd
(svn r3528) - Feature: Allow sorting of vehicle lists by model or value (based on meush's work)
peter1138
parents:
2962
diff
changeset
|
451 |
r = valuea - valueb; |
edaa999a25dd
(svn r3528) - Feature: Allow sorting of vehicle lists by model or value (based on meush's work)
peter1138
parents:
2962
diff
changeset
|
452 |
|
edaa999a25dd
(svn r3528) - Feature: Allow sorting of vehicle lists by model or value (based on meush's work)
peter1138
parents:
2962
diff
changeset
|
453 |
VEHICLEUNITNUMBERSORTER(r, va, vb); |
edaa999a25dd
(svn r3528) - Feature: Allow sorting of vehicle lists by model or value (based on meush's work)
peter1138
parents:
2962
diff
changeset
|
454 |
|
edaa999a25dd
(svn r3528) - Feature: Allow sorting of vehicle lists by model or value (based on meush's work)
peter1138
parents:
2962
diff
changeset
|
455 |
return (_internal_sort_order & 1) ? -r : r; |
edaa999a25dd
(svn r3528) - Feature: Allow sorting of vehicle lists by model or value (based on meush's work)
peter1138
parents:
2962
diff
changeset
|
456 |
} |
edaa999a25dd
(svn r3528) - Feature: Allow sorting of vehicle lists by model or value (based on meush's work)
peter1138
parents:
2962
diff
changeset
|
457 |
|
842 | 458 |
// this define is to match engine.c, but engine.c keeps it to itself |
459 |
// ENGINE_AVAILABLE is used in ReplaceVehicleWndProc |
|
2530
b8d5a5284024
(svn r3059) Use bitfields to encode railtype and climates of engines instead of manual shifting/anding
tron
parents:
2520
diff
changeset
|
460 |
#define ENGINE_AVAILABLE ((e->flags & 1 && HASBIT(info->climates, _opt.landscape)) || HASBIT(e->player_avail, _local_player)) |
842 | 461 |
|
462 |
/* if show_outdated is selected, it do not sort psudo engines properly but it draws all engines |
|
867
581154a08a78
(svn r1348) -Feature: resizable windows. Read the comment in window.h to find out
truelight
parents:
845
diff
changeset
|
463 |
* if used compined with show_cars set to false, it will work as intended. Replace window do it like that |
842 | 464 |
* this was a big hack even before show_outdated was added. Stupid newgrf :p */ |
2746
d96ce2fdc3e4
(svn r3291) - Codechange, Autoreplace: Replace int with EngineID and -1 with INVALID_ENGINE, as appropriate.
peter1138
parents:
2725
diff
changeset
|
465 |
static void train_engine_drawing_loop(int *x, int *y, int *pos, int *sel, EngineID *selected_id, RailType railtype, |
3355
a653b8e47f27
(svn r4150) -Feature: Merged elrails into trunk. Thanks to Tron for lots of code and proofreading, thanks to peter1138 for another lot of code and ideas.
celestar
parents:
3040
diff
changeset
|
466 |
uint8 lines_drawn, bool is_engine, bool show_cars, bool show_outdated, bool show_compatible) |
842 | 467 |
{ |
2971
9b62397dbd56
(svn r3546) - NewGRF feature: Implement rail vehicle 'property' 0x1A: allows shuffling order of rail vehicle purchase list (and replace vehicle list)
peter1138
parents:
2970
diff
changeset
|
468 |
EngineID j; |
842 | 469 |
byte colour; |
2569
2851becf6330
(svn r3106) -Autoreplace feature: Continue to show old vehicles in replace window after all player's vehicles of that type have been replaced. This allows the replacement to be removed. These vehicles are shown in grey instead of the player's colour.
peter1138
parents:
2556
diff
changeset
|
470 |
const Player *p = GetPlayer(_local_player); |
867
581154a08a78
(svn r1348) -Feature: resizable windows. Read the comment in window.h to find out
truelight
parents:
845
diff
changeset
|
471 |
|
2971
9b62397dbd56
(svn r3546) - NewGRF feature: Implement rail vehicle 'property' 0x1A: allows shuffling order of rail vehicle purchase list (and replace vehicle list)
peter1138
parents:
2970
diff
changeset
|
472 |
for (j = 0; j < NUM_TRAIN_ENGINES; j++) { |
9b62397dbd56
(svn r3546) - NewGRF feature: Implement rail vehicle 'property' 0x1A: allows shuffling order of rail vehicle purchase list (and replace vehicle list)
peter1138
parents:
2970
diff
changeset
|
473 |
EngineID i = GetRailVehAtPosition(j); |
1926
68d60188a22f
(svn r2432) Use GetEngine() instead of DEREF_ENGINE() or even _engines[]
tron
parents:
1923
diff
changeset
|
474 |
const Engine *e = GetEngine(i); |
842 | 475 |
const RailVehicleInfo *rvi = RailVehInfo(i); |
3393
48ce4c723a76
(svn r4201) - Codechange: Do for _engine_info[] what we do for _*_vehicle_info[]; create and use a function to retrieve data, and ensure constness.
peter1138
parents:
3355
diff
changeset
|
476 |
const EngineInfo *info = EngInfo(i); |
842 | 477 |
|
2848 | 478 |
if (!EngineHasReplacementForPlayer(p, i) && _player_num_engines[i] == 0 && show_outdated) continue; |
1128
d3ffc98b92ad
(svn r1629) added a counter to tell how many engines you have of each type to the autoreplace vehicle windows and made them show only the vehicles you actually have in the left list.
bjarni
parents:
1093
diff
changeset
|
479 |
|
2970
77fa46c313c0
(svn r3535) -Feature: [autoreplace] allow autoreplacing of train wagons
bjarni
parents:
2965
diff
changeset
|
480 |
if ((rvi->power == 0 && !show_cars) || (rvi->power != 0 && show_cars)) // show wagons or engines (works since wagons do not have power) |
842 | 481 |
continue; |
867
581154a08a78
(svn r1348) -Feature: resizable windows. Read the comment in window.h to find out
truelight
parents:
845
diff
changeset
|
482 |
|
2971
9b62397dbd56
(svn r3546) - NewGRF feature: Implement rail vehicle 'property' 0x1A: allows shuffling order of rail vehicle purchase list (and replace vehicle list)
peter1138
parents:
2970
diff
changeset
|
483 |
if (*sel == 0) *selected_id = j; |
842 | 484 |
|
485 |
||
486 |
colour = *sel == 0 ? 0xC : 0x10; |
|
3492
5670ff6c83e9
(svn r4343) [Autoreplace] Fix drawing of train list for outdated engines. Fixes FS#106
peter1138
parents:
3414
diff
changeset
|
487 |
if (!(ENGINE_AVAILABLE && show_outdated && RailVehInfo(i)->power && IsCompatibleRail(e->railtype, railtype))) { |
3414
35a7ea80eee7
(svn r4229) [elrail & autoreplace] Always show compatible rail vehicles in the left list, and only the selected rail type in the right list, to
peter1138
parents:
3393
diff
changeset
|
488 |
if ((!IsCompatibleRail(e->railtype, railtype) && show_compatible) |
3355
a653b8e47f27
(svn r4150) -Feature: Merged elrails into trunk. Thanks to Tron for lots of code and proofreading, thanks to peter1138 for another lot of code and ideas.
celestar
parents:
3040
diff
changeset
|
489 |
|| (e->railtype != railtype && !show_compatible) |
a653b8e47f27
(svn r4150) -Feature: Merged elrails into trunk. Thanks to Tron for lots of code and proofreading, thanks to peter1138 for another lot of code and ideas.
celestar
parents:
3040
diff
changeset
|
490 |
|| !(rvi->flags & RVI_WAGON) != is_engine || |
842 | 491 |
!HASBIT(e->player_avail, _local_player)) |
492 |
continue; |
|
867
581154a08a78
(svn r1348) -Feature: resizable windows. Read the comment in window.h to find out
truelight
parents:
845
diff
changeset
|
493 |
} /*else { |
842 | 494 |
// TODO find a nice red colour for vehicles being replaced |
495 |
if ( _autoreplace_array[i] != i ) |
|
496 |
colour = *sel == 0 ? 0x44 : 0x45; |
|
497 |
} */ |
|
867
581154a08a78
(svn r1348) -Feature: resizable windows. Read the comment in window.h to find out
truelight
parents:
845
diff
changeset
|
498 |
|
842 | 499 |
if (IS_INT_INSIDE(--*pos, -lines_drawn, 0)) { |
500 |
DrawString(*x + 59, *y + 2, GetCustomEngineName(i), |
|
501 |
colour); |
|
2569
2851becf6330
(svn r3106) -Autoreplace feature: Continue to show old vehicles in replace window after all player's vehicles of that type have been replaced. This allows the replacement to be removed. These vehicles are shown in grey instead of the player's colour.
peter1138
parents:
2556
diff
changeset
|
502 |
// show_outdated is true only for left side, which is where we show old replacements |
2851becf6330
(svn r3106) -Autoreplace feature: Continue to show old vehicles in replace window after all player's vehicles of that type have been replaced. This allows the replacement to be removed. These vehicles are shown in grey instead of the player's colour.
peter1138
parents:
2556
diff
changeset
|
503 |
DrawTrainEngine(*x + 29, *y + 6, i, (_player_num_engines[i] == 0 && show_outdated) ? |
3040
c3473d1fb81f
(svn r3620) - 2cc: Replace use of macro to determine colour map with a function call for drawing of vehicles.
peter1138
parents:
3030
diff
changeset
|
504 |
PALETTE_CRASH : GetEnginePalette(i, _local_player)); |
1128
d3ffc98b92ad
(svn r1629) added a counter to tell how many engines you have of each type to the autoreplace vehicle windows and made them show only the vehicles you actually have in the left list.
bjarni
parents:
1093
diff
changeset
|
505 |
if ( show_outdated ) { |
d3ffc98b92ad
(svn r1629) added a counter to tell how many engines you have of each type to the autoreplace vehicle windows and made them show only the vehicles you actually have in the left list.
bjarni
parents:
1093
diff
changeset
|
506 |
SetDParam(0, _player_num_engines[i]); |
d3ffc98b92ad
(svn r1629) added a counter to tell how many engines you have of each type to the autoreplace vehicle windows and made them show only the vehicles you actually have in the left list.
bjarni
parents:
1093
diff
changeset
|
507 |
DrawStringRightAligned(213, *y+5, STR_TINY_BLACK, 0); |
d3ffc98b92ad
(svn r1629) added a counter to tell how many engines you have of each type to the autoreplace vehicle windows and made them show only the vehicles you actually have in the left list.
bjarni
parents:
1093
diff
changeset
|
508 |
} |
842 | 509 |
*y += 14; |
510 |
} |
|
511 |
--*sel; |
|
512 |
} |
|
513 |
} |
|
514 |
||
515 |
||
516 |
static void SetupScrollStuffForReplaceWindow(Window *w) |
|
517 |
{ |
|
2746
d96ce2fdc3e4
(svn r3291) - Codechange, Autoreplace: Replace int with EngineID and -1 with INVALID_ENGINE, as appropriate.
peter1138
parents:
2725
diff
changeset
|
518 |
EngineID selected_id[2] = { INVALID_ENGINE, INVALID_ENGINE }; |
3029
157958f9e1f3
(svn r3609) Some more simplification in the same function as r3608
tron
parents:
3028
diff
changeset
|
519 |
const Player* p = GetPlayer(_local_player); |
157958f9e1f3
(svn r3609) Some more simplification in the same function as r3608
tron
parents:
3028
diff
changeset
|
520 |
uint sel[2]; |
157958f9e1f3
(svn r3609) Some more simplification in the same function as r3608
tron
parents:
3028
diff
changeset
|
521 |
uint count = 0; |
157958f9e1f3
(svn r3609) Some more simplification in the same function as r3608
tron
parents:
3028
diff
changeset
|
522 |
uint count2 = 0; |
3028
e470394e175e
(svn r3608) No functional change, just make some code more comprehensible: Reduce variable scope, remove write-only variables, turn do-while-loops with multiple induction variables into canonical for-loops
tron
parents:
3025
diff
changeset
|
523 |
EngineID i; |
867
581154a08a78
(svn r1348) -Feature: resizable windows. Read the comment in window.h to find out
truelight
parents:
845
diff
changeset
|
524 |
|
912
d9a42d0dcbf5
(svn r1399) -Fix: Fixes for compiling with Watcom C/C++ (ie, OS/2 port). (orudge)
truelight
parents:
907
diff
changeset
|
525 |
sel[0] = WP(w,replaceveh_d).sel_index[0]; |
d9a42d0dcbf5
(svn r1399) -Fix: Fixes for compiling with Watcom C/C++ (ie, OS/2 port). (orudge)
truelight
parents:
907
diff
changeset
|
526 |
sel[1] = WP(w,replaceveh_d).sel_index[1]; |
915 | 527 |
|
842 | 528 |
switch (WP(w,replaceveh_d).vehicletype) { |
529 |
case VEH_Train: { |
|
3028
e470394e175e
(svn r3608) No functional change, just make some code more comprehensible: Reduce variable scope, remove write-only variables, turn do-while-loops with multiple induction variables into canonical for-loops
tron
parents:
3025
diff
changeset
|
530 |
RailType railtype = _railtype_selected_in_replace_gui; |
e470394e175e
(svn r3608) No functional change, just make some code more comprehensible: Reduce variable scope, remove write-only variables, turn do-while-loops with multiple induction variables into canonical for-loops
tron
parents:
3025
diff
changeset
|
531 |
|
870
1b8600157298
(svn r1351) fixed issue in last commit where it it not update the replace train window properly when changing company colour (the lower two panels stayed the old colour until the window was reopened)
bjarni
parents:
869
diff
changeset
|
532 |
w->widget[13].color = _player_colors[_local_player]; // sets the colour of that art thing |
1b8600157298
(svn r1351) fixed issue in last commit where it it not update the replace train window properly when changing company colour (the lower two panels stayed the old colour until the window was reopened)
bjarni
parents:
869
diff
changeset
|
533 |
w->widget[16].color = _player_colors[_local_player]; // sets the colour of that art thing |
3029
157958f9e1f3
(svn r3609) Some more simplification in the same function as r3608
tron
parents:
3028
diff
changeset
|
534 |
|
2971
9b62397dbd56
(svn r3546) - NewGRF feature: Implement rail vehicle 'property' 0x1A: allows shuffling order of rail vehicle purchase list (and replace vehicle list)
peter1138
parents:
2970
diff
changeset
|
535 |
for (i = 0; i < NUM_TRAIN_ENGINES; i++) { |
3028
e470394e175e
(svn r3608) No functional change, just make some code more comprehensible: Reduce variable scope, remove write-only variables, turn do-while-loops with multiple induction variables into canonical for-loops
tron
parents:
3025
diff
changeset
|
536 |
EngineID eid = GetRailVehAtPosition(i); |
e470394e175e
(svn r3608) No functional change, just make some code more comprehensible: Reduce variable scope, remove write-only variables, turn do-while-loops with multiple induction variables into canonical for-loops
tron
parents:
3025
diff
changeset
|
537 |
const Engine* e = GetEngine(eid); |
3393
48ce4c723a76
(svn r4201) - Codechange: Do for _engine_info[] what we do for _*_vehicle_info[]; create and use a function to retrieve data, and ensure constness.
peter1138
parents:
3355
diff
changeset
|
538 |
const EngineInfo* info = EngInfo(eid); |
867
581154a08a78
(svn r1348) -Feature: resizable windows. Read the comment in window.h to find out
truelight
parents:
845
diff
changeset
|
539 |
|
3355
a653b8e47f27
(svn r4150) -Feature: Merged elrails into trunk. Thanks to Tron for lots of code and proofreading, thanks to peter1138 for another lot of code and ideas.
celestar
parents:
3040
diff
changeset
|
540 |
// left window contains compatible engines while right window only contains engines of the selected type |
3028
e470394e175e
(svn r3608) No functional change, just make some code more comprehensible: Reduce variable scope, remove write-only variables, turn do-while-loops with multiple induction variables into canonical for-loops
tron
parents:
3025
diff
changeset
|
541 |
if (ENGINE_AVAILABLE && ( |
e470394e175e
(svn r3608) No functional change, just make some code more comprehensible: Reduce variable scope, remove write-only variables, turn do-while-loops with multiple induction variables into canonical for-loops
tron
parents:
3025
diff
changeset
|
542 |
(RailVehInfo(eid)->power != 0 && WP(w, replaceveh_d).wagon_btnstate) || |
3355
a653b8e47f27
(svn r4150) -Feature: Merged elrails into trunk. Thanks to Tron for lots of code and proofreading, thanks to peter1138 for another lot of code and ideas.
celestar
parents:
3040
diff
changeset
|
543 |
(RailVehInfo(eid)->power == 0 && !WP(w, replaceveh_d).wagon_btnstate))) { |
3414
35a7ea80eee7
(svn r4229) [elrail & autoreplace] Always show compatible rail vehicles in the left list, and only the selected rail type in the right list, to
peter1138
parents:
3393
diff
changeset
|
544 |
if (IsCompatibleRail(e->railtype, railtype) && (_player_num_engines[eid] > 0 || EngineHasReplacementForPlayer(p, eid))) { |
3029
157958f9e1f3
(svn r3609) Some more simplification in the same function as r3608
tron
parents:
3028
diff
changeset
|
545 |
if (sel[0] == count) selected_id[0] = eid; |
1134
cdaa9f6a7d73
(svn r1635) fix: forgot to set SetVScrollCount properly in autoreplace train GUI. It appears ok now
bjarni
parents:
1128
diff
changeset
|
546 |
count++; |
1128
d3ffc98b92ad
(svn r1629) added a counter to tell how many engines you have of each type to the autoreplace vehicle windows and made them show only the vehicles you actually have in the left list.
bjarni
parents:
1093
diff
changeset
|
547 |
} |
3355
a653b8e47f27
(svn r4150) -Feature: Merged elrails into trunk. Thanks to Tron for lots of code and proofreading, thanks to peter1138 for another lot of code and ideas.
celestar
parents:
3040
diff
changeset
|
548 |
if (e->railtype == railtype && HASBIT(e->player_avail, _local_player)) { |
3029
157958f9e1f3
(svn r3609) Some more simplification in the same function as r3608
tron
parents:
3028
diff
changeset
|
549 |
if (sel[1] == count2) selected_id[1] = eid; |
1128
d3ffc98b92ad
(svn r1629) added a counter to tell how many engines you have of each type to the autoreplace vehicle windows and made them show only the vehicles you actually have in the left list.
bjarni
parents:
1093
diff
changeset
|
550 |
count2++; |
842 | 551 |
} |
552 |
} |
|
1128
d3ffc98b92ad
(svn r1629) added a counter to tell how many engines you have of each type to the autoreplace vehicle windows and made them show only the vehicles you actually have in the left list.
bjarni
parents:
1093
diff
changeset
|
553 |
} |
842 | 554 |
break; |
1128
d3ffc98b92ad
(svn r1629) added a counter to tell how many engines you have of each type to the autoreplace vehicle windows and made them show only the vehicles you actually have in the left list.
bjarni
parents:
1093
diff
changeset
|
555 |
} |
3028
e470394e175e
(svn r3608) No functional change, just make some code more comprehensible: Reduce variable scope, remove write-only variables, turn do-while-loops with multiple induction variables into canonical for-loops
tron
parents:
3025
diff
changeset
|
556 |
|
842 | 557 |
case VEH_Road: { |
3028
e470394e175e
(svn r3608) No functional change, just make some code more comprehensible: Reduce variable scope, remove write-only variables, turn do-while-loops with multiple induction variables into canonical for-loops
tron
parents:
3025
diff
changeset
|
558 |
for (i = ROAD_ENGINES_INDEX; i < ROAD_ENGINES_INDEX + NUM_ROAD_ENGINES; i++) { |
e470394e175e
(svn r3608) No functional change, just make some code more comprehensible: Reduce variable scope, remove write-only variables, turn do-while-loops with multiple induction variables into canonical for-loops
tron
parents:
3025
diff
changeset
|
559 |
if (_player_num_engines[i] > 0 || EngineHasReplacementForPlayer(p, i)) { |
3029
157958f9e1f3
(svn r3609) Some more simplification in the same function as r3608
tron
parents:
3028
diff
changeset
|
560 |
if (sel[0] == count) selected_id[0] = i; |
842 | 561 |
count++; |
562 |
} |
|
3028
e470394e175e
(svn r3608) No functional change, just make some code more comprehensible: Reduce variable scope, remove write-only variables, turn do-while-loops with multiple induction variables into canonical for-loops
tron
parents:
3025
diff
changeset
|
563 |
} |
867
581154a08a78
(svn r1348) -Feature: resizable windows. Read the comment in window.h to find out
truelight
parents:
845
diff
changeset
|
564 |
|
2746
d96ce2fdc3e4
(svn r3291) - Codechange, Autoreplace: Replace int with EngineID and -1 with INVALID_ENGINE, as appropriate.
peter1138
parents:
2725
diff
changeset
|
565 |
if (selected_id[0] != INVALID_ENGINE) { // only draw right array if we have anything in the left one |
3028
e470394e175e
(svn r3608) No functional change, just make some code more comprehensible: Reduce variable scope, remove write-only variables, turn do-while-loops with multiple induction variables into canonical for-loops
tron
parents:
3025
diff
changeset
|
566 |
CargoID cargo = RoadVehInfo(selected_id[0])->cargo_type; |
867
581154a08a78
(svn r1348) -Feature: resizable windows. Read the comment in window.h to find out
truelight
parents:
845
diff
changeset
|
567 |
|
3028
e470394e175e
(svn r3608) No functional change, just make some code more comprehensible: Reduce variable scope, remove write-only variables, turn do-while-loops with multiple induction variables into canonical for-loops
tron
parents:
3025
diff
changeset
|
568 |
for (i = ROAD_ENGINES_INDEX; i < ROAD_ENGINES_INDEX + NUM_ROAD_ENGINES; i++) { |
3029
157958f9e1f3
(svn r3609) Some more simplification in the same function as r3608
tron
parents:
3028
diff
changeset
|
569 |
if (cargo == RoadVehInfo(i)->cargo_type && |
157958f9e1f3
(svn r3609) Some more simplification in the same function as r3608
tron
parents:
3028
diff
changeset
|
570 |
HASBIT(GetEngine(i)->player_avail, _local_player)) { |
157958f9e1f3
(svn r3609) Some more simplification in the same function as r3608
tron
parents:
3028
diff
changeset
|
571 |
if (sel[1] == count2) selected_id[1] = i; |
842 | 572 |
count2++; |
573 |
} |
|
3028
e470394e175e
(svn r3608) No functional change, just make some code more comprehensible: Reduce variable scope, remove write-only variables, turn do-while-loops with multiple induction variables into canonical for-loops
tron
parents:
3025
diff
changeset
|
574 |
} |
867
581154a08a78
(svn r1348) -Feature: resizable windows. Read the comment in window.h to find out
truelight
parents:
845
diff
changeset
|
575 |
} |
842 | 576 |
break; |
577 |
} |
|
867
581154a08a78
(svn r1348) -Feature: resizable windows. Read the comment in window.h to find out
truelight
parents:
845
diff
changeset
|
578 |
|
842 | 579 |
case VEH_Ship: { |
3028
e470394e175e
(svn r3608) No functional change, just make some code more comprehensible: Reduce variable scope, remove write-only variables, turn do-while-loops with multiple induction variables into canonical for-loops
tron
parents:
3025
diff
changeset
|
580 |
for (i = SHIP_ENGINES_INDEX; i < SHIP_ENGINES_INDEX + NUM_SHIP_ENGINES; i++) { |
e470394e175e
(svn r3608) No functional change, just make some code more comprehensible: Reduce variable scope, remove write-only variables, turn do-while-loops with multiple induction variables into canonical for-loops
tron
parents:
3025
diff
changeset
|
581 |
if (_player_num_engines[i] > 0 || EngineHasReplacementForPlayer(p, i)) { |
3029
157958f9e1f3
(svn r3609) Some more simplification in the same function as r3608
tron
parents:
3028
diff
changeset
|
582 |
if (sel[0] == count) selected_id[0] = i; |
842 | 583 |
count++; |
584 |
} |
|
3028
e470394e175e
(svn r3608) No functional change, just make some code more comprehensible: Reduce variable scope, remove write-only variables, turn do-while-loops with multiple induction variables into canonical for-loops
tron
parents:
3025
diff
changeset
|
585 |
} |
867
581154a08a78
(svn r1348) -Feature: resizable windows. Read the comment in window.h to find out
truelight
parents:
845
diff
changeset
|
586 |
|
2746
d96ce2fdc3e4
(svn r3291) - Codechange, Autoreplace: Replace int with EngineID and -1 with INVALID_ENGINE, as appropriate.
peter1138
parents:
2725
diff
changeset
|
587 |
if (selected_id[0] != INVALID_ENGINE) { |
3030 | 588 |
const ShipVehicleInfo* svi = ShipVehInfo(selected_id[0]); |
589 |
CargoID cargo = svi->cargo_type; |
|
590 |
byte refittable = svi->refittable; |
|
867
581154a08a78
(svn r1348) -Feature: resizable windows. Read the comment in window.h to find out
truelight
parents:
845
diff
changeset
|
591 |
|
3028
e470394e175e
(svn r3608) No functional change, just make some code more comprehensible: Reduce variable scope, remove write-only variables, turn do-while-loops with multiple induction variables into canonical for-loops
tron
parents:
3025
diff
changeset
|
592 |
for (i = SHIP_ENGINES_INDEX; i < SHIP_ENGINES_INDEX + NUM_SHIP_ENGINES; i++) { |
3029
157958f9e1f3
(svn r3609) Some more simplification in the same function as r3608
tron
parents:
3028
diff
changeset
|
593 |
if (HASBIT(GetEngine(i)->player_avail, _local_player) && ( |
3028
e470394e175e
(svn r3608) No functional change, just make some code more comprehensible: Reduce variable scope, remove write-only variables, turn do-while-loops with multiple induction variables into canonical for-loops
tron
parents:
3025
diff
changeset
|
594 |
ShipVehInfo(i)->cargo_type == cargo || |
e470394e175e
(svn r3608) No functional change, just make some code more comprehensible: Reduce variable scope, remove write-only variables, turn do-while-loops with multiple induction variables into canonical for-loops
tron
parents:
3025
diff
changeset
|
595 |
ShipVehInfo(i)->refittable & refittable |
e470394e175e
(svn r3608) No functional change, just make some code more comprehensible: Reduce variable scope, remove write-only variables, turn do-while-loops with multiple induction variables into canonical for-loops
tron
parents:
3025
diff
changeset
|
596 |
)) { |
3029
157958f9e1f3
(svn r3609) Some more simplification in the same function as r3608
tron
parents:
3028
diff
changeset
|
597 |
if (sel[1] == count2) selected_id[1] = i; |
842 | 598 |
count2++; |
599 |
} |
|
3028
e470394e175e
(svn r3608) No functional change, just make some code more comprehensible: Reduce variable scope, remove write-only variables, turn do-while-loops with multiple induction variables into canonical for-loops
tron
parents:
3025
diff
changeset
|
600 |
} |
842 | 601 |
} |
602 |
break; |
|
3028
e470394e175e
(svn r3608) No functional change, just make some code more comprehensible: Reduce variable scope, remove write-only variables, turn do-while-loops with multiple induction variables into canonical for-loops
tron
parents:
3025
diff
changeset
|
603 |
} |
867
581154a08a78
(svn r1348) -Feature: resizable windows. Read the comment in window.h to find out
truelight
parents:
845
diff
changeset
|
604 |
|
3028
e470394e175e
(svn r3608) No functional change, just make some code more comprehensible: Reduce variable scope, remove write-only variables, turn do-while-loops with multiple induction variables into canonical for-loops
tron
parents:
3025
diff
changeset
|
605 |
case VEH_Aircraft: { |
e470394e175e
(svn r3608) No functional change, just make some code more comprehensible: Reduce variable scope, remove write-only variables, turn do-while-loops with multiple induction variables into canonical for-loops
tron
parents:
3025
diff
changeset
|
606 |
for (i = AIRCRAFT_ENGINES_INDEX; i < AIRCRAFT_ENGINES_INDEX + NUM_AIRCRAFT_ENGINES; i++) { |
e470394e175e
(svn r3608) No functional change, just make some code more comprehensible: Reduce variable scope, remove write-only variables, turn do-while-loops with multiple induction variables into canonical for-loops
tron
parents:
3025
diff
changeset
|
607 |
if (_player_num_engines[i] > 0 || EngineHasReplacementForPlayer(p, i)) { |
3029
157958f9e1f3
(svn r3609) Some more simplification in the same function as r3608
tron
parents:
3028
diff
changeset
|
608 |
if (sel[0] == count) selected_id[0] = i; |
842 | 609 |
count++; |
610 |
} |
|
3028
e470394e175e
(svn r3608) No functional change, just make some code more comprehensible: Reduce variable scope, remove write-only variables, turn do-while-loops with multiple induction variables into canonical for-loops
tron
parents:
3025
diff
changeset
|
611 |
} |
867
581154a08a78
(svn r1348) -Feature: resizable windows. Read the comment in window.h to find out
truelight
parents:
845
diff
changeset
|
612 |
|
2746
d96ce2fdc3e4
(svn r3291) - Codechange, Autoreplace: Replace int with EngineID and -1 with INVALID_ENGINE, as appropriate.
peter1138
parents:
2725
diff
changeset
|
613 |
if (selected_id[0] != INVALID_ENGINE) { |
3028
e470394e175e
(svn r3608) No functional change, just make some code more comprehensible: Reduce variable scope, remove write-only variables, turn do-while-loops with multiple induction variables into canonical for-loops
tron
parents:
3025
diff
changeset
|
614 |
byte subtype = AircraftVehInfo(selected_id[0])->subtype; |
e470394e175e
(svn r3608) No functional change, just make some code more comprehensible: Reduce variable scope, remove write-only variables, turn do-while-loops with multiple induction variables into canonical for-loops
tron
parents:
3025
diff
changeset
|
615 |
|
e470394e175e
(svn r3608) No functional change, just make some code more comprehensible: Reduce variable scope, remove write-only variables, turn do-while-loops with multiple induction variables into canonical for-loops
tron
parents:
3025
diff
changeset
|
616 |
for (i = AIRCRAFT_ENGINES_INDEX; i < AIRCRAFT_ENGINES_INDEX + NUM_AIRCRAFT_ENGINES; i++) { |
3029
157958f9e1f3
(svn r3609) Some more simplification in the same function as r3608
tron
parents:
3028
diff
changeset
|
617 |
if (HASBIT(GetEngine(i)->player_avail, _local_player) && |
157958f9e1f3
(svn r3609) Some more simplification in the same function as r3608
tron
parents:
3028
diff
changeset
|
618 |
HASBIT(subtype, 0) == HASBIT(AircraftVehInfo(i)->subtype, 0)) { |
157958f9e1f3
(svn r3609) Some more simplification in the same function as r3608
tron
parents:
3028
diff
changeset
|
619 |
if (sel[1] == count2) selected_id[1] = i; |
157958f9e1f3
(svn r3609) Some more simplification in the same function as r3608
tron
parents:
3028
diff
changeset
|
620 |
count2++; |
842 | 621 |
} |
3028
e470394e175e
(svn r3608) No functional change, just make some code more comprehensible: Reduce variable scope, remove write-only variables, turn do-while-loops with multiple induction variables into canonical for-loops
tron
parents:
3025
diff
changeset
|
622 |
} |
842 | 623 |
} |
624 |
break; |
|
625 |
} |
|
626 |
} |
|
627 |
// sets up the number of items in each list |
|
628 |
SetVScrollCount(w, count); |
|
629 |
SetVScroll2Count(w, count2); |
|
630 |
WP(w,replaceveh_d).sel_engine[0] = selected_id[0]; |
|
631 |
WP(w,replaceveh_d).sel_engine[1] = selected_id[1]; |
|
867
581154a08a78
(svn r1348) -Feature: resizable windows. Read the comment in window.h to find out
truelight
parents:
845
diff
changeset
|
632 |
|
842 | 633 |
WP(w,replaceveh_d).count[0] = count; |
634 |
WP(w,replaceveh_d).count[1] = count2; |
|
635 |
return; |
|
636 |
} |
|
637 |
||
638 |
||
639 |
static void DrawEngineArrayInReplaceWindow(Window *w, int x, int y, int x2, int y2, int pos, int pos2, |
|
2746
d96ce2fdc3e4
(svn r3291) - Codechange, Autoreplace: Replace int with EngineID and -1 with INVALID_ENGINE, as appropriate.
peter1138
parents:
2725
diff
changeset
|
640 |
int sel1, int sel2, EngineID selected_id1, EngineID selected_id2) |
842 | 641 |
{ |
912
d9a42d0dcbf5
(svn r1399) -Fix: Fixes for compiling with Watcom C/C++ (ie, OS/2 port). (orudge)
truelight
parents:
907
diff
changeset
|
642 |
int sel[2]; |
2746
d96ce2fdc3e4
(svn r3291) - Codechange, Autoreplace: Replace int with EngineID and -1 with INVALID_ENGINE, as appropriate.
peter1138
parents:
2725
diff
changeset
|
643 |
EngineID selected_id[2]; |
2569
2851becf6330
(svn r3106) -Autoreplace feature: Continue to show old vehicles in replace window after all player's vehicles of that type have been replaced. This allows the replacement to be removed. These vehicles are shown in grey instead of the player's colour.
peter1138
parents:
2556
diff
changeset
|
644 |
const Player *p = GetPlayer(_local_player); |
912
d9a42d0dcbf5
(svn r1399) -Fix: Fixes for compiling with Watcom C/C++ (ie, OS/2 port). (orudge)
truelight
parents:
907
diff
changeset
|
645 |
|
d9a42d0dcbf5
(svn r1399) -Fix: Fixes for compiling with Watcom C/C++ (ie, OS/2 port). (orudge)
truelight
parents:
907
diff
changeset
|
646 |
sel[0] = sel1; |
d9a42d0dcbf5
(svn r1399) -Fix: Fixes for compiling with Watcom C/C++ (ie, OS/2 port). (orudge)
truelight
parents:
907
diff
changeset
|
647 |
sel[1] = sel2; |
915 | 648 |
|
912
d9a42d0dcbf5
(svn r1399) -Fix: Fixes for compiling with Watcom C/C++ (ie, OS/2 port). (orudge)
truelight
parents:
907
diff
changeset
|
649 |
selected_id[0] = selected_id1; |
d9a42d0dcbf5
(svn r1399) -Fix: Fixes for compiling with Watcom C/C++ (ie, OS/2 port). (orudge)
truelight
parents:
907
diff
changeset
|
650 |
selected_id[1] = selected_id2; |
915 | 651 |
|
842 | 652 |
switch (WP(w,replaceveh_d).vehicletype) { |
653 |
case VEH_Train: { |
|
2520
75eb66d6e371
(svn r3049) Replace byte/int/uint by RailType where appropriate
tron
parents:
2519
diff
changeset
|
654 |
RailType railtype = _railtype_selected_in_replace_gui; |
1923
f30ab832ecf7
(svn r2429) - Fix: Oops, forgot to increase the size of the autoreplace window to fit the extra info from powered wagons.
hackykid
parents:
1907
diff
changeset
|
655 |
DrawString(157, 99 + (14 * w->vscroll.cap), _rail_types_list[railtype], 0x10); |
842 | 656 |
/* draw sorting criteria string */ |
657 |
||
658 |
/* Ensure that custom engines which substituted wagons |
|
659 |
* are sorted correctly. |
|
660 |
* XXX - DO NOT EVER DO THIS EVER AGAIN! GRRR hacking in wagons as |
|
661 |
* engines to get more types.. Stays here until we have our own format |
|
662 |
* then it is exit!!! */ |
|
2970
77fa46c313c0
(svn r3535) -Feature: [autoreplace] allow autoreplacing of train wagons
bjarni
parents:
2965
diff
changeset
|
663 |
if (WP(w,replaceveh_d).wagon_btnstate) { |
3355
a653b8e47f27
(svn r4150) -Feature: Merged elrails into trunk. Thanks to Tron for lots of code and proofreading, thanks to peter1138 for another lot of code and ideas.
celestar
parents:
3040
diff
changeset
|
664 |
train_engine_drawing_loop(&x, &y, &pos, &sel[0], &selected_id[0], railtype, w->vscroll.cap, true, false, true, true); // True engines |
a653b8e47f27
(svn r4150) -Feature: Merged elrails into trunk. Thanks to Tron for lots of code and proofreading, thanks to peter1138 for another lot of code and ideas.
celestar
parents:
3040
diff
changeset
|
665 |
train_engine_drawing_loop(&x2, &y2, &pos2, &sel[1], &selected_id[1], railtype, w->vscroll.cap, true, false, false, false); // True engines |
a653b8e47f27
(svn r4150) -Feature: Merged elrails into trunk. Thanks to Tron for lots of code and proofreading, thanks to peter1138 for another lot of code and ideas.
celestar
parents:
3040
diff
changeset
|
666 |
train_engine_drawing_loop(&x2, &y2, &pos2, &sel[1], &selected_id[1], railtype, w->vscroll.cap, false, false, false, false); // Feeble wagons |
2970
77fa46c313c0
(svn r3535) -Feature: [autoreplace] allow autoreplacing of train wagons
bjarni
parents:
2965
diff
changeset
|
667 |
} else { |
3355
a653b8e47f27
(svn r4150) -Feature: Merged elrails into trunk. Thanks to Tron for lots of code and proofreading, thanks to peter1138 for another lot of code and ideas.
celestar
parents:
3040
diff
changeset
|
668 |
train_engine_drawing_loop(&x, &y, &pos, &sel[0], &selected_id[0], railtype, w->vscroll.cap, false, true, true, true); |
a653b8e47f27
(svn r4150) -Feature: Merged elrails into trunk. Thanks to Tron for lots of code and proofreading, thanks to peter1138 for another lot of code and ideas.
celestar
parents:
3040
diff
changeset
|
669 |
train_engine_drawing_loop(&x2, &y2, &pos2, &sel[1], &selected_id[1], railtype, w->vscroll.cap, false, true, false, true); |
2970
77fa46c313c0
(svn r3535) -Feature: [autoreplace] allow autoreplacing of train wagons
bjarni
parents:
2965
diff
changeset
|
670 |
} |
842 | 671 |
break; |
672 |
} |
|
867
581154a08a78
(svn r1348) -Feature: resizable windows. Read the comment in window.h to find out
truelight
parents:
845
diff
changeset
|
673 |
|
842 | 674 |
case VEH_Road: { |
675 |
int num = NUM_ROAD_ENGINES; |
|
2630 | 676 |
const Engine* e = GetEngine(ROAD_ENGINES_INDEX); |
2477
d454d5152386
(svn r3003) Change int, uint, uin16 and byte to EngineID where appropriate, plus some related changes (mostly casts)
tron
parents:
2466
diff
changeset
|
677 |
EngineID engine_id = ROAD_ENGINES_INDEX; |
842 | 678 |
byte cargo; |
867
581154a08a78
(svn r1348) -Feature: resizable windows. Read the comment in window.h to find out
truelight
parents:
845
diff
changeset
|
679 |
|
2639 | 680 |
if (selected_id[0] >= ROAD_ENGINES_INDEX && selected_id[0] < SHIP_ENGINES_INDEX) { |
867
581154a08a78
(svn r1348) -Feature: resizable windows. Read the comment in window.h to find out
truelight
parents:
845
diff
changeset
|
681 |
cargo = RoadVehInfo(selected_id[0])->cargo_type; |
842 | 682 |
|
845
0c66e26fecb2
(svn r1326) fixed compiler warnings in vehicle_gui.c and widget.c
bjarni
parents:
843
diff
changeset
|
683 |
do { |
2848 | 684 |
if (_player_num_engines[engine_id] > 0 || EngineHasReplacementForPlayer(p, engine_id)) { |
845
0c66e26fecb2
(svn r1326) fixed compiler warnings in vehicle_gui.c and widget.c
bjarni
parents:
843
diff
changeset
|
685 |
if (IS_INT_INSIDE(--pos, -w->vscroll.cap, 0)) { |
0c66e26fecb2
(svn r1326) fixed compiler warnings in vehicle_gui.c and widget.c
bjarni
parents:
843
diff
changeset
|
686 |
DrawString(x+59, y+2, GetCustomEngineName(engine_id), sel[0]==0 ? 0xC : 0x10); |
3040
c3473d1fb81f
(svn r3620) - 2cc: Replace use of macro to determine colour map with a function call for drawing of vehicles.
peter1138
parents:
3030
diff
changeset
|
687 |
DrawRoadVehEngine(x+29, y+6, engine_id, _player_num_engines[engine_id] > 0 ? GetEnginePalette(engine_id, _local_player) : PALETTE_CRASH); |
1128
d3ffc98b92ad
(svn r1629) added a counter to tell how many engines you have of each type to the autoreplace vehicle windows and made them show only the vehicles you actually have in the left list.
bjarni
parents:
1093
diff
changeset
|
688 |
SetDParam(0, _player_num_engines[engine_id]); |
d3ffc98b92ad
(svn r1629) added a counter to tell how many engines you have of each type to the autoreplace vehicle windows and made them show only the vehicles you actually have in the left list.
bjarni
parents:
1093
diff
changeset
|
689 |
DrawStringRightAligned(213, y+5, STR_TINY_BLACK, 0); |
845
0c66e26fecb2
(svn r1326) fixed compiler warnings in vehicle_gui.c and widget.c
bjarni
parents:
843
diff
changeset
|
690 |
y += 14; |
0c66e26fecb2
(svn r1326) fixed compiler warnings in vehicle_gui.c and widget.c
bjarni
parents:
843
diff
changeset
|
691 |
} |
1128
d3ffc98b92ad
(svn r1629) added a counter to tell how many engines you have of each type to the autoreplace vehicle windows and made them show only the vehicles you actually have in the left list.
bjarni
parents:
1093
diff
changeset
|
692 |
sel[0]--; |
d3ffc98b92ad
(svn r1629) added a counter to tell how many engines you have of each type to the autoreplace vehicle windows and made them show only the vehicles you actually have in the left list.
bjarni
parents:
1093
diff
changeset
|
693 |
} |
867
581154a08a78
(svn r1348) -Feature: resizable windows. Read the comment in window.h to find out
truelight
parents:
845
diff
changeset
|
694 |
|
2639 | 695 |
if (RoadVehInfo(engine_id)->cargo_type == cargo && HASBIT(e->player_avail, _local_player)) { |
1128
d3ffc98b92ad
(svn r1629) added a counter to tell how many engines you have of each type to the autoreplace vehicle windows and made them show only the vehicles you actually have in the left list.
bjarni
parents:
1093
diff
changeset
|
696 |
if (IS_INT_INSIDE(--pos2, -w->vscroll.cap, 0) && RoadVehInfo(engine_id)->cargo_type == cargo) { |
d3ffc98b92ad
(svn r1629) added a counter to tell how many engines you have of each type to the autoreplace vehicle windows and made them show only the vehicles you actually have in the left list.
bjarni
parents:
1093
diff
changeset
|
697 |
DrawString(x2+59, y2+2, GetCustomEngineName(engine_id), sel[1]==0 ? 0xC : 0x10); |
3040
c3473d1fb81f
(svn r3620) - 2cc: Replace use of macro to determine colour map with a function call for drawing of vehicles.
peter1138
parents:
3030
diff
changeset
|
698 |
DrawRoadVehEngine(x2+29, y2+6, engine_id, GetEnginePalette(engine_id, _local_player)); |
1128
d3ffc98b92ad
(svn r1629) added a counter to tell how many engines you have of each type to the autoreplace vehicle windows and made them show only the vehicles you actually have in the left list.
bjarni
parents:
1093
diff
changeset
|
699 |
y2 += 14; |
845
0c66e26fecb2
(svn r1326) fixed compiler warnings in vehicle_gui.c and widget.c
bjarni
parents:
843
diff
changeset
|
700 |
} |
1128
d3ffc98b92ad
(svn r1629) added a counter to tell how many engines you have of each type to the autoreplace vehicle windows and made them show only the vehicles you actually have in the left list.
bjarni
parents:
1093
diff
changeset
|
701 |
sel[1]--; |
842 | 702 |
} |
845
0c66e26fecb2
(svn r1326) fixed compiler warnings in vehicle_gui.c and widget.c
bjarni
parents:
843
diff
changeset
|
703 |
} while (++engine_id, ++e,--num); |
0c66e26fecb2
(svn r1326) fixed compiler warnings in vehicle_gui.c and widget.c
bjarni
parents:
843
diff
changeset
|
704 |
} |
842 | 705 |
break; |
706 |
} |
|
867
581154a08a78
(svn r1348) -Feature: resizable windows. Read the comment in window.h to find out
truelight
parents:
845
diff
changeset
|
707 |
|
842 | 708 |
case VEH_Ship: { |
709 |
int num = NUM_SHIP_ENGINES; |
|
2630 | 710 |
const Engine* e = GetEngine(SHIP_ENGINES_INDEX); |
2477
d454d5152386
(svn r3003) Change int, uint, uin16 and byte to EngineID where appropriate, plus some related changes (mostly casts)
tron
parents:
2466
diff
changeset
|
711 |
EngineID engine_id = SHIP_ENGINES_INDEX; |
867
581154a08a78
(svn r1348) -Feature: resizable windows. Read the comment in window.h to find out
truelight
parents:
845
diff
changeset
|
712 |
byte cargo, refittable; |
842 | 713 |
|
2746
d96ce2fdc3e4
(svn r3291) - Codechange, Autoreplace: Replace int with EngineID and -1 with INVALID_ENGINE, as appropriate.
peter1138
parents:
2725
diff
changeset
|
714 |
if (selected_id[0] != INVALID_ENGINE) { |
842 | 715 |
cargo = ShipVehInfo(selected_id[0])->cargo_type; |
716 |
refittable = ShipVehInfo(selected_id[0])->refittable; |
|
867
581154a08a78
(svn r1348) -Feature: resizable windows. Read the comment in window.h to find out
truelight
parents:
845
diff
changeset
|
717 |
|
845
0c66e26fecb2
(svn r1326) fixed compiler warnings in vehicle_gui.c and widget.c
bjarni
parents:
843
diff
changeset
|
718 |
do { |
2848 | 719 |
if (_player_num_engines[engine_id] > 0 || EngineHasReplacementForPlayer(p, engine_id)) { |
845
0c66e26fecb2
(svn r1326) fixed compiler warnings in vehicle_gui.c and widget.c
bjarni
parents:
843
diff
changeset
|
720 |
if (IS_INT_INSIDE(--pos, -w->vscroll.cap, 0)) { |
0c66e26fecb2
(svn r1326) fixed compiler warnings in vehicle_gui.c and widget.c
bjarni
parents:
843
diff
changeset
|
721 |
DrawString(x+75, y+7, GetCustomEngineName(engine_id), sel[0]==0 ? 0xC : 0x10); |
3040
c3473d1fb81f
(svn r3620) - 2cc: Replace use of macro to determine colour map with a function call for drawing of vehicles.
peter1138
parents:
3030
diff
changeset
|
722 |
DrawShipEngine(x+35, y+10, engine_id, _player_num_engines[engine_id] > 0 ? GetEnginePalette(engine_id, _local_player) : PALETTE_CRASH); |
1128
d3ffc98b92ad
(svn r1629) added a counter to tell how many engines you have of each type to the autoreplace vehicle windows and made them show only the vehicles you actually have in the left list.
bjarni
parents:
1093
diff
changeset
|
723 |
SetDParam(0, _player_num_engines[engine_id]); |
d3ffc98b92ad
(svn r1629) added a counter to tell how many engines you have of each type to the autoreplace vehicle windows and made them show only the vehicles you actually have in the left list.
bjarni
parents:
1093
diff
changeset
|
724 |
DrawStringRightAligned(213, y+15, STR_TINY_BLACK, 0); |
845
0c66e26fecb2
(svn r1326) fixed compiler warnings in vehicle_gui.c and widget.c
bjarni
parents:
843
diff
changeset
|
725 |
y += 24; |
0c66e26fecb2
(svn r1326) fixed compiler warnings in vehicle_gui.c and widget.c
bjarni
parents:
843
diff
changeset
|
726 |
} |
1128
d3ffc98b92ad
(svn r1629) added a counter to tell how many engines you have of each type to the autoreplace vehicle windows and made them show only the vehicles you actually have in the left list.
bjarni
parents:
1093
diff
changeset
|
727 |
sel[0]--; |
d3ffc98b92ad
(svn r1629) added a counter to tell how many engines you have of each type to the autoreplace vehicle windows and made them show only the vehicles you actually have in the left list.
bjarni
parents:
1093
diff
changeset
|
728 |
} |
2746
d96ce2fdc3e4
(svn r3291) - Codechange, Autoreplace: Replace int with EngineID and -1 with INVALID_ENGINE, as appropriate.
peter1138
parents:
2725
diff
changeset
|
729 |
if (selected_id[0] != INVALID_ENGINE) { |
1128
d3ffc98b92ad
(svn r1629) added a counter to tell how many engines you have of each type to the autoreplace vehicle windows and made them show only the vehicles you actually have in the left list.
bjarni
parents:
1093
diff
changeset
|
730 |
if (HASBIT(e->player_avail, _local_player) && ( cargo == ShipVehInfo(engine_id)->cargo_type || refittable & ShipVehInfo(engine_id)->refittable)) { |
d3ffc98b92ad
(svn r1629) added a counter to tell how many engines you have of each type to the autoreplace vehicle windows and made them show only the vehicles you actually have in the left list.
bjarni
parents:
1093
diff
changeset
|
731 |
if (IS_INT_INSIDE(--pos2, -w->vscroll.cap, 0)) { |
d3ffc98b92ad
(svn r1629) added a counter to tell how many engines you have of each type to the autoreplace vehicle windows and made them show only the vehicles you actually have in the left list.
bjarni
parents:
1093
diff
changeset
|
732 |
DrawString(x2+75, y2+7, GetCustomEngineName(engine_id), sel[1]==0 ? 0xC : 0x10); |
3040
c3473d1fb81f
(svn r3620) - 2cc: Replace use of macro to determine colour map with a function call for drawing of vehicles.
peter1138
parents:
3030
diff
changeset
|
733 |
DrawShipEngine(x2+35, y2+10, engine_id, GetEnginePalette(engine_id, _local_player)); |
1128
d3ffc98b92ad
(svn r1629) added a counter to tell how many engines you have of each type to the autoreplace vehicle windows and made them show only the vehicles you actually have in the left list.
bjarni
parents:
1093
diff
changeset
|
734 |
y2 += 24; |
845
0c66e26fecb2
(svn r1326) fixed compiler warnings in vehicle_gui.c and widget.c
bjarni
parents:
843
diff
changeset
|
735 |
} |
1128
d3ffc98b92ad
(svn r1629) added a counter to tell how many engines you have of each type to the autoreplace vehicle windows and made them show only the vehicles you actually have in the left list.
bjarni
parents:
1093
diff
changeset
|
736 |
sel[1]--; |
845
0c66e26fecb2
(svn r1326) fixed compiler warnings in vehicle_gui.c and widget.c
bjarni
parents:
843
diff
changeset
|
737 |
} |
842 | 738 |
} |
845
0c66e26fecb2
(svn r1326) fixed compiler warnings in vehicle_gui.c and widget.c
bjarni
parents:
843
diff
changeset
|
739 |
} while (++engine_id, ++e,--num); |
0c66e26fecb2
(svn r1326) fixed compiler warnings in vehicle_gui.c and widget.c
bjarni
parents:
843
diff
changeset
|
740 |
} |
0c66e26fecb2
(svn r1326) fixed compiler warnings in vehicle_gui.c and widget.c
bjarni
parents:
843
diff
changeset
|
741 |
break; |
842 | 742 |
} //end of ship |
867
581154a08a78
(svn r1348) -Feature: resizable windows. Read the comment in window.h to find out
truelight
parents:
845
diff
changeset
|
743 |
|
842 | 744 |
case VEH_Aircraft: { |
2746
d96ce2fdc3e4
(svn r3291) - Codechange, Autoreplace: Replace int with EngineID and -1 with INVALID_ENGINE, as appropriate.
peter1138
parents:
2725
diff
changeset
|
745 |
if (selected_id[0] != INVALID_ENGINE) { |
842 | 746 |
int num = NUM_AIRCRAFT_ENGINES; |
2630 | 747 |
const Engine* e = GetEngine(AIRCRAFT_ENGINES_INDEX); |
2477
d454d5152386
(svn r3003) Change int, uint, uin16 and byte to EngineID where appropriate, plus some related changes (mostly casts)
tron
parents:
2466
diff
changeset
|
748 |
EngineID engine_id = AIRCRAFT_ENGINES_INDEX; |
842 | 749 |
byte subtype = AircraftVehInfo(selected_id[0])->subtype; |
750 |
||
751 |
do { |
|
2848 | 752 |
if (_player_num_engines[engine_id] > 0 || EngineHasReplacementForPlayer(p, engine_id)) { |
2639 | 753 |
if (sel[0] == 0) selected_id[0] = engine_id; |
842 | 754 |
if (IS_INT_INSIDE(--pos, -w->vscroll.cap, 0)) { |
755 |
DrawString(x+62, y+7, GetCustomEngineName(engine_id), sel[0]==0 ? 0xC : 0x10); |
|
3040
c3473d1fb81f
(svn r3620) - 2cc: Replace use of macro to determine colour map with a function call for drawing of vehicles.
peter1138
parents:
3030
diff
changeset
|
756 |
DrawAircraftEngine(x+29, y+10, engine_id, _player_num_engines[engine_id] > 0 ? GetEnginePalette(engine_id, _local_player) : PALETTE_CRASH); |
1128
d3ffc98b92ad
(svn r1629) added a counter to tell how many engines you have of each type to the autoreplace vehicle windows and made them show only the vehicles you actually have in the left list.
bjarni
parents:
1093
diff
changeset
|
757 |
SetDParam(0, _player_num_engines[engine_id]); |
d3ffc98b92ad
(svn r1629) added a counter to tell how many engines you have of each type to the autoreplace vehicle windows and made them show only the vehicles you actually have in the left list.
bjarni
parents:
1093
diff
changeset
|
758 |
DrawStringRightAligned(213, y+15, STR_TINY_BLACK, 0); |
842 | 759 |
y += 24; |
760 |
} |
|
1128
d3ffc98b92ad
(svn r1629) added a counter to tell how many engines you have of each type to the autoreplace vehicle windows and made them show only the vehicles you actually have in the left list.
bjarni
parents:
1093
diff
changeset
|
761 |
sel[0]--; |
d3ffc98b92ad
(svn r1629) added a counter to tell how many engines you have of each type to the autoreplace vehicle windows and made them show only the vehicles you actually have in the left list.
bjarni
parents:
1093
diff
changeset
|
762 |
} |
2639 | 763 |
if (HASBIT(subtype, 0) == HASBIT(AircraftVehInfo(engine_id)->subtype, 0) && |
764 |
HASBIT(e->player_avail, _local_player)) { |
|
765 |
if (sel[1] == 0) selected_id[1] = engine_id; |
|
1128
d3ffc98b92ad
(svn r1629) added a counter to tell how many engines you have of each type to the autoreplace vehicle windows and made them show only the vehicles you actually have in the left list.
bjarni
parents:
1093
diff
changeset
|
766 |
if (IS_INT_INSIDE(--pos2, -w->vscroll.cap, 0)) { |
d3ffc98b92ad
(svn r1629) added a counter to tell how many engines you have of each type to the autoreplace vehicle windows and made them show only the vehicles you actually have in the left list.
bjarni
parents:
1093
diff
changeset
|
767 |
DrawString(x2+62, y2+7, GetCustomEngineName(engine_id), sel[1]==0 ? 0xC : 0x10); |
3040
c3473d1fb81f
(svn r3620) - 2cc: Replace use of macro to determine colour map with a function call for drawing of vehicles.
peter1138
parents:
3030
diff
changeset
|
768 |
DrawAircraftEngine(x2+29, y2+10, engine_id, GetEnginePalette(engine_id, _local_player)); |
1128
d3ffc98b92ad
(svn r1629) added a counter to tell how many engines you have of each type to the autoreplace vehicle windows and made them show only the vehicles you actually have in the left list.
bjarni
parents:
1093
diff
changeset
|
769 |
y2 += 24; |
d3ffc98b92ad
(svn r1629) added a counter to tell how many engines you have of each type to the autoreplace vehicle windows and made them show only the vehicles you actually have in the left list.
bjarni
parents:
1093
diff
changeset
|
770 |
} |
842 | 771 |
sel[1]--; |
772 |
} |
|
773 |
} while (++engine_id, ++e,--num); |
|
774 |
} |
|
775 |
break; |
|
776 |
} // end of aircraft |
|
777 |
} |
|
2639 | 778 |
} |
842 | 779 |
|
2639 | 780 |
|
842 | 781 |
static void ReplaceVehicleWndProc(Window *w, WindowEvent *e) |
782 |
{ |
|
2639 | 783 |
static const StringID _vehicle_type_names[] = { |
784 |
STR_019F_TRAIN, |
|
785 |
STR_019C_ROAD_VEHICLE, |
|
786 |
STR_019E_SHIP, |
|
787 |
STR_019D_AIRCRAFT |
|
788 |
}; |
|
842 | 789 |
|
2375
0355db918128
(svn r2901) Refix 'replace window' with wrong string-etc. coordinates. Also clean up, and make window-title a bit more meaningful (specify vehicle type replaced)
Darkvater
parents:
2354
diff
changeset
|
790 |
switch (e->event) { |
0355db918128
(svn r2901) Refix 'replace window' with wrong string-etc. coordinates. Also clean up, and make window-title a bit more meaningful (specify vehicle type replaced)
Darkvater
parents:
2354
diff
changeset
|
791 |
case WE_PAINT: { |
2805
b6098e7ca457
(svn r3353) Simplify the automatic length adjustment algorithm for replacing trains: Use the length of the train before the replacement as reference length
tron
parents:
2753
diff
changeset
|
792 |
const Player *p = GetPlayer(_local_player); |
842 | 793 |
int pos = w->vscroll.pos; |
2746
d96ce2fdc3e4
(svn r3291) - Codechange, Autoreplace: Replace int with EngineID and -1 with INVALID_ENGINE, as appropriate.
peter1138
parents:
2725
diff
changeset
|
794 |
EngineID selected_id[2] = { INVALID_ENGINE, INVALID_ENGINE }; |
842 | 795 |
int x = 1; |
796 |
int y = 15; |
|
797 |
int pos2 = w->vscroll2.pos; |
|
798 |
int x2 = 1 + 228; |
|
799 |
int y2 = 15; |
|
912
d9a42d0dcbf5
(svn r1399) -Fix: Fixes for compiling with Watcom C/C++ (ie, OS/2 port). (orudge)
truelight
parents:
907
diff
changeset
|
800 |
int sel[2]; |
d9a42d0dcbf5
(svn r1399) -Fix: Fixes for compiling with Watcom C/C++ (ie, OS/2 port). (orudge)
truelight
parents:
907
diff
changeset
|
801 |
sel[0] = WP(w,replaceveh_d).sel_index[0]; |
d9a42d0dcbf5
(svn r1399) -Fix: Fixes for compiling with Watcom C/C++ (ie, OS/2 port). (orudge)
truelight
parents:
907
diff
changeset
|
802 |
sel[1] = WP(w,replaceveh_d).sel_index[1]; |
867
581154a08a78
(svn r1348) -Feature: resizable windows. Read the comment in window.h to find out
truelight
parents:
845
diff
changeset
|
803 |
|
1128
d3ffc98b92ad
(svn r1629) added a counter to tell how many engines you have of each type to the autoreplace vehicle windows and made them show only the vehicles you actually have in the left list.
bjarni
parents:
1093
diff
changeset
|
804 |
{ |
d3ffc98b92ad
(svn r1629) added a counter to tell how many engines you have of each type to the autoreplace vehicle windows and made them show only the vehicles you actually have in the left list.
bjarni
parents:
1093
diff
changeset
|
805 |
uint i; |
d3ffc98b92ad
(svn r1629) added a counter to tell how many engines you have of each type to the autoreplace vehicle windows and made them show only the vehicles you actually have in the left list.
bjarni
parents:
1093
diff
changeset
|
806 |
const Vehicle *vehicle; |
d3ffc98b92ad
(svn r1629) added a counter to tell how many engines you have of each type to the autoreplace vehicle windows and made them show only the vehicles you actually have in the left list.
bjarni
parents:
1093
diff
changeset
|
807 |
|
d3ffc98b92ad
(svn r1629) added a counter to tell how many engines you have of each type to the autoreplace vehicle windows and made them show only the vehicles you actually have in the left list.
bjarni
parents:
1093
diff
changeset
|
808 |
for (i = 0; i < lengthof(_player_num_engines); i++) { |
d3ffc98b92ad
(svn r1629) added a counter to tell how many engines you have of each type to the autoreplace vehicle windows and made them show only the vehicles you actually have in the left list.
bjarni
parents:
1093
diff
changeset
|
809 |
_player_num_engines[i] = 0; |
d3ffc98b92ad
(svn r1629) added a counter to tell how many engines you have of each type to the autoreplace vehicle windows and made them show only the vehicles you actually have in the left list.
bjarni
parents:
1093
diff
changeset
|
810 |
} |
d3ffc98b92ad
(svn r1629) added a counter to tell how many engines you have of each type to the autoreplace vehicle windows and made them show only the vehicles you actually have in the left list.
bjarni
parents:
1093
diff
changeset
|
811 |
FOR_ALL_VEHICLES(vehicle) { |
2639 | 812 |
if (vehicle->owner == _local_player) { |
1128
d3ffc98b92ad
(svn r1629) added a counter to tell how many engines you have of each type to the autoreplace vehicle windows and made them show only the vehicles you actually have in the left list.
bjarni
parents:
1093
diff
changeset
|
813 |
if (vehicle->type == VEH_Aircraft && vehicle->subtype > 2) continue; |
d3ffc98b92ad
(svn r1629) added a counter to tell how many engines you have of each type to the autoreplace vehicle windows and made them show only the vehicles you actually have in the left list.
bjarni
parents:
1093
diff
changeset
|
814 |
|
d3ffc98b92ad
(svn r1629) added a counter to tell how many engines you have of each type to the autoreplace vehicle windows and made them show only the vehicles you actually have in the left list.
bjarni
parents:
1093
diff
changeset
|
815 |
// do not count the vehicles, that contains only 0 in all var |
2639 | 816 |
if (vehicle->engine_type == 0 && vehicle->spritenum == 0) continue; |
1128
d3ffc98b92ad
(svn r1629) added a counter to tell how many engines you have of each type to the autoreplace vehicle windows and made them show only the vehicles you actually have in the left list.
bjarni
parents:
1093
diff
changeset
|
817 |
|
1926
68d60188a22f
(svn r2432) Use GetEngine() instead of DEREF_ENGINE() or even _engines[]
tron
parents:
1923
diff
changeset
|
818 |
if (vehicle->type != GetEngine(vehicle->engine_type)->type) continue; |
1128
d3ffc98b92ad
(svn r1629) added a counter to tell how many engines you have of each type to the autoreplace vehicle windows and made them show only the vehicles you actually have in the left list.
bjarni
parents:
1093
diff
changeset
|
819 |
|
d3ffc98b92ad
(svn r1629) added a counter to tell how many engines you have of each type to the autoreplace vehicle windows and made them show only the vehicles you actually have in the left list.
bjarni
parents:
1093
diff
changeset
|
820 |
_player_num_engines[vehicle->engine_type]++; |
d3ffc98b92ad
(svn r1629) added a counter to tell how many engines you have of each type to the autoreplace vehicle windows and made them show only the vehicles you actually have in the left list.
bjarni
parents:
1093
diff
changeset
|
821 |
} |
d3ffc98b92ad
(svn r1629) added a counter to tell how many engines you have of each type to the autoreplace vehicle windows and made them show only the vehicles you actually have in the left list.
bjarni
parents:
1093
diff
changeset
|
822 |
} |
d3ffc98b92ad
(svn r1629) added a counter to tell how many engines you have of each type to the autoreplace vehicle windows and made them show only the vehicles you actually have in the left list.
bjarni
parents:
1093
diff
changeset
|
823 |
} |
d3ffc98b92ad
(svn r1629) added a counter to tell how many engines you have of each type to the autoreplace vehicle windows and made them show only the vehicles you actually have in the left list.
bjarni
parents:
1093
diff
changeset
|
824 |
|
842 | 825 |
SetupScrollStuffForReplaceWindow(w); |
867
581154a08a78
(svn r1348) -Feature: resizable windows. Read the comment in window.h to find out
truelight
parents:
845
diff
changeset
|
826 |
|
842 | 827 |
selected_id[0] = WP(w,replaceveh_d).sel_engine[0]; |
828 |
selected_id[1] = WP(w,replaceveh_d).sel_engine[1]; |
|
867
581154a08a78
(svn r1348) -Feature: resizable windows. Read the comment in window.h to find out
truelight
parents:
845
diff
changeset
|
829 |
|
842 | 830 |
// sets the selected left item to the top one if it's greater than the number of vehicles in the left side |
831 |
||
2639 | 832 |
if (WP(w,replaceveh_d).count[0] <= sel[0]) { |
842 | 833 |
if (WP(w,replaceveh_d).count[0]) { |
834 |
sel[0] = 0; |
|
835 |
WP(w,replaceveh_d).sel_index[0] = 0; |
|
836 |
w->vscroll.pos = 0; |
|
837 |
// now we go back to set selected_id[1] properly |
|
838 |
SetWindowDirty(w); |
|
839 |
return; |
|
840 |
} else { //there are no vehicles in the left window |
|
2746
d96ce2fdc3e4
(svn r3291) - Codechange, Autoreplace: Replace int with EngineID and -1 with INVALID_ENGINE, as appropriate.
peter1138
parents:
2725
diff
changeset
|
841 |
selected_id[1] = INVALID_ENGINE; |
842 | 842 |
} |
843 |
} |
|
844 |
||
2639 | 845 |
if (WP(w,replaceveh_d).count[1] <= sel[1]) { |
842 | 846 |
if (WP(w,replaceveh_d).count[1]) { |
847 |
sel[1] = 0; |
|
848 |
WP(w,replaceveh_d).sel_index[1] = 0; |
|
849 |
w->vscroll2.pos = 0; |
|
850 |
// now we go back to set selected_id[1] properly |
|
851 |
SetWindowDirty(w); |
|
852 |
return; |
|
853 |
} else { //there are no vehicles in the right window |
|
2746
d96ce2fdc3e4
(svn r3291) - Codechange, Autoreplace: Replace int with EngineID and -1 with INVALID_ENGINE, as appropriate.
peter1138
parents:
2725
diff
changeset
|
854 |
selected_id[1] = INVALID_ENGINE; |
842 | 855 |
} |
856 |
} |
|
867
581154a08a78
(svn r1348) -Feature: resizable windows. Read the comment in window.h to find out
truelight
parents:
845
diff
changeset
|
857 |
|
2556
a6f1c61fa5d0
(svn r3089) Fix possible issue with out-of-bounds array access in replace vehicle gui, and add brief commenting.
peter1138
parents:
2553
diff
changeset
|
858 |
// Disable the "Start Replacing" button if: |
a6f1c61fa5d0
(svn r3089) Fix possible issue with out-of-bounds array access in replace vehicle gui, and add brief commenting.
peter1138
parents:
2553
diff
changeset
|
859 |
// Either list is empty |
a6f1c61fa5d0
(svn r3089) Fix possible issue with out-of-bounds array access in replace vehicle gui, and add brief commenting.
peter1138
parents:
2553
diff
changeset
|
860 |
// or Both lists have the same vehicle selected |
2747
ac25d748652b
(svn r3292) - Autoreplace: Disallow replacing to an engine type that already has a replacement set up; this stops loops being set up.
peter1138
parents:
2746
diff
changeset
|
861 |
// or The selected replacement engine has a replacement (to prevent loops) |
2556
a6f1c61fa5d0
(svn r3089) Fix possible issue with out-of-bounds array access in replace vehicle gui, and add brief commenting.
peter1138
parents:
2553
diff
changeset
|
862 |
// or The right list (new replacement) has the existing replacement vehicle selected |
2746
d96ce2fdc3e4
(svn r3291) - Codechange, Autoreplace: Replace int with EngineID and -1 with INVALID_ENGINE, as appropriate.
peter1138
parents:
2725
diff
changeset
|
863 |
if (selected_id[0] == INVALID_ENGINE || |
d96ce2fdc3e4
(svn r3291) - Codechange, Autoreplace: Replace int with EngineID and -1 with INVALID_ENGINE, as appropriate.
peter1138
parents:
2725
diff
changeset
|
864 |
selected_id[1] == INVALID_ENGINE || |
2556
a6f1c61fa5d0
(svn r3089) Fix possible issue with out-of-bounds array access in replace vehicle gui, and add brief commenting.
peter1138
parents:
2553
diff
changeset
|
865 |
selected_id[0] == selected_id[1] || |
2848 | 866 |
EngineReplacementForPlayer(p, selected_id[1]) != INVALID_ENGINE || |
867 |
EngineReplacementForPlayer(p, selected_id[0]) == selected_id[1]) { |
|
842 | 868 |
SETBIT(w->disabled_state, 4); |
2639 | 869 |
} else { |
842 | 870 |
CLRBIT(w->disabled_state, 4); |
2639 | 871 |
} |
867
581154a08a78
(svn r1348) -Feature: resizable windows. Read the comment in window.h to find out
truelight
parents:
845
diff
changeset
|
872 |
|
2556
a6f1c61fa5d0
(svn r3089) Fix possible issue with out-of-bounds array access in replace vehicle gui, and add brief commenting.
peter1138
parents:
2553
diff
changeset
|
873 |
// Disable the "Stop Replacing" button if: |
a6f1c61fa5d0
(svn r3089) Fix possible issue with out-of-bounds array access in replace vehicle gui, and add brief commenting.
peter1138
parents:
2553
diff
changeset
|
874 |
// The left list (existing vehicle) is empty |
a6f1c61fa5d0
(svn r3089) Fix possible issue with out-of-bounds array access in replace vehicle gui, and add brief commenting.
peter1138
parents:
2553
diff
changeset
|
875 |
// or The selected vehicle has no replacement set up |
2746
d96ce2fdc3e4
(svn r3291) - Codechange, Autoreplace: Replace int with EngineID and -1 with INVALID_ENGINE, as appropriate.
peter1138
parents:
2725
diff
changeset
|
876 |
if (selected_id[0] == INVALID_ENGINE || |
2848 | 877 |
!EngineHasReplacementForPlayer(p, selected_id[0])) { |
842 | 878 |
SETBIT(w->disabled_state, 6); |
2639 | 879 |
} else { |
842 | 880 |
CLRBIT(w->disabled_state, 6); |
2639 | 881 |
} |
867
581154a08a78
(svn r1348) -Feature: resizable windows. Read the comment in window.h to find out
truelight
parents:
845
diff
changeset
|
882 |
|
842 | 883 |
// now the actual drawing of the window itself takes place |
2375
0355db918128
(svn r2901) Refix 'replace window' with wrong string-etc. coordinates. Also clean up, and make window-title a bit more meaningful (specify vehicle type replaced)
Darkvater
parents:
2354
diff
changeset
|
884 |
SetDParam(0, _vehicle_type_names[WP(w, replaceveh_d).vehicletype - VEH_Train]); |
2617
a9e1a187de99
(svn r3155) -Feature: [autoreplace] autoreplace can now remove cars from too long trains
bjarni
parents:
2611
diff
changeset
|
885 |
|
a9e1a187de99
(svn r3155) -Feature: [autoreplace] autoreplace can now remove cars from too long trains
bjarni
parents:
2611
diff
changeset
|
886 |
if (WP(w, replaceveh_d).vehicletype == VEH_Train) { |
a9e1a187de99
(svn r3155) -Feature: [autoreplace] autoreplace can now remove cars from too long trains
bjarni
parents:
2611
diff
changeset
|
887 |
// set on/off for renew_keep_length |
a9e1a187de99
(svn r3155) -Feature: [autoreplace] autoreplace can now remove cars from too long trains
bjarni
parents:
2611
diff
changeset
|
888 |
SetDParam(1, p->renew_keep_length ? STR_CONFIG_PATCHES_ON : STR_CONFIG_PATCHES_OFF); |
2970
77fa46c313c0
(svn r3535) -Feature: [autoreplace] allow autoreplacing of train wagons
bjarni
parents:
2965
diff
changeset
|
889 |
|
77fa46c313c0
(svn r3535) -Feature: [autoreplace] allow autoreplacing of train wagons
bjarni
parents:
2965
diff
changeset
|
890 |
// set wagon/engine button |
77fa46c313c0
(svn r3535) -Feature: [autoreplace] allow autoreplacing of train wagons
bjarni
parents:
2965
diff
changeset
|
891 |
SetDParam(2, WP(w, replaceveh_d).wagon_btnstate ? STR_ENGINES : STR_WAGONS); |
2617
a9e1a187de99
(svn r3155) -Feature: [autoreplace] autoreplace can now remove cars from too long trains
bjarni
parents:
2611
diff
changeset
|
892 |
} |
a9e1a187de99
(svn r3155) -Feature: [autoreplace] autoreplace can now remove cars from too long trains
bjarni
parents:
2611
diff
changeset
|
893 |
|
842 | 894 |
DrawWindowWidgets(w); |
867
581154a08a78
(svn r1348) -Feature: resizable windows. Read the comment in window.h to find out
truelight
parents:
845
diff
changeset
|
895 |
|
842 | 896 |
// sets up the string for the vehicle that is being replaced to |
2746
d96ce2fdc3e4
(svn r3291) - Codechange, Autoreplace: Replace int with EngineID and -1 with INVALID_ENGINE, as appropriate.
peter1138
parents:
2725
diff
changeset
|
897 |
if (selected_id[0] != INVALID_ENGINE) { |
2848 | 898 |
if (!EngineHasReplacementForPlayer(p, selected_id[0])) { |
842 | 899 |
SetDParam(0, STR_NOT_REPLACING); |
2639 | 900 |
} else { |
2848 | 901 |
SetDParam(0, GetCustomEngineName(EngineReplacementForPlayer(p, selected_id[0]))); |
2639 | 902 |
} |
842 | 903 |
} else { |
904 |
SetDParam(0, STR_NOT_REPLACING_VEHICLE_SELECTED); |
|
905 |
} |
|
867
581154a08a78
(svn r1348) -Feature: resizable windows. Read the comment in window.h to find out
truelight
parents:
845
diff
changeset
|
906 |
|
2639 | 907 |
DrawString(145, (w->resize.step_height == 24 ? 67 : 87) + w->resize.step_height * w->vscroll.cap, STR_02BD, 0x10); |
867
581154a08a78
(svn r1348) -Feature: resizable windows. Read the comment in window.h to find out
truelight
parents:
845
diff
changeset
|
908 |
|
842 | 909 |
/* now we draw the two arrays according to what we just counted */ |
910 |
DrawEngineArrayInReplaceWindow(w, x, y, x2, y2, pos, pos2, sel[0], sel[1], selected_id[0], selected_id[1]); |
|
867
581154a08a78
(svn r1348) -Feature: resizable windows. Read the comment in window.h to find out
truelight
parents:
845
diff
changeset
|
911 |
|
842 | 912 |
WP(w,replaceveh_d).sel_engine[0] = selected_id[0]; |
913 |
WP(w,replaceveh_d).sel_engine[1] = selected_id[1]; |
|
914 |
/* now we draw the info about the vehicles we selected */ |
|
915 |
switch (WP(w,replaceveh_d).vehicletype) { |
|
916 |
case VEH_Train: { |
|
917 |
byte i = 0; |
|
918 |
int offset = 0; |
|
867
581154a08a78
(svn r1348) -Feature: resizable windows. Read the comment in window.h to find out
truelight
parents:
845
diff
changeset
|
919 |
|
2639 | 920 |
for (i = 0 ; i < 2 ; i++) { |
921 |
if (i > 0) offset = 228; |
|
2746
d96ce2fdc3e4
(svn r3291) - Codechange, Autoreplace: Replace int with EngineID and -1 with INVALID_ENGINE, as appropriate.
peter1138
parents:
2725
diff
changeset
|
922 |
if (selected_id[i] != INVALID_ENGINE) { |
2970
77fa46c313c0
(svn r3535) -Feature: [autoreplace] allow autoreplacing of train wagons
bjarni
parents:
2965
diff
changeset
|
923 |
if (WP(w, replaceveh_d).wagon_btnstate) { |
842 | 924 |
/* it's an engine */ |
1907
cebdef7a1c8a
(svn r2413) - Codechange: Rewrite the displaying of purchase details a bit, make it easyer to add lines later.
hackykid
parents:
1891
diff
changeset
|
925 |
DrawTrainEnginePurchaseInfo(2 + offset, 15 + (14 * w->vscroll.cap), selected_id[i]); |
842 | 926 |
} else { |
927 |
/* it's a wagon. Train cars are not replaced with the current GUI, but this code is ready for newgrf if anybody adds that*/ |
|
1907
cebdef7a1c8a
(svn r2413) - Codechange: Rewrite the displaying of purchase details a bit, make it easyer to add lines later.
hackykid
parents:
1891
diff
changeset
|
928 |
DrawTrainWagonPurchaseInfo(2 + offset, 15 + (14 * w->vscroll.cap), selected_id[i]); |
842 | 929 |
} |
930 |
} |
|
931 |
} |
|
932 |
break; |
|
933 |
} //end if case VEH_Train |
|
867
581154a08a78
(svn r1348) -Feature: resizable windows. Read the comment in window.h to find out
truelight
parents:
845
diff
changeset
|
934 |
|
842 | 935 |
case VEH_Road: { |
2746
d96ce2fdc3e4
(svn r3291) - Codechange, Autoreplace: Replace int with EngineID and -1 with INVALID_ENGINE, as appropriate.
peter1138
parents:
2725
diff
changeset
|
936 |
if (selected_id[0] != INVALID_ENGINE) { |
1907
cebdef7a1c8a
(svn r2413) - Codechange: Rewrite the displaying of purchase details a bit, make it easyer to add lines later.
hackykid
parents:
1891
diff
changeset
|
937 |
DrawRoadVehPurchaseInfo(2, 15 + (14 * w->vscroll.cap), selected_id[0]); |
2746
d96ce2fdc3e4
(svn r3291) - Codechange, Autoreplace: Replace int with EngineID and -1 with INVALID_ENGINE, as appropriate.
peter1138
parents:
2725
diff
changeset
|
938 |
if (selected_id[1] != INVALID_ENGINE) { |
1907
cebdef7a1c8a
(svn r2413) - Codechange: Rewrite the displaying of purchase details a bit, make it easyer to add lines later.
hackykid
parents:
1891
diff
changeset
|
939 |
DrawRoadVehPurchaseInfo(2 + 228, 15 + (14 * w->vscroll.cap), selected_id[1]); |
842 | 940 |
} |
941 |
} |
|
942 |
break; |
|
943 |
} // end of VEH_Road |
|
867
581154a08a78
(svn r1348) -Feature: resizable windows. Read the comment in window.h to find out
truelight
parents:
845
diff
changeset
|
944 |
|
842 | 945 |
case VEH_Ship: { |
2746
d96ce2fdc3e4
(svn r3291) - Codechange, Autoreplace: Replace int with EngineID and -1 with INVALID_ENGINE, as appropriate.
peter1138
parents:
2725
diff
changeset
|
946 |
if (selected_id[0] != INVALID_ENGINE) { |
1907
cebdef7a1c8a
(svn r2413) - Codechange: Rewrite the displaying of purchase details a bit, make it easyer to add lines later.
hackykid
parents:
1891
diff
changeset
|
947 |
DrawShipPurchaseInfo(2, 15 + (24 * w->vscroll.cap), selected_id[0]); |
2746
d96ce2fdc3e4
(svn r3291) - Codechange, Autoreplace: Replace int with EngineID and -1 with INVALID_ENGINE, as appropriate.
peter1138
parents:
2725
diff
changeset
|
948 |
if (selected_id[1] != INVALID_ENGINE) { |
1907
cebdef7a1c8a
(svn r2413) - Codechange: Rewrite the displaying of purchase details a bit, make it easyer to add lines later.
hackykid
parents:
1891
diff
changeset
|
949 |
DrawShipPurchaseInfo(2 + 228, 15 + (24 * w->vscroll.cap), selected_id[1]); |
842 | 950 |
} |
951 |
} |
|
952 |
break; |
|
867
581154a08a78
(svn r1348) -Feature: resizable windows. Read the comment in window.h to find out
truelight
parents:
845
diff
changeset
|
953 |
} // end of VEH_Ship |
581154a08a78
(svn r1348) -Feature: resizable windows. Read the comment in window.h to find out
truelight
parents:
845
diff
changeset
|
954 |
|
842 | 955 |
case VEH_Aircraft: { |
2746
d96ce2fdc3e4
(svn r3291) - Codechange, Autoreplace: Replace int with EngineID and -1 with INVALID_ENGINE, as appropriate.
peter1138
parents:
2725
diff
changeset
|
956 |
if (selected_id[0] != INVALID_ENGINE) { |
1907
cebdef7a1c8a
(svn r2413) - Codechange: Rewrite the displaying of purchase details a bit, make it easyer to add lines later.
hackykid
parents:
1891
diff
changeset
|
957 |
DrawAircraftPurchaseInfo(2, 15 + (24 * w->vscroll.cap), selected_id[0]); |
2746
d96ce2fdc3e4
(svn r3291) - Codechange, Autoreplace: Replace int with EngineID and -1 with INVALID_ENGINE, as appropriate.
peter1138
parents:
2725
diff
changeset
|
958 |
if (selected_id[1] != INVALID_ENGINE) { |
1907
cebdef7a1c8a
(svn r2413) - Codechange: Rewrite the displaying of purchase details a bit, make it easyer to add lines later.
hackykid
parents:
1891
diff
changeset
|
959 |
DrawAircraftPurchaseInfo(2 + 228, 15 + (24 * w->vscroll.cap), selected_id[1]); |
842 | 960 |
} |
961 |
} |
|
962 |
break; |
|
963 |
} // end of VEH_Aircraft |
|
964 |
} |
|
1462
f487048c5748
(svn r1966) - Fix: [ 1110437 ] Replace Vehicles GUI gets random clicks. Breaks people! Don't forget the breaks in switch() statements!!
Darkvater
parents:
1363
diff
changeset
|
965 |
} break; // end of paint |
842 | 966 |
|
967 |
case WE_CLICK: { |
|
2375
0355db918128
(svn r2901) Refix 'replace window' with wrong string-etc. coordinates. Also clean up, and make window-title a bit more meaningful (specify vehicle type replaced)
Darkvater
parents:
2354
diff
changeset
|
968 |
// these 3 variables is used if any of the lists is clicked |
0355db918128
(svn r2901) Refix 'replace window' with wrong string-etc. coordinates. Also clean up, and make window-title a bit more meaningful (specify vehicle type replaced)
Darkvater
parents:
2354
diff
changeset
|
969 |
uint16 click_scroll_pos = w->vscroll2.pos; |
0355db918128
(svn r2901) Refix 'replace window' with wrong string-etc. coordinates. Also clean up, and make window-title a bit more meaningful (specify vehicle type replaced)
Darkvater
parents:
2354
diff
changeset
|
970 |
uint16 click_scroll_cap = w->vscroll2.cap; |
0355db918128
(svn r2901) Refix 'replace window' with wrong string-etc. coordinates. Also clean up, and make window-title a bit more meaningful (specify vehicle type replaced)
Darkvater
parents:
2354
diff
changeset
|
971 |
byte click_side = 1; |
0355db918128
(svn r2901) Refix 'replace window' with wrong string-etc. coordinates. Also clean up, and make window-title a bit more meaningful (specify vehicle type replaced)
Darkvater
parents:
2354
diff
changeset
|
972 |
|
0355db918128
(svn r2901) Refix 'replace window' with wrong string-etc. coordinates. Also clean up, and make window-title a bit more meaningful (specify vehicle type replaced)
Darkvater
parents:
2354
diff
changeset
|
973 |
switch (e->click.widget) { |
2989 | 974 |
case 12: |
975 |
WP(w, replaceveh_d).wagon_btnstate = !(WP(w, replaceveh_d).wagon_btnstate); |
|
976 |
SetWindowDirty(w); |
|
977 |
break; |
|
978 |
||
979 |
case 14: |
|
980 |
case 15: /* Railtype selection dropdown menu */ |
|
2448
0a34e90cb31f
(svn r2974) -Fix: Drag and drop selection on drop down boxes didn't select correct item when some items were hidden.
peter1138
parents:
2436
diff
changeset
|
981 |
ShowDropDownMenu(w, _rail_types_list, _railtype_selected_in_replace_gui, 15, 0, ~GetPlayer(_local_player)->avail_railtypes); |
869 | 982 |
break; |
2989 | 983 |
|
984 |
case 17: /* toggle renew_keep_length */ |
|
2805
b6098e7ca457
(svn r3353) Simplify the automatic length adjustment algorithm for replacing trains: Use the length of the train before the replacement as reference length
tron
parents:
2753
diff
changeset
|
985 |
DoCommandP(0, 5, GetPlayer(_local_player)->renew_keep_length ? 0 : 1, NULL, CMD_REPLACE_VEHICLE); |
2989 | 986 |
break; |
987 |
||
2293
a71c210076be
(svn r2817) -Codechange: [autoreplace]: moved autoreplace and autorenew to serverside
bjarni
parents:
2288
diff
changeset
|
988 |
case 4: { /* Start replacing */ |
a71c210076be
(svn r2817) -Codechange: [autoreplace]: moved autoreplace and autorenew to serverside
bjarni
parents:
2288
diff
changeset
|
989 |
EngineID veh_from = WP(w, replaceveh_d).sel_engine[0]; |
a71c210076be
(svn r2817) -Codechange: [autoreplace]: moved autoreplace and autorenew to serverside
bjarni
parents:
2288
diff
changeset
|
990 |
EngineID veh_to = WP(w, replaceveh_d).sel_engine[1]; |
a71c210076be
(svn r2817) -Codechange: [autoreplace]: moved autoreplace and autorenew to serverside
bjarni
parents:
2288
diff
changeset
|
991 |
DoCommandP(0, 3, veh_from + (veh_to << 16), NULL, CMD_REPLACE_VEHICLE); |
842 | 992 |
break; |
993 |
} |
|
867
581154a08a78
(svn r1348) -Feature: resizable windows. Read the comment in window.h to find out
truelight
parents:
845
diff
changeset
|
994 |
|
2293
a71c210076be
(svn r2817) -Codechange: [autoreplace]: moved autoreplace and autorenew to serverside
bjarni
parents:
2288
diff
changeset
|
995 |
case 6: { /* Stop replacing */ |
a71c210076be
(svn r2817) -Codechange: [autoreplace]: moved autoreplace and autorenew to serverside
bjarni
parents:
2288
diff
changeset
|
996 |
EngineID veh_from = WP(w, replaceveh_d).sel_engine[0]; |
a71c210076be
(svn r2817) -Codechange: [autoreplace]: moved autoreplace and autorenew to serverside
bjarni
parents:
2288
diff
changeset
|
997 |
DoCommandP(0, 3, veh_from + (INVALID_ENGINE << 16), NULL, CMD_REPLACE_VEHICLE); |
842 | 998 |
break; |
999 |
} |
|
867
581154a08a78
(svn r1348) -Feature: resizable windows. Read the comment in window.h to find out
truelight
parents:
845
diff
changeset
|
1000 |
|
581154a08a78
(svn r1348) -Feature: resizable windows. Read the comment in window.h to find out
truelight
parents:
845
diff
changeset
|
1001 |
case 7: |
842 | 1002 |
// sets up that the left one was clicked. The default values are for the right one (9) |
1003 |
// this way, the code for 9 handles both sides |
|
1004 |
click_scroll_pos = w->vscroll.pos; |
|
1005 |
click_scroll_cap = w->vscroll.cap; |
|
1006 |
click_side = 0; |
|
2989 | 1007 |
/* FALL THROUGH */ |
1008 |
||
842 | 1009 |
case 9: { |
869 | 1010 |
uint i = (e->click.pt.y - 14) / w->resize.step_height; |
842 | 1011 |
if (i < click_scroll_cap) { |
1012 |
WP(w,replaceveh_d).sel_index[click_side] = i + click_scroll_pos; |
|
1013 |
SetWindowDirty(w); |
|
1014 |
} |
|
2989 | 1015 |
break; |
1016 |
} |
|
842 | 1017 |
} |
2989 | 1018 |
break; |
1019 |
} |
|
867
581154a08a78
(svn r1348) -Feature: resizable windows. Read the comment in window.h to find out
truelight
parents:
845
diff
changeset
|
1020 |
|
2989 | 1021 |
case WE_DROPDOWN_SELECT: /* we have selected a dropdown item in the list */ |
1178
ce85710f92ff
(svn r1680) Feature: Replace train GUI now remembers the railtype selected in the dropdown menu
bjarni
parents:
1177
diff
changeset
|
1022 |
_railtype_selected_in_replace_gui = e->dropdown.index; |
3414
35a7ea80eee7
(svn r4229) [elrail & autoreplace] Always show compatible rail vehicles in the left list, and only the selected rail type in the right list, to
peter1138
parents:
3393
diff
changeset
|
1023 |
/* Reset scrollbar positions */ |
35a7ea80eee7
(svn r4229) [elrail & autoreplace] Always show compatible rail vehicles in the left list, and only the selected rail type in the right list, to
peter1138
parents:
3393
diff
changeset
|
1024 |
w->vscroll.pos = 0; |
35a7ea80eee7
(svn r4229) [elrail & autoreplace] Always show compatible rail vehicles in the left list, and only the selected rail type in the right list, to
peter1138
parents:
3393
diff
changeset
|
1025 |
w->vscroll2.pos = 0; |
842 | 1026 |
SetWindowDirty(w); |
2989 | 1027 |
break; |
867
581154a08a78
(svn r1348) -Feature: resizable windows. Read the comment in window.h to find out
truelight
parents:
845
diff
changeset
|
1028 |
|
2989 | 1029 |
case WE_RESIZE: |
867
581154a08a78
(svn r1348) -Feature: resizable windows. Read the comment in window.h to find out
truelight
parents:
845
diff
changeset
|
1030 |
w->vscroll.cap += e->sizing.diff.y / (int)w->resize.step_height; |
581154a08a78
(svn r1348) -Feature: resizable windows. Read the comment in window.h to find out
truelight
parents:
845
diff
changeset
|
1031 |
w->vscroll2.cap += e->sizing.diff.y / (int)w->resize.step_height; |
581154a08a78
(svn r1348) -Feature: resizable windows. Read the comment in window.h to find out
truelight
parents:
845
diff
changeset
|
1032 |
|
581154a08a78
(svn r1348) -Feature: resizable windows. Read the comment in window.h to find out
truelight
parents:
845
diff
changeset
|
1033 |
w->widget[7].unkA = (w->vscroll.cap << 8) + 1; |
581154a08a78
(svn r1348) -Feature: resizable windows. Read the comment in window.h to find out
truelight
parents:
845
diff
changeset
|
1034 |
w->widget[9].unkA = (w->vscroll2.cap << 8) + 1; |
2989 | 1035 |
break; |
842 | 1036 |
} |
1037 |
} |
|
1038 |
||
1039 |
static const Widget _replace_rail_vehicle_widgets[] = { |
|
1465
c3fda8e8edf6
(svn r1969) - GUI: Replace vehicle dropdown menu now looks a bit more comform the ones used throughout the game.
Darkvater
parents:
1462
diff
changeset
|
1040 |
{ WWT_CLOSEBOX, RESIZE_NONE, 14, 0, 10, 0, 13, STR_00C5, STR_018B_CLOSE_WINDOW}, |
869 | 1041 |
{ WWT_CAPTION, RESIZE_NONE, 14, 11, 443, 0, 13, STR_REPLACE_VEHICLES_WHITE, STR_018C_WINDOW_TITLE_DRAG_THIS}, |
2375
0355db918128
(svn r2901) Refix 'replace window' with wrong string-etc. coordinates. Also clean up, and make window-title a bit more meaningful (specify vehicle type replaced)
Darkvater
parents:
2354
diff
changeset
|
1042 |
{ WWT_STICKYBOX, RESIZE_NONE, 14, 444, 455, 0, 13, STR_NULL, STR_STICKY_BUTTON}, |
0355db918128
(svn r2901) Refix 'replace window' with wrong string-etc. coordinates. Also clean up, and make window-title a bit more meaningful (specify vehicle type replaced)
Darkvater
parents:
2354
diff
changeset
|
1043 |
{ WWT_PANEL, RESIZE_TB, 14, 0, 227, 126, 197, STR_NULL, STR_NULL}, |
1923
f30ab832ecf7
(svn r2429) - Fix: Oops, forgot to increase the size of the autoreplace window to fit the extra info from powered wagons.
hackykid
parents:
1907
diff
changeset
|
1044 |
{ WWT_PUSHTXTBTN, RESIZE_TB, 14, 0, 138, 210, 221, STR_REPLACE_VEHICLES_START, STR_REPLACE_HELP_START_BUTTON}, |
2375
0355db918128
(svn r2901) Refix 'replace window' with wrong string-etc. coordinates. Also clean up, and make window-title a bit more meaningful (specify vehicle type replaced)
Darkvater
parents:
2354
diff
changeset
|
1045 |
{ WWT_PANEL, RESIZE_TB, 14, 139, 316, 198, 209, STR_NULL, STR_REPLACE_HELP_REPLACE_INFO_TAB}, |
1923
f30ab832ecf7
(svn r2429) - Fix: Oops, forgot to increase the size of the autoreplace window to fit the extra info from powered wagons.
hackykid
parents:
1907
diff
changeset
|
1046 |
{ WWT_PUSHTXTBTN, RESIZE_TB, 14, 306, 443, 210, 221, STR_REPLACE_VEHICLES_STOP, STR_REPLACE_HELP_STOP_BUTTON}, |
1465
c3fda8e8edf6
(svn r1969) - GUI: Replace vehicle dropdown menu now looks a bit more comform the ones used throughout the game.
Darkvater
parents:
1462
diff
changeset
|
1047 |
{ WWT_MATRIX, RESIZE_BOTTOM, 14, 0, 215, 14, 125, 0x801, STR_REPLACE_HELP_LEFT_ARRAY}, |
2375
0355db918128
(svn r2901) Refix 'replace window' with wrong string-etc. coordinates. Also clean up, and make window-title a bit more meaningful (specify vehicle type replaced)
Darkvater
parents:
2354
diff
changeset
|
1048 |
{ WWT_SCROLLBAR, RESIZE_BOTTOM, 14, 216, 227, 14, 125, STR_NULL, STR_0190_SCROLL_BAR_SCROLLS_LIST}, |
1465
c3fda8e8edf6
(svn r1969) - GUI: Replace vehicle dropdown menu now looks a bit more comform the ones used throughout the game.
Darkvater
parents:
1462
diff
changeset
|
1049 |
{ WWT_MATRIX, RESIZE_BOTTOM, 14, 228, 443, 14, 125, 0x801, STR_REPLACE_HELP_RIGHT_ARRAY}, |
2375
0355db918128
(svn r2901) Refix 'replace window' with wrong string-etc. coordinates. Also clean up, and make window-title a bit more meaningful (specify vehicle type replaced)
Darkvater
parents:
2354
diff
changeset
|
1050 |
{ WWT_SCROLL2BAR, RESIZE_BOTTOM, 14, 444, 455, 14, 125, STR_NULL, STR_0190_SCROLL_BAR_SCROLLS_LIST}, |
0355db918128
(svn r2901) Refix 'replace window' with wrong string-etc. coordinates. Also clean up, and make window-title a bit more meaningful (specify vehicle type replaced)
Darkvater
parents:
2354
diff
changeset
|
1051 |
{ WWT_PANEL, RESIZE_TB, 14, 228, 455, 126, 197, STR_NULL, STR_NULL}, |
869 | 1052 |
// train specific stuff |
2970
77fa46c313c0
(svn r3535) -Feature: [autoreplace] allow autoreplacing of train wagons
bjarni
parents:
2965
diff
changeset
|
1053 |
{ WWT_PUSHTXTBTN, RESIZE_TB, 14, 0, 138, 198, 209, STR_REPLACE_ENGINE_WAGON_SELECT, STR_REPLACE_ENGINE_WAGON_SELECT_HELP}, // widget 12 |
2375
0355db918128
(svn r2901) Refix 'replace window' with wrong string-etc. coordinates. Also clean up, and make window-title a bit more meaningful (specify vehicle type replaced)
Darkvater
parents:
2354
diff
changeset
|
1054 |
{ WWT_PANEL, RESIZE_TB, 14, 139, 153, 210, 221, STR_NULL, STR_NULL}, |
0355db918128
(svn r2901) Refix 'replace window' with wrong string-etc. coordinates. Also clean up, and make window-title a bit more meaningful (specify vehicle type replaced)
Darkvater
parents:
2354
diff
changeset
|
1055 |
{ WWT_PANEL, RESIZE_TB, 14, 154, 277, 210, 221, STR_NULL, STR_REPLACE_HELP_RAILTYPE}, |
2725
5c632bc5be28
(svn r3270) Correct all (mis)uses of WWT_CLOSEBOX / WWT_TEXTBTN to reflect their actual use, and add "Close Window" tooltip where missing.
peter1138
parents:
2697
diff
changeset
|
1056 |
{ WWT_TEXTBTN, RESIZE_TB, 14, 278, 289, 210, 221, STR_0225, STR_REPLACE_HELP_RAILTYPE}, |
2375
0355db918128
(svn r2901) Refix 'replace window' with wrong string-etc. coordinates. Also clean up, and make window-title a bit more meaningful (specify vehicle type replaced)
Darkvater
parents:
2354
diff
changeset
|
1057 |
{ WWT_PANEL, RESIZE_TB, 14, 290, 305, 210, 221, STR_NULL, STR_NULL}, |
2617
a9e1a187de99
(svn r3155) -Feature: [autoreplace] autoreplace can now remove cars from too long trains
bjarni
parents:
2611
diff
changeset
|
1058 |
{ WWT_PUSHTXTBTN, RESIZE_TB, 14, 317, 455, 198, 209, STR_REPLACE_REMOVE_WAGON, STR_REPLACE_REMOVE_WAGON_HELP}, |
869 | 1059 |
// end of train specific stuff |
2375
0355db918128
(svn r2901) Refix 'replace window' with wrong string-etc. coordinates. Also clean up, and make window-title a bit more meaningful (specify vehicle type replaced)
Darkvater
parents:
2354
diff
changeset
|
1060 |
{ WWT_RESIZEBOX, RESIZE_TB, 14, 444, 455, 210, 221, STR_NULL, STR_RESIZE_BUTTON}, |
842 | 1061 |
{ WIDGETS_END}, |
1062 |
}; |
|
1063 |
||
1064 |
static const Widget _replace_road_vehicle_widgets[] = { |
|
1465
c3fda8e8edf6
(svn r1969) - GUI: Replace vehicle dropdown menu now looks a bit more comform the ones used throughout the game.
Darkvater
parents:
1462
diff
changeset
|
1065 |
{ WWT_CLOSEBOX, RESIZE_NONE, 14, 0, 10, 0, 13, STR_00C5, STR_018B_CLOSE_WINDOW}, |
c3fda8e8edf6
(svn r1969) - GUI: Replace vehicle dropdown menu now looks a bit more comform the ones used throughout the game.
Darkvater
parents:
1462
diff
changeset
|
1066 |
{ WWT_CAPTION, RESIZE_NONE, 14, 11, 443, 0, 13, STR_REPLACE_VEHICLES_WHITE, STR_018C_WINDOW_TITLE_DRAG_THIS}, |
2375
0355db918128
(svn r2901) Refix 'replace window' with wrong string-etc. coordinates. Also clean up, and make window-title a bit more meaningful (specify vehicle type replaced)
Darkvater
parents:
2354
diff
changeset
|
1067 |
{ WWT_STICKYBOX, RESIZE_NONE, 14, 444, 455, 0, 13, STR_NULL, STR_STICKY_BUTTON}, |
0355db918128
(svn r2901) Refix 'replace window' with wrong string-etc. coordinates. Also clean up, and make window-title a bit more meaningful (specify vehicle type replaced)
Darkvater
parents:
2354
diff
changeset
|
1068 |
{ WWT_PANEL, RESIZE_TB, 14, 0, 227, 126, 197, STR_NULL, STR_NULL}, |
0355db918128
(svn r2901) Refix 'replace window' with wrong string-etc. coordinates. Also clean up, and make window-title a bit more meaningful (specify vehicle type replaced)
Darkvater
parents:
2354
diff
changeset
|
1069 |
{ WWT_PUSHTXTBTN, RESIZE_TB, 14, 0, 138, 198, 209, STR_REPLACE_VEHICLES_START, STR_REPLACE_HELP_START_BUTTON}, |
0355db918128
(svn r2901) Refix 'replace window' with wrong string-etc. coordinates. Also clean up, and make window-title a bit more meaningful (specify vehicle type replaced)
Darkvater
parents:
2354
diff
changeset
|
1070 |
{ WWT_PANEL, RESIZE_TB, 14, 139, 305, 198, 209, STR_NULL, STR_REPLACE_HELP_REPLACE_INFO_TAB}, |
0355db918128
(svn r2901) Refix 'replace window' with wrong string-etc. coordinates. Also clean up, and make window-title a bit more meaningful (specify vehicle type replaced)
Darkvater
parents:
2354
diff
changeset
|
1071 |
{ WWT_PUSHTXTBTN, RESIZE_TB, 14, 306, 443, 198, 209, STR_REPLACE_VEHICLES_STOP, STR_REPLACE_HELP_STOP_BUTTON}, |
1465
c3fda8e8edf6
(svn r1969) - GUI: Replace vehicle dropdown menu now looks a bit more comform the ones used throughout the game.
Darkvater
parents:
1462
diff
changeset
|
1072 |
{ WWT_MATRIX, RESIZE_BOTTOM, 14, 0, 215, 14, 125, 0x801, STR_REPLACE_HELP_LEFT_ARRAY}, |
2375
0355db918128
(svn r2901) Refix 'replace window' with wrong string-etc. coordinates. Also clean up, and make window-title a bit more meaningful (specify vehicle type replaced)
Darkvater
parents:
2354
diff
changeset
|
1073 |
{ WWT_SCROLLBAR, RESIZE_BOTTOM, 14, 216, 227, 14, 125, STR_NULL, STR_0190_SCROLL_BAR_SCROLLS_LIST}, |
1465
c3fda8e8edf6
(svn r1969) - GUI: Replace vehicle dropdown menu now looks a bit more comform the ones used throughout the game.
Darkvater
parents:
1462
diff
changeset
|
1074 |
{ WWT_MATRIX, RESIZE_BOTTOM, 14, 228, 443, 14, 125, 0x801, STR_REPLACE_HELP_RIGHT_ARRAY}, |
2375
0355db918128
(svn r2901) Refix 'replace window' with wrong string-etc. coordinates. Also clean up, and make window-title a bit more meaningful (specify vehicle type replaced)
Darkvater
parents:
2354
diff
changeset
|
1075 |
{ WWT_SCROLL2BAR, RESIZE_BOTTOM, 14, 444, 455, 14, 125, STR_NULL, STR_0190_SCROLL_BAR_SCROLLS_LIST}, |
0355db918128
(svn r2901) Refix 'replace window' with wrong string-etc. coordinates. Also clean up, and make window-title a bit more meaningful (specify vehicle type replaced)
Darkvater
parents:
2354
diff
changeset
|
1076 |
{ WWT_PANEL, RESIZE_TB, 14, 228, 455, 126, 197, STR_NULL, STR_NULL}, |
0355db918128
(svn r2901) Refix 'replace window' with wrong string-etc. coordinates. Also clean up, and make window-title a bit more meaningful (specify vehicle type replaced)
Darkvater
parents:
2354
diff
changeset
|
1077 |
{ WWT_RESIZEBOX, RESIZE_TB, 14, 444, 455, 198, 209, STR_NULL, STR_RESIZE_BUTTON}, |
842 | 1078 |
{ WIDGETS_END}, |
1079 |
}; |
|
1080 |
||
1081 |
static const Widget _replace_ship_aircraft_vehicle_widgets[] = { |
|
1465
c3fda8e8edf6
(svn r1969) - GUI: Replace vehicle dropdown menu now looks a bit more comform the ones used throughout the game.
Darkvater
parents:
1462
diff
changeset
|
1082 |
{ WWT_CLOSEBOX, RESIZE_NONE, 14, 0, 10, 0, 13, STR_00C5, STR_018B_CLOSE_WINDOW}, |
c3fda8e8edf6
(svn r1969) - GUI: Replace vehicle dropdown menu now looks a bit more comform the ones used throughout the game.
Darkvater
parents:
1462
diff
changeset
|
1083 |
{ WWT_CAPTION, RESIZE_NONE, 14, 11, 443, 0, 13, STR_REPLACE_VEHICLES_WHITE, STR_018C_WINDOW_TITLE_DRAG_THIS}, |
2375
0355db918128
(svn r2901) Refix 'replace window' with wrong string-etc. coordinates. Also clean up, and make window-title a bit more meaningful (specify vehicle type replaced)
Darkvater
parents:
2354
diff
changeset
|
1084 |
{ WWT_STICKYBOX, RESIZE_NONE, 14, 444, 455, 0, 13, STR_NULL, STR_STICKY_BUTTON}, |
0355db918128
(svn r2901) Refix 'replace window' with wrong string-etc. coordinates. Also clean up, and make window-title a bit more meaningful (specify vehicle type replaced)
Darkvater
parents:
2354
diff
changeset
|
1085 |
{ WWT_PANEL, RESIZE_TB, 14, 0, 227, 110, 161, STR_NULL, STR_NULL}, |
1465
c3fda8e8edf6
(svn r1969) - GUI: Replace vehicle dropdown menu now looks a bit more comform the ones used throughout the game.
Darkvater
parents:
1462
diff
changeset
|
1086 |
{ WWT_PUSHTXTBTN, RESIZE_TB, 14, 0, 138, 162, 173, STR_REPLACE_VEHICLES_START, STR_REPLACE_HELP_START_BUTTON}, |
2375
0355db918128
(svn r2901) Refix 'replace window' with wrong string-etc. coordinates. Also clean up, and make window-title a bit more meaningful (specify vehicle type replaced)
Darkvater
parents:
2354
diff
changeset
|
1087 |
{ WWT_PANEL, RESIZE_TB, 14, 139, 305, 162, 173, STR_NULL, STR_REPLACE_HELP_REPLACE_INFO_TAB}, |
1465
c3fda8e8edf6
(svn r1969) - GUI: Replace vehicle dropdown menu now looks a bit more comform the ones used throughout the game.
Darkvater
parents:
1462
diff
changeset
|
1088 |
{ WWT_PUSHTXTBTN, RESIZE_TB, 14, 306, 443, 162, 173, STR_REPLACE_VEHICLES_STOP, STR_REPLACE_HELP_STOP_BUTTON}, |
c3fda8e8edf6
(svn r1969) - GUI: Replace vehicle dropdown menu now looks a bit more comform the ones used throughout the game.
Darkvater
parents:
1462
diff
changeset
|
1089 |
{ WWT_MATRIX, RESIZE_BOTTOM, 14, 0, 215, 14, 109, 0x401, STR_REPLACE_HELP_LEFT_ARRAY}, |
2375
0355db918128
(svn r2901) Refix 'replace window' with wrong string-etc. coordinates. Also clean up, and make window-title a bit more meaningful (specify vehicle type replaced)
Darkvater
parents:
2354
diff
changeset
|
1090 |
{ WWT_SCROLLBAR, RESIZE_BOTTOM, 14, 216, 227, 14, 109, STR_NULL, STR_0190_SCROLL_BAR_SCROLLS_LIST}, |
1465
c3fda8e8edf6
(svn r1969) - GUI: Replace vehicle dropdown menu now looks a bit more comform the ones used throughout the game.
Darkvater
parents:
1462
diff
changeset
|
1091 |
{ WWT_MATRIX, RESIZE_BOTTOM, 14, 228, 443, 14, 109, 0x401, STR_REPLACE_HELP_RIGHT_ARRAY}, |
2375
0355db918128
(svn r2901) Refix 'replace window' with wrong string-etc. coordinates. Also clean up, and make window-title a bit more meaningful (specify vehicle type replaced)
Darkvater
parents:
2354
diff
changeset
|
1092 |
{ WWT_SCROLL2BAR, RESIZE_BOTTOM, 14, 444, 455, 14, 109, STR_NULL, STR_0190_SCROLL_BAR_SCROLLS_LIST}, |
0355db918128
(svn r2901) Refix 'replace window' with wrong string-etc. coordinates. Also clean up, and make window-title a bit more meaningful (specify vehicle type replaced)
Darkvater
parents:
2354
diff
changeset
|
1093 |
{ WWT_PANEL, RESIZE_TB, 14, 228, 455, 110, 161, STR_NULL, STR_NULL}, |
0355db918128
(svn r2901) Refix 'replace window' with wrong string-etc. coordinates. Also clean up, and make window-title a bit more meaningful (specify vehicle type replaced)
Darkvater
parents:
2354
diff
changeset
|
1094 |
{ WWT_RESIZEBOX, RESIZE_TB, 14, 444, 455, 162, 173, STR_NULL, STR_RESIZE_BUTTON}, |
842 | 1095 |
{ WIDGETS_END}, |
1096 |
}; |
|
1097 |
||
1098 |
static const WindowDesc _replace_rail_vehicle_desc = { |
|
1923
f30ab832ecf7
(svn r2429) - Fix: Oops, forgot to increase the size of the autoreplace window to fit the extra info from powered wagons.
hackykid
parents:
1907
diff
changeset
|
1099 |
-1, -1, 456, 222, |
842 | 1100 |
WC_REPLACE_VEHICLE,0, |
867
581154a08a78
(svn r1348) -Feature: resizable windows. Read the comment in window.h to find out
truelight
parents:
845
diff
changeset
|
1101 |
WDF_STD_TOOLTIPS | WDF_STD_BTN | WDF_DEF_WIDGET | WDF_UNCLICK_BUTTONS | WDF_STICKY_BUTTON | WDF_RESIZABLE, |
842 | 1102 |
_replace_rail_vehicle_widgets, |
1103 |
ReplaceVehicleWndProc |
|
1104 |
}; |
|
1105 |
||
1106 |
static const WindowDesc _replace_road_vehicle_desc = { |
|
2375
0355db918128
(svn r2901) Refix 'replace window' with wrong string-etc. coordinates. Also clean up, and make window-title a bit more meaningful (specify vehicle type replaced)
Darkvater
parents:
2354
diff
changeset
|
1107 |
-1, -1, 456, 210, |
842 | 1108 |
WC_REPLACE_VEHICLE,0, |
867
581154a08a78
(svn r1348) -Feature: resizable windows. Read the comment in window.h to find out
truelight
parents:
845
diff
changeset
|
1109 |
WDF_STD_TOOLTIPS | WDF_STD_BTN | WDF_DEF_WIDGET | WDF_UNCLICK_BUTTONS | WDF_STICKY_BUTTON | WDF_RESIZABLE, |
842 | 1110 |
_replace_road_vehicle_widgets, |
1111 |
ReplaceVehicleWndProc |
|
1112 |
}; |
|
1113 |
||
1114 |
static const WindowDesc _replace_ship_aircraft_vehicle_desc = { |
|
1115 |
-1, -1, 456, 174, |
|
1116 |
WC_REPLACE_VEHICLE,0, |
|
867
581154a08a78
(svn r1348) -Feature: resizable windows. Read the comment in window.h to find out
truelight
parents:
845
diff
changeset
|
1117 |
WDF_STD_TOOLTIPS | WDF_STD_BTN | WDF_DEF_WIDGET | WDF_UNCLICK_BUTTONS | WDF_STICKY_BUTTON | WDF_RESIZABLE, |
842 | 1118 |
_replace_ship_aircraft_vehicle_widgets, |
1119 |
ReplaceVehicleWndProc |
|
1120 |
}; |
|
1121 |
||
1122 |
||
1123 |
void ShowReplaceVehicleWindow(byte vehicletype) |
|
1124 |
{ |
|
1125 |
Window *w; |
|
867
581154a08a78
(svn r1348) -Feature: resizable windows. Read the comment in window.h to find out
truelight
parents:
845
diff
changeset
|
1126 |
|
2549 | 1127 |
DeleteWindowById(WC_REPLACE_VEHICLE, vehicletype); |
867
581154a08a78
(svn r1348) -Feature: resizable windows. Read the comment in window.h to find out
truelight
parents:
845
diff
changeset
|
1128 |
|
842 | 1129 |
switch (vehicletype) { |
1130 |
case VEH_Train: |
|
1131 |
w = AllocateWindowDescFront(&_replace_rail_vehicle_desc, vehicletype); |
|
1132 |
w->vscroll.cap = 8; |
|
867
581154a08a78
(svn r1348) -Feature: resizable windows. Read the comment in window.h to find out
truelight
parents:
845
diff
changeset
|
1133 |
w->resize.step_height = 14; |
2970
77fa46c313c0
(svn r3535) -Feature: [autoreplace] allow autoreplacing of train wagons
bjarni
parents:
2965
diff
changeset
|
1134 |
WP(w, replaceveh_d).wagon_btnstate = true; |
842 | 1135 |
break; |
1136 |
case VEH_Road: |
|
1137 |
w = AllocateWindowDescFront(&_replace_road_vehicle_desc, vehicletype); |
|
1138 |
w->vscroll.cap = 8; |
|
867
581154a08a78
(svn r1348) -Feature: resizable windows. Read the comment in window.h to find out
truelight
parents:
845
diff
changeset
|
1139 |
w->resize.step_height = 14; |
842 | 1140 |
break; |
2549 | 1141 |
case VEH_Ship: |
1142 |
case VEH_Aircraft: |
|
842 | 1143 |
w = AllocateWindowDescFront(&_replace_ship_aircraft_vehicle_desc, vehicletype); |
1144 |
w->vscroll.cap = 4; |
|
867
581154a08a78
(svn r1348) -Feature: resizable windows. Read the comment in window.h to find out
truelight
parents:
845
diff
changeset
|
1145 |
w->resize.step_height = 24; |
842 | 1146 |
break; |
845
0c66e26fecb2
(svn r1326) fixed compiler warnings in vehicle_gui.c and widget.c
bjarni
parents:
843
diff
changeset
|
1147 |
default: return; |
842 | 1148 |
} |
869 | 1149 |
w->caption_color = _local_player; |
842 | 1150 |
WP(w,replaceveh_d).vehicletype = vehicletype; |
1151 |
w->vscroll2.cap = w->vscroll.cap; // these two are always the same |
|
1152 |
} |
|
1246
45f15251412b
(svn r1750) - Feature: [ 1093261 ] Saving vehicle sorting criteria for each vehicle type (bociusz)
darkvater
parents:
1191
diff
changeset
|
1153 |
|
45f15251412b
(svn r1750) - Feature: [ 1093261 ] Saving vehicle sorting criteria for each vehicle type (bociusz)
darkvater
parents:
1191
diff
changeset
|
1154 |
void InitializeGUI(void) |
45f15251412b
(svn r1750) - Feature: [ 1093261 ] Saving vehicle sorting criteria for each vehicle type (bociusz)
darkvater
parents:
1191
diff
changeset
|
1155 |
{ |
45f15251412b
(svn r1750) - Feature: [ 1093261 ] Saving vehicle sorting criteria for each vehicle type (bociusz)
darkvater
parents:
1191
diff
changeset
|
1156 |
memset(&_sorting, 0, sizeof(_sorting)); |
45f15251412b
(svn r1750) - Feature: [ 1093261 ] Saving vehicle sorting criteria for each vehicle type (bociusz)
darkvater
parents:
1191
diff
changeset
|
1157 |
} |
2552
fb174febb0b1
(svn r3081) -Codechange: [autoreplace] complete rewrite of autoreplace
bjarni
parents:
2549
diff
changeset
|
1158 |
|
fb174febb0b1
(svn r3081) -Codechange: [autoreplace] complete rewrite of autoreplace
bjarni
parents:
2549
diff
changeset
|
1159 |
/** Assigns an already open vehicle window to a new vehicle. |
2639 | 1160 |
* Assigns an already open vehicle window to a new vehicle. If the vehicle got |
1161 |
* any sub window open (orders and so on) it will change owner too. |
|
1162 |
* @param *from_v the current owner of the window |
|
1163 |
* @param *to_v the new owner of the window |
|
1164 |
*/ |
|
2552
fb174febb0b1
(svn r3081) -Codechange: [autoreplace] complete rewrite of autoreplace
bjarni
parents:
2549
diff
changeset
|
1165 |
void ChangeVehicleViewWindow(const Vehicle *from_v, const Vehicle *to_v) |
fb174febb0b1
(svn r3081) -Codechange: [autoreplace] complete rewrite of autoreplace
bjarni
parents:
2549
diff
changeset
|
1166 |
{ |
fb174febb0b1
(svn r3081) -Codechange: [autoreplace] complete rewrite of autoreplace
bjarni
parents:
2549
diff
changeset
|
1167 |
Window *w; |
fb174febb0b1
(svn r3081) -Codechange: [autoreplace] complete rewrite of autoreplace
bjarni
parents:
2549
diff
changeset
|
1168 |
|
fb174febb0b1
(svn r3081) -Codechange: [autoreplace] complete rewrite of autoreplace
bjarni
parents:
2549
diff
changeset
|
1169 |
w = FindWindowById(WC_VEHICLE_VIEW, from_v->index); |
fb174febb0b1
(svn r3081) -Codechange: [autoreplace] complete rewrite of autoreplace
bjarni
parents:
2549
diff
changeset
|
1170 |
if (w != NULL) { |
fb174febb0b1
(svn r3081) -Codechange: [autoreplace] complete rewrite of autoreplace
bjarni
parents:
2549
diff
changeset
|
1171 |
w->window_number = to_v->index; |
2639 | 1172 |
WP(w, vp_d).follow_vehicle = to_v->index; |
2552
fb174febb0b1
(svn r3081) -Codechange: [autoreplace] complete rewrite of autoreplace
bjarni
parents:
2549
diff
changeset
|
1173 |
SetWindowDirty(w); |
fb174febb0b1
(svn r3081) -Codechange: [autoreplace] complete rewrite of autoreplace
bjarni
parents:
2549
diff
changeset
|
1174 |
|
fb174febb0b1
(svn r3081) -Codechange: [autoreplace] complete rewrite of autoreplace
bjarni
parents:
2549
diff
changeset
|
1175 |
w = FindWindowById(WC_VEHICLE_ORDERS, from_v->index); |
fb174febb0b1
(svn r3081) -Codechange: [autoreplace] complete rewrite of autoreplace
bjarni
parents:
2549
diff
changeset
|
1176 |
if (w != NULL) { |
fb174febb0b1
(svn r3081) -Codechange: [autoreplace] complete rewrite of autoreplace
bjarni
parents:
2549
diff
changeset
|
1177 |
w->window_number = to_v->index; |
fb174febb0b1
(svn r3081) -Codechange: [autoreplace] complete rewrite of autoreplace
bjarni
parents:
2549
diff
changeset
|
1178 |
SetWindowDirty(w); |
fb174febb0b1
(svn r3081) -Codechange: [autoreplace] complete rewrite of autoreplace
bjarni
parents:
2549
diff
changeset
|
1179 |
} |
fb174febb0b1
(svn r3081) -Codechange: [autoreplace] complete rewrite of autoreplace
bjarni
parents:
2549
diff
changeset
|
1180 |
|
fb174febb0b1
(svn r3081) -Codechange: [autoreplace] complete rewrite of autoreplace
bjarni
parents:
2549
diff
changeset
|
1181 |
w = FindWindowById(WC_VEHICLE_REFIT, from_v->index); |
fb174febb0b1
(svn r3081) -Codechange: [autoreplace] complete rewrite of autoreplace
bjarni
parents:
2549
diff
changeset
|
1182 |
if (w != NULL) { |
fb174febb0b1
(svn r3081) -Codechange: [autoreplace] complete rewrite of autoreplace
bjarni
parents:
2549
diff
changeset
|
1183 |
w->window_number = to_v->index; |
fb174febb0b1
(svn r3081) -Codechange: [autoreplace] complete rewrite of autoreplace
bjarni
parents:
2549
diff
changeset
|
1184 |
SetWindowDirty(w); |
fb174febb0b1
(svn r3081) -Codechange: [autoreplace] complete rewrite of autoreplace
bjarni
parents:
2549
diff
changeset
|
1185 |
} |
fb174febb0b1
(svn r3081) -Codechange: [autoreplace] complete rewrite of autoreplace
bjarni
parents:
2549
diff
changeset
|
1186 |
|
fb174febb0b1
(svn r3081) -Codechange: [autoreplace] complete rewrite of autoreplace
bjarni
parents:
2549
diff
changeset
|
1187 |
w = FindWindowById(WC_VEHICLE_DETAILS, from_v->index); |
fb174febb0b1
(svn r3081) -Codechange: [autoreplace] complete rewrite of autoreplace
bjarni
parents:
2549
diff
changeset
|
1188 |
if (w != NULL) { |
fb174febb0b1
(svn r3081) -Codechange: [autoreplace] complete rewrite of autoreplace
bjarni
parents:
2549
diff
changeset
|
1189 |
w->window_number = to_v->index; |
fb174febb0b1
(svn r3081) -Codechange: [autoreplace] complete rewrite of autoreplace
bjarni
parents:
2549
diff
changeset
|
1190 |
SetWindowDirty(w); |
fb174febb0b1
(svn r3081) -Codechange: [autoreplace] complete rewrite of autoreplace
bjarni
parents:
2549
diff
changeset
|
1191 |
} |
fb174febb0b1
(svn r3081) -Codechange: [autoreplace] complete rewrite of autoreplace
bjarni
parents:
2549
diff
changeset
|
1192 |
} |
fb174febb0b1
(svn r3081) -Codechange: [autoreplace] complete rewrite of autoreplace
bjarni
parents:
2549
diff
changeset
|
1193 |
} |