author | rubidium |
Thu, 01 Feb 2007 15:49:12 +0000 | |
changeset 5893 | 7e431a4abebb |
parent 5609 | dc6a58930ba4 |
child 5924 | f9e5c4f44bc5 |
permissions | -rw-r--r-- |
2186 | 1 |
/* $Id$ */ |
2 |
||
0 | 3 |
#include "stdafx.h" |
1891
862800791170
(svn r2397) - CodeChange: rename all "ttd" files to "openttd" files.
Darkvater
parents:
1883
diff
changeset
|
4 |
#include "openttd.h" |
3686
16627c28741d
(svn r4611) - NewGRF: introduce new vehicle sprite group resolver code. This also fixes some known bugs (e.g. the 'Standard Five' in UKRS is now the correct colour)
peter1138
parents:
3684
diff
changeset
|
5 |
#include "variables.h" |
1299
39c06aba09aa
(svn r1803) Move debugging stuff into files of it's own
tron
parents:
1197
diff
changeset
|
6 |
#include "debug.h" |
2163
b17b313113a0
(svn r2673) Include functions.h directly, not globally via openttd.h
tron
parents:
2159
diff
changeset
|
7 |
#include "functions.h" |
0 | 8 |
#include "engine.h" |
3686
16627c28741d
(svn r4611) - NewGRF: introduce new vehicle sprite group resolver code. This also fixes some known bugs (e.g. the 'Standard Five' in UKRS is now the correct colour)
peter1138
parents:
3684
diff
changeset
|
9 |
#include "train.h" |
16627c28741d
(svn r4611) - NewGRF: introduce new vehicle sprite group resolver code. This also fixes some known bugs (e.g. the 'Standard Five' in UKRS is now the correct colour)
peter1138
parents:
3684
diff
changeset
|
10 |
#include "player.h" |
3702
219fc5d61455
(svn r4643) - NewGRF: Add support for ttdp aircraft states. This involves mapping from our own state. (heavily based on mart3p's code)
peter1138
parents:
3696
diff
changeset
|
11 |
#include "station.h" |
219fc5d61455
(svn r4643) - NewGRF: Add support for ttdp aircraft states. This involves mapping from our own state. (heavily based on mart3p's code)
peter1138
parents:
3696
diff
changeset
|
12 |
#include "airport.h" |
3924
d06b513d65c3
(svn r5059) - NewGRF: store a GRFFile pointer reference for each pointer, instead of just the GRF ID.
peter1138
parents:
3920
diff
changeset
|
13 |
#include "newgrf.h" |
2982
eb7f50dcb249
(svn r3557) - NewGRF: move callback enums to a new file as more than just engines will use them
peter1138
parents:
2971
diff
changeset
|
14 |
#include "newgrf_callbacks.h" |
2962
f0a49b646c48
(svn r3524) - Split newgrf features from engine.[ch] into newgrf_engine.[ch], and add the new files to project files.
peter1138
parents:
2951
diff
changeset
|
15 |
#include "newgrf_engine.h" |
3686
16627c28741d
(svn r4611) - NewGRF: introduce new vehicle sprite group resolver code. This also fixes some known bugs (e.g. the 'Standard Five' in UKRS is now the correct colour)
peter1138
parents:
3684
diff
changeset
|
16 |
#include "newgrf_station.h" |
16627c28741d
(svn r4611) - NewGRF: introduce new vehicle sprite group resolver code. This also fixes some known bugs (e.g. the 'Standard Five' in UKRS is now the correct colour)
peter1138
parents:
3684
diff
changeset
|
17 |
#include "newgrf_spritegroup.h" |
3866
b13553406a0a
(svn r4902) Newgrf : Introduction of the newgrf_cargo files.
belugas
parents:
3862
diff
changeset
|
18 |
#include "newgrf_cargo.h" |
4261
28670f743746
(svn r5887) -Cleanup: move date related functions, defines and variables to date.[ch]
rubidium
parents:
4059
diff
changeset
|
19 |
#include "date.h" |
5587
167d9a91ef02
(svn r8038) -Merge: the cpp branch. Effort of KUDr, Celestar, glx, Smoovius, stillunknown and pv2b.
rubidium
parents:
5584
diff
changeset
|
20 |
#include "helpers.hpp" |
0 | 21 |
|
3843
03f39cd3dc56
(svn r4867) - NewGRF: implement partial support for engine variable 0x42
peter1138
parents:
3785
diff
changeset
|
22 |
|
03f39cd3dc56
(svn r4867) - NewGRF: implement partial support for engine variable 0x42
peter1138
parents:
3785
diff
changeset
|
23 |
|
03f39cd3dc56
(svn r4867) - NewGRF: implement partial support for engine variable 0x42
peter1138
parents:
3785
diff
changeset
|
24 |
/* Default cargo classes */ |
03f39cd3dc56
(svn r4867) - NewGRF: implement partial support for engine variable 0x42
peter1138
parents:
3785
diff
changeset
|
25 |
static const uint16 _cargo_classes[NUM_GLOBAL_CID] = { |
03f39cd3dc56
(svn r4867) - NewGRF: implement partial support for engine variable 0x42
peter1138
parents:
3785
diff
changeset
|
26 |
CC_PASSENGERS, |
03f39cd3dc56
(svn r4867) - NewGRF: implement partial support for engine variable 0x42
peter1138
parents:
3785
diff
changeset
|
27 |
CC_BULK, |
03f39cd3dc56
(svn r4867) - NewGRF: implement partial support for engine variable 0x42
peter1138
parents:
3785
diff
changeset
|
28 |
CC_MAIL, |
03f39cd3dc56
(svn r4867) - NewGRF: implement partial support for engine variable 0x42
peter1138
parents:
3785
diff
changeset
|
29 |
CC_LIQUID, |
03f39cd3dc56
(svn r4867) - NewGRF: implement partial support for engine variable 0x42
peter1138
parents:
3785
diff
changeset
|
30 |
CC_PIECE_GOODS, |
03f39cd3dc56
(svn r4867) - NewGRF: implement partial support for engine variable 0x42
peter1138
parents:
3785
diff
changeset
|
31 |
CC_EXPRESS, |
03f39cd3dc56
(svn r4867) - NewGRF: implement partial support for engine variable 0x42
peter1138
parents:
3785
diff
changeset
|
32 |
CC_BULK, |
03f39cd3dc56
(svn r4867) - NewGRF: implement partial support for engine variable 0x42
peter1138
parents:
3785
diff
changeset
|
33 |
CC_PIECE_GOODS, |
03f39cd3dc56
(svn r4867) - NewGRF: implement partial support for engine variable 0x42
peter1138
parents:
3785
diff
changeset
|
34 |
CC_BULK, |
03f39cd3dc56
(svn r4867) - NewGRF: implement partial support for engine variable 0x42
peter1138
parents:
3785
diff
changeset
|
35 |
CC_PIECE_GOODS, |
03f39cd3dc56
(svn r4867) - NewGRF: implement partial support for engine variable 0x42
peter1138
parents:
3785
diff
changeset
|
36 |
CC_ARMOURED, |
03f39cd3dc56
(svn r4867) - NewGRF: implement partial support for engine variable 0x42
peter1138
parents:
3785
diff
changeset
|
37 |
CC_PIECE_GOODS, |
03f39cd3dc56
(svn r4867) - NewGRF: implement partial support for engine variable 0x42
peter1138
parents:
3785
diff
changeset
|
38 |
CC_REFRIGERATED | CC_EXPRESS, |
03f39cd3dc56
(svn r4867) - NewGRF: implement partial support for engine variable 0x42
peter1138
parents:
3785
diff
changeset
|
39 |
CC_REFRIGERATED | CC_EXPRESS, |
03f39cd3dc56
(svn r4867) - NewGRF: implement partial support for engine variable 0x42
peter1138
parents:
3785
diff
changeset
|
40 |
CC_BULK, |
03f39cd3dc56
(svn r4867) - NewGRF: implement partial support for engine variable 0x42
peter1138
parents:
3785
diff
changeset
|
41 |
CC_LIQUID, |
03f39cd3dc56
(svn r4867) - NewGRF: implement partial support for engine variable 0x42
peter1138
parents:
3785
diff
changeset
|
42 |
CC_LIQUID, |
03f39cd3dc56
(svn r4867) - NewGRF: implement partial support for engine variable 0x42
peter1138
parents:
3785
diff
changeset
|
43 |
CC_BULK, |
03f39cd3dc56
(svn r4867) - NewGRF: implement partial support for engine variable 0x42
peter1138
parents:
3785
diff
changeset
|
44 |
CC_PIECE_GOODS, |
03f39cd3dc56
(svn r4867) - NewGRF: implement partial support for engine variable 0x42
peter1138
parents:
3785
diff
changeset
|
45 |
CC_PIECE_GOODS, |
03f39cd3dc56
(svn r4867) - NewGRF: implement partial support for engine variable 0x42
peter1138
parents:
3785
diff
changeset
|
46 |
CC_EXPRESS, |
03f39cd3dc56
(svn r4867) - NewGRF: implement partial support for engine variable 0x42
peter1138
parents:
3785
diff
changeset
|
47 |
CC_BULK, |
03f39cd3dc56
(svn r4867) - NewGRF: implement partial support for engine variable 0x42
peter1138
parents:
3785
diff
changeset
|
48 |
CC_LIQUID, |
03f39cd3dc56
(svn r4867) - NewGRF: implement partial support for engine variable 0x42
peter1138
parents:
3785
diff
changeset
|
49 |
CC_BULK, |
03f39cd3dc56
(svn r4867) - NewGRF: implement partial support for engine variable 0x42
peter1138
parents:
3785
diff
changeset
|
50 |
CC_PIECE_GOODS, |
03f39cd3dc56
(svn r4867) - NewGRF: implement partial support for engine variable 0x42
peter1138
parents:
3785
diff
changeset
|
51 |
CC_LIQUID, |
03f39cd3dc56
(svn r4867) - NewGRF: implement partial support for engine variable 0x42
peter1138
parents:
3785
diff
changeset
|
52 |
CC_PIECE_GOODS, |
03f39cd3dc56
(svn r4867) - NewGRF: implement partial support for engine variable 0x42
peter1138
parents:
3785
diff
changeset
|
53 |
CC_PIECE_GOODS, |
3866
b13553406a0a
(svn r4902) Newgrf : Introduction of the newgrf_cargo files.
belugas
parents:
3862
diff
changeset
|
54 |
CC_NOAVAILABLE, |
b13553406a0a
(svn r4902) Newgrf : Introduction of the newgrf_cargo files.
belugas
parents:
3862
diff
changeset
|
55 |
CC_NOAVAILABLE, |
b13553406a0a
(svn r4902) Newgrf : Introduction of the newgrf_cargo files.
belugas
parents:
3862
diff
changeset
|
56 |
CC_NOAVAILABLE, |
3843
03f39cd3dc56
(svn r4867) - NewGRF: implement partial support for engine variable 0x42
peter1138
parents:
3785
diff
changeset
|
57 |
}; |
03f39cd3dc56
(svn r4867) - NewGRF: implement partial support for engine variable 0x42
peter1138
parents:
3785
diff
changeset
|
58 |
|
3785
7d4c0a7850b2
(svn r4781) - NewGRF: give _traininfo_vehicle_pitch a proper declaration
peter1138
parents:
3739
diff
changeset
|
59 |
int _traininfo_vehicle_pitch = 0; |
3845
af6eb0103fed
(svn r4869) - NewGRF: support setting train list vehicle width to 32 instead of 29 pixels, for sets which use 32 pixel long engines/wagons.
peter1138
parents:
3843
diff
changeset
|
60 |
int _traininfo_vehicle_width = 29; |
3785
7d4c0a7850b2
(svn r4781) - NewGRF: give _traininfo_vehicle_pitch a proper declaration
peter1138
parents:
3739
diff
changeset
|
61 |
|
1477 | 62 |
typedef struct WagonOverride { |
0 | 63 |
byte *train_id; |
64 |
int trains; |
|
4869
3a75d9b3b5ea
(svn r6795) - NewGRF: Add support for cargo-specific wagon overrides.
peter1138
parents:
4832
diff
changeset
|
65 |
CargoID cargo; |
3693
c154dbd20439
(svn r4629) - NewGRF: constify more code that deals with sprite groups, now that ref counting is gone.
peter1138
parents:
3686
diff
changeset
|
66 |
const SpriteGroup *group; |
1477 | 67 |
} WagonOverride; |
0 | 68 |
|
1477 | 69 |
typedef struct WagonOverrides { |
0 | 70 |
int overrides_count; |
1477 | 71 |
WagonOverride *overrides; |
72 |
} WagonOverrides; |
|
0 | 73 |
|
1477 | 74 |
static WagonOverrides _engine_wagon_overrides[TOTAL_NUM_ENGINES]; |
75 |
||
4869
3a75d9b3b5ea
(svn r6795) - NewGRF: Add support for cargo-specific wagon overrides.
peter1138
parents:
4832
diff
changeset
|
76 |
void SetWagonOverrideSprites(EngineID engine, CargoID cargo, const SpriteGroup *group, byte *train_id, int trains) |
0 | 77 |
{ |
1477 | 78 |
WagonOverrides *wos; |
79 |
WagonOverride *wo; |
|
0 | 80 |
|
5338
a78592405640
(svn r7503) -Codechange: [NewGRF] Add bounds checking for spriteset cargo types. (NewCargo support will change this rule a bit...)
peter1138
parents:
5175
diff
changeset
|
81 |
assert(engine < TOTAL_NUM_ENGINES); |
a78592405640
(svn r7503) -Codechange: [NewGRF] Add bounds checking for spriteset cargo types. (NewCargo support will change this rule a bit...)
peter1138
parents:
5175
diff
changeset
|
82 |
assert(cargo < NUM_GLOBAL_CID); |
a78592405640
(svn r7503) -Codechange: [NewGRF] Add bounds checking for spriteset cargo types. (NewCargo support will change this rule a bit...)
peter1138
parents:
5175
diff
changeset
|
83 |
|
0 | 84 |
wos = &_engine_wagon_overrides[engine]; |
85 |
wos->overrides_count++; |
|
5609
dc6a58930ba4
(svn r8066) - Codechange: MallocT(), CallocT(), ReallocT() now return the pointer to allocated memory instead of modifying the pointer given as parameter
KUDr
parents:
5601
diff
changeset
|
86 |
wos->overrides = ReallocT(wos->overrides, wos->overrides_count); |
193
0a7025304867
(svn r194) -Codechange: stripping trailing-spaces. Please keep this that way!
truelight
parents:
114
diff
changeset
|
87 |
|
0 | 88 |
wo = &wos->overrides[wos->overrides_count - 1]; |
408
48da21eb9ff2
(svn r605) -newgrf: Framework for supporting variational spritegroups . Deterministic only at the moment, but random ones support shouldn't be that difficult now It doesn't do anything, but makes these actions actually possible (pasky).
darkvater
parents:
405
diff
changeset
|
89 |
/* FIXME: If we are replacing an override, release original SpriteGroup |
48da21eb9ff2
(svn r605) -newgrf: Framework for supporting variational spritegroups . Deterministic only at the moment, but random ones support shouldn't be that difficult now It doesn't do anything, but makes these actions actually possible (pasky).
darkvater
parents:
405
diff
changeset
|
90 |
* to prevent leaks. But first we need to refcount the SpriteGroup. |
48da21eb9ff2
(svn r605) -newgrf: Framework for supporting variational spritegroups . Deterministic only at the moment, but random ones support shouldn't be that difficult now It doesn't do anything, but makes these actions actually possible (pasky).
darkvater
parents:
405
diff
changeset
|
91 |
* --pasky */ |
2488
1e98c71e5f6a
(svn r3014) -NewGRF, Codechange: Make all sprite group references be pointers instead of copying the data around.
peter1138
parents:
2477
diff
changeset
|
92 |
wo->group = group; |
4869
3a75d9b3b5ea
(svn r6795) - NewGRF: Add support for cargo-specific wagon overrides.
peter1138
parents:
4832
diff
changeset
|
93 |
wo->cargo = cargo; |
0 | 94 |
wo->trains = trains; |
5609
dc6a58930ba4
(svn r8066) - Codechange: MallocT(), CallocT(), ReallocT() now return the pointer to allocated memory instead of modifying the pointer given as parameter
KUDr
parents:
5601
diff
changeset
|
95 |
wo->train_id = MallocT<byte>(trains); |
0 | 96 |
memcpy(wo->train_id, train_id, trains); |
97 |
} |
|
98 |
||
4869
3a75d9b3b5ea
(svn r6795) - NewGRF: Add support for cargo-specific wagon overrides.
peter1138
parents:
4832
diff
changeset
|
99 |
static const SpriteGroup *GetWagonOverrideSpriteSet(EngineID engine, CargoID cargo, byte overriding_engine) |
0 | 100 |
{ |
2242
512eae2cf006
(svn r2762) Simplify a loop, remove an unused variable and add many consts
tron
parents:
2204
diff
changeset
|
101 |
const WagonOverrides *wos = &_engine_wagon_overrides[engine]; |
0 | 102 |
int i; |
103 |
||
408
48da21eb9ff2
(svn r605) -newgrf: Framework for supporting variational spritegroups . Deterministic only at the moment, but random ones support shouldn't be that difficult now It doesn't do anything, but makes these actions actually possible (pasky).
darkvater
parents:
405
diff
changeset
|
104 |
// XXX: This could turn out to be a timesink on profiles. We could |
48da21eb9ff2
(svn r605) -newgrf: Framework for supporting variational spritegroups . Deterministic only at the moment, but random ones support shouldn't be that difficult now It doesn't do anything, but makes these actions actually possible (pasky).
darkvater
parents:
405
diff
changeset
|
105 |
// always just dedicate 65535 bytes for an [engine][train] trampoline |
48da21eb9ff2
(svn r605) -newgrf: Framework for supporting variational spritegroups . Deterministic only at the moment, but random ones support shouldn't be that difficult now It doesn't do anything, but makes these actions actually possible (pasky).
darkvater
parents:
405
diff
changeset
|
106 |
// for O(1). Or O(logMlogN) and searching binary tree or smt. like |
48da21eb9ff2
(svn r605) -newgrf: Framework for supporting variational spritegroups . Deterministic only at the moment, but random ones support shouldn't be that difficult now It doesn't do anything, but makes these actions actually possible (pasky).
darkvater
parents:
405
diff
changeset
|
107 |
// that. --pasky |
0 | 108 |
|
109 |
for (i = 0; i < wos->overrides_count; i++) { |
|
2242
512eae2cf006
(svn r2762) Simplify a loop, remove an unused variable and add many consts
tron
parents:
2204
diff
changeset
|
110 |
const WagonOverride *wo = &wos->overrides[i]; |
0 | 111 |
int j; |
112 |
||
113 |
for (j = 0; j < wo->trains; j++) { |
|
4869
3a75d9b3b5ea
(svn r6795) - NewGRF: Add support for cargo-specific wagon overrides.
peter1138
parents:
4832
diff
changeset
|
114 |
if (wo->train_id[j] == overriding_engine && (wo->cargo == cargo || wo->cargo == GC_DEFAULT)) return wo->group; |
0 | 115 |
} |
116 |
} |
|
117 |
return NULL; |
|
118 |
} |
|
119 |
||
2491
15a117630a4f
(svn r3017) -NewGRF: Implement sprite group unreferencing and unloading.
peter1138
parents:
2490
diff
changeset
|
120 |
/** |
15a117630a4f
(svn r3017) -NewGRF: Implement sprite group unreferencing and unloading.
peter1138
parents:
2490
diff
changeset
|
121 |
* Unload all wagon override sprite groups. |
15a117630a4f
(svn r3017) -NewGRF: Implement sprite group unreferencing and unloading.
peter1138
parents:
2490
diff
changeset
|
122 |
*/ |
15a117630a4f
(svn r3017) -NewGRF: Implement sprite group unreferencing and unloading.
peter1138
parents:
2490
diff
changeset
|
123 |
void UnloadWagonOverrides(void) |
15a117630a4f
(svn r3017) -NewGRF: Implement sprite group unreferencing and unloading.
peter1138
parents:
2490
diff
changeset
|
124 |
{ |
15a117630a4f
(svn r3017) -NewGRF: Implement sprite group unreferencing and unloading.
peter1138
parents:
2490
diff
changeset
|
125 |
WagonOverrides *wos; |
15a117630a4f
(svn r3017) -NewGRF: Implement sprite group unreferencing and unloading.
peter1138
parents:
2490
diff
changeset
|
126 |
WagonOverride *wo; |
15a117630a4f
(svn r3017) -NewGRF: Implement sprite group unreferencing and unloading.
peter1138
parents:
2490
diff
changeset
|
127 |
EngineID engine; |
15a117630a4f
(svn r3017) -NewGRF: Implement sprite group unreferencing and unloading.
peter1138
parents:
2490
diff
changeset
|
128 |
int i; |
15a117630a4f
(svn r3017) -NewGRF: Implement sprite group unreferencing and unloading.
peter1138
parents:
2490
diff
changeset
|
129 |
|
15a117630a4f
(svn r3017) -NewGRF: Implement sprite group unreferencing and unloading.
peter1138
parents:
2490
diff
changeset
|
130 |
for (engine = 0; engine < TOTAL_NUM_ENGINES; engine++) { |
15a117630a4f
(svn r3017) -NewGRF: Implement sprite group unreferencing and unloading.
peter1138
parents:
2490
diff
changeset
|
131 |
wos = &_engine_wagon_overrides[engine]; |
15a117630a4f
(svn r3017) -NewGRF: Implement sprite group unreferencing and unloading.
peter1138
parents:
2490
diff
changeset
|
132 |
for (i = 0; i < wos->overrides_count; i++) { |
15a117630a4f
(svn r3017) -NewGRF: Implement sprite group unreferencing and unloading.
peter1138
parents:
2490
diff
changeset
|
133 |
wo = &wos->overrides[i]; |
3595
a0acdb23e662
(svn r4486) - NewGRF: Create and use a memory pool to manage sprite groups. This
peter1138
parents:
3390
diff
changeset
|
134 |
wo->group = NULL; |
2491
15a117630a4f
(svn r3017) -NewGRF: Implement sprite group unreferencing and unloading.
peter1138
parents:
2490
diff
changeset
|
135 |
free(wo->train_id); |
15a117630a4f
(svn r3017) -NewGRF: Implement sprite group unreferencing and unloading.
peter1138
parents:
2490
diff
changeset
|
136 |
} |
15a117630a4f
(svn r3017) -NewGRF: Implement sprite group unreferencing and unloading.
peter1138
parents:
2490
diff
changeset
|
137 |
free(wos->overrides); |
15a117630a4f
(svn r3017) -NewGRF: Implement sprite group unreferencing and unloading.
peter1138
parents:
2490
diff
changeset
|
138 |
wos->overrides_count = 0; |
15a117630a4f
(svn r3017) -NewGRF: Implement sprite group unreferencing and unloading.
peter1138
parents:
2490
diff
changeset
|
139 |
wos->overrides = NULL; |
15a117630a4f
(svn r3017) -NewGRF: Implement sprite group unreferencing and unloading.
peter1138
parents:
2490
diff
changeset
|
140 |
} |
15a117630a4f
(svn r3017) -NewGRF: Implement sprite group unreferencing and unloading.
peter1138
parents:
2490
diff
changeset
|
141 |
} |
0 | 142 |
|
143 |
// 0 - 28 are cargos, 29 is default, 30 is the advert (purchase list) |
|
144 |
// (It isn't and shouldn't be like this in the GRF files since new cargo types |
|
145 |
// may appear in future - however it's more convenient to store it like this in |
|
146 |
// memory. --pasky) |
|
3693
c154dbd20439
(svn r4629) - NewGRF: constify more code that deals with sprite groups, now that ref counting is gone.
peter1138
parents:
3686
diff
changeset
|
147 |
static const SpriteGroup *engine_custom_sprites[TOTAL_NUM_ENGINES][NUM_GLOBAL_CID]; |
3924
d06b513d65c3
(svn r5059) - NewGRF: store a GRFFile pointer reference for each pointer, instead of just the GRF ID.
peter1138
parents:
3920
diff
changeset
|
148 |
static const GRFFile *_engine_grf[TOTAL_NUM_ENGINES]; |
0 | 149 |
|
3693
c154dbd20439
(svn r4629) - NewGRF: constify more code that deals with sprite groups, now that ref counting is gone.
peter1138
parents:
3686
diff
changeset
|
150 |
void SetCustomEngineSprites(EngineID engine, byte cargo, const SpriteGroup *group) |
0 | 151 |
{ |
3614 | 152 |
assert(engine < TOTAL_NUM_ENGINES); |
5338
a78592405640
(svn r7503) -Codechange: [NewGRF] Add bounds checking for spriteset cargo types. (NewCargo support will change this rule a bit...)
peter1138
parents:
5175
diff
changeset
|
153 |
assert(cargo < NUM_GLOBAL_CID); |
a78592405640
(svn r7503) -Codechange: [NewGRF] Add bounds checking for spriteset cargo types. (NewCargo support will change this rule a bit...)
peter1138
parents:
5175
diff
changeset
|
154 |
|
2491
15a117630a4f
(svn r3017) -NewGRF: Implement sprite group unreferencing and unloading.
peter1138
parents:
2490
diff
changeset
|
155 |
if (engine_custom_sprites[engine][cargo] != NULL) { |
5380
8ea58542b6e0
(svn r7565) -Codechange: Rework DEBUG functionality. Look for appropiate debugging levels to
Darkvater
parents:
5338
diff
changeset
|
156 |
grfmsg(6, "SetCustomEngineSprites: engine %d cargo %d already has group -- replacing", engine, cargo); |
2491
15a117630a4f
(svn r3017) -NewGRF: Implement sprite group unreferencing and unloading.
peter1138
parents:
2490
diff
changeset
|
157 |
} |
2488
1e98c71e5f6a
(svn r3014) -NewGRF, Codechange: Make all sprite group references be pointers instead of copying the data around.
peter1138
parents:
2477
diff
changeset
|
158 |
engine_custom_sprites[engine][cargo] = group; |
0 | 159 |
} |
160 |
||
2491
15a117630a4f
(svn r3017) -NewGRF: Implement sprite group unreferencing and unloading.
peter1138
parents:
2490
diff
changeset
|
161 |
/** |
15a117630a4f
(svn r3017) -NewGRF: Implement sprite group unreferencing and unloading.
peter1138
parents:
2490
diff
changeset
|
162 |
* Unload all engine sprite groups. |
15a117630a4f
(svn r3017) -NewGRF: Implement sprite group unreferencing and unloading.
peter1138
parents:
2490
diff
changeset
|
163 |
*/ |
15a117630a4f
(svn r3017) -NewGRF: Implement sprite group unreferencing and unloading.
peter1138
parents:
2490
diff
changeset
|
164 |
void UnloadCustomEngineSprites(void) |
15a117630a4f
(svn r3017) -NewGRF: Implement sprite group unreferencing and unloading.
peter1138
parents:
2490
diff
changeset
|
165 |
{ |
15a117630a4f
(svn r3017) -NewGRF: Implement sprite group unreferencing and unloading.
peter1138
parents:
2490
diff
changeset
|
166 |
EngineID engine; |
15a117630a4f
(svn r3017) -NewGRF: Implement sprite group unreferencing and unloading.
peter1138
parents:
2490
diff
changeset
|
167 |
CargoID cargo; |
15a117630a4f
(svn r3017) -NewGRF: Implement sprite group unreferencing and unloading.
peter1138
parents:
2490
diff
changeset
|
168 |
|
15a117630a4f
(svn r3017) -NewGRF: Implement sprite group unreferencing and unloading.
peter1138
parents:
2490
diff
changeset
|
169 |
for (engine = 0; engine < TOTAL_NUM_ENGINES; engine++) { |
15a117630a4f
(svn r3017) -NewGRF: Implement sprite group unreferencing and unloading.
peter1138
parents:
2490
diff
changeset
|
170 |
for (cargo = 0; cargo < NUM_GLOBAL_CID; cargo++) { |
3595
a0acdb23e662
(svn r4486) - NewGRF: Create and use a memory pool to manage sprite groups. This
peter1138
parents:
3390
diff
changeset
|
171 |
engine_custom_sprites[engine][cargo] = NULL; |
2491
15a117630a4f
(svn r3017) -NewGRF: Implement sprite group unreferencing and unloading.
peter1138
parents:
2490
diff
changeset
|
172 |
} |
3648
d234c46bb37a
(svn r4559) - NewGRF: keep a record of which grf an engine is defined in. Will be used in the future.
peter1138
parents:
3630
diff
changeset
|
173 |
_engine_grf[engine] = 0; |
2491
15a117630a4f
(svn r3017) -NewGRF: Implement sprite group unreferencing and unloading.
peter1138
parents:
2490
diff
changeset
|
174 |
} |
15a117630a4f
(svn r3017) -NewGRF: Implement sprite group unreferencing and unloading.
peter1138
parents:
2490
diff
changeset
|
175 |
} |
15a117630a4f
(svn r3017) -NewGRF: Implement sprite group unreferencing and unloading.
peter1138
parents:
2490
diff
changeset
|
176 |
|
3695
e1d5608f4d32
(svn r4632) - NewGRF: support loading of helicopter rotor sprites (mart3p)
peter1138
parents:
3693
diff
changeset
|
177 |
static const SpriteGroup *heli_rotor_custom_sprites[NUM_AIRCRAFT_ENGINES]; |
e1d5608f4d32
(svn r4632) - NewGRF: support loading of helicopter rotor sprites (mart3p)
peter1138
parents:
3693
diff
changeset
|
178 |
|
e1d5608f4d32
(svn r4632) - NewGRF: support loading of helicopter rotor sprites (mart3p)
peter1138
parents:
3693
diff
changeset
|
179 |
/** Load a rotor override sprite group for an aircraft */ |
e1d5608f4d32
(svn r4632) - NewGRF: support loading of helicopter rotor sprites (mart3p)
peter1138
parents:
3693
diff
changeset
|
180 |
void SetRotorOverrideSprites(EngineID engine, const SpriteGroup *group) |
e1d5608f4d32
(svn r4632) - NewGRF: support loading of helicopter rotor sprites (mart3p)
peter1138
parents:
3693
diff
changeset
|
181 |
{ |
e1d5608f4d32
(svn r4632) - NewGRF: support loading of helicopter rotor sprites (mart3p)
peter1138
parents:
3693
diff
changeset
|
182 |
assert(engine >= AIRCRAFT_ENGINES_INDEX); |
e1d5608f4d32
(svn r4632) - NewGRF: support loading of helicopter rotor sprites (mart3p)
peter1138
parents:
3693
diff
changeset
|
183 |
assert(engine < AIRCRAFT_ENGINES_INDEX + NUM_AIRCRAFT_ENGINES); |
e1d5608f4d32
(svn r4632) - NewGRF: support loading of helicopter rotor sprites (mart3p)
peter1138
parents:
3693
diff
changeset
|
184 |
|
e1d5608f4d32
(svn r4632) - NewGRF: support loading of helicopter rotor sprites (mart3p)
peter1138
parents:
3693
diff
changeset
|
185 |
if (heli_rotor_custom_sprites[engine - AIRCRAFT_ENGINES_INDEX] != NULL) { |
5380
8ea58542b6e0
(svn r7565) -Codechange: Rework DEBUG functionality. Look for appropiate debugging levels to
Darkvater
parents:
5338
diff
changeset
|
186 |
grfmsg(6, "SetRotorOverrideSprites: engine %d already has group -- replacing.", engine); |
3695
e1d5608f4d32
(svn r4632) - NewGRF: support loading of helicopter rotor sprites (mart3p)
peter1138
parents:
3693
diff
changeset
|
187 |
} |
e1d5608f4d32
(svn r4632) - NewGRF: support loading of helicopter rotor sprites (mart3p)
peter1138
parents:
3693
diff
changeset
|
188 |
heli_rotor_custom_sprites[engine - AIRCRAFT_ENGINES_INDEX] = group; |
e1d5608f4d32
(svn r4632) - NewGRF: support loading of helicopter rotor sprites (mart3p)
peter1138
parents:
3693
diff
changeset
|
189 |
} |
e1d5608f4d32
(svn r4632) - NewGRF: support loading of helicopter rotor sprites (mart3p)
peter1138
parents:
3693
diff
changeset
|
190 |
|
e1d5608f4d32
(svn r4632) - NewGRF: support loading of helicopter rotor sprites (mart3p)
peter1138
parents:
3693
diff
changeset
|
191 |
/** Unload all rotor override sprite groups */ |
e1d5608f4d32
(svn r4632) - NewGRF: support loading of helicopter rotor sprites (mart3p)
peter1138
parents:
3693
diff
changeset
|
192 |
void UnloadRotorOverrideSprites(void) |
e1d5608f4d32
(svn r4632) - NewGRF: support loading of helicopter rotor sprites (mart3p)
peter1138
parents:
3693
diff
changeset
|
193 |
{ |
e1d5608f4d32
(svn r4632) - NewGRF: support loading of helicopter rotor sprites (mart3p)
peter1138
parents:
3693
diff
changeset
|
194 |
EngineID engine; |
e1d5608f4d32
(svn r4632) - NewGRF: support loading of helicopter rotor sprites (mart3p)
peter1138
parents:
3693
diff
changeset
|
195 |
|
e1d5608f4d32
(svn r4632) - NewGRF: support loading of helicopter rotor sprites (mart3p)
peter1138
parents:
3693
diff
changeset
|
196 |
/* Starting at AIRCRAFT_ENGINES_INDEX may seem pointless, but it means |
e1d5608f4d32
(svn r4632) - NewGRF: support loading of helicopter rotor sprites (mart3p)
peter1138
parents:
3693
diff
changeset
|
197 |
* the context of EngineID is correct */ |
e1d5608f4d32
(svn r4632) - NewGRF: support loading of helicopter rotor sprites (mart3p)
peter1138
parents:
3693
diff
changeset
|
198 |
for (engine = AIRCRAFT_ENGINES_INDEX; engine < AIRCRAFT_ENGINES_INDEX + NUM_AIRCRAFT_ENGINES; engine++) { |
e1d5608f4d32
(svn r4632) - NewGRF: support loading of helicopter rotor sprites (mart3p)
peter1138
parents:
3693
diff
changeset
|
199 |
heli_rotor_custom_sprites[engine - AIRCRAFT_ENGINES_INDEX] = NULL; |
e1d5608f4d32
(svn r4632) - NewGRF: support loading of helicopter rotor sprites (mart3p)
peter1138
parents:
3693
diff
changeset
|
200 |
} |
e1d5608f4d32
(svn r4632) - NewGRF: support loading of helicopter rotor sprites (mart3p)
peter1138
parents:
3693
diff
changeset
|
201 |
} |
e1d5608f4d32
(svn r4632) - NewGRF: support loading of helicopter rotor sprites (mart3p)
peter1138
parents:
3693
diff
changeset
|
202 |
|
3924
d06b513d65c3
(svn r5059) - NewGRF: store a GRFFile pointer reference for each pointer, instead of just the GRF ID.
peter1138
parents:
3920
diff
changeset
|
203 |
|
d06b513d65c3
(svn r5059) - NewGRF: store a GRFFile pointer reference for each pointer, instead of just the GRF ID.
peter1138
parents:
3920
diff
changeset
|
204 |
/** |
d06b513d65c3
(svn r5059) - NewGRF: store a GRFFile pointer reference for each pointer, instead of just the GRF ID.
peter1138
parents:
3920
diff
changeset
|
205 |
* Tie a GRFFile entry to an engine, to allow us to retrieve GRF parameters |
d06b513d65c3
(svn r5059) - NewGRF: store a GRFFile pointer reference for each pointer, instead of just the GRF ID.
peter1138
parents:
3920
diff
changeset
|
206 |
* etc during a game. |
d06b513d65c3
(svn r5059) - NewGRF: store a GRFFile pointer reference for each pointer, instead of just the GRF ID.
peter1138
parents:
3920
diff
changeset
|
207 |
* @param engine Engine ID to tie the GRFFile to. |
d06b513d65c3
(svn r5059) - NewGRF: store a GRFFile pointer reference for each pointer, instead of just the GRF ID.
peter1138
parents:
3920
diff
changeset
|
208 |
* @param file Pointer of GRFFile to tie. |
d06b513d65c3
(svn r5059) - NewGRF: store a GRFFile pointer reference for each pointer, instead of just the GRF ID.
peter1138
parents:
3920
diff
changeset
|
209 |
*/ |
d06b513d65c3
(svn r5059) - NewGRF: store a GRFFile pointer reference for each pointer, instead of just the GRF ID.
peter1138
parents:
3920
diff
changeset
|
210 |
void SetEngineGRF(EngineID engine, const GRFFile *file) |
3648
d234c46bb37a
(svn r4559) - NewGRF: keep a record of which grf an engine is defined in. Will be used in the future.
peter1138
parents:
3630
diff
changeset
|
211 |
{ |
d234c46bb37a
(svn r4559) - NewGRF: keep a record of which grf an engine is defined in. Will be used in the future.
peter1138
parents:
3630
diff
changeset
|
212 |
assert(engine < TOTAL_NUM_ENGINES); |
3924
d06b513d65c3
(svn r5059) - NewGRF: store a GRFFile pointer reference for each pointer, instead of just the GRF ID.
peter1138
parents:
3920
diff
changeset
|
213 |
_engine_grf[engine] = file; |
3648
d234c46bb37a
(svn r4559) - NewGRF: keep a record of which grf an engine is defined in. Will be used in the future.
peter1138
parents:
3630
diff
changeset
|
214 |
} |
d234c46bb37a
(svn r4559) - NewGRF: keep a record of which grf an engine is defined in. Will be used in the future.
peter1138
parents:
3630
diff
changeset
|
215 |
|
3924
d06b513d65c3
(svn r5059) - NewGRF: store a GRFFile pointer reference for each pointer, instead of just the GRF ID.
peter1138
parents:
3920
diff
changeset
|
216 |
|
d06b513d65c3
(svn r5059) - NewGRF: store a GRFFile pointer reference for each pointer, instead of just the GRF ID.
peter1138
parents:
3920
diff
changeset
|
217 |
/** |
d06b513d65c3
(svn r5059) - NewGRF: store a GRFFile pointer reference for each pointer, instead of just the GRF ID.
peter1138
parents:
3920
diff
changeset
|
218 |
* Retrieve the GRFFile tied to an engine |
d06b513d65c3
(svn r5059) - NewGRF: store a GRFFile pointer reference for each pointer, instead of just the GRF ID.
peter1138
parents:
3920
diff
changeset
|
219 |
* @param engine Engine ID to retrieve. |
d06b513d65c3
(svn r5059) - NewGRF: store a GRFFile pointer reference for each pointer, instead of just the GRF ID.
peter1138
parents:
3920
diff
changeset
|
220 |
* @return Pointer to GRFFile. |
d06b513d65c3
(svn r5059) - NewGRF: store a GRFFile pointer reference for each pointer, instead of just the GRF ID.
peter1138
parents:
3920
diff
changeset
|
221 |
*/ |
d06b513d65c3
(svn r5059) - NewGRF: store a GRFFile pointer reference for each pointer, instead of just the GRF ID.
peter1138
parents:
3920
diff
changeset
|
222 |
const GRFFile *GetEngineGRF(EngineID engine) |
d06b513d65c3
(svn r5059) - NewGRF: store a GRFFile pointer reference for each pointer, instead of just the GRF ID.
peter1138
parents:
3920
diff
changeset
|
223 |
{ |
d06b513d65c3
(svn r5059) - NewGRF: store a GRFFile pointer reference for each pointer, instead of just the GRF ID.
peter1138
parents:
3920
diff
changeset
|
224 |
assert(engine < TOTAL_NUM_ENGINES); |
d06b513d65c3
(svn r5059) - NewGRF: store a GRFFile pointer reference for each pointer, instead of just the GRF ID.
peter1138
parents:
3920
diff
changeset
|
225 |
return _engine_grf[engine]; |
d06b513d65c3
(svn r5059) - NewGRF: store a GRFFile pointer reference for each pointer, instead of just the GRF ID.
peter1138
parents:
3920
diff
changeset
|
226 |
} |
d06b513d65c3
(svn r5059) - NewGRF: store a GRFFile pointer reference for each pointer, instead of just the GRF ID.
peter1138
parents:
3920
diff
changeset
|
227 |
|
d06b513d65c3
(svn r5059) - NewGRF: store a GRFFile pointer reference for each pointer, instead of just the GRF ID.
peter1138
parents:
3920
diff
changeset
|
228 |
|
d06b513d65c3
(svn r5059) - NewGRF: store a GRFFile pointer reference for each pointer, instead of just the GRF ID.
peter1138
parents:
3920
diff
changeset
|
229 |
/** |
d06b513d65c3
(svn r5059) - NewGRF: store a GRFFile pointer reference for each pointer, instead of just the GRF ID.
peter1138
parents:
3920
diff
changeset
|
230 |
* Retrieve the GRF ID of the GRFFile tied to an engine |
d06b513d65c3
(svn r5059) - NewGRF: store a GRFFile pointer reference for each pointer, instead of just the GRF ID.
peter1138
parents:
3920
diff
changeset
|
231 |
* @param engine Engine ID to retrieve. |
d06b513d65c3
(svn r5059) - NewGRF: store a GRFFile pointer reference for each pointer, instead of just the GRF ID.
peter1138
parents:
3920
diff
changeset
|
232 |
* @return 32 bit GRFID value. |
d06b513d65c3
(svn r5059) - NewGRF: store a GRFFile pointer reference for each pointer, instead of just the GRF ID.
peter1138
parents:
3920
diff
changeset
|
233 |
*/ |
3648
d234c46bb37a
(svn r4559) - NewGRF: keep a record of which grf an engine is defined in. Will be used in the future.
peter1138
parents:
3630
diff
changeset
|
234 |
uint32 GetEngineGRFID(EngineID engine) |
d234c46bb37a
(svn r4559) - NewGRF: keep a record of which grf an engine is defined in. Will be used in the future.
peter1138
parents:
3630
diff
changeset
|
235 |
{ |
d234c46bb37a
(svn r4559) - NewGRF: keep a record of which grf an engine is defined in. Will be used in the future.
peter1138
parents:
3630
diff
changeset
|
236 |
assert(engine < TOTAL_NUM_ENGINES); |
3924
d06b513d65c3
(svn r5059) - NewGRF: store a GRFFile pointer reference for each pointer, instead of just the GRF ID.
peter1138
parents:
3920
diff
changeset
|
237 |
return _engine_grf[engine]->grfid; |
3648
d234c46bb37a
(svn r4559) - NewGRF: keep a record of which grf an engine is defined in. Will be used in the future.
peter1138
parents:
3630
diff
changeset
|
238 |
} |
d234c46bb37a
(svn r4559) - NewGRF: keep a record of which grf an engine is defined in. Will be used in the future.
peter1138
parents:
3630
diff
changeset
|
239 |
|
d234c46bb37a
(svn r4559) - NewGRF: keep a record of which grf an engine is defined in. Will be used in the future.
peter1138
parents:
3630
diff
changeset
|
240 |
|
2708
48714bad9499
(svn r3252) - NewGRF: Map new train subtypes to old types for rail vehicles.
peter1138
parents:
2639
diff
changeset
|
241 |
static int MapOldSubType(const Vehicle *v) |
48714bad9499
(svn r3252) - NewGRF: Map new train subtypes to old types for rail vehicles.
peter1138
parents:
2639
diff
changeset
|
242 |
{ |
48714bad9499
(svn r3252) - NewGRF: Map new train subtypes to old types for rail vehicles.
peter1138
parents:
2639
diff
changeset
|
243 |
if (v->type != VEH_Train) return v->subtype; |
48714bad9499
(svn r3252) - NewGRF: Map new train subtypes to old types for rail vehicles.
peter1138
parents:
2639
diff
changeset
|
244 |
if (IsTrainEngine(v)) return 0; |
48714bad9499
(svn r3252) - NewGRF: Map new train subtypes to old types for rail vehicles.
peter1138
parents:
2639
diff
changeset
|
245 |
if (IsFreeWagon(v)) return 4; |
48714bad9499
(svn r3252) - NewGRF: Map new train subtypes to old types for rail vehicles.
peter1138
parents:
2639
diff
changeset
|
246 |
return 2; |
48714bad9499
(svn r3252) - NewGRF: Map new train subtypes to old types for rail vehicles.
peter1138
parents:
2639
diff
changeset
|
247 |
} |
48714bad9499
(svn r3252) - NewGRF: Map new train subtypes to old types for rail vehicles.
peter1138
parents:
2639
diff
changeset
|
248 |
|
3686
16627c28741d
(svn r4611) - NewGRF: introduce new vehicle sprite group resolver code. This also fixes some known bugs (e.g. the 'Standard Five' in UKRS is now the correct colour)
peter1138
parents:
3684
diff
changeset
|
249 |
|
3702
219fc5d61455
(svn r4643) - NewGRF: Add support for ttdp aircraft states. This involves mapping from our own state. (heavily based on mart3p's code)
peter1138
parents:
3696
diff
changeset
|
250 |
/* TTDP style aircraft movement states for GRF Action 2 Var 0xE2 */ |
219fc5d61455
(svn r4643) - NewGRF: Add support for ttdp aircraft states. This involves mapping from our own state. (heavily based on mart3p's code)
peter1138
parents:
3696
diff
changeset
|
251 |
enum { |
4055
582a469d6c5c
(svn r5335) - Newgrf: correct spelling of hangar
peter1138
parents:
4050
diff
changeset
|
252 |
AMS_TTDP_HANGAR, |
582a469d6c5c
(svn r5335) - Newgrf: correct spelling of hangar
peter1138
parents:
4050
diff
changeset
|
253 |
AMS_TTDP_TO_HANGAR, |
3702
219fc5d61455
(svn r4643) - NewGRF: Add support for ttdp aircraft states. This involves mapping from our own state. (heavily based on mart3p's code)
peter1138
parents:
3696
diff
changeset
|
254 |
AMS_TTDP_TO_PAD1, |
219fc5d61455
(svn r4643) - NewGRF: Add support for ttdp aircraft states. This involves mapping from our own state. (heavily based on mart3p's code)
peter1138
parents:
3696
diff
changeset
|
255 |
AMS_TTDP_TO_PAD2, |
219fc5d61455
(svn r4643) - NewGRF: Add support for ttdp aircraft states. This involves mapping from our own state. (heavily based on mart3p's code)
peter1138
parents:
3696
diff
changeset
|
256 |
AMS_TTDP_TO_PAD3, |
219fc5d61455
(svn r4643) - NewGRF: Add support for ttdp aircraft states. This involves mapping from our own state. (heavily based on mart3p's code)
peter1138
parents:
3696
diff
changeset
|
257 |
AMS_TTDP_TO_ENTRY_2_AND_3, |
219fc5d61455
(svn r4643) - NewGRF: Add support for ttdp aircraft states. This involves mapping from our own state. (heavily based on mart3p's code)
peter1138
parents:
3696
diff
changeset
|
258 |
AMS_TTDP_TO_ENTRY_2_AND_3_AND_H, |
219fc5d61455
(svn r4643) - NewGRF: Add support for ttdp aircraft states. This involves mapping from our own state. (heavily based on mart3p's code)
peter1138
parents:
3696
diff
changeset
|
259 |
AMS_TTDP_TO_JUNCTION, |
219fc5d61455
(svn r4643) - NewGRF: Add support for ttdp aircraft states. This involves mapping from our own state. (heavily based on mart3p's code)
peter1138
parents:
3696
diff
changeset
|
260 |
AMS_TTDP_LEAVE_RUNWAY, |
219fc5d61455
(svn r4643) - NewGRF: Add support for ttdp aircraft states. This involves mapping from our own state. (heavily based on mart3p's code)
peter1138
parents:
3696
diff
changeset
|
261 |
AMS_TTDP_TO_INWAY, |
219fc5d61455
(svn r4643) - NewGRF: Add support for ttdp aircraft states. This involves mapping from our own state. (heavily based on mart3p's code)
peter1138
parents:
3696
diff
changeset
|
262 |
AMS_TTDP_TO_RUNWAY, |
219fc5d61455
(svn r4643) - NewGRF: Add support for ttdp aircraft states. This involves mapping from our own state. (heavily based on mart3p's code)
peter1138
parents:
3696
diff
changeset
|
263 |
AMS_TTDP_TO_OUTWAY, |
219fc5d61455
(svn r4643) - NewGRF: Add support for ttdp aircraft states. This involves mapping from our own state. (heavily based on mart3p's code)
peter1138
parents:
3696
diff
changeset
|
264 |
AMS_TTDP_WAITING, |
219fc5d61455
(svn r4643) - NewGRF: Add support for ttdp aircraft states. This involves mapping from our own state. (heavily based on mart3p's code)
peter1138
parents:
3696
diff
changeset
|
265 |
AMS_TTDP_TAKEOFF, |
219fc5d61455
(svn r4643) - NewGRF: Add support for ttdp aircraft states. This involves mapping from our own state. (heavily based on mart3p's code)
peter1138
parents:
3696
diff
changeset
|
266 |
AMS_TTDP_TO_TAKEOFF, |
219fc5d61455
(svn r4643) - NewGRF: Add support for ttdp aircraft states. This involves mapping from our own state. (heavily based on mart3p's code)
peter1138
parents:
3696
diff
changeset
|
267 |
AMS_TTDP_CLIMBING, |
219fc5d61455
(svn r4643) - NewGRF: Add support for ttdp aircraft states. This involves mapping from our own state. (heavily based on mart3p's code)
peter1138
parents:
3696
diff
changeset
|
268 |
AMS_TTDP_FLIGHT_APPROACH, |
219fc5d61455
(svn r4643) - NewGRF: Add support for ttdp aircraft states. This involves mapping from our own state. (heavily based on mart3p's code)
peter1138
parents:
3696
diff
changeset
|
269 |
AMS_TTDP_UNUSED_0x11, |
219fc5d61455
(svn r4643) - NewGRF: Add support for ttdp aircraft states. This involves mapping from our own state. (heavily based on mart3p's code)
peter1138
parents:
3696
diff
changeset
|
270 |
AMS_TTDP_FLIGHT_TO_TOWER, |
219fc5d61455
(svn r4643) - NewGRF: Add support for ttdp aircraft states. This involves mapping from our own state. (heavily based on mart3p's code)
peter1138
parents:
3696
diff
changeset
|
271 |
AMS_TTDP_UNUSED_0x13, |
219fc5d61455
(svn r4643) - NewGRF: Add support for ttdp aircraft states. This involves mapping from our own state. (heavily based on mart3p's code)
peter1138
parents:
3696
diff
changeset
|
272 |
AMS_TTDP_FLIGHT_FINAL, |
219fc5d61455
(svn r4643) - NewGRF: Add support for ttdp aircraft states. This involves mapping from our own state. (heavily based on mart3p's code)
peter1138
parents:
3696
diff
changeset
|
273 |
AMS_TTDP_FLIGHT_DESCENT, |
219fc5d61455
(svn r4643) - NewGRF: Add support for ttdp aircraft states. This involves mapping from our own state. (heavily based on mart3p's code)
peter1138
parents:
3696
diff
changeset
|
274 |
AMS_TTDP_BRAKING, |
3920
cca65c17b760
(svn r5047) - NewGRF: fix typo of AIRPORT in enum
peter1138
parents:
3893
diff
changeset
|
275 |
AMS_TTDP_HELI_TAKEOFF_AIRPORT, |
cca65c17b760
(svn r5047) - NewGRF: fix typo of AIRPORT in enum
peter1138
parents:
3893
diff
changeset
|
276 |
AMS_TTDP_HELI_TO_TAKEOFF_AIRPORT, |
cca65c17b760
(svn r5047) - NewGRF: fix typo of AIRPORT in enum
peter1138
parents:
3893
diff
changeset
|
277 |
AMS_TTDP_HELI_LAND_AIRPORT, |
3702
219fc5d61455
(svn r4643) - NewGRF: Add support for ttdp aircraft states. This involves mapping from our own state. (heavily based on mart3p's code)
peter1138
parents:
3696
diff
changeset
|
278 |
AMS_TTDP_HELI_TAKEOFF_HELIPORT, |
219fc5d61455
(svn r4643) - NewGRF: Add support for ttdp aircraft states. This involves mapping from our own state. (heavily based on mart3p's code)
peter1138
parents:
3696
diff
changeset
|
279 |
AMS_TTDP_HELI_TO_TAKEOFF_HELIPORT, |
219fc5d61455
(svn r4643) - NewGRF: Add support for ttdp aircraft states. This involves mapping from our own state. (heavily based on mart3p's code)
peter1138
parents:
3696
diff
changeset
|
280 |
AMS_TTDP_HELI_LAND_HELIPORT, |
219fc5d61455
(svn r4643) - NewGRF: Add support for ttdp aircraft states. This involves mapping from our own state. (heavily based on mart3p's code)
peter1138
parents:
3696
diff
changeset
|
281 |
}; |
219fc5d61455
(svn r4643) - NewGRF: Add support for ttdp aircraft states. This involves mapping from our own state. (heavily based on mart3p's code)
peter1138
parents:
3696
diff
changeset
|
282 |
|
219fc5d61455
(svn r4643) - NewGRF: Add support for ttdp aircraft states. This involves mapping from our own state. (heavily based on mart3p's code)
peter1138
parents:
3696
diff
changeset
|
283 |
|
219fc5d61455
(svn r4643) - NewGRF: Add support for ttdp aircraft states. This involves mapping from our own state. (heavily based on mart3p's code)
peter1138
parents:
3696
diff
changeset
|
284 |
/** |
219fc5d61455
(svn r4643) - NewGRF: Add support for ttdp aircraft states. This involves mapping from our own state. (heavily based on mart3p's code)
peter1138
parents:
3696
diff
changeset
|
285 |
* Map OTTD aircraft movement states to TTDPatch style movement states |
219fc5d61455
(svn r4643) - NewGRF: Add support for ttdp aircraft states. This involves mapping from our own state. (heavily based on mart3p's code)
peter1138
parents:
3696
diff
changeset
|
286 |
* (VarAction 2 Variable 0xE2) |
219fc5d61455
(svn r4643) - NewGRF: Add support for ttdp aircraft states. This involves mapping from our own state. (heavily based on mart3p's code)
peter1138
parents:
3696
diff
changeset
|
287 |
*/ |
219fc5d61455
(svn r4643) - NewGRF: Add support for ttdp aircraft states. This involves mapping from our own state. (heavily based on mart3p's code)
peter1138
parents:
3696
diff
changeset
|
288 |
static byte MapAircraftMovementState(const Vehicle *v) |
219fc5d61455
(svn r4643) - NewGRF: Add support for ttdp aircraft states. This involves mapping from our own state. (heavily based on mart3p's code)
peter1138
parents:
3696
diff
changeset
|
289 |
{ |
219fc5d61455
(svn r4643) - NewGRF: Add support for ttdp aircraft states. This involves mapping from our own state. (heavily based on mart3p's code)
peter1138
parents:
3696
diff
changeset
|
290 |
const Station *st = GetStation(v->u.air.targetairport); |
219fc5d61455
(svn r4643) - NewGRF: Add support for ttdp aircraft states. This involves mapping from our own state. (heavily based on mart3p's code)
peter1138
parents:
3696
diff
changeset
|
291 |
byte amdflag = GetAirportMovingData(st->airport_type, v->u.air.pos)->flag; |
219fc5d61455
(svn r4643) - NewGRF: Add support for ttdp aircraft states. This involves mapping from our own state. (heavily based on mart3p's code)
peter1138
parents:
3696
diff
changeset
|
292 |
|
219fc5d61455
(svn r4643) - NewGRF: Add support for ttdp aircraft states. This involves mapping from our own state. (heavily based on mart3p's code)
peter1138
parents:
3696
diff
changeset
|
293 |
switch (v->u.air.state) { |
219fc5d61455
(svn r4643) - NewGRF: Add support for ttdp aircraft states. This involves mapping from our own state. (heavily based on mart3p's code)
peter1138
parents:
3696
diff
changeset
|
294 |
case HANGAR: |
219fc5d61455
(svn r4643) - NewGRF: Add support for ttdp aircraft states. This involves mapping from our own state. (heavily based on mart3p's code)
peter1138
parents:
3696
diff
changeset
|
295 |
/* The international airport is a special case as helicopters can land in |
219fc5d61455
(svn r4643) - NewGRF: Add support for ttdp aircraft states. This involves mapping from our own state. (heavily based on mart3p's code)
peter1138
parents:
3696
diff
changeset
|
296 |
* front of the hanger. Helicopters also change their air.state to |
219fc5d61455
(svn r4643) - NewGRF: Add support for ttdp aircraft states. This involves mapping from our own state. (heavily based on mart3p's code)
peter1138
parents:
3696
diff
changeset
|
297 |
* AMED_HELI_LOWER some time before actually descending. */ |
219fc5d61455
(svn r4643) - NewGRF: Add support for ttdp aircraft states. This involves mapping from our own state. (heavily based on mart3p's code)
peter1138
parents:
3696
diff
changeset
|
298 |
|
219fc5d61455
(svn r4643) - NewGRF: Add support for ttdp aircraft states. This involves mapping from our own state. (heavily based on mart3p's code)
peter1138
parents:
3696
diff
changeset
|
299 |
/* This condition only occurs for helicopters, during descent, |
219fc5d61455
(svn r4643) - NewGRF: Add support for ttdp aircraft states. This involves mapping from our own state. (heavily based on mart3p's code)
peter1138
parents:
3696
diff
changeset
|
300 |
* to a landing by the hanger of an international airport. */ |
3920
cca65c17b760
(svn r5047) - NewGRF: fix typo of AIRPORT in enum
peter1138
parents:
3893
diff
changeset
|
301 |
if (amdflag & AMED_HELI_LOWER) return AMS_TTDP_HELI_LAND_AIRPORT; |
3702
219fc5d61455
(svn r4643) - NewGRF: Add support for ttdp aircraft states. This involves mapping from our own state. (heavily based on mart3p's code)
peter1138
parents:
3696
diff
changeset
|
302 |
|
219fc5d61455
(svn r4643) - NewGRF: Add support for ttdp aircraft states. This involves mapping from our own state. (heavily based on mart3p's code)
peter1138
parents:
3696
diff
changeset
|
303 |
/* This condition only occurs for helicopters, before starting descent, |
219fc5d61455
(svn r4643) - NewGRF: Add support for ttdp aircraft states. This involves mapping from our own state. (heavily based on mart3p's code)
peter1138
parents:
3696
diff
changeset
|
304 |
* to a landing by the hanger of an international airport. */ |
219fc5d61455
(svn r4643) - NewGRF: Add support for ttdp aircraft states. This involves mapping from our own state. (heavily based on mart3p's code)
peter1138
parents:
3696
diff
changeset
|
305 |
if (amdflag & AMED_SLOWTURN) return AMS_TTDP_FLIGHT_TO_TOWER; |
219fc5d61455
(svn r4643) - NewGRF: Add support for ttdp aircraft states. This involves mapping from our own state. (heavily based on mart3p's code)
peter1138
parents:
3696
diff
changeset
|
306 |
|
219fc5d61455
(svn r4643) - NewGRF: Add support for ttdp aircraft states. This involves mapping from our own state. (heavily based on mart3p's code)
peter1138
parents:
3696
diff
changeset
|
307 |
// The final two conditions apply to helicopters or aircraft. |
219fc5d61455
(svn r4643) - NewGRF: Add support for ttdp aircraft states. This involves mapping from our own state. (heavily based on mart3p's code)
peter1138
parents:
3696
diff
changeset
|
308 |
/* Has reached hanger? */ |
4055
582a469d6c5c
(svn r5335) - Newgrf: correct spelling of hangar
peter1138
parents:
4050
diff
changeset
|
309 |
if (amdflag & AMED_EXACTPOS) return AMS_TTDP_HANGAR; |
3702
219fc5d61455
(svn r4643) - NewGRF: Add support for ttdp aircraft states. This involves mapping from our own state. (heavily based on mart3p's code)
peter1138
parents:
3696
diff
changeset
|
310 |
|
219fc5d61455
(svn r4643) - NewGRF: Add support for ttdp aircraft states. This involves mapping from our own state. (heavily based on mart3p's code)
peter1138
parents:
3696
diff
changeset
|
311 |
// Still moving towards hanger. |
4055
582a469d6c5c
(svn r5335) - Newgrf: correct spelling of hangar
peter1138
parents:
4050
diff
changeset
|
312 |
return AMS_TTDP_TO_HANGAR; |
3702
219fc5d61455
(svn r4643) - NewGRF: Add support for ttdp aircraft states. This involves mapping from our own state. (heavily based on mart3p's code)
peter1138
parents:
3696
diff
changeset
|
313 |
|
219fc5d61455
(svn r4643) - NewGRF: Add support for ttdp aircraft states. This involves mapping from our own state. (heavily based on mart3p's code)
peter1138
parents:
3696
diff
changeset
|
314 |
case TERM1: |
219fc5d61455
(svn r4643) - NewGRF: Add support for ttdp aircraft states. This involves mapping from our own state. (heavily based on mart3p's code)
peter1138
parents:
3696
diff
changeset
|
315 |
if (amdflag & AMED_EXACTPOS) return AMS_TTDP_TO_PAD1; |
219fc5d61455
(svn r4643) - NewGRF: Add support for ttdp aircraft states. This involves mapping from our own state. (heavily based on mart3p's code)
peter1138
parents:
3696
diff
changeset
|
316 |
return AMS_TTDP_TO_JUNCTION; |
219fc5d61455
(svn r4643) - NewGRF: Add support for ttdp aircraft states. This involves mapping from our own state. (heavily based on mart3p's code)
peter1138
parents:
3696
diff
changeset
|
317 |
|
219fc5d61455
(svn r4643) - NewGRF: Add support for ttdp aircraft states. This involves mapping from our own state. (heavily based on mart3p's code)
peter1138
parents:
3696
diff
changeset
|
318 |
case TERM2: |
219fc5d61455
(svn r4643) - NewGRF: Add support for ttdp aircraft states. This involves mapping from our own state. (heavily based on mart3p's code)
peter1138
parents:
3696
diff
changeset
|
319 |
if (amdflag & AMED_EXACTPOS) return AMS_TTDP_TO_PAD2; |
219fc5d61455
(svn r4643) - NewGRF: Add support for ttdp aircraft states. This involves mapping from our own state. (heavily based on mart3p's code)
peter1138
parents:
3696
diff
changeset
|
320 |
return AMS_TTDP_TO_ENTRY_2_AND_3_AND_H; |
219fc5d61455
(svn r4643) - NewGRF: Add support for ttdp aircraft states. This involves mapping from our own state. (heavily based on mart3p's code)
peter1138
parents:
3696
diff
changeset
|
321 |
|
219fc5d61455
(svn r4643) - NewGRF: Add support for ttdp aircraft states. This involves mapping from our own state. (heavily based on mart3p's code)
peter1138
parents:
3696
diff
changeset
|
322 |
case TERM3: |
219fc5d61455
(svn r4643) - NewGRF: Add support for ttdp aircraft states. This involves mapping from our own state. (heavily based on mart3p's code)
peter1138
parents:
3696
diff
changeset
|
323 |
case TERM4: |
219fc5d61455
(svn r4643) - NewGRF: Add support for ttdp aircraft states. This involves mapping from our own state. (heavily based on mart3p's code)
peter1138
parents:
3696
diff
changeset
|
324 |
case TERM5: |
219fc5d61455
(svn r4643) - NewGRF: Add support for ttdp aircraft states. This involves mapping from our own state. (heavily based on mart3p's code)
peter1138
parents:
3696
diff
changeset
|
325 |
case TERM6: |
4059
b1e1c1193f0a
(svn r5346) - Feature: Add 4 new airports. 2 for aircraft, 2 for helicopters.
richk
parents:
4058
diff
changeset
|
326 |
case TERM7: |
b1e1c1193f0a
(svn r5346) - Feature: Add 4 new airports. 2 for aircraft, 2 for helicopters.
richk
parents:
4058
diff
changeset
|
327 |
case TERM8: |
3702
219fc5d61455
(svn r4643) - NewGRF: Add support for ttdp aircraft states. This involves mapping from our own state. (heavily based on mart3p's code)
peter1138
parents:
3696
diff
changeset
|
328 |
/* TTDPatch only has 3 terminals, so treat these states the same */ |
219fc5d61455
(svn r4643) - NewGRF: Add support for ttdp aircraft states. This involves mapping from our own state. (heavily based on mart3p's code)
peter1138
parents:
3696
diff
changeset
|
329 |
if (amdflag & AMED_EXACTPOS) return AMS_TTDP_TO_PAD3; |
219fc5d61455
(svn r4643) - NewGRF: Add support for ttdp aircraft states. This involves mapping from our own state. (heavily based on mart3p's code)
peter1138
parents:
3696
diff
changeset
|
330 |
return AMS_TTDP_TO_ENTRY_2_AND_3_AND_H; |
219fc5d61455
(svn r4643) - NewGRF: Add support for ttdp aircraft states. This involves mapping from our own state. (heavily based on mart3p's code)
peter1138
parents:
3696
diff
changeset
|
331 |
|
219fc5d61455
(svn r4643) - NewGRF: Add support for ttdp aircraft states. This involves mapping from our own state. (heavily based on mart3p's code)
peter1138
parents:
3696
diff
changeset
|
332 |
case HELIPAD1: |
4059
b1e1c1193f0a
(svn r5346) - Feature: Add 4 new airports. 2 for aircraft, 2 for helicopters.
richk
parents:
4058
diff
changeset
|
333 |
case HELIPAD2: |
b1e1c1193f0a
(svn r5346) - Feature: Add 4 new airports. 2 for aircraft, 2 for helicopters.
richk
parents:
4058
diff
changeset
|
334 |
case HELIPAD3: |
b1e1c1193f0a
(svn r5346) - Feature: Add 4 new airports. 2 for aircraft, 2 for helicopters.
richk
parents:
4058
diff
changeset
|
335 |
case HELIPAD4: // Will only occur for helicopters. |
3920
cca65c17b760
(svn r5047) - NewGRF: fix typo of AIRPORT in enum
peter1138
parents:
3893
diff
changeset
|
336 |
if (amdflag & AMED_HELI_LOWER) return AMS_TTDP_HELI_LAND_AIRPORT; // Descending. |
3702
219fc5d61455
(svn r4643) - NewGRF: Add support for ttdp aircraft states. This involves mapping from our own state. (heavily based on mart3p's code)
peter1138
parents:
3696
diff
changeset
|
337 |
if (amdflag & AMED_SLOWTURN) return AMS_TTDP_FLIGHT_TO_TOWER; // Still hasn't started descent. |
219fc5d61455
(svn r4643) - NewGRF: Add support for ttdp aircraft states. This involves mapping from our own state. (heavily based on mart3p's code)
peter1138
parents:
3696
diff
changeset
|
338 |
return AMS_TTDP_TO_JUNCTION; // On the ground. |
219fc5d61455
(svn r4643) - NewGRF: Add support for ttdp aircraft states. This involves mapping from our own state. (heavily based on mart3p's code)
peter1138
parents:
3696
diff
changeset
|
339 |
|
219fc5d61455
(svn r4643) - NewGRF: Add support for ttdp aircraft states. This involves mapping from our own state. (heavily based on mart3p's code)
peter1138
parents:
3696
diff
changeset
|
340 |
case TAKEOFF: // Moving to takeoff position. |
219fc5d61455
(svn r4643) - NewGRF: Add support for ttdp aircraft states. This involves mapping from our own state. (heavily based on mart3p's code)
peter1138
parents:
3696
diff
changeset
|
341 |
return AMS_TTDP_TO_OUTWAY; |
219fc5d61455
(svn r4643) - NewGRF: Add support for ttdp aircraft states. This involves mapping from our own state. (heavily based on mart3p's code)
peter1138
parents:
3696
diff
changeset
|
342 |
|
219fc5d61455
(svn r4643) - NewGRF: Add support for ttdp aircraft states. This involves mapping from our own state. (heavily based on mart3p's code)
peter1138
parents:
3696
diff
changeset
|
343 |
case STARTTAKEOFF: // Accelerating down runway. |
219fc5d61455
(svn r4643) - NewGRF: Add support for ttdp aircraft states. This involves mapping from our own state. (heavily based on mart3p's code)
peter1138
parents:
3696
diff
changeset
|
344 |
return AMS_TTDP_TAKEOFF; |
219fc5d61455
(svn r4643) - NewGRF: Add support for ttdp aircraft states. This involves mapping from our own state. (heavily based on mart3p's code)
peter1138
parents:
3696
diff
changeset
|
345 |
|
219fc5d61455
(svn r4643) - NewGRF: Add support for ttdp aircraft states. This involves mapping from our own state. (heavily based on mart3p's code)
peter1138
parents:
3696
diff
changeset
|
346 |
case ENDTAKEOFF: // Ascent |
219fc5d61455
(svn r4643) - NewGRF: Add support for ttdp aircraft states. This involves mapping from our own state. (heavily based on mart3p's code)
peter1138
parents:
3696
diff
changeset
|
347 |
return AMS_TTDP_CLIMBING; |
219fc5d61455
(svn r4643) - NewGRF: Add support for ttdp aircraft states. This involves mapping from our own state. (heavily based on mart3p's code)
peter1138
parents:
3696
diff
changeset
|
348 |
|
219fc5d61455
(svn r4643) - NewGRF: Add support for ttdp aircraft states. This involves mapping from our own state. (heavily based on mart3p's code)
peter1138
parents:
3696
diff
changeset
|
349 |
case HELITAKEOFF: // Helicopter is moving to take off position. |
219fc5d61455
(svn r4643) - NewGRF: Add support for ttdp aircraft states. This involves mapping from our own state. (heavily based on mart3p's code)
peter1138
parents:
3696
diff
changeset
|
350 |
switch (st->airport_type) { |
219fc5d61455
(svn r4643) - NewGRF: Add support for ttdp aircraft states. This involves mapping from our own state. (heavily based on mart3p's code)
peter1138
parents:
3696
diff
changeset
|
351 |
case AT_SMALL: |
219fc5d61455
(svn r4643) - NewGRF: Add support for ttdp aircraft states. This involves mapping from our own state. (heavily based on mart3p's code)
peter1138
parents:
3696
diff
changeset
|
352 |
case AT_LARGE: |
219fc5d61455
(svn r4643) - NewGRF: Add support for ttdp aircraft states. This involves mapping from our own state. (heavily based on mart3p's code)
peter1138
parents:
3696
diff
changeset
|
353 |
case AT_METROPOLITAN: |
219fc5d61455
(svn r4643) - NewGRF: Add support for ttdp aircraft states. This involves mapping from our own state. (heavily based on mart3p's code)
peter1138
parents:
3696
diff
changeset
|
354 |
case AT_INTERNATIONAL: |
4059
b1e1c1193f0a
(svn r5346) - Feature: Add 4 new airports. 2 for aircraft, 2 for helicopters.
richk
parents:
4058
diff
changeset
|
355 |
case AT_COMMUTER: |
b1e1c1193f0a
(svn r5346) - Feature: Add 4 new airports. 2 for aircraft, 2 for helicopters.
richk
parents:
4058
diff
changeset
|
356 |
case AT_INTERCON: |
b1e1c1193f0a
(svn r5346) - Feature: Add 4 new airports. 2 for aircraft, 2 for helicopters.
richk
parents:
4058
diff
changeset
|
357 |
/* Note, Helidepot and Helistation are treated as airports as |
b1e1c1193f0a
(svn r5346) - Feature: Add 4 new airports. 2 for aircraft, 2 for helicopters.
richk
parents:
4058
diff
changeset
|
358 |
* helicopters are taking off from ground level. */ |
b1e1c1193f0a
(svn r5346) - Feature: Add 4 new airports. 2 for aircraft, 2 for helicopters.
richk
parents:
4058
diff
changeset
|
359 |
case AT_HELIDEPOT: |
b1e1c1193f0a
(svn r5346) - Feature: Add 4 new airports. 2 for aircraft, 2 for helicopters.
richk
parents:
4058
diff
changeset
|
360 |
case AT_HELISTATION: |
3920
cca65c17b760
(svn r5047) - NewGRF: fix typo of AIRPORT in enum
peter1138
parents:
3893
diff
changeset
|
361 |
if (amdflag & AMED_HELI_RAISE) return AMS_TTDP_HELI_TAKEOFF_AIRPORT; |
3702
219fc5d61455
(svn r4643) - NewGRF: Add support for ttdp aircraft states. This involves mapping from our own state. (heavily based on mart3p's code)
peter1138
parents:
3696
diff
changeset
|
362 |
return AMS_TTDP_TO_JUNCTION; |
219fc5d61455
(svn r4643) - NewGRF: Add support for ttdp aircraft states. This involves mapping from our own state. (heavily based on mart3p's code)
peter1138
parents:
3696
diff
changeset
|
363 |
|
219fc5d61455
(svn r4643) - NewGRF: Add support for ttdp aircraft states. This involves mapping from our own state. (heavily based on mart3p's code)
peter1138
parents:
3696
diff
changeset
|
364 |
case AT_HELIPORT: |
219fc5d61455
(svn r4643) - NewGRF: Add support for ttdp aircraft states. This involves mapping from our own state. (heavily based on mart3p's code)
peter1138
parents:
3696
diff
changeset
|
365 |
case AT_OILRIG: |
219fc5d61455
(svn r4643) - NewGRF: Add support for ttdp aircraft states. This involves mapping from our own state. (heavily based on mart3p's code)
peter1138
parents:
3696
diff
changeset
|
366 |
return AMS_TTDP_HELI_TAKEOFF_HELIPORT; |
219fc5d61455
(svn r4643) - NewGRF: Add support for ttdp aircraft states. This involves mapping from our own state. (heavily based on mart3p's code)
peter1138
parents:
3696
diff
changeset
|
367 |
|
219fc5d61455
(svn r4643) - NewGRF: Add support for ttdp aircraft states. This involves mapping from our own state. (heavily based on mart3p's code)
peter1138
parents:
3696
diff
changeset
|
368 |
default: |
3920
cca65c17b760
(svn r5047) - NewGRF: fix typo of AIRPORT in enum
peter1138
parents:
3893
diff
changeset
|
369 |
return AMS_TTDP_HELI_TAKEOFF_AIRPORT; |
3702
219fc5d61455
(svn r4643) - NewGRF: Add support for ttdp aircraft states. This involves mapping from our own state. (heavily based on mart3p's code)
peter1138
parents:
3696
diff
changeset
|
370 |
} |
219fc5d61455
(svn r4643) - NewGRF: Add support for ttdp aircraft states. This involves mapping from our own state. (heavily based on mart3p's code)
peter1138
parents:
3696
diff
changeset
|
371 |
|
219fc5d61455
(svn r4643) - NewGRF: Add support for ttdp aircraft states. This involves mapping from our own state. (heavily based on mart3p's code)
peter1138
parents:
3696
diff
changeset
|
372 |
case FLYING: |
219fc5d61455
(svn r4643) - NewGRF: Add support for ttdp aircraft states. This involves mapping from our own state. (heavily based on mart3p's code)
peter1138
parents:
3696
diff
changeset
|
373 |
return AMS_TTDP_FLIGHT_TO_TOWER; |
219fc5d61455
(svn r4643) - NewGRF: Add support for ttdp aircraft states. This involves mapping from our own state. (heavily based on mart3p's code)
peter1138
parents:
3696
diff
changeset
|
374 |
|
219fc5d61455
(svn r4643) - NewGRF: Add support for ttdp aircraft states. This involves mapping from our own state. (heavily based on mart3p's code)
peter1138
parents:
3696
diff
changeset
|
375 |
case LANDING: // Descent |
219fc5d61455
(svn r4643) - NewGRF: Add support for ttdp aircraft states. This involves mapping from our own state. (heavily based on mart3p's code)
peter1138
parents:
3696
diff
changeset
|
376 |
return AMS_TTDP_FLIGHT_DESCENT; |
219fc5d61455
(svn r4643) - NewGRF: Add support for ttdp aircraft states. This involves mapping from our own state. (heavily based on mart3p's code)
peter1138
parents:
3696
diff
changeset
|
377 |
|
219fc5d61455
(svn r4643) - NewGRF: Add support for ttdp aircraft states. This involves mapping from our own state. (heavily based on mart3p's code)
peter1138
parents:
3696
diff
changeset
|
378 |
case ENDLANDING: // On the runway braking |
219fc5d61455
(svn r4643) - NewGRF: Add support for ttdp aircraft states. This involves mapping from our own state. (heavily based on mart3p's code)
peter1138
parents:
3696
diff
changeset
|
379 |
if (amdflag & AMED_BRAKE) return AMS_TTDP_BRAKING; |
219fc5d61455
(svn r4643) - NewGRF: Add support for ttdp aircraft states. This involves mapping from our own state. (heavily based on mart3p's code)
peter1138
parents:
3696
diff
changeset
|
380 |
// Landed - moving off runway |
219fc5d61455
(svn r4643) - NewGRF: Add support for ttdp aircraft states. This involves mapping from our own state. (heavily based on mart3p's code)
peter1138
parents:
3696
diff
changeset
|
381 |
return AMS_TTDP_TO_INWAY; |
219fc5d61455
(svn r4643) - NewGRF: Add support for ttdp aircraft states. This involves mapping from our own state. (heavily based on mart3p's code)
peter1138
parents:
3696
diff
changeset
|
382 |
|
219fc5d61455
(svn r4643) - NewGRF: Add support for ttdp aircraft states. This involves mapping from our own state. (heavily based on mart3p's code)
peter1138
parents:
3696
diff
changeset
|
383 |
case HELILANDING: |
219fc5d61455
(svn r4643) - NewGRF: Add support for ttdp aircraft states. This involves mapping from our own state. (heavily based on mart3p's code)
peter1138
parents:
3696
diff
changeset
|
384 |
case HELIENDLANDING: // Helicoptor is decending. |
219fc5d61455
(svn r4643) - NewGRF: Add support for ttdp aircraft states. This involves mapping from our own state. (heavily based on mart3p's code)
peter1138
parents:
3696
diff
changeset
|
385 |
if (amdflag & AMED_HELI_LOWER) { |
219fc5d61455
(svn r4643) - NewGRF: Add support for ttdp aircraft states. This involves mapping from our own state. (heavily based on mart3p's code)
peter1138
parents:
3696
diff
changeset
|
386 |
switch (st->airport_type) { |
219fc5d61455
(svn r4643) - NewGRF: Add support for ttdp aircraft states. This involves mapping from our own state. (heavily based on mart3p's code)
peter1138
parents:
3696
diff
changeset
|
387 |
case AT_HELIPORT: |
219fc5d61455
(svn r4643) - NewGRF: Add support for ttdp aircraft states. This involves mapping from our own state. (heavily based on mart3p's code)
peter1138
parents:
3696
diff
changeset
|
388 |
case AT_OILRIG: |
219fc5d61455
(svn r4643) - NewGRF: Add support for ttdp aircraft states. This involves mapping from our own state. (heavily based on mart3p's code)
peter1138
parents:
3696
diff
changeset
|
389 |
return AMS_TTDP_HELI_LAND_HELIPORT; |
219fc5d61455
(svn r4643) - NewGRF: Add support for ttdp aircraft states. This involves mapping from our own state. (heavily based on mart3p's code)
peter1138
parents:
3696
diff
changeset
|
390 |
|
219fc5d61455
(svn r4643) - NewGRF: Add support for ttdp aircraft states. This involves mapping from our own state. (heavily based on mart3p's code)
peter1138
parents:
3696
diff
changeset
|
391 |
default: |
4059
b1e1c1193f0a
(svn r5346) - Feature: Add 4 new airports. 2 for aircraft, 2 for helicopters.
richk
parents:
4058
diff
changeset
|
392 |
/* Note, Helidepot and Helistation are treated as airports as |
b1e1c1193f0a
(svn r5346) - Feature: Add 4 new airports. 2 for aircraft, 2 for helicopters.
richk
parents:
4058
diff
changeset
|
393 |
* helicopters are landing at ground level. */ |
3920
cca65c17b760
(svn r5047) - NewGRF: fix typo of AIRPORT in enum
peter1138
parents:
3893
diff
changeset
|
394 |
return AMS_TTDP_HELI_LAND_AIRPORT; |
3702
219fc5d61455
(svn r4643) - NewGRF: Add support for ttdp aircraft states. This involves mapping from our own state. (heavily based on mart3p's code)
peter1138
parents:
3696
diff
changeset
|
395 |
} |
219fc5d61455
(svn r4643) - NewGRF: Add support for ttdp aircraft states. This involves mapping from our own state. (heavily based on mart3p's code)
peter1138
parents:
3696
diff
changeset
|
396 |
} |
219fc5d61455
(svn r4643) - NewGRF: Add support for ttdp aircraft states. This involves mapping from our own state. (heavily based on mart3p's code)
peter1138
parents:
3696
diff
changeset
|
397 |
return AMS_TTDP_FLIGHT_TO_TOWER; |
219fc5d61455
(svn r4643) - NewGRF: Add support for ttdp aircraft states. This involves mapping from our own state. (heavily based on mart3p's code)
peter1138
parents:
3696
diff
changeset
|
398 |
|
219fc5d61455
(svn r4643) - NewGRF: Add support for ttdp aircraft states. This involves mapping from our own state. (heavily based on mart3p's code)
peter1138
parents:
3696
diff
changeset
|
399 |
default: |
4055
582a469d6c5c
(svn r5335) - Newgrf: correct spelling of hangar
peter1138
parents:
4050
diff
changeset
|
400 |
return AMS_TTDP_HANGAR; |
3702
219fc5d61455
(svn r4643) - NewGRF: Add support for ttdp aircraft states. This involves mapping from our own state. (heavily based on mart3p's code)
peter1138
parents:
3696
diff
changeset
|
401 |
} |
219fc5d61455
(svn r4643) - NewGRF: Add support for ttdp aircraft states. This involves mapping from our own state. (heavily based on mart3p's code)
peter1138
parents:
3696
diff
changeset
|
402 |
} |
219fc5d61455
(svn r4643) - NewGRF: Add support for ttdp aircraft states. This involves mapping from our own state. (heavily based on mart3p's code)
peter1138
parents:
3696
diff
changeset
|
403 |
|
219fc5d61455
(svn r4643) - NewGRF: Add support for ttdp aircraft states. This involves mapping from our own state. (heavily based on mart3p's code)
peter1138
parents:
3696
diff
changeset
|
404 |
|
219fc5d61455
(svn r4643) - NewGRF: Add support for ttdp aircraft states. This involves mapping from our own state. (heavily based on mart3p's code)
peter1138
parents:
3696
diff
changeset
|
405 |
/* TTDP style aircraft movement action for GRF Action 2 Var 0xE6 */ |
219fc5d61455
(svn r4643) - NewGRF: Add support for ttdp aircraft states. This involves mapping from our own state. (heavily based on mart3p's code)
peter1138
parents:
3696
diff
changeset
|
406 |
enum { |
4055
582a469d6c5c
(svn r5335) - Newgrf: correct spelling of hangar
peter1138
parents:
4050
diff
changeset
|
407 |
AMA_TTDP_IN_HANGAR, |
3702
219fc5d61455
(svn r4643) - NewGRF: Add support for ttdp aircraft states. This involves mapping from our own state. (heavily based on mart3p's code)
peter1138
parents:
3696
diff
changeset
|
408 |
AMA_TTDP_ON_PAD1, |
219fc5d61455
(svn r4643) - NewGRF: Add support for ttdp aircraft states. This involves mapping from our own state. (heavily based on mart3p's code)
peter1138
parents:
3696
diff
changeset
|
409 |
AMA_TTDP_ON_PAD2, |
219fc5d61455
(svn r4643) - NewGRF: Add support for ttdp aircraft states. This involves mapping from our own state. (heavily based on mart3p's code)
peter1138
parents:
3696
diff
changeset
|
410 |
AMA_TTDP_ON_PAD3, |
4055
582a469d6c5c
(svn r5335) - Newgrf: correct spelling of hangar
peter1138
parents:
4050
diff
changeset
|
411 |
AMA_TTDP_HANGAR_TO_PAD1, |
582a469d6c5c
(svn r5335) - Newgrf: correct spelling of hangar
peter1138
parents:
4050
diff
changeset
|
412 |
AMA_TTDP_HANGAR_TO_PAD2, |
582a469d6c5c
(svn r5335) - Newgrf: correct spelling of hangar
peter1138
parents:
4050
diff
changeset
|
413 |
AMA_TTDP_HANGAR_TO_PAD3, |
3702
219fc5d61455
(svn r4643) - NewGRF: Add support for ttdp aircraft states. This involves mapping from our own state. (heavily based on mart3p's code)
peter1138
parents:
3696
diff
changeset
|
414 |
AMA_TTDP_LANDING_TO_PAD1, |
219fc5d61455
(svn r4643) - NewGRF: Add support for ttdp aircraft states. This involves mapping from our own state. (heavily based on mart3p's code)
peter1138
parents:
3696
diff
changeset
|
415 |
AMA_TTDP_LANDING_TO_PAD2, |
219fc5d61455
(svn r4643) - NewGRF: Add support for ttdp aircraft states. This involves mapping from our own state. (heavily based on mart3p's code)
peter1138
parents:
3696
diff
changeset
|
416 |
AMA_TTDP_LANDING_TO_PAD3, |
4055
582a469d6c5c
(svn r5335) - Newgrf: correct spelling of hangar
peter1138
parents:
4050
diff
changeset
|
417 |
AMA_TTDP_PAD1_TO_HANGAR, |
582a469d6c5c
(svn r5335) - Newgrf: correct spelling of hangar
peter1138
parents:
4050
diff
changeset
|
418 |
AMA_TTDP_PAD2_TO_HANGAR, |
582a469d6c5c
(svn r5335) - Newgrf: correct spelling of hangar
peter1138
parents:
4050
diff
changeset
|
419 |
AMA_TTDP_PAD3_TO_HANGAR, |
3702
219fc5d61455
(svn r4643) - NewGRF: Add support for ttdp aircraft states. This involves mapping from our own state. (heavily based on mart3p's code)
peter1138
parents:
3696
diff
changeset
|
420 |
AMA_TTDP_PAD1_TO_TAKEOFF, |
219fc5d61455
(svn r4643) - NewGRF: Add support for ttdp aircraft states. This involves mapping from our own state. (heavily based on mart3p's code)
peter1138
parents:
3696
diff
changeset
|
421 |
AMA_TTDP_PAD2_TO_TAKEOFF, |
219fc5d61455
(svn r4643) - NewGRF: Add support for ttdp aircraft states. This involves mapping from our own state. (heavily based on mart3p's code)
peter1138
parents:
3696
diff
changeset
|
422 |
AMA_TTDP_PAD3_TO_TAKEOFF, |
4055
582a469d6c5c
(svn r5335) - Newgrf: correct spelling of hangar
peter1138
parents:
4050
diff
changeset
|
423 |
AMA_TTDP_HANGAR_TO_TAKOFF, |
582a469d6c5c
(svn r5335) - Newgrf: correct spelling of hangar
peter1138
parents:
4050
diff
changeset
|
424 |
AMA_TTDP_LANDING_TO_HANGAR, |
3702
219fc5d61455
(svn r4643) - NewGRF: Add support for ttdp aircraft states. This involves mapping from our own state. (heavily based on mart3p's code)
peter1138
parents:
3696
diff
changeset
|
425 |
AMA_TTDP_IN_FLIGHT, |
219fc5d61455
(svn r4643) - NewGRF: Add support for ttdp aircraft states. This involves mapping from our own state. (heavily based on mart3p's code)
peter1138
parents:
3696
diff
changeset
|
426 |
}; |
219fc5d61455
(svn r4643) - NewGRF: Add support for ttdp aircraft states. This involves mapping from our own state. (heavily based on mart3p's code)
peter1138
parents:
3696
diff
changeset
|
427 |
|
219fc5d61455
(svn r4643) - NewGRF: Add support for ttdp aircraft states. This involves mapping from our own state. (heavily based on mart3p's code)
peter1138
parents:
3696
diff
changeset
|
428 |
|
219fc5d61455
(svn r4643) - NewGRF: Add support for ttdp aircraft states. This involves mapping from our own state. (heavily based on mart3p's code)
peter1138
parents:
3696
diff
changeset
|
429 |
/** |
219fc5d61455
(svn r4643) - NewGRF: Add support for ttdp aircraft states. This involves mapping from our own state. (heavily based on mart3p's code)
peter1138
parents:
3696
diff
changeset
|
430 |
* Map OTTD aircraft movement states to TTDPatch style movement actions |
219fc5d61455
(svn r4643) - NewGRF: Add support for ttdp aircraft states. This involves mapping from our own state. (heavily based on mart3p's code)
peter1138
parents:
3696
diff
changeset
|
431 |
* (VarAction 2 Variable 0xE6) |
219fc5d61455
(svn r4643) - NewGRF: Add support for ttdp aircraft states. This involves mapping from our own state. (heavily based on mart3p's code)
peter1138
parents:
3696
diff
changeset
|
432 |
* This is not fully supported yet but it's enough for Planeset. |
219fc5d61455
(svn r4643) - NewGRF: Add support for ttdp aircraft states. This involves mapping from our own state. (heavily based on mart3p's code)
peter1138
parents:
3696
diff
changeset
|
433 |
*/ |
219fc5d61455
(svn r4643) - NewGRF: Add support for ttdp aircraft states. This involves mapping from our own state. (heavily based on mart3p's code)
peter1138
parents:
3696
diff
changeset
|
434 |
static byte MapAircraftMovementAction(const Vehicle *v) |
219fc5d61455
(svn r4643) - NewGRF: Add support for ttdp aircraft states. This involves mapping from our own state. (heavily based on mart3p's code)
peter1138
parents:
3696
diff
changeset
|
435 |
{ |
219fc5d61455
(svn r4643) - NewGRF: Add support for ttdp aircraft states. This involves mapping from our own state. (heavily based on mart3p's code)
peter1138
parents:
3696
diff
changeset
|
436 |
switch (v->u.air.state) { |
219fc5d61455
(svn r4643) - NewGRF: Add support for ttdp aircraft states. This involves mapping from our own state. (heavily based on mart3p's code)
peter1138
parents:
3696
diff
changeset
|
437 |
case HANGAR: |
4055
582a469d6c5c
(svn r5335) - Newgrf: correct spelling of hangar
peter1138
parents:
4050
diff
changeset
|
438 |
return (v->cur_speed > 0) ? AMA_TTDP_LANDING_TO_HANGAR : AMA_TTDP_IN_HANGAR; |
3702
219fc5d61455
(svn r4643) - NewGRF: Add support for ttdp aircraft states. This involves mapping from our own state. (heavily based on mart3p's code)
peter1138
parents:
3696
diff
changeset
|
439 |
|
219fc5d61455
(svn r4643) - NewGRF: Add support for ttdp aircraft states. This involves mapping from our own state. (heavily based on mart3p's code)
peter1138
parents:
3696
diff
changeset
|
440 |
case TERM1: |
219fc5d61455
(svn r4643) - NewGRF: Add support for ttdp aircraft states. This involves mapping from our own state. (heavily based on mart3p's code)
peter1138
parents:
3696
diff
changeset
|
441 |
case HELIPAD1: |
219fc5d61455
(svn r4643) - NewGRF: Add support for ttdp aircraft states. This involves mapping from our own state. (heavily based on mart3p's code)
peter1138
parents:
3696
diff
changeset
|
442 |
return (v->current_order.type == OT_LOADING) ? AMA_TTDP_ON_PAD1 : AMA_TTDP_LANDING_TO_PAD1; |
219fc5d61455
(svn r4643) - NewGRF: Add support for ttdp aircraft states. This involves mapping from our own state. (heavily based on mart3p's code)
peter1138
parents:
3696
diff
changeset
|
443 |
|
219fc5d61455
(svn r4643) - NewGRF: Add support for ttdp aircraft states. This involves mapping from our own state. (heavily based on mart3p's code)
peter1138
parents:
3696
diff
changeset
|
444 |
case TERM2: |
219fc5d61455
(svn r4643) - NewGRF: Add support for ttdp aircraft states. This involves mapping from our own state. (heavily based on mart3p's code)
peter1138
parents:
3696
diff
changeset
|
445 |
case HELIPAD2: |
219fc5d61455
(svn r4643) - NewGRF: Add support for ttdp aircraft states. This involves mapping from our own state. (heavily based on mart3p's code)
peter1138
parents:
3696
diff
changeset
|
446 |
return (v->current_order.type == OT_LOADING) ? AMA_TTDP_ON_PAD2 : AMA_TTDP_LANDING_TO_PAD2; |
219fc5d61455
(svn r4643) - NewGRF: Add support for ttdp aircraft states. This involves mapping from our own state. (heavily based on mart3p's code)
peter1138
parents:
3696
diff
changeset
|
447 |
|
219fc5d61455
(svn r4643) - NewGRF: Add support for ttdp aircraft states. This involves mapping from our own state. (heavily based on mart3p's code)
peter1138
parents:
3696
diff
changeset
|
448 |
case TERM3: |
219fc5d61455
(svn r4643) - NewGRF: Add support for ttdp aircraft states. This involves mapping from our own state. (heavily based on mart3p's code)
peter1138
parents:
3696
diff
changeset
|
449 |
case TERM4: |
219fc5d61455
(svn r4643) - NewGRF: Add support for ttdp aircraft states. This involves mapping from our own state. (heavily based on mart3p's code)
peter1138
parents:
3696
diff
changeset
|
450 |
case TERM5: |
219fc5d61455
(svn r4643) - NewGRF: Add support for ttdp aircraft states. This involves mapping from our own state. (heavily based on mart3p's code)
peter1138
parents:
3696
diff
changeset
|
451 |
case TERM6: |
4059
b1e1c1193f0a
(svn r5346) - Feature: Add 4 new airports. 2 for aircraft, 2 for helicopters.
richk
parents:
4058
diff
changeset
|
452 |
case TERM7: |
b1e1c1193f0a
(svn r5346) - Feature: Add 4 new airports. 2 for aircraft, 2 for helicopters.
richk
parents:
4058
diff
changeset
|
453 |
case TERM8: |
b1e1c1193f0a
(svn r5346) - Feature: Add 4 new airports. 2 for aircraft, 2 for helicopters.
richk
parents:
4058
diff
changeset
|
454 |
case HELIPAD3: |
b1e1c1193f0a
(svn r5346) - Feature: Add 4 new airports. 2 for aircraft, 2 for helicopters.
richk
parents:
4058
diff
changeset
|
455 |
case HELIPAD4: |
3702
219fc5d61455
(svn r4643) - NewGRF: Add support for ttdp aircraft states. This involves mapping from our own state. (heavily based on mart3p's code)
peter1138
parents:
3696
diff
changeset
|
456 |
return (v->current_order.type == OT_LOADING) ? AMA_TTDP_ON_PAD3 : AMA_TTDP_LANDING_TO_PAD3; |
219fc5d61455
(svn r4643) - NewGRF: Add support for ttdp aircraft states. This involves mapping from our own state. (heavily based on mart3p's code)
peter1138
parents:
3696
diff
changeset
|
457 |
|
219fc5d61455
(svn r4643) - NewGRF: Add support for ttdp aircraft states. This involves mapping from our own state. (heavily based on mart3p's code)
peter1138
parents:
3696
diff
changeset
|
458 |
case TAKEOFF: // Moving to takeoff position |
219fc5d61455
(svn r4643) - NewGRF: Add support for ttdp aircraft states. This involves mapping from our own state. (heavily based on mart3p's code)
peter1138
parents:
3696
diff
changeset
|
459 |
case STARTTAKEOFF: // Accelerating down runway |
219fc5d61455
(svn r4643) - NewGRF: Add support for ttdp aircraft states. This involves mapping from our own state. (heavily based on mart3p's code)
peter1138
parents:
3696
diff
changeset
|
460 |
case ENDTAKEOFF: // Ascent |
219fc5d61455
(svn r4643) - NewGRF: Add support for ttdp aircraft states. This involves mapping from our own state. (heavily based on mart3p's code)
peter1138
parents:
3696
diff
changeset
|
461 |
case HELITAKEOFF: |
219fc5d61455
(svn r4643) - NewGRF: Add support for ttdp aircraft states. This involves mapping from our own state. (heavily based on mart3p's code)
peter1138
parents:
3696
diff
changeset
|
462 |
// TODO Need to find which terminal (or hanger) we've come from. How? |
219fc5d61455
(svn r4643) - NewGRF: Add support for ttdp aircraft states. This involves mapping from our own state. (heavily based on mart3p's code)
peter1138
parents:
3696
diff
changeset
|
463 |
return AMA_TTDP_PAD1_TO_TAKEOFF; |
219fc5d61455
(svn r4643) - NewGRF: Add support for ttdp aircraft states. This involves mapping from our own state. (heavily based on mart3p's code)
peter1138
parents:
3696
diff
changeset
|
464 |
|
219fc5d61455
(svn r4643) - NewGRF: Add support for ttdp aircraft states. This involves mapping from our own state. (heavily based on mart3p's code)
peter1138
parents:
3696
diff
changeset
|
465 |
case FLYING: |
219fc5d61455
(svn r4643) - NewGRF: Add support for ttdp aircraft states. This involves mapping from our own state. (heavily based on mart3p's code)
peter1138
parents:
3696
diff
changeset
|
466 |
return AMA_TTDP_IN_FLIGHT; |
219fc5d61455
(svn r4643) - NewGRF: Add support for ttdp aircraft states. This involves mapping from our own state. (heavily based on mart3p's code)
peter1138
parents:
3696
diff
changeset
|
467 |
|
219fc5d61455
(svn r4643) - NewGRF: Add support for ttdp aircraft states. This involves mapping from our own state. (heavily based on mart3p's code)
peter1138
parents:
3696
diff
changeset
|
468 |
case LANDING: // Descent |
219fc5d61455
(svn r4643) - NewGRF: Add support for ttdp aircraft states. This involves mapping from our own state. (heavily based on mart3p's code)
peter1138
parents:
3696
diff
changeset
|
469 |
case ENDLANDING: // On the runway braking |
219fc5d61455
(svn r4643) - NewGRF: Add support for ttdp aircraft states. This involves mapping from our own state. (heavily based on mart3p's code)
peter1138
parents:
3696
diff
changeset
|
470 |
case HELILANDING: |
219fc5d61455
(svn r4643) - NewGRF: Add support for ttdp aircraft states. This involves mapping from our own state. (heavily based on mart3p's code)
peter1138
parents:
3696
diff
changeset
|
471 |
case HELIENDLANDING: |
219fc5d61455
(svn r4643) - NewGRF: Add support for ttdp aircraft states. This involves mapping from our own state. (heavily based on mart3p's code)
peter1138
parents:
3696
diff
changeset
|
472 |
// TODO Need to check terminal we're landing to. Is it known yet? |
219fc5d61455
(svn r4643) - NewGRF: Add support for ttdp aircraft states. This involves mapping from our own state. (heavily based on mart3p's code)
peter1138
parents:
3696
diff
changeset
|
473 |
return (v->current_order.type == OT_GOTO_DEPOT) ? |
4055
582a469d6c5c
(svn r5335) - Newgrf: correct spelling of hangar
peter1138
parents:
4050
diff
changeset
|
474 |
AMA_TTDP_LANDING_TO_HANGAR : AMA_TTDP_LANDING_TO_PAD1; |
3702
219fc5d61455
(svn r4643) - NewGRF: Add support for ttdp aircraft states. This involves mapping from our own state. (heavily based on mart3p's code)
peter1138
parents:
3696
diff
changeset
|
475 |
|
219fc5d61455
(svn r4643) - NewGRF: Add support for ttdp aircraft states. This involves mapping from our own state. (heavily based on mart3p's code)
peter1138
parents:
3696
diff
changeset
|
476 |
default: |
4055
582a469d6c5c
(svn r5335) - Newgrf: correct spelling of hangar
peter1138
parents:
4050
diff
changeset
|
477 |
return AMA_TTDP_IN_HANGAR; |
3702
219fc5d61455
(svn r4643) - NewGRF: Add support for ttdp aircraft states. This involves mapping from our own state. (heavily based on mart3p's code)
peter1138
parents:
3696
diff
changeset
|
478 |
} |
219fc5d61455
(svn r4643) - NewGRF: Add support for ttdp aircraft states. This involves mapping from our own state. (heavily based on mart3p's code)
peter1138
parents:
3696
diff
changeset
|
479 |
} |
219fc5d61455
(svn r4643) - NewGRF: Add support for ttdp aircraft states. This involves mapping from our own state. (heavily based on mart3p's code)
peter1138
parents:
3696
diff
changeset
|
480 |
|
219fc5d61455
(svn r4643) - NewGRF: Add support for ttdp aircraft states. This involves mapping from our own state. (heavily based on mart3p's code)
peter1138
parents:
3696
diff
changeset
|
481 |
|
3703
3c815d04affb
(svn r4644) - NewGRF: support for variable 0x44, aircraft information. (mart3p)
peter1138
parents:
3702
diff
changeset
|
482 |
/* TTDP airport types. Used to map our types to TTDPatch's */ |
3c815d04affb
(svn r4644) - NewGRF: support for variable 0x44, aircraft information. (mart3p)
peter1138
parents:
3702
diff
changeset
|
483 |
enum { |
3c815d04affb
(svn r4644) - NewGRF: support for variable 0x44, aircraft information. (mart3p)
peter1138
parents:
3702
diff
changeset
|
484 |
ATP_TTDP_SMALL, |
3c815d04affb
(svn r4644) - NewGRF: support for variable 0x44, aircraft information. (mart3p)
peter1138
parents:
3702
diff
changeset
|
485 |
ATP_TTDP_LARGE, |
3c815d04affb
(svn r4644) - NewGRF: support for variable 0x44, aircraft information. (mart3p)
peter1138
parents:
3702
diff
changeset
|
486 |
ATP_TTDP_HELIPORT, |
3c815d04affb
(svn r4644) - NewGRF: support for variable 0x44, aircraft information. (mart3p)
peter1138
parents:
3702
diff
changeset
|
487 |
ATP_TTDP_OILRIG, |
3c815d04affb
(svn r4644) - NewGRF: support for variable 0x44, aircraft information. (mart3p)
peter1138
parents:
3702
diff
changeset
|
488 |
}; |
3c815d04affb
(svn r4644) - NewGRF: support for variable 0x44, aircraft information. (mart3p)
peter1138
parents:
3702
diff
changeset
|
489 |
|
3c815d04affb
(svn r4644) - NewGRF: support for variable 0x44, aircraft information. (mart3p)
peter1138
parents:
3702
diff
changeset
|
490 |
|
3686
16627c28741d
(svn r4611) - NewGRF: introduce new vehicle sprite group resolver code. This also fixes some known bugs (e.g. the 'Standard Five' in UKRS is now the correct colour)
peter1138
parents:
3684
diff
changeset
|
491 |
/* Vehicle Resolver Functions */ |
16627c28741d
(svn r4611) - NewGRF: introduce new vehicle sprite group resolver code. This also fixes some known bugs (e.g. the 'Standard Five' in UKRS is now the correct colour)
peter1138
parents:
3684
diff
changeset
|
492 |
static inline const Vehicle *GRV(const ResolverObject *object) |
16627c28741d
(svn r4611) - NewGRF: introduce new vehicle sprite group resolver code. This also fixes some known bugs (e.g. the 'Standard Five' in UKRS is now the correct colour)
peter1138
parents:
3684
diff
changeset
|
493 |
{ |
3720
8a82d64ea485
(svn r4691) - Codechange: don't use unnamed unions as GCC 2.95.ancient won't compile it. Needed for our MorphOS user ;)
peter1138
parents:
3706
diff
changeset
|
494 |
return object->scope == VSG_SCOPE_SELF ? object->u.vehicle.self : object->u.vehicle.parent; |
3686
16627c28741d
(svn r4611) - NewGRF: introduce new vehicle sprite group resolver code. This also fixes some known bugs (e.g. the 'Standard Five' in UKRS is now the correct colour)
peter1138
parents:
3684
diff
changeset
|
495 |
} |
16627c28741d
(svn r4611) - NewGRF: introduce new vehicle sprite group resolver code. This also fixes some known bugs (e.g. the 'Standard Five' in UKRS is now the correct colour)
peter1138
parents:
3684
diff
changeset
|
496 |
|
16627c28741d
(svn r4611) - NewGRF: introduce new vehicle sprite group resolver code. This also fixes some known bugs (e.g. the 'Standard Five' in UKRS is now the correct colour)
peter1138
parents:
3684
diff
changeset
|
497 |
|
16627c28741d
(svn r4611) - NewGRF: introduce new vehicle sprite group resolver code. This also fixes some known bugs (e.g. the 'Standard Five' in UKRS is now the correct colour)
peter1138
parents:
3684
diff
changeset
|
498 |
static uint32 VehicleGetRandomBits(const ResolverObject *object) |
16627c28741d
(svn r4611) - NewGRF: introduce new vehicle sprite group resolver code. This also fixes some known bugs (e.g. the 'Standard Five' in UKRS is now the correct colour)
peter1138
parents:
3684
diff
changeset
|
499 |
{ |
16627c28741d
(svn r4611) - NewGRF: introduce new vehicle sprite group resolver code. This also fixes some known bugs (e.g. the 'Standard Five' in UKRS is now the correct colour)
peter1138
parents:
3684
diff
changeset
|
500 |
return GRV(object) == NULL ? 0 : GRV(object)->random_bits; |
16627c28741d
(svn r4611) - NewGRF: introduce new vehicle sprite group resolver code. This also fixes some known bugs (e.g. the 'Standard Five' in UKRS is now the correct colour)
peter1138
parents:
3684
diff
changeset
|
501 |
} |
16627c28741d
(svn r4611) - NewGRF: introduce new vehicle sprite group resolver code. This also fixes some known bugs (e.g. the 'Standard Five' in UKRS is now the correct colour)
peter1138
parents:
3684
diff
changeset
|
502 |
|
16627c28741d
(svn r4611) - NewGRF: introduce new vehicle sprite group resolver code. This also fixes some known bugs (e.g. the 'Standard Five' in UKRS is now the correct colour)
peter1138
parents:
3684
diff
changeset
|
503 |
|
16627c28741d
(svn r4611) - NewGRF: introduce new vehicle sprite group resolver code. This also fixes some known bugs (e.g. the 'Standard Five' in UKRS is now the correct colour)
peter1138
parents:
3684
diff
changeset
|
504 |
static uint32 VehicleGetTriggers(const ResolverObject *object) |
16627c28741d
(svn r4611) - NewGRF: introduce new vehicle sprite group resolver code. This also fixes some known bugs (e.g. the 'Standard Five' in UKRS is now the correct colour)
peter1138
parents:
3684
diff
changeset
|
505 |
{ |
16627c28741d
(svn r4611) - NewGRF: introduce new vehicle sprite group resolver code. This also fixes some known bugs (e.g. the 'Standard Five' in UKRS is now the correct colour)
peter1138
parents:
3684
diff
changeset
|
506 |
return GRV(object) == NULL ? 0 : GRV(object)->waiting_triggers; |
16627c28741d
(svn r4611) - NewGRF: introduce new vehicle sprite group resolver code. This also fixes some known bugs (e.g. the 'Standard Five' in UKRS is now the correct colour)
peter1138
parents:
3684
diff
changeset
|
507 |
} |
16627c28741d
(svn r4611) - NewGRF: introduce new vehicle sprite group resolver code. This also fixes some known bugs (e.g. the 'Standard Five' in UKRS is now the correct colour)
peter1138
parents:
3684
diff
changeset
|
508 |
|
16627c28741d
(svn r4611) - NewGRF: introduce new vehicle sprite group resolver code. This also fixes some known bugs (e.g. the 'Standard Five' in UKRS is now the correct colour)
peter1138
parents:
3684
diff
changeset
|
509 |
|
16627c28741d
(svn r4611) - NewGRF: introduce new vehicle sprite group resolver code. This also fixes some known bugs (e.g. the 'Standard Five' in UKRS is now the correct colour)
peter1138
parents:
3684
diff
changeset
|
510 |
static void VehicleSetTriggers(const ResolverObject *object, int triggers) |
16627c28741d
(svn r4611) - NewGRF: introduce new vehicle sprite group resolver code. This also fixes some known bugs (e.g. the 'Standard Five' in UKRS is now the correct colour)
peter1138
parents:
3684
diff
changeset
|
511 |
{ |
16627c28741d
(svn r4611) - NewGRF: introduce new vehicle sprite group resolver code. This also fixes some known bugs (e.g. the 'Standard Five' in UKRS is now the correct colour)
peter1138
parents:
3684
diff
changeset
|
512 |
/* Evil cast to get around const-ness. This used to be achieved by an |
16627c28741d
(svn r4611) - NewGRF: introduce new vehicle sprite group resolver code. This also fixes some known bugs (e.g. the 'Standard Five' in UKRS is now the correct colour)
peter1138
parents:
3684
diff
changeset
|
513 |
* innocent looking function pointer cast... Currently I cannot see a |
16627c28741d
(svn r4611) - NewGRF: introduce new vehicle sprite group resolver code. This also fixes some known bugs (e.g. the 'Standard Five' in UKRS is now the correct colour)
peter1138
parents:
3684
diff
changeset
|
514 |
* way of avoiding this without removing consts deep within gui code. |
16627c28741d
(svn r4611) - NewGRF: introduce new vehicle sprite group resolver code. This also fixes some known bugs (e.g. the 'Standard Five' in UKRS is now the correct colour)
peter1138
parents:
3684
diff
changeset
|
515 |
*/ |
16627c28741d
(svn r4611) - NewGRF: introduce new vehicle sprite group resolver code. This also fixes some known bugs (e.g. the 'Standard Five' in UKRS is now the correct colour)
peter1138
parents:
3684
diff
changeset
|
516 |
Vehicle *v = (Vehicle*)GRV(object); |
16627c28741d
(svn r4611) - NewGRF: introduce new vehicle sprite group resolver code. This also fixes some known bugs (e.g. the 'Standard Five' in UKRS is now the correct colour)
peter1138
parents:
3684
diff
changeset
|
517 |
|
16627c28741d
(svn r4611) - NewGRF: introduce new vehicle sprite group resolver code. This also fixes some known bugs (e.g. the 'Standard Five' in UKRS is now the correct colour)
peter1138
parents:
3684
diff
changeset
|
518 |
/* This function must only be called when processing triggers -- any |
16627c28741d
(svn r4611) - NewGRF: introduce new vehicle sprite group resolver code. This also fixes some known bugs (e.g. the 'Standard Five' in UKRS is now the correct colour)
peter1138
parents:
3684
diff
changeset
|
519 |
* other time is an error. */ |
16627c28741d
(svn r4611) - NewGRF: introduce new vehicle sprite group resolver code. This also fixes some known bugs (e.g. the 'Standard Five' in UKRS is now the correct colour)
peter1138
parents:
3684
diff
changeset
|
520 |
assert(object->trigger != 0); |
16627c28741d
(svn r4611) - NewGRF: introduce new vehicle sprite group resolver code. This also fixes some known bugs (e.g. the 'Standard Five' in UKRS is now the correct colour)
peter1138
parents:
3684
diff
changeset
|
521 |
|
16627c28741d
(svn r4611) - NewGRF: introduce new vehicle sprite group resolver code. This also fixes some known bugs (e.g. the 'Standard Five' in UKRS is now the correct colour)
peter1138
parents:
3684
diff
changeset
|
522 |
if (v != NULL) v->waiting_triggers = triggers; |
16627c28741d
(svn r4611) - NewGRF: introduce new vehicle sprite group resolver code. This also fixes some known bugs (e.g. the 'Standard Five' in UKRS is now the correct colour)
peter1138
parents:
3684
diff
changeset
|
523 |
} |
16627c28741d
(svn r4611) - NewGRF: introduce new vehicle sprite group resolver code. This also fixes some known bugs (e.g. the 'Standard Five' in UKRS is now the correct colour)
peter1138
parents:
3684
diff
changeset
|
524 |
|
16627c28741d
(svn r4611) - NewGRF: introduce new vehicle sprite group resolver code. This also fixes some known bugs (e.g. the 'Standard Five' in UKRS is now the correct colour)
peter1138
parents:
3684
diff
changeset
|
525 |
|
4058
7d1e904e79b5
(svn r5338) - NewGRF: add support for vehicle variable 48, vehicle type info (more mart3p)
peter1138
parents:
4057
diff
changeset
|
526 |
static uint32 GetVehicleTypeInfo(EngineID engine_type) |
7d1e904e79b5
(svn r5338) - NewGRF: add support for vehicle variable 48, vehicle type info (more mart3p)
peter1138
parents:
4057
diff
changeset
|
527 |
{ |
7d1e904e79b5
(svn r5338) - NewGRF: add support for vehicle variable 48, vehicle type info (more mart3p)
peter1138
parents:
4057
diff
changeset
|
528 |
/* Bit 0 Vehicle type is available on the market |
7d1e904e79b5
(svn r5338) - NewGRF: add support for vehicle variable 48, vehicle type info (more mart3p)
peter1138
parents:
4057
diff
changeset
|
529 |
* Bit 1 Vehicle type is in the testing phase |
7d1e904e79b5
(svn r5338) - NewGRF: add support for vehicle variable 48, vehicle type info (more mart3p)
peter1138
parents:
4057
diff
changeset
|
530 |
* Bit 2 Exclusive testing offer for a human player active */ |
7d1e904e79b5
(svn r5338) - NewGRF: add support for vehicle variable 48, vehicle type info (more mart3p)
peter1138
parents:
4057
diff
changeset
|
531 |
const Engine *e = GetEngine(engine_type); |
7d1e904e79b5
(svn r5338) - NewGRF: add support for vehicle variable 48, vehicle type info (more mart3p)
peter1138
parents:
4057
diff
changeset
|
532 |
uint32 var = 0; |
7d1e904e79b5
(svn r5338) - NewGRF: add support for vehicle variable 48, vehicle type info (more mart3p)
peter1138
parents:
4057
diff
changeset
|
533 |
|
7d1e904e79b5
(svn r5338) - NewGRF: add support for vehicle variable 48, vehicle type info (more mart3p)
peter1138
parents:
4057
diff
changeset
|
534 |
if (e->player_avail == 0xFF) SETBIT(var, 0); |
7d1e904e79b5
(svn r5338) - NewGRF: add support for vehicle variable 48, vehicle type info (more mart3p)
peter1138
parents:
4057
diff
changeset
|
535 |
if (e->age < e->duration_phase_1) SETBIT(var, 1); |
7d1e904e79b5
(svn r5338) - NewGRF: add support for vehicle variable 48, vehicle type info (more mart3p)
peter1138
parents:
4057
diff
changeset
|
536 |
if (e->player_avail > 0 && e->player_avail != 0xFF) SETBIT(var, 2); |
7d1e904e79b5
(svn r5338) - NewGRF: add support for vehicle variable 48, vehicle type info (more mart3p)
peter1138
parents:
4057
diff
changeset
|
537 |
return var; |
7d1e904e79b5
(svn r5338) - NewGRF: add support for vehicle variable 48, vehicle type info (more mart3p)
peter1138
parents:
4057
diff
changeset
|
538 |
} |
7d1e904e79b5
(svn r5338) - NewGRF: add support for vehicle variable 48, vehicle type info (more mart3p)
peter1138
parents:
4057
diff
changeset
|
539 |
|
7d1e904e79b5
(svn r5338) - NewGRF: add support for vehicle variable 48, vehicle type info (more mart3p)
peter1138
parents:
4057
diff
changeset
|
540 |
|
4057
863fce30596d
(svn r5337) - NewGRF: pass the engine type to the engine resolver, to allow support for variable 7F for unbuilt vehicles (mart3p)
peter1138
parents:
4056
diff
changeset
|
541 |
static uint32 GetGRFParameter(EngineID engine_type, byte parameter) |
863fce30596d
(svn r5337) - NewGRF: pass the engine type to the engine resolver, to allow support for variable 7F for unbuilt vehicles (mart3p)
peter1138
parents:
4056
diff
changeset
|
542 |
{ |
863fce30596d
(svn r5337) - NewGRF: pass the engine type to the engine resolver, to allow support for variable 7F for unbuilt vehicles (mart3p)
peter1138
parents:
4056
diff
changeset
|
543 |
const GRFFile *file = GetEngineGRF(engine_type); |
863fce30596d
(svn r5337) - NewGRF: pass the engine type to the engine resolver, to allow support for variable 7F for unbuilt vehicles (mart3p)
peter1138
parents:
4056
diff
changeset
|
544 |
|
863fce30596d
(svn r5337) - NewGRF: pass the engine type to the engine resolver, to allow support for variable 7F for unbuilt vehicles (mart3p)
peter1138
parents:
4056
diff
changeset
|
545 |
if (parameter >= file->param_end) return 0; |
863fce30596d
(svn r5337) - NewGRF: pass the engine type to the engine resolver, to allow support for variable 7F for unbuilt vehicles (mart3p)
peter1138
parents:
4056
diff
changeset
|
546 |
return file->param[parameter]; |
863fce30596d
(svn r5337) - NewGRF: pass the engine type to the engine resolver, to allow support for variable 7F for unbuilt vehicles (mart3p)
peter1138
parents:
4056
diff
changeset
|
547 |
} |
863fce30596d
(svn r5337) - NewGRF: pass the engine type to the engine resolver, to allow support for variable 7F for unbuilt vehicles (mart3p)
peter1138
parents:
4056
diff
changeset
|
548 |
|
863fce30596d
(svn r5337) - NewGRF: pass the engine type to the engine resolver, to allow support for variable 7F for unbuilt vehicles (mart3p)
peter1138
parents:
4056
diff
changeset
|
549 |
|
3893
ced26054ee00
(svn r4960) - NewGRF: explicitly handle unsupported variables, instead of returning -1.
peter1138
parents:
3870
diff
changeset
|
550 |
static uint32 VehicleGetVariable(const ResolverObject *object, byte variable, byte parameter, bool *available) |
3686
16627c28741d
(svn r4611) - NewGRF: introduce new vehicle sprite group resolver code. This also fixes some known bugs (e.g. the 'Standard Five' in UKRS is now the correct colour)
peter1138
parents:
3684
diff
changeset
|
551 |
{ |
16627c28741d
(svn r4611) - NewGRF: introduce new vehicle sprite group resolver code. This also fixes some known bugs (e.g. the 'Standard Five' in UKRS is now the correct colour)
peter1138
parents:
3684
diff
changeset
|
552 |
const Vehicle *v = GRV(object); |
16627c28741d
(svn r4611) - NewGRF: introduce new vehicle sprite group resolver code. This also fixes some known bugs (e.g. the 'Standard Five' in UKRS is now the correct colour)
peter1138
parents:
3684
diff
changeset
|
553 |
|
16627c28741d
(svn r4611) - NewGRF: introduce new vehicle sprite group resolver code. This also fixes some known bugs (e.g. the 'Standard Five' in UKRS is now the correct colour)
peter1138
parents:
3684
diff
changeset
|
554 |
if (v == NULL) { |
16627c28741d
(svn r4611) - NewGRF: introduce new vehicle sprite group resolver code. This also fixes some known bugs (e.g. the 'Standard Five' in UKRS is now the correct colour)
peter1138
parents:
3684
diff
changeset
|
555 |
/* Vehicle does not exist, so we're in a purchase list */ |
16627c28741d
(svn r4611) - NewGRF: introduce new vehicle sprite group resolver code. This also fixes some known bugs (e.g. the 'Standard Five' in UKRS is now the correct colour)
peter1138
parents:
3684
diff
changeset
|
556 |
switch (variable) { |
16627c28741d
(svn r4611) - NewGRF: introduce new vehicle sprite group resolver code. This also fixes some known bugs (e.g. the 'Standard Five' in UKRS is now the correct colour)
peter1138
parents:
3684
diff
changeset
|
557 |
case 0x43: return _current_player; /* Owner information */ |
16627c28741d
(svn r4611) - NewGRF: introduce new vehicle sprite group resolver code. This also fixes some known bugs (e.g. the 'Standard Five' in UKRS is now the correct colour)
peter1138
parents:
3684
diff
changeset
|
558 |
case 0x46: return 0; /* Motion counter */ |
4058
7d1e904e79b5
(svn r5338) - NewGRF: add support for vehicle variable 48, vehicle type info (more mart3p)
peter1138
parents:
4057
diff
changeset
|
559 |
case 0x48: return GetVehicleTypeInfo(object->u.vehicle.self_type); /* Vehicle Type Info */ |
4322
f40bbdf476b3
(svn r5975) -Cleanup: use ORIGINAL_BASE_YEAR & ORIGINAL_MAX_YEAR where the functions really depend on the original date format.
rubidium
parents:
4293
diff
changeset
|
560 |
case 0xC4: return clamp(_cur_year, ORIGINAL_BASE_YEAR, ORIGINAL_MAX_YEAR) - ORIGINAL_BASE_YEAR; /* Build year */ |
3686
16627c28741d
(svn r4611) - NewGRF: introduce new vehicle sprite group resolver code. This also fixes some known bugs (e.g. the 'Standard Five' in UKRS is now the correct colour)
peter1138
parents:
3684
diff
changeset
|
561 |
case 0xDA: return INVALID_VEHICLE; /* Next vehicle */ |
4057
863fce30596d
(svn r5337) - NewGRF: pass the engine type to the engine resolver, to allow support for variable 7F for unbuilt vehicles (mart3p)
peter1138
parents:
4056
diff
changeset
|
562 |
case 0x7F: return GetGRFParameter(object->u.vehicle.self_type, parameter); /* Read GRF parameter */ |
3686
16627c28741d
(svn r4611) - NewGRF: introduce new vehicle sprite group resolver code. This also fixes some known bugs (e.g. the 'Standard Five' in UKRS is now the correct colour)
peter1138
parents:
3684
diff
changeset
|
563 |
} |
3893
ced26054ee00
(svn r4960) - NewGRF: explicitly handle unsupported variables, instead of returning -1.
peter1138
parents:
3870
diff
changeset
|
564 |
|
ced26054ee00
(svn r4960) - NewGRF: explicitly handle unsupported variables, instead of returning -1.
peter1138
parents:
3870
diff
changeset
|
565 |
*available = false; |
5587
167d9a91ef02
(svn r8038) -Merge: the cpp branch. Effort of KUDr, Celestar, glx, Smoovius, stillunknown and pv2b.
rubidium
parents:
5584
diff
changeset
|
566 |
return UINT_MAX; |
3686
16627c28741d
(svn r4611) - NewGRF: introduce new vehicle sprite group resolver code. This also fixes some known bugs (e.g. the 'Standard Five' in UKRS is now the correct colour)
peter1138
parents:
3684
diff
changeset
|
567 |
} |
16627c28741d
(svn r4611) - NewGRF: introduce new vehicle sprite group resolver code. This also fixes some known bugs (e.g. the 'Standard Five' in UKRS is now the correct colour)
peter1138
parents:
3684
diff
changeset
|
568 |
|
16627c28741d
(svn r4611) - NewGRF: introduce new vehicle sprite group resolver code. This also fixes some known bugs (e.g. the 'Standard Five' in UKRS is now the correct colour)
peter1138
parents:
3684
diff
changeset
|
569 |
/* Calculated vehicle parameters */ |
16627c28741d
(svn r4611) - NewGRF: introduce new vehicle sprite group resolver code. This also fixes some known bugs (e.g. the 'Standard Five' in UKRS is now the correct colour)
peter1138
parents:
3684
diff
changeset
|
570 |
switch (variable) { |
16627c28741d
(svn r4611) - NewGRF: introduce new vehicle sprite group resolver code. This also fixes some known bugs (e.g. the 'Standard Five' in UKRS is now the correct colour)
peter1138
parents:
3684
diff
changeset
|
571 |
case 0x40: /* Get length of consist */ |
16627c28741d
(svn r4611) - NewGRF: introduce new vehicle sprite group resolver code. This also fixes some known bugs (e.g. the 'Standard Five' in UKRS is now the correct colour)
peter1138
parents:
3684
diff
changeset
|
572 |
case 0x41: /* Get length of same consecutive wagons */ |
16627c28741d
(svn r4611) - NewGRF: introduce new vehicle sprite group resolver code. This also fixes some known bugs (e.g. the 'Standard Five' in UKRS is now the correct colour)
peter1138
parents:
3684
diff
changeset
|
573 |
if (v->type != VEH_Train) return 1; |
16627c28741d
(svn r4611) - NewGRF: introduce new vehicle sprite group resolver code. This also fixes some known bugs (e.g. the 'Standard Five' in UKRS is now the correct colour)
peter1138
parents:
3684
diff
changeset
|
574 |
|
16627c28741d
(svn r4611) - NewGRF: introduce new vehicle sprite group resolver code. This also fixes some known bugs (e.g. the 'Standard Five' in UKRS is now the correct colour)
peter1138
parents:
3684
diff
changeset
|
575 |
{ |
16627c28741d
(svn r4611) - NewGRF: introduce new vehicle sprite group resolver code. This also fixes some known bugs (e.g. the 'Standard Five' in UKRS is now the correct colour)
peter1138
parents:
3684
diff
changeset
|
576 |
const Vehicle* u; |
16627c28741d
(svn r4611) - NewGRF: introduce new vehicle sprite group resolver code. This also fixes some known bugs (e.g. the 'Standard Five' in UKRS is now the correct colour)
peter1138
parents:
3684
diff
changeset
|
577 |
byte chain_before = 0; |
16627c28741d
(svn r4611) - NewGRF: introduce new vehicle sprite group resolver code. This also fixes some known bugs (e.g. the 'Standard Five' in UKRS is now the correct colour)
peter1138
parents:
3684
diff
changeset
|
578 |
byte chain_after = 0; |
16627c28741d
(svn r4611) - NewGRF: introduce new vehicle sprite group resolver code. This also fixes some known bugs (e.g. the 'Standard Five' in UKRS is now the correct colour)
peter1138
parents:
3684
diff
changeset
|
579 |
|
16627c28741d
(svn r4611) - NewGRF: introduce new vehicle sprite group resolver code. This also fixes some known bugs (e.g. the 'Standard Five' in UKRS is now the correct colour)
peter1138
parents:
3684
diff
changeset
|
580 |
for (u = GetFirstVehicleInChain(v); u != v; u = u->next) { |
16627c28741d
(svn r4611) - NewGRF: introduce new vehicle sprite group resolver code. This also fixes some known bugs (e.g. the 'Standard Five' in UKRS is now the correct colour)
peter1138
parents:
3684
diff
changeset
|
581 |
chain_before++; |
16627c28741d
(svn r4611) - NewGRF: introduce new vehicle sprite group resolver code. This also fixes some known bugs (e.g. the 'Standard Five' in UKRS is now the correct colour)
peter1138
parents:
3684
diff
changeset
|
582 |
if (variable == 0x41 && u->engine_type != v->engine_type) chain_before = 0; |
16627c28741d
(svn r4611) - NewGRF: introduce new vehicle sprite group resolver code. This also fixes some known bugs (e.g. the 'Standard Five' in UKRS is now the correct colour)
peter1138
parents:
3684
diff
changeset
|
583 |
} |
16627c28741d
(svn r4611) - NewGRF: introduce new vehicle sprite group resolver code. This also fixes some known bugs (e.g. the 'Standard Five' in UKRS is now the correct colour)
peter1138
parents:
3684
diff
changeset
|
584 |
|
16627c28741d
(svn r4611) - NewGRF: introduce new vehicle sprite group resolver code. This also fixes some known bugs (e.g. the 'Standard Five' in UKRS is now the correct colour)
peter1138
parents:
3684
diff
changeset
|
585 |
while (u->next != NULL && (variable == 0x40 || u->next->engine_type == v->engine_type)) { |
16627c28741d
(svn r4611) - NewGRF: introduce new vehicle sprite group resolver code. This also fixes some known bugs (e.g. the 'Standard Five' in UKRS is now the correct colour)
peter1138
parents:
3684
diff
changeset
|
586 |
chain_after++; |
16627c28741d
(svn r4611) - NewGRF: introduce new vehicle sprite group resolver code. This also fixes some known bugs (e.g. the 'Standard Five' in UKRS is now the correct colour)
peter1138
parents:
3684
diff
changeset
|
587 |
u = u->next; |
16627c28741d
(svn r4611) - NewGRF: introduce new vehicle sprite group resolver code. This also fixes some known bugs (e.g. the 'Standard Five' in UKRS is now the correct colour)
peter1138
parents:
3684
diff
changeset
|
588 |
} |
16627c28741d
(svn r4611) - NewGRF: introduce new vehicle sprite group resolver code. This also fixes some known bugs (e.g. the 'Standard Five' in UKRS is now the correct colour)
peter1138
parents:
3684
diff
changeset
|
589 |
|
5174
0f31845853d3
(svn r7284) -Fix (r2361): off by one when calculating vehicle newgrf variable 41 result, partly blamed by vague documentation... (thanks lakie)
peter1138
parents:
5172
diff
changeset
|
590 |
return chain_before | chain_after << 8 | (chain_before + chain_after + (variable == 0x41)) << 16; |
3686
16627c28741d
(svn r4611) - NewGRF: introduce new vehicle sprite group resolver code. This also fixes some known bugs (e.g. the 'Standard Five' in UKRS is now the correct colour)
peter1138
parents:
3684
diff
changeset
|
591 |
} |
16627c28741d
(svn r4611) - NewGRF: introduce new vehicle sprite group resolver code. This also fixes some known bugs (e.g. the 'Standard Five' in UKRS is now the correct colour)
peter1138
parents:
3684
diff
changeset
|
592 |
|
3843
03f39cd3dc56
(svn r4867) - NewGRF: implement partial support for engine variable 0x42
peter1138
parents:
3785
diff
changeset
|
593 |
case 0x42: { /* Consist cargo information */ |
03f39cd3dc56
(svn r4867) - NewGRF: implement partial support for engine variable 0x42
peter1138
parents:
3785
diff
changeset
|
594 |
/* XXX Missing support for common refit cycle and property 25 */ |
03f39cd3dc56
(svn r4867) - NewGRF: implement partial support for engine variable 0x42
peter1138
parents:
3785
diff
changeset
|
595 |
const Vehicle *u; |
03f39cd3dc56
(svn r4867) - NewGRF: implement partial support for engine variable 0x42
peter1138
parents:
3785
diff
changeset
|
596 |
byte cargo_classes = 0; |
03f39cd3dc56
(svn r4867) - NewGRF: implement partial support for engine variable 0x42
peter1138
parents:
3785
diff
changeset
|
597 |
uint common_cargo_best = 0; |
03f39cd3dc56
(svn r4867) - NewGRF: implement partial support for engine variable 0x42
peter1138
parents:
3785
diff
changeset
|
598 |
uint common_cargos[NUM_GLOBAL_CID]; |
3862
fe7b57944a39
(svn r4896) - NewGRF: add support for vehicle property 0x25 (user defined data) used by variable 0x42.
peter1138
parents:
3848
diff
changeset
|
599 |
byte user_def_data = 0; |
3843
03f39cd3dc56
(svn r4867) - NewGRF: implement partial support for engine variable 0x42
peter1138
parents:
3785
diff
changeset
|
600 |
CargoID cargo; |
03f39cd3dc56
(svn r4867) - NewGRF: implement partial support for engine variable 0x42
peter1138
parents:
3785
diff
changeset
|
601 |
CargoID common_cargo_type = GC_PASSENGERS; |
03f39cd3dc56
(svn r4867) - NewGRF: implement partial support for engine variable 0x42
peter1138
parents:
3785
diff
changeset
|
602 |
|
03f39cd3dc56
(svn r4867) - NewGRF: implement partial support for engine variable 0x42
peter1138
parents:
3785
diff
changeset
|
603 |
/* Reset our arrays */ |
03f39cd3dc56
(svn r4867) - NewGRF: implement partial support for engine variable 0x42
peter1138
parents:
3785
diff
changeset
|
604 |
memset(common_cargos, 0, sizeof(common_cargos)); |
03f39cd3dc56
(svn r4867) - NewGRF: implement partial support for engine variable 0x42
peter1138
parents:
3785
diff
changeset
|
605 |
|
03f39cd3dc56
(svn r4867) - NewGRF: implement partial support for engine variable 0x42
peter1138
parents:
3785
diff
changeset
|
606 |
for (u = v; u != NULL; u = u->next) { |
03f39cd3dc56
(svn r4867) - NewGRF: implement partial support for engine variable 0x42
peter1138
parents:
3785
diff
changeset
|
607 |
/* Skip empty engines */ |
03f39cd3dc56
(svn r4867) - NewGRF: implement partial support for engine variable 0x42
peter1138
parents:
3785
diff
changeset
|
608 |
if (u->cargo_cap == 0) continue; |
03f39cd3dc56
(svn r4867) - NewGRF: implement partial support for engine variable 0x42
peter1138
parents:
3785
diff
changeset
|
609 |
/* Map from climate to global cargo ID */ |
03f39cd3dc56
(svn r4867) - NewGRF: implement partial support for engine variable 0x42
peter1138
parents:
3785
diff
changeset
|
610 |
cargo = _global_cargo_id[_opt.landscape][u->cargo_type]; |
03f39cd3dc56
(svn r4867) - NewGRF: implement partial support for engine variable 0x42
peter1138
parents:
3785
diff
changeset
|
611 |
cargo_classes |= _cargo_classes[cargo]; |
03f39cd3dc56
(svn r4867) - NewGRF: implement partial support for engine variable 0x42
peter1138
parents:
3785
diff
changeset
|
612 |
common_cargos[cargo]++; |
3862
fe7b57944a39
(svn r4896) - NewGRF: add support for vehicle property 0x25 (user defined data) used by variable 0x42.
peter1138
parents:
3848
diff
changeset
|
613 |
user_def_data |= RailVehInfo(u->engine_type)->user_def_data; |
3843
03f39cd3dc56
(svn r4867) - NewGRF: implement partial support for engine variable 0x42
peter1138
parents:
3785
diff
changeset
|
614 |
} |
03f39cd3dc56
(svn r4867) - NewGRF: implement partial support for engine variable 0x42
peter1138
parents:
3785
diff
changeset
|
615 |
|
03f39cd3dc56
(svn r4867) - NewGRF: implement partial support for engine variable 0x42
peter1138
parents:
3785
diff
changeset
|
616 |
/* Pick the most common cargo type */ |
03f39cd3dc56
(svn r4867) - NewGRF: implement partial support for engine variable 0x42
peter1138
parents:
3785
diff
changeset
|
617 |
for (cargo = 0; cargo < NUM_GLOBAL_CID; cargo++) { |
03f39cd3dc56
(svn r4867) - NewGRF: implement partial support for engine variable 0x42
peter1138
parents:
3785
diff
changeset
|
618 |
if (common_cargos[cargo] > common_cargo_best) { |
03f39cd3dc56
(svn r4867) - NewGRF: implement partial support for engine variable 0x42
peter1138
parents:
3785
diff
changeset
|
619 |
common_cargo_best = common_cargos[cargo]; |
03f39cd3dc56
(svn r4867) - NewGRF: implement partial support for engine variable 0x42
peter1138
parents:
3785
diff
changeset
|
620 |
common_cargo_type = cargo; |
03f39cd3dc56
(svn r4867) - NewGRF: implement partial support for engine variable 0x42
peter1138
parents:
3785
diff
changeset
|
621 |
} |
03f39cd3dc56
(svn r4867) - NewGRF: implement partial support for engine variable 0x42
peter1138
parents:
3785
diff
changeset
|
622 |
} |
03f39cd3dc56
(svn r4867) - NewGRF: implement partial support for engine variable 0x42
peter1138
parents:
3785
diff
changeset
|
623 |
|
3862
fe7b57944a39
(svn r4896) - NewGRF: add support for vehicle property 0x25 (user defined data) used by variable 0x42.
peter1138
parents:
3848
diff
changeset
|
624 |
return cargo_classes | (common_cargo_type << 8) | (user_def_data << 24); |
3843
03f39cd3dc56
(svn r4867) - NewGRF: implement partial support for engine variable 0x42
peter1138
parents:
3785
diff
changeset
|
625 |
} |
03f39cd3dc56
(svn r4867) - NewGRF: implement partial support for engine variable 0x42
peter1138
parents:
3785
diff
changeset
|
626 |
|
3686
16627c28741d
(svn r4611) - NewGRF: introduce new vehicle sprite group resolver code. This also fixes some known bugs (e.g. the 'Standard Five' in UKRS is now the correct colour)
peter1138
parents:
3684
diff
changeset
|
627 |
case 0x43: /* Player information */ |
16627c28741d
(svn r4611) - NewGRF: introduce new vehicle sprite group resolver code. This also fixes some known bugs (e.g. the 'Standard Five' in UKRS is now the correct colour)
peter1138
parents:
3684
diff
changeset
|
628 |
return v->owner; |
16627c28741d
(svn r4611) - NewGRF: introduce new vehicle sprite group resolver code. This also fixes some known bugs (e.g. the 'Standard Five' in UKRS is now the correct colour)
peter1138
parents:
3684
diff
changeset
|
629 |
|
3703
3c815d04affb
(svn r4644) - NewGRF: support for variable 0x44, aircraft information. (mart3p)
peter1138
parents:
3702
diff
changeset
|
630 |
case 0x44: /* Aircraft information */ |
5587
167d9a91ef02
(svn r8038) -Merge: the cpp branch. Effort of KUDr, Celestar, glx, Smoovius, stillunknown and pv2b.
rubidium
parents:
5584
diff
changeset
|
631 |
if (v->type != VEH_Aircraft) return UINT_MAX; |
3703
3c815d04affb
(svn r4644) - NewGRF: support for variable 0x44, aircraft information. (mart3p)
peter1138
parents:
3702
diff
changeset
|
632 |
|
3c815d04affb
(svn r4644) - NewGRF: support for variable 0x44, aircraft information. (mart3p)
peter1138
parents:
3702
diff
changeset
|
633 |
{ |
3c815d04affb
(svn r4644) - NewGRF: support for variable 0x44, aircraft information. (mart3p)
peter1138
parents:
3702
diff
changeset
|
634 |
const Vehicle *w = v->next; |
3c815d04affb
(svn r4644) - NewGRF: support for variable 0x44, aircraft information. (mart3p)
peter1138
parents:
3702
diff
changeset
|
635 |
uint16 altitude = v->z_pos - w->z_pos; /* Aircraft height - shadow height */ |
3c815d04affb
(svn r4644) - NewGRF: support for variable 0x44, aircraft information. (mart3p)
peter1138
parents:
3702
diff
changeset
|
636 |
byte airporttype; |
3c815d04affb
(svn r4644) - NewGRF: support for variable 0x44, aircraft information. (mart3p)
peter1138
parents:
3702
diff
changeset
|
637 |
|
3c815d04affb
(svn r4644) - NewGRF: support for variable 0x44, aircraft information. (mart3p)
peter1138
parents:
3702
diff
changeset
|
638 |
switch (GetStation(v->u.air.targetairport)->airport_type) { |
4059
b1e1c1193f0a
(svn r5346) - Feature: Add 4 new airports. 2 for aircraft, 2 for helicopters.
richk
parents:
4058
diff
changeset
|
639 |
/* Note, Helidepot and Helistation are treated as small airports |
b1e1c1193f0a
(svn r5346) - Feature: Add 4 new airports. 2 for aircraft, 2 for helicopters.
richk
parents:
4058
diff
changeset
|
640 |
* as they are at ground level. */ |
b1e1c1193f0a
(svn r5346) - Feature: Add 4 new airports. 2 for aircraft, 2 for helicopters.
richk
parents:
4058
diff
changeset
|
641 |
case AT_HELIDEPOT: |
b1e1c1193f0a
(svn r5346) - Feature: Add 4 new airports. 2 for aircraft, 2 for helicopters.
richk
parents:
4058
diff
changeset
|
642 |
case AT_HELISTATION: |
b1e1c1193f0a
(svn r5346) - Feature: Add 4 new airports. 2 for aircraft, 2 for helicopters.
richk
parents:
4058
diff
changeset
|
643 |
case AT_COMMUTER: |
b1e1c1193f0a
(svn r5346) - Feature: Add 4 new airports. 2 for aircraft, 2 for helicopters.
richk
parents:
4058
diff
changeset
|
644 |
case AT_SMALL: airporttype = ATP_TTDP_SMALL; break; |
3703
3c815d04affb
(svn r4644) - NewGRF: support for variable 0x44, aircraft information. (mart3p)
peter1138
parents:
3702
diff
changeset
|
645 |
case AT_METROPOLITAN: |
3c815d04affb
(svn r4644) - NewGRF: support for variable 0x44, aircraft information. (mart3p)
peter1138
parents:
3702
diff
changeset
|
646 |
case AT_INTERNATIONAL: |
4059
b1e1c1193f0a
(svn r5346) - Feature: Add 4 new airports. 2 for aircraft, 2 for helicopters.
richk
parents:
4058
diff
changeset
|
647 |
case AT_INTERCON: |
b1e1c1193f0a
(svn r5346) - Feature: Add 4 new airports. 2 for aircraft, 2 for helicopters.
richk
parents:
4058
diff
changeset
|
648 |
case AT_LARGE: airporttype = ATP_TTDP_LARGE; break; |
b1e1c1193f0a
(svn r5346) - Feature: Add 4 new airports. 2 for aircraft, 2 for helicopters.
richk
parents:
4058
diff
changeset
|
649 |
case AT_HELIPORT: airporttype = ATP_TTDP_HELIPORT; break; |
b1e1c1193f0a
(svn r5346) - Feature: Add 4 new airports. 2 for aircraft, 2 for helicopters.
richk
parents:
4058
diff
changeset
|
650 |
case AT_OILRIG: airporttype = ATP_TTDP_OILRIG; break; |
b1e1c1193f0a
(svn r5346) - Feature: Add 4 new airports. 2 for aircraft, 2 for helicopters.
richk
parents:
4058
diff
changeset
|
651 |
default: airporttype = ATP_TTDP_LARGE; break; |
3703
3c815d04affb
(svn r4644) - NewGRF: support for variable 0x44, aircraft information. (mart3p)
peter1138
parents:
3702
diff
changeset
|
652 |
} |
3c815d04affb
(svn r4644) - NewGRF: support for variable 0x44, aircraft information. (mart3p)
peter1138
parents:
3702
diff
changeset
|
653 |
|
3c815d04affb
(svn r4644) - NewGRF: support for variable 0x44, aircraft information. (mart3p)
peter1138
parents:
3702
diff
changeset
|
654 |
return (altitude << 8) | airporttype; |
3c815d04affb
(svn r4644) - NewGRF: support for variable 0x44, aircraft information. (mart3p)
peter1138
parents:
3702
diff
changeset
|
655 |
} |
3c815d04affb
(svn r4644) - NewGRF: support for variable 0x44, aircraft information. (mart3p)
peter1138
parents:
3702
diff
changeset
|
656 |
|
3686
16627c28741d
(svn r4611) - NewGRF: introduce new vehicle sprite group resolver code. This also fixes some known bugs (e.g. the 'Standard Five' in UKRS is now the correct colour)
peter1138
parents:
3684
diff
changeset
|
657 |
case 0x46: /* Motion counter */ |
4656
9c1d8c4d3e60
(svn r6532) - Feature: Add support for NewGRF sound effects. Currently sound priority isn't supported.
peter1138
parents:
4331
diff
changeset
|
658 |
return v->motion_counter; |
3723
efb172c37d8c
(svn r4696) - NewGRF: add support for vehicle variable 0x60, count vehicle type occurance.
peter1138
parents:
3720
diff
changeset
|
659 |
|
3848
ad94e6144369
(svn r4872) - NewGRF: add support for vehicle variable 0x47 (mart3p)
peter1138
parents:
3845
diff
changeset
|
660 |
case 0x47: { /* Vehicle cargo info */ |
ad94e6144369
(svn r4872) - NewGRF: add support for vehicle variable 0x47 (mart3p)
peter1138
parents:
3845
diff
changeset
|
661 |
/* Format: ccccwwtt |
ad94e6144369
(svn r4872) - NewGRF: add support for vehicle variable 0x47 (mart3p)
peter1138
parents:
3845
diff
changeset
|
662 |
* tt - the cargo type transported by the vehicle, |
ad94e6144369
(svn r4872) - NewGRF: add support for vehicle variable 0x47 (mart3p)
peter1138
parents:
3845
diff
changeset
|
663 |
* translated if a translation table has been installed. |
ad94e6144369
(svn r4872) - NewGRF: add support for vehicle variable 0x47 (mart3p)
peter1138
parents:
3845
diff
changeset
|
664 |
* ww - cargo unit weight in 1/16 tons, same as cargo prop. 0F. |
ad94e6144369
(svn r4872) - NewGRF: add support for vehicle variable 0x47 (mart3p)
peter1138
parents:
3845
diff
changeset
|
665 |
* cccc - the cargo class value of the cargo transported by the vehicle. |
ad94e6144369
(svn r4872) - NewGRF: add support for vehicle variable 0x47 (mart3p)
peter1138
parents:
3845
diff
changeset
|
666 |
*/ |
ad94e6144369
(svn r4872) - NewGRF: add support for vehicle variable 0x47 (mart3p)
peter1138
parents:
3845
diff
changeset
|
667 |
CargoID cid = _global_cargo_id[_opt.landscape][v->cargo_type]; |
ad94e6144369
(svn r4872) - NewGRF: add support for vehicle variable 0x47 (mart3p)
peter1138
parents:
3845
diff
changeset
|
668 |
|
ad94e6144369
(svn r4872) - NewGRF: add support for vehicle variable 0x47 (mart3p)
peter1138
parents:
3845
diff
changeset
|
669 |
return (_cargo_classes[cid] << 16) | (_cargoc.weights[v->cargo_type] << 8) | cid; |
ad94e6144369
(svn r4872) - NewGRF: add support for vehicle variable 0x47 (mart3p)
peter1138
parents:
3845
diff
changeset
|
670 |
} |
ad94e6144369
(svn r4872) - NewGRF: add support for vehicle variable 0x47 (mart3p)
peter1138
parents:
3845
diff
changeset
|
671 |
|
4058
7d1e904e79b5
(svn r5338) - NewGRF: add support for vehicle variable 48, vehicle type info (more mart3p)
peter1138
parents:
4057
diff
changeset
|
672 |
case 0x48: return GetVehicleTypeInfo(v->engine_type); /* Vehicle Type Info */ |
7d1e904e79b5
(svn r5338) - NewGRF: add support for vehicle variable 48, vehicle type info (more mart3p)
peter1138
parents:
4057
diff
changeset
|
673 |
|
3723
efb172c37d8c
(svn r4696) - NewGRF: add support for vehicle variable 0x60, count vehicle type occurance.
peter1138
parents:
3720
diff
changeset
|
674 |
/* Variables which use the parameter */ |
efb172c37d8c
(svn r4696) - NewGRF: add support for vehicle variable 0x60, count vehicle type occurance.
peter1138
parents:
3720
diff
changeset
|
675 |
case 0x60: /* Count consist's engine ID occurance */ |
efb172c37d8c
(svn r4696) - NewGRF: add support for vehicle variable 0x60, count vehicle type occurance.
peter1138
parents:
3720
diff
changeset
|
676 |
if (v->type != VEH_Train) return v->engine_type == parameter; |
efb172c37d8c
(svn r4696) - NewGRF: add support for vehicle variable 0x60, count vehicle type occurance.
peter1138
parents:
3720
diff
changeset
|
677 |
|
efb172c37d8c
(svn r4696) - NewGRF: add support for vehicle variable 0x60, count vehicle type occurance.
peter1138
parents:
3720
diff
changeset
|
678 |
{ |
efb172c37d8c
(svn r4696) - NewGRF: add support for vehicle variable 0x60, count vehicle type occurance.
peter1138
parents:
3720
diff
changeset
|
679 |
uint count = 0; |
efb172c37d8c
(svn r4696) - NewGRF: add support for vehicle variable 0x60, count vehicle type occurance.
peter1138
parents:
3720
diff
changeset
|
680 |
for (; v != NULL; v = v->next) { |
efb172c37d8c
(svn r4696) - NewGRF: add support for vehicle variable 0x60, count vehicle type occurance.
peter1138
parents:
3720
diff
changeset
|
681 |
if (v->engine_type == parameter) count++; |
efb172c37d8c
(svn r4696) - NewGRF: add support for vehicle variable 0x60, count vehicle type occurance.
peter1138
parents:
3720
diff
changeset
|
682 |
} |
efb172c37d8c
(svn r4696) - NewGRF: add support for vehicle variable 0x60, count vehicle type occurance.
peter1138
parents:
3720
diff
changeset
|
683 |
return count; |
efb172c37d8c
(svn r4696) - NewGRF: add support for vehicle variable 0x60, count vehicle type occurance.
peter1138
parents:
3720
diff
changeset
|
684 |
} |
3925
80f987b4c2e2
(svn r5060) - NewGRF: add support for variable 7F (retrieve GRF parameter) for vehicles
peter1138
parents:
3924
diff
changeset
|
685 |
|
4057
863fce30596d
(svn r5337) - NewGRF: pass the engine type to the engine resolver, to allow support for variable 7F for unbuilt vehicles (mart3p)
peter1138
parents:
4056
diff
changeset
|
686 |
case 0x7F: return GetGRFParameter(v->engine_type, parameter); /* Read GRF parameter */ |
3686
16627c28741d
(svn r4611) - NewGRF: introduce new vehicle sprite group resolver code. This also fixes some known bugs (e.g. the 'Standard Five' in UKRS is now the correct colour)
peter1138
parents:
3684
diff
changeset
|
687 |
} |
16627c28741d
(svn r4611) - NewGRF: introduce new vehicle sprite group resolver code. This also fixes some known bugs (e.g. the 'Standard Five' in UKRS is now the correct colour)
peter1138
parents:
3684
diff
changeset
|
688 |
|
16627c28741d
(svn r4611) - NewGRF: introduce new vehicle sprite group resolver code. This also fixes some known bugs (e.g. the 'Standard Five' in UKRS is now the correct colour)
peter1138
parents:
3684
diff
changeset
|
689 |
/* General vehicle properties */ |
16627c28741d
(svn r4611) - NewGRF: introduce new vehicle sprite group resolver code. This also fixes some known bugs (e.g. the 'Standard Five' in UKRS is now the correct colour)
peter1138
parents:
3684
diff
changeset
|
690 |
switch (variable - 0x80) { |
16627c28741d
(svn r4611) - NewGRF: introduce new vehicle sprite group resolver code. This also fixes some known bugs (e.g. the 'Standard Five' in UKRS is now the correct colour)
peter1138
parents:
3684
diff
changeset
|
691 |
case 0x00: return v->type; |
16627c28741d
(svn r4611) - NewGRF: introduce new vehicle sprite group resolver code. This also fixes some known bugs (e.g. the 'Standard Five' in UKRS is now the correct colour)
peter1138
parents:
3684
diff
changeset
|
692 |
case 0x01: return MapOldSubType(v); |
16627c28741d
(svn r4611) - NewGRF: introduce new vehicle sprite group resolver code. This also fixes some known bugs (e.g. the 'Standard Five' in UKRS is now the correct colour)
peter1138
parents:
3684
diff
changeset
|
693 |
case 0x04: return v->index; |
5172
285d1ab82403
(svn r7282) -Fix (r625): ttdpatch vars are little endian
peter1138
parents:
4901
diff
changeset
|
694 |
case 0x05: return GB(v->index, 8, 8); |
3686
16627c28741d
(svn r4611) - NewGRF: introduce new vehicle sprite group resolver code. This also fixes some known bugs (e.g. the 'Standard Five' in UKRS is now the correct colour)
peter1138
parents:
3684
diff
changeset
|
695 |
case 0x0A: return PackOrder(&v->current_order); |
5172
285d1ab82403
(svn r7282) -Fix (r625): ttdpatch vars are little endian
peter1138
parents:
4901
diff
changeset
|
696 |
case 0x0B: return GB(PackOrder(&v->current_order), 8, 8); |
3686
16627c28741d
(svn r4611) - NewGRF: introduce new vehicle sprite group resolver code. This also fixes some known bugs (e.g. the 'Standard Five' in UKRS is now the correct colour)
peter1138
parents:
3684
diff
changeset
|
697 |
case 0x0C: return v->num_orders; |
16627c28741d
(svn r4611) - NewGRF: introduce new vehicle sprite group resolver code. This also fixes some known bugs (e.g. the 'Standard Five' in UKRS is now the correct colour)
peter1138
parents:
3684
diff
changeset
|
698 |
case 0x0D: return v->cur_order_index; |
16627c28741d
(svn r4611) - NewGRF: introduce new vehicle sprite group resolver code. This also fixes some known bugs (e.g. the 'Standard Five' in UKRS is now the correct colour)
peter1138
parents:
3684
diff
changeset
|
699 |
case 0x10: return v->load_unload_time_rem; |
5172
285d1ab82403
(svn r7282) -Fix (r625): ttdpatch vars are little endian
peter1138
parents:
4901
diff
changeset
|
700 |
case 0x11: return GB(v->load_unload_time_rem, 8, 8); |
4331
ec584824ffb8
(svn r6013) -Fix: some newgrf properties returned the date in the new format where the newgrf's expect the original format. Thanks to michi_cc for finding these and providing the initial patch.
rubidium
parents:
4322
diff
changeset
|
701 |
case 0x12: return max(v->date_of_last_service - DAYS_TILL_ORIGINAL_BASE_YEAR, 0); |
5172
285d1ab82403
(svn r7282) -Fix (r625): ttdpatch vars are little endian
peter1138
parents:
4901
diff
changeset
|
702 |
case 0x13: return GB(max(v->date_of_last_service - DAYS_TILL_ORIGINAL_BASE_YEAR, 0), 8, 8); |
3686
16627c28741d
(svn r4611) - NewGRF: introduce new vehicle sprite group resolver code. This also fixes some known bugs (e.g. the 'Standard Five' in UKRS is now the correct colour)
peter1138
parents:
3684
diff
changeset
|
703 |
case 0x14: return v->service_interval; |
5172
285d1ab82403
(svn r7282) -Fix (r625): ttdpatch vars are little endian
peter1138
parents:
4901
diff
changeset
|
704 |
case 0x15: return GB(v->service_interval, 8, 8); |
3686
16627c28741d
(svn r4611) - NewGRF: introduce new vehicle sprite group resolver code. This also fixes some known bugs (e.g. the 'Standard Five' in UKRS is now the correct colour)
peter1138
parents:
3684
diff
changeset
|
705 |
case 0x16: return v->last_station_visited; |
16627c28741d
(svn r4611) - NewGRF: introduce new vehicle sprite group resolver code. This also fixes some known bugs (e.g. the 'Standard Five' in UKRS is now the correct colour)
peter1138
parents:
3684
diff
changeset
|
706 |
case 0x17: return v->tick_counter; |
16627c28741d
(svn r4611) - NewGRF: introduce new vehicle sprite group resolver code. This also fixes some known bugs (e.g. the 'Standard Five' in UKRS is now the correct colour)
peter1138
parents:
3684
diff
changeset
|
707 |
case 0x18: return v->max_speed; |
5172
285d1ab82403
(svn r7282) -Fix (r625): ttdpatch vars are little endian
peter1138
parents:
4901
diff
changeset
|
708 |
case 0x19: return GB(v->max_speed, 8, 8); |
3686
16627c28741d
(svn r4611) - NewGRF: introduce new vehicle sprite group resolver code. This also fixes some known bugs (e.g. the 'Standard Five' in UKRS is now the correct colour)
peter1138
parents:
3684
diff
changeset
|
709 |
case 0x1A: return v->x_pos; |
5172
285d1ab82403
(svn r7282) -Fix (r625): ttdpatch vars are little endian
peter1138
parents:
4901
diff
changeset
|
710 |
case 0x1B: return GB(v->x_pos, 8, 8); |
3686
16627c28741d
(svn r4611) - NewGRF: introduce new vehicle sprite group resolver code. This also fixes some known bugs (e.g. the 'Standard Five' in UKRS is now the correct colour)
peter1138
parents:
3684
diff
changeset
|
711 |
case 0x1C: return v->y_pos; |
5172
285d1ab82403
(svn r7282) -Fix (r625): ttdpatch vars are little endian
peter1138
parents:
4901
diff
changeset
|
712 |
case 0x1D: return GB(v->y_pos, 8, 8); |
3686
16627c28741d
(svn r4611) - NewGRF: introduce new vehicle sprite group resolver code. This also fixes some known bugs (e.g. the 'Standard Five' in UKRS is now the correct colour)
peter1138
parents:
3684
diff
changeset
|
713 |
case 0x1E: return v->z_pos; |
4056
7899dc230a12
(svn r5336) - NewGRF: draw custom helicopter rotor sprites in vehicle info window, ensuring the correct direction is used (inspiration from mart3p)
peter1138
parents:
4055
diff
changeset
|
714 |
case 0x1F: return object->info_view ? DIR_W : v->direction; |
3686
16627c28741d
(svn r4611) - NewGRF: introduce new vehicle sprite group resolver code. This also fixes some known bugs (e.g. the 'Standard Five' in UKRS is now the correct colour)
peter1138
parents:
3684
diff
changeset
|
715 |
case 0x28: return v->cur_image; |
5172
285d1ab82403
(svn r7282) -Fix (r625): ttdpatch vars are little endian
peter1138
parents:
4901
diff
changeset
|
716 |
case 0x29: return GB(v->cur_image, 8, 8); |
3686
16627c28741d
(svn r4611) - NewGRF: introduce new vehicle sprite group resolver code. This also fixes some known bugs (e.g. the 'Standard Five' in UKRS is now the correct colour)
peter1138
parents:
3684
diff
changeset
|
717 |
case 0x32: return v->vehstatus; |
5175
e528d197bbdd
(svn r7285) -Fix (r7282): Our vehstatus is a byte, not a word.
peter1138
parents:
5174
diff
changeset
|
718 |
case 0x33: return 0; // non-existent high byte of vehstatus |
3686
16627c28741d
(svn r4611) - NewGRF: introduce new vehicle sprite group resolver code. This also fixes some known bugs (e.g. the 'Standard Five' in UKRS is now the correct colour)
peter1138
parents:
3684
diff
changeset
|
719 |
case 0x34: return v->cur_speed; |
5172
285d1ab82403
(svn r7282) -Fix (r625): ttdpatch vars are little endian
peter1138
parents:
4901
diff
changeset
|
720 |
case 0x35: return GB(v->cur_speed, 8, 8); |
3686
16627c28741d
(svn r4611) - NewGRF: introduce new vehicle sprite group resolver code. This also fixes some known bugs (e.g. the 'Standard Five' in UKRS is now the correct colour)
peter1138
parents:
3684
diff
changeset
|
721 |
case 0x36: return v->subspeed; |
16627c28741d
(svn r4611) - NewGRF: introduce new vehicle sprite group resolver code. This also fixes some known bugs (e.g. the 'Standard Five' in UKRS is now the correct colour)
peter1138
parents:
3684
diff
changeset
|
722 |
case 0x37: return v->acceleration; |
16627c28741d
(svn r4611) - NewGRF: introduce new vehicle sprite group resolver code. This also fixes some known bugs (e.g. the 'Standard Five' in UKRS is now the correct colour)
peter1138
parents:
3684
diff
changeset
|
723 |
case 0x39: return v->cargo_type; |
16627c28741d
(svn r4611) - NewGRF: introduce new vehicle sprite group resolver code. This also fixes some known bugs (e.g. the 'Standard Five' in UKRS is now the correct colour)
peter1138
parents:
3684
diff
changeset
|
724 |
case 0x3A: return v->cargo_cap; |
5172
285d1ab82403
(svn r7282) -Fix (r625): ttdpatch vars are little endian
peter1138
parents:
4901
diff
changeset
|
725 |
case 0x3B: return GB(v->cargo_cap, 8, 8); |
3686
16627c28741d
(svn r4611) - NewGRF: introduce new vehicle sprite group resolver code. This also fixes some known bugs (e.g. the 'Standard Five' in UKRS is now the correct colour)
peter1138
parents:
3684
diff
changeset
|
726 |
case 0x3C: return v->cargo_count; |
5172
285d1ab82403
(svn r7282) -Fix (r625): ttdpatch vars are little endian
peter1138
parents:
4901
diff
changeset
|
727 |
case 0x3D: return GB(v->cargo_count, 8, 8); |
3686
16627c28741d
(svn r4611) - NewGRF: introduce new vehicle sprite group resolver code. This also fixes some known bugs (e.g. the 'Standard Five' in UKRS is now the correct colour)
peter1138
parents:
3684
diff
changeset
|
728 |
case 0x3E: return v->cargo_source; |
16627c28741d
(svn r4611) - NewGRF: introduce new vehicle sprite group resolver code. This also fixes some known bugs (e.g. the 'Standard Five' in UKRS is now the correct colour)
peter1138
parents:
3684
diff
changeset
|
729 |
case 0x3F: return v->cargo_days; |
16627c28741d
(svn r4611) - NewGRF: introduce new vehicle sprite group resolver code. This also fixes some known bugs (e.g. the 'Standard Five' in UKRS is now the correct colour)
peter1138
parents:
3684
diff
changeset
|
730 |
case 0x40: return v->age; |
5172
285d1ab82403
(svn r7282) -Fix (r625): ttdpatch vars are little endian
peter1138
parents:
4901
diff
changeset
|
731 |
case 0x41: return GB(v->age, 8, 8); |
3686
16627c28741d
(svn r4611) - NewGRF: introduce new vehicle sprite group resolver code. This also fixes some known bugs (e.g. the 'Standard Five' in UKRS is now the correct colour)
peter1138
parents:
3684
diff
changeset
|
732 |
case 0x42: return v->max_age; |
5172
285d1ab82403
(svn r7282) -Fix (r625): ttdpatch vars are little endian
peter1138
parents:
4901
diff
changeset
|
733 |
case 0x43: return GB(v->max_age, 8, 8); |
4331
ec584824ffb8
(svn r6013) -Fix: some newgrf properties returned the date in the new format where the newgrf's expect the original format. Thanks to michi_cc for finding these and providing the initial patch.
rubidium
parents:
4322
diff
changeset
|
734 |
case 0x44: return clamp(v->build_year, ORIGINAL_BASE_YEAR, ORIGINAL_MAX_YEAR) - ORIGINAL_BASE_YEAR; |
3686
16627c28741d
(svn r4611) - NewGRF: introduce new vehicle sprite group resolver code. This also fixes some known bugs (e.g. the 'Standard Five' in UKRS is now the correct colour)
peter1138
parents:
3684
diff
changeset
|
735 |
case 0x45: return v->unitnumber; |
16627c28741d
(svn r4611) - NewGRF: introduce new vehicle sprite group resolver code. This also fixes some known bugs (e.g. the 'Standard Five' in UKRS is now the correct colour)
peter1138
parents:
3684
diff
changeset
|
736 |
case 0x46: return v->engine_type; |
5172
285d1ab82403
(svn r7282) -Fix (r625): ttdpatch vars are little endian
peter1138
parents:
4901
diff
changeset
|
737 |
case 0x47: return GB(v->engine_type, 8, 8); |
3686
16627c28741d
(svn r4611) - NewGRF: introduce new vehicle sprite group resolver code. This also fixes some known bugs (e.g. the 'Standard Five' in UKRS is now the correct colour)
peter1138
parents:
3684
diff
changeset
|
738 |
case 0x48: return v->spritenum; |
16627c28741d
(svn r4611) - NewGRF: introduce new vehicle sprite group resolver code. This also fixes some known bugs (e.g. the 'Standard Five' in UKRS is now the correct colour)
peter1138
parents:
3684
diff
changeset
|
739 |
case 0x49: return v->day_counter; |
16627c28741d
(svn r4611) - NewGRF: introduce new vehicle sprite group resolver code. This also fixes some known bugs (e.g. the 'Standard Five' in UKRS is now the correct colour)
peter1138
parents:
3684
diff
changeset
|
740 |
case 0x4A: return v->breakdowns_since_last_service; |
16627c28741d
(svn r4611) - NewGRF: introduce new vehicle sprite group resolver code. This also fixes some known bugs (e.g. the 'Standard Five' in UKRS is now the correct colour)
peter1138
parents:
3684
diff
changeset
|
741 |
case 0x4B: return v->breakdown_ctr; |
16627c28741d
(svn r4611) - NewGRF: introduce new vehicle sprite group resolver code. This also fixes some known bugs (e.g. the 'Standard Five' in UKRS is now the correct colour)
peter1138
parents:
3684
diff
changeset
|
742 |
case 0x4C: return v->breakdown_delay; |
16627c28741d
(svn r4611) - NewGRF: introduce new vehicle sprite group resolver code. This also fixes some known bugs (e.g. the 'Standard Five' in UKRS is now the correct colour)
peter1138
parents:
3684
diff
changeset
|
743 |
case 0x4D: return v->breakdown_chance; |
16627c28741d
(svn r4611) - NewGRF: introduce new vehicle sprite group resolver code. This also fixes some known bugs (e.g. the 'Standard Five' in UKRS is now the correct colour)
peter1138
parents:
3684
diff
changeset
|
744 |
case 0x4E: return v->reliability; |
5172
285d1ab82403
(svn r7282) -Fix (r625): ttdpatch vars are little endian
peter1138
parents:
4901
diff
changeset
|
745 |
case 0x4F: return GB(v->reliability, 8, 8); |
3686
16627c28741d
(svn r4611) - NewGRF: introduce new vehicle sprite group resolver code. This also fixes some known bugs (e.g. the 'Standard Five' in UKRS is now the correct colour)
peter1138
parents:
3684
diff
changeset
|
746 |
case 0x50: return v->reliability_spd_dec; |
5172
285d1ab82403
(svn r7282) -Fix (r625): ttdpatch vars are little endian
peter1138
parents:
4901
diff
changeset
|
747 |
case 0x51: return GB(v->reliability_spd_dec, 8, 8); |
3686
16627c28741d
(svn r4611) - NewGRF: introduce new vehicle sprite group resolver code. This also fixes some known bugs (e.g. the 'Standard Five' in UKRS is now the correct colour)
peter1138
parents:
3684
diff
changeset
|
748 |
case 0x52: return v->profit_this_year; |
5172
285d1ab82403
(svn r7282) -Fix (r625): ttdpatch vars are little endian
peter1138
parents:
4901
diff
changeset
|
749 |
case 0x53: return GB(v->profit_this_year, 8, 24); |
285d1ab82403
(svn r7282) -Fix (r625): ttdpatch vars are little endian
peter1138
parents:
4901
diff
changeset
|
750 |
case 0x54: return GB(v->profit_this_year, 16, 16); |
285d1ab82403
(svn r7282) -Fix (r625): ttdpatch vars are little endian
peter1138
parents:
4901
diff
changeset
|
751 |
case 0x55: return GB(v->profit_this_year, 24, 8); |
3686
16627c28741d
(svn r4611) - NewGRF: introduce new vehicle sprite group resolver code. This also fixes some known bugs (e.g. the 'Standard Five' in UKRS is now the correct colour)
peter1138
parents:
3684
diff
changeset
|
752 |
case 0x56: return v->profit_last_year; |
5172
285d1ab82403
(svn r7282) -Fix (r625): ttdpatch vars are little endian
peter1138
parents:
4901
diff
changeset
|
753 |
case 0x57: return GB(v->profit_last_year, 8, 24); |
285d1ab82403
(svn r7282) -Fix (r625): ttdpatch vars are little endian
peter1138
parents:
4901
diff
changeset
|
754 |
case 0x58: return GB(v->profit_last_year, 16, 16); |
285d1ab82403
(svn r7282) -Fix (r625): ttdpatch vars are little endian
peter1138
parents:
4901
diff
changeset
|
755 |
case 0x59: return GB(v->profit_last_year, 24, 8); |
3686
16627c28741d
(svn r4611) - NewGRF: introduce new vehicle sprite group resolver code. This also fixes some known bugs (e.g. the 'Standard Five' in UKRS is now the correct colour)
peter1138
parents:
3684
diff
changeset
|
756 |
case 0x5A: return v->next == NULL ? INVALID_VEHICLE : v->next->index; |
16627c28741d
(svn r4611) - NewGRF: introduce new vehicle sprite group resolver code. This also fixes some known bugs (e.g. the 'Standard Five' in UKRS is now the correct colour)
peter1138
parents:
3684
diff
changeset
|
757 |
case 0x5C: return v->value; |
5172
285d1ab82403
(svn r7282) -Fix (r625): ttdpatch vars are little endian
peter1138
parents:
4901
diff
changeset
|
758 |
case 0x5D: return GB(v->value, 8, 24); |
285d1ab82403
(svn r7282) -Fix (r625): ttdpatch vars are little endian
peter1138
parents:
4901
diff
changeset
|
759 |
case 0x5E: return GB(v->value, 16, 16); |
285d1ab82403
(svn r7282) -Fix (r625): ttdpatch vars are little endian
peter1138
parents:
4901
diff
changeset
|
760 |
case 0x5F: return GB(v->value, 24, 8); |
3686
16627c28741d
(svn r4611) - NewGRF: introduce new vehicle sprite group resolver code. This also fixes some known bugs (e.g. the 'Standard Five' in UKRS is now the correct colour)
peter1138
parents:
3684
diff
changeset
|
761 |
case 0x60: return v->string_id; |
5172
285d1ab82403
(svn r7282) -Fix (r625): ttdpatch vars are little endian
peter1138
parents:
4901
diff
changeset
|
762 |
case 0x61: return GB(v->string_id, 8, 8); |
3870
d9ebc4ea750a
(svn r4910) - NewGRF: add and initialize cargo subtype for vehicle visual variations
peter1138
parents:
3866
diff
changeset
|
763 |
case 0x72: return v->cargo_subtype; |
3686
16627c28741d
(svn r4611) - NewGRF: introduce new vehicle sprite group resolver code. This also fixes some known bugs (e.g. the 'Standard Five' in UKRS is now the correct colour)
peter1138
parents:
3684
diff
changeset
|
764 |
case 0x7A: return v->random_bits; |
16627c28741d
(svn r4611) - NewGRF: introduce new vehicle sprite group resolver code. This also fixes some known bugs (e.g. the 'Standard Five' in UKRS is now the correct colour)
peter1138
parents:
3684
diff
changeset
|
765 |
case 0x7B: return v->waiting_triggers; |
16627c28741d
(svn r4611) - NewGRF: introduce new vehicle sprite group resolver code. This also fixes some known bugs (e.g. the 'Standard Five' in UKRS is now the correct colour)
peter1138
parents:
3684
diff
changeset
|
766 |
} |
16627c28741d
(svn r4611) - NewGRF: introduce new vehicle sprite group resolver code. This also fixes some known bugs (e.g. the 'Standard Five' in UKRS is now the correct colour)
peter1138
parents:
3684
diff
changeset
|
767 |
|
16627c28741d
(svn r4611) - NewGRF: introduce new vehicle sprite group resolver code. This also fixes some known bugs (e.g. the 'Standard Five' in UKRS is now the correct colour)
peter1138
parents:
3684
diff
changeset
|
768 |
/* Vehicle specific properties */ |
3014
1a60d4541d3c
(svn r3594) - NewGRF: Add support for some vehicle specific properties and a give a debug message for unknown variables.
peter1138
parents:
2982
diff
changeset
|
769 |
switch (v->type) { |
1a60d4541d3c
(svn r3594) - NewGRF: Add support for some vehicle specific properties and a give a debug message for unknown variables.
peter1138
parents:
2982
diff
changeset
|
770 |
case VEH_Train: |
3686
16627c28741d
(svn r4611) - NewGRF: introduce new vehicle sprite group resolver code. This also fixes some known bugs (e.g. the 'Standard Five' in UKRS is now the correct colour)
peter1138
parents:
3684
diff
changeset
|
771 |
switch (variable - 0x80) { |
3014
1a60d4541d3c
(svn r3594) - NewGRF: Add support for some vehicle specific properties and a give a debug message for unknown variables.
peter1138
parents:
2982
diff
changeset
|
772 |
case 0x62: return v->u.rail.track; |
1a60d4541d3c
(svn r3594) - NewGRF: Add support for some vehicle specific properties and a give a debug message for unknown variables.
peter1138
parents:
2982
diff
changeset
|
773 |
case 0x66: return v->u.rail.railtype; |
1a60d4541d3c
(svn r3594) - NewGRF: Add support for some vehicle specific properties and a give a debug message for unknown variables.
peter1138
parents:
2982
diff
changeset
|
774 |
case 0x73: return v->u.rail.cached_veh_length; |
1a60d4541d3c
(svn r3594) - NewGRF: Add support for some vehicle specific properties and a give a debug message for unknown variables.
peter1138
parents:
2982
diff
changeset
|
775 |
case 0x74: return v->u.rail.cached_power; |
5172
285d1ab82403
(svn r7282) -Fix (r625): ttdpatch vars are little endian
peter1138
parents:
4901
diff
changeset
|
776 |
case 0x75: return GB(v->u.rail.cached_power, 8, 24); |
285d1ab82403
(svn r7282) -Fix (r625): ttdpatch vars are little endian
peter1138
parents:
4901
diff
changeset
|
777 |
case 0x76: return GB(v->u.rail.cached_power, 16, 16); |
285d1ab82403
(svn r7282) -Fix (r625): ttdpatch vars are little endian
peter1138
parents:
4901
diff
changeset
|
778 |
case 0x77: return GB(v->u.rail.cached_power, 24, 8); |
3014
1a60d4541d3c
(svn r3594) - NewGRF: Add support for some vehicle specific properties and a give a debug message for unknown variables.
peter1138
parents:
2982
diff
changeset
|
779 |
case 0x7C: return v->first->index; |
5172
285d1ab82403
(svn r7282) -Fix (r625): ttdpatch vars are little endian
peter1138
parents:
4901
diff
changeset
|
780 |
case 0x7D: return GB(v->first->index, 8, 8); |
4050
012c308c2870
(svn r5320) - NewGRF: make sets using TTDPatch's train reversing hack/feature happier (and consistent) by returning 0 for the flag it uses.
peter1138
parents:
4023
diff
changeset
|
781 |
case 0x7F: return 0; // Used for vehicle reversing hack in TTDP |
3014
1a60d4541d3c
(svn r3594) - NewGRF: Add support for some vehicle specific properties and a give a debug message for unknown variables.
peter1138
parents:
2982
diff
changeset
|
782 |
} |
1a60d4541d3c
(svn r3594) - NewGRF: Add support for some vehicle specific properties and a give a debug message for unknown variables.
peter1138
parents:
2982
diff
changeset
|
783 |
break; |
1a60d4541d3c
(svn r3594) - NewGRF: Add support for some vehicle specific properties and a give a debug message for unknown variables.
peter1138
parents:
2982
diff
changeset
|
784 |
|
1a60d4541d3c
(svn r3594) - NewGRF: Add support for some vehicle specific properties and a give a debug message for unknown variables.
peter1138
parents:
2982
diff
changeset
|
785 |
case VEH_Road: |
3686
16627c28741d
(svn r4611) - NewGRF: introduce new vehicle sprite group resolver code. This also fixes some known bugs (e.g. the 'Standard Five' in UKRS is now the correct colour)
peter1138
parents:
3684
diff
changeset
|
786 |
switch (variable - 0x80) { |
3014
1a60d4541d3c
(svn r3594) - NewGRF: Add support for some vehicle specific properties and a give a debug message for unknown variables.
peter1138
parents:
2982
diff
changeset
|
787 |
case 0x62: return v->u.road.state; |
1a60d4541d3c
(svn r3594) - NewGRF: Add support for some vehicle specific properties and a give a debug message for unknown variables.
peter1138
parents:
2982
diff
changeset
|
788 |
case 0x64: return v->u.road.blocked_ctr; |
5172
285d1ab82403
(svn r7282) -Fix (r625): ttdpatch vars are little endian
peter1138
parents:
4901
diff
changeset
|
789 |
case 0x65: return GB(v->u.road.blocked_ctr, 8, 8); |
3014
1a60d4541d3c
(svn r3594) - NewGRF: Add support for some vehicle specific properties and a give a debug message for unknown variables.
peter1138
parents:
2982
diff
changeset
|
790 |
case 0x66: return v->u.road.overtaking; |
1a60d4541d3c
(svn r3594) - NewGRF: Add support for some vehicle specific properties and a give a debug message for unknown variables.
peter1138
parents:
2982
diff
changeset
|
791 |
case 0x67: return v->u.road.overtaking_ctr; |
1a60d4541d3c
(svn r3594) - NewGRF: Add support for some vehicle specific properties and a give a debug message for unknown variables.
peter1138
parents:
2982
diff
changeset
|
792 |
case 0x68: return v->u.road.crashed_ctr; |
5172
285d1ab82403
(svn r7282) -Fix (r625): ttdpatch vars are little endian
peter1138
parents:
4901
diff
changeset
|
793 |
case 0x69: return GB(v->u.road.crashed_ctr, 8, 8); |
3014
1a60d4541d3c
(svn r3594) - NewGRF: Add support for some vehicle specific properties and a give a debug message for unknown variables.
peter1138
parents:
2982
diff
changeset
|
794 |
} |
1a60d4541d3c
(svn r3594) - NewGRF: Add support for some vehicle specific properties and a give a debug message for unknown variables.
peter1138
parents:
2982
diff
changeset
|
795 |
break; |
1a60d4541d3c
(svn r3594) - NewGRF: Add support for some vehicle specific properties and a give a debug message for unknown variables.
peter1138
parents:
2982
diff
changeset
|
796 |
|
1a60d4541d3c
(svn r3594) - NewGRF: Add support for some vehicle specific properties and a give a debug message for unknown variables.
peter1138
parents:
2982
diff
changeset
|
797 |
case VEH_Aircraft: |
3686
16627c28741d
(svn r4611) - NewGRF: introduce new vehicle sprite group resolver code. This also fixes some known bugs (e.g. the 'Standard Five' in UKRS is now the correct colour)
peter1138
parents:
3684
diff
changeset
|
798 |
switch (variable - 0x80) { |
3702
219fc5d61455
(svn r4643) - NewGRF: Add support for ttdp aircraft states. This involves mapping from our own state. (heavily based on mart3p's code)
peter1138
parents:
3696
diff
changeset
|
799 |
case 0x62: return MapAircraftMovementState(v); // Current movement state |
219fc5d61455
(svn r4643) - NewGRF: Add support for ttdp aircraft states. This involves mapping from our own state. (heavily based on mart3p's code)
peter1138
parents:
3696
diff
changeset
|
800 |
case 0x63: return v->u.air.targetairport; // Airport to which the action refers |
219fc5d61455
(svn r4643) - NewGRF: Add support for ttdp aircraft states. This involves mapping from our own state. (heavily based on mart3p's code)
peter1138
parents:
3696
diff
changeset
|
801 |
case 0x66: return MapAircraftMovementAction(v); // Current movement action |
3014
1a60d4541d3c
(svn r3594) - NewGRF: Add support for some vehicle specific properties and a give a debug message for unknown variables.
peter1138
parents:
2982
diff
changeset
|
802 |
} |
1a60d4541d3c
(svn r3594) - NewGRF: Add support for some vehicle specific properties and a give a debug message for unknown variables.
peter1138
parents:
2982
diff
changeset
|
803 |
break; |
1a60d4541d3c
(svn r3594) - NewGRF: Add support for some vehicle specific properties and a give a debug message for unknown variables.
peter1138
parents:
2982
diff
changeset
|
804 |
} |
1a60d4541d3c
(svn r3594) - NewGRF: Add support for some vehicle specific properties and a give a debug message for unknown variables.
peter1138
parents:
2982
diff
changeset
|
805 |
|
5380
8ea58542b6e0
(svn r7565) -Codechange: Rework DEBUG functionality. Look for appropiate debugging levels to
Darkvater
parents:
5338
diff
changeset
|
806 |
DEBUG(grf, 1, "Unhandled vehicle property 0x%X, type 0x%X", variable, v->type); |
3014
1a60d4541d3c
(svn r3594) - NewGRF: Add support for some vehicle specific properties and a give a debug message for unknown variables.
peter1138
parents:
2982
diff
changeset
|
807 |
|
3893
ced26054ee00
(svn r4960) - NewGRF: explicitly handle unsupported variables, instead of returning -1.
peter1138
parents:
3870
diff
changeset
|
808 |
*available = false; |
5587
167d9a91ef02
(svn r8038) -Merge: the cpp branch. Effort of KUDr, Celestar, glx, Smoovius, stillunknown and pv2b.
rubidium
parents:
5584
diff
changeset
|
809 |
return UINT_MAX; |
3014
1a60d4541d3c
(svn r3594) - NewGRF: Add support for some vehicle specific properties and a give a debug message for unknown variables.
peter1138
parents:
2982
diff
changeset
|
810 |
} |
1a60d4541d3c
(svn r3594) - NewGRF: Add support for some vehicle specific properties and a give a debug message for unknown variables.
peter1138
parents:
2982
diff
changeset
|
811 |
|
426
381172276dc6
(svn r625) Almost complete support for deterministic variational vehicle spritegroups. (pasky)
tron
parents:
414
diff
changeset
|
812 |
|
3734
5b331306e6fe
(svn r4714) - NewGRF: simplify evaluation of 'real' sprite groups.
peter1138
parents:
3731
diff
changeset
|
813 |
static const SpriteGroup *VehicleResolveReal(const ResolverObject *object, const SpriteGroup *group) |
3686
16627c28741d
(svn r4611) - NewGRF: introduce new vehicle sprite group resolver code. This also fixes some known bugs (e.g. the 'Standard Five' in UKRS is now the correct colour)
peter1138
parents:
3684
diff
changeset
|
814 |
{ |
3720
8a82d64ea485
(svn r4691) - Codechange: don't use unnamed unions as GCC 2.95.ancient won't compile it. Needed for our MorphOS user ;)
peter1138
parents:
3706
diff
changeset
|
815 |
const Vehicle *v = object->u.vehicle.self; |
3686
16627c28741d
(svn r4611) - NewGRF: introduce new vehicle sprite group resolver code. This also fixes some known bugs (e.g. the 'Standard Five' in UKRS is now the correct colour)
peter1138
parents:
3684
diff
changeset
|
816 |
uint totalsets; |
16627c28741d
(svn r4611) - NewGRF: introduce new vehicle sprite group resolver code. This also fixes some known bugs (e.g. the 'Standard Five' in UKRS is now the correct colour)
peter1138
parents:
3684
diff
changeset
|
817 |
uint set; |
3734
5b331306e6fe
(svn r4714) - NewGRF: simplify evaluation of 'real' sprite groups.
peter1138
parents:
3731
diff
changeset
|
818 |
bool in_motion; |
426
381172276dc6
(svn r625) Almost complete support for deterministic variational vehicle spritegroups. (pasky)
tron
parents:
414
diff
changeset
|
819 |
|
3739
c96a784d5c53
(svn r4721) - NewGRF: use loading sprites rather than loaded when there is no vehicle (fixes issue with purchase list)
peter1138
parents:
3734
diff
changeset
|
820 |
if (v == NULL) return group->g.real.loading[0]; |
3734
5b331306e6fe
(svn r4714) - NewGRF: simplify evaluation of 'real' sprite groups.
peter1138
parents:
3731
diff
changeset
|
821 |
|
5b331306e6fe
(svn r4714) - NewGRF: simplify evaluation of 'real' sprite groups.
peter1138
parents:
3731
diff
changeset
|
822 |
if (v->type == VEH_Train) { |
5b331306e6fe
(svn r4714) - NewGRF: simplify evaluation of 'real' sprite groups.
peter1138
parents:
3731
diff
changeset
|
823 |
in_motion = GetFirstVehicleInChain(v)->current_order.type != OT_LOADING; |
5b331306e6fe
(svn r4714) - NewGRF: simplify evaluation of 'real' sprite groups.
peter1138
parents:
3731
diff
changeset
|
824 |
} else { |
5b331306e6fe
(svn r4714) - NewGRF: simplify evaluation of 'real' sprite groups.
peter1138
parents:
3731
diff
changeset
|
825 |
in_motion = v->current_order.type != OT_LOADING; |
3686
16627c28741d
(svn r4611) - NewGRF: introduce new vehicle sprite group resolver code. This also fixes some known bugs (e.g. the 'Standard Five' in UKRS is now the correct colour)
peter1138
parents:
3684
diff
changeset
|
826 |
} |
445
beafc0fb8f12
(svn r654) Hopefully complete support for randomized variational spritegroups (i.e. the cars transporter in DBSetXL gets different cars each time) (pasky)
tron
parents:
433
diff
changeset
|
827 |
|
3734
5b331306e6fe
(svn r4714) - NewGRF: simplify evaluation of 'real' sprite groups.
peter1138
parents:
3731
diff
changeset
|
828 |
totalsets = in_motion ? group->g.real.num_loaded : group->g.real.num_loading; |
445
beafc0fb8f12
(svn r654) Hopefully complete support for randomized variational spritegroups (i.e. the cars transporter in DBSetXL gets different cars each time) (pasky)
tron
parents:
433
diff
changeset
|
829 |
|
3686
16627c28741d
(svn r4611) - NewGRF: introduce new vehicle sprite group resolver code. This also fixes some known bugs (e.g. the 'Standard Five' in UKRS is now the correct colour)
peter1138
parents:
3684
diff
changeset
|
830 |
if (v->cargo_count == v->cargo_cap || totalsets == 1) { |
16627c28741d
(svn r4611) - NewGRF: introduce new vehicle sprite group resolver code. This also fixes some known bugs (e.g. the 'Standard Five' in UKRS is now the correct colour)
peter1138
parents:
3684
diff
changeset
|
831 |
set = totalsets - 1; |
16627c28741d
(svn r4611) - NewGRF: introduce new vehicle sprite group resolver code. This also fixes some known bugs (e.g. the 'Standard Five' in UKRS is now the correct colour)
peter1138
parents:
3684
diff
changeset
|
832 |
} else if (v->cargo_count == 0 || totalsets == 2) { |
16627c28741d
(svn r4611) - NewGRF: introduce new vehicle sprite group resolver code. This also fixes some known bugs (e.g. the 'Standard Five' in UKRS is now the correct colour)
peter1138
parents:
3684
diff
changeset
|
833 |
set = 0; |
16627c28741d
(svn r4611) - NewGRF: introduce new vehicle sprite group resolver code. This also fixes some known bugs (e.g. the 'Standard Five' in UKRS is now the correct colour)
peter1138
parents:
3684
diff
changeset
|
834 |
} else { |
5601
d58f82901b2f
(svn r8055) -Codechange: Replace the different max, dmax, maxu whatever macros by a simple template function max(), that requires two arguments of the same type. While I'm at it change a variable called "max" to "maxval" in a function that calls max().
celestar
parents:
5587
diff
changeset
|
835 |
set = v->cargo_count * (totalsets - 2) / max((uint16)1, v->cargo_cap) + 1; |
3686
16627c28741d
(svn r4611) - NewGRF: introduce new vehicle sprite group resolver code. This also fixes some known bugs (e.g. the 'Standard Five' in UKRS is now the correct colour)
peter1138
parents:
3684
diff
changeset
|
836 |
} |
426
381172276dc6
(svn r625) Almost complete support for deterministic variational vehicle spritegroups. (pasky)
tron
parents:
414
diff
changeset
|
837 |
|
3734
5b331306e6fe
(svn r4714) - NewGRF: simplify evaluation of 'real' sprite groups.
peter1138
parents:
3731
diff
changeset
|
838 |
return in_motion ? group->g.real.loaded[set] : group->g.real.loading[set]; |
426
381172276dc6
(svn r625) Almost complete support for deterministic variational vehicle spritegroups. (pasky)
tron
parents:
414
diff
changeset
|
839 |
} |
381172276dc6
(svn r625) Almost complete support for deterministic variational vehicle spritegroups. (pasky)
tron
parents:
414
diff
changeset
|
840 |
|
3686
16627c28741d
(svn r4611) - NewGRF: introduce new vehicle sprite group resolver code. This also fixes some known bugs (e.g. the 'Standard Five' in UKRS is now the correct colour)
peter1138
parents:
3684
diff
changeset
|
841 |
|
4057
863fce30596d
(svn r5337) - NewGRF: pass the engine type to the engine resolver, to allow support for variable 7F for unbuilt vehicles (mart3p)
peter1138
parents:
4056
diff
changeset
|
842 |
static inline void NewVehicleResolver(ResolverObject *res, EngineID engine_type, const Vehicle *v) |
3686
16627c28741d
(svn r4611) - NewGRF: introduce new vehicle sprite group resolver code. This also fixes some known bugs (e.g. the 'Standard Five' in UKRS is now the correct colour)
peter1138
parents:
3684
diff
changeset
|
843 |
{ |
16627c28741d
(svn r4611) - NewGRF: introduce new vehicle sprite group resolver code. This also fixes some known bugs (e.g. the 'Standard Five' in UKRS is now the correct colour)
peter1138
parents:
3684
diff
changeset
|
844 |
res->GetRandomBits = &VehicleGetRandomBits; |
16627c28741d
(svn r4611) - NewGRF: introduce new vehicle sprite group resolver code. This also fixes some known bugs (e.g. the 'Standard Five' in UKRS is now the correct colour)
peter1138
parents:
3684
diff
changeset
|
845 |
res->GetTriggers = &VehicleGetTriggers; |
16627c28741d
(svn r4611) - NewGRF: introduce new vehicle sprite group resolver code. This also fixes some known bugs (e.g. the 'Standard Five' in UKRS is now the correct colour)
peter1138
parents:
3684
diff
changeset
|
846 |
res->SetTriggers = &VehicleSetTriggers; |
16627c28741d
(svn r4611) - NewGRF: introduce new vehicle sprite group resolver code. This also fixes some known bugs (e.g. the 'Standard Five' in UKRS is now the correct colour)
peter1138
parents:
3684
diff
changeset
|
847 |
res->GetVariable = &VehicleGetVariable; |
16627c28741d
(svn r4611) - NewGRF: introduce new vehicle sprite group resolver code. This also fixes some known bugs (e.g. the 'Standard Five' in UKRS is now the correct colour)
peter1138
parents:
3684
diff
changeset
|
848 |
res->ResolveReal = &VehicleResolveReal; |
16627c28741d
(svn r4611) - NewGRF: introduce new vehicle sprite group resolver code. This also fixes some known bugs (e.g. the 'Standard Five' in UKRS is now the correct colour)
peter1138
parents:
3684
diff
changeset
|
849 |
|
3720
8a82d64ea485
(svn r4691) - Codechange: don't use unnamed unions as GCC 2.95.ancient won't compile it. Needed for our MorphOS user ;)
peter1138
parents:
3706
diff
changeset
|
850 |
res->u.vehicle.self = v; |
8a82d64ea485
(svn r4691) - Codechange: don't use unnamed unions as GCC 2.95.ancient won't compile it. Needed for our MorphOS user ;)
peter1138
parents:
3706
diff
changeset
|
851 |
res->u.vehicle.parent = (v != NULL && v->type == VEH_Train) ? GetFirstVehicleInChain(v) : v; |
3686
16627c28741d
(svn r4611) - NewGRF: introduce new vehicle sprite group resolver code. This also fixes some known bugs (e.g. the 'Standard Five' in UKRS is now the correct colour)
peter1138
parents:
3684
diff
changeset
|
852 |
|
4057
863fce30596d
(svn r5337) - NewGRF: pass the engine type to the engine resolver, to allow support for variable 7F for unbuilt vehicles (mart3p)
peter1138
parents:
4056
diff
changeset
|
853 |
res->u.vehicle.self_type = engine_type; |
863fce30596d
(svn r5337) - NewGRF: pass the engine type to the engine resolver, to allow support for variable 7F for unbuilt vehicles (mart3p)
peter1138
parents:
4056
diff
changeset
|
854 |
|
4056
7899dc230a12
(svn r5336) - NewGRF: draw custom helicopter rotor sprites in vehicle info window, ensuring the correct direction is used (inspiration from mart3p)
peter1138
parents:
4055
diff
changeset
|
855 |
res->info_view = false; |
7899dc230a12
(svn r5336) - NewGRF: draw custom helicopter rotor sprites in vehicle info window, ensuring the correct direction is used (inspiration from mart3p)
peter1138
parents:
4055
diff
changeset
|
856 |
|
3686
16627c28741d
(svn r4611) - NewGRF: introduce new vehicle sprite group resolver code. This also fixes some known bugs (e.g. the 'Standard Five' in UKRS is now the correct colour)
peter1138
parents:
3684
diff
changeset
|
857 |
res->callback = 0; |
16627c28741d
(svn r4611) - NewGRF: introduce new vehicle sprite group resolver code. This also fixes some known bugs (e.g. the 'Standard Five' in UKRS is now the correct colour)
peter1138
parents:
3684
diff
changeset
|
858 |
res->callback_param1 = 0; |
16627c28741d
(svn r4611) - NewGRF: introduce new vehicle sprite group resolver code. This also fixes some known bugs (e.g. the 'Standard Five' in UKRS is now the correct colour)
peter1138
parents:
3684
diff
changeset
|
859 |
res->callback_param2 = 0; |
16627c28741d
(svn r4611) - NewGRF: introduce new vehicle sprite group resolver code. This also fixes some known bugs (e.g. the 'Standard Five' in UKRS is now the correct colour)
peter1138
parents:
3684
diff
changeset
|
860 |
res->last_value = 0; |
16627c28741d
(svn r4611) - NewGRF: introduce new vehicle sprite group resolver code. This also fixes some known bugs (e.g. the 'Standard Five' in UKRS is now the correct colour)
peter1138
parents:
3684
diff
changeset
|
861 |
res->trigger = 0; |
16627c28741d
(svn r4611) - NewGRF: introduce new vehicle sprite group resolver code. This also fixes some known bugs (e.g. the 'Standard Five' in UKRS is now the correct colour)
peter1138
parents:
3684
diff
changeset
|
862 |
res->reseed = 0; |
16627c28741d
(svn r4611) - NewGRF: introduce new vehicle sprite group resolver code. This also fixes some known bugs (e.g. the 'Standard Five' in UKRS is now the correct colour)
peter1138
parents:
3684
diff
changeset
|
863 |
} |
16627c28741d
(svn r4611) - NewGRF: introduce new vehicle sprite group resolver code. This also fixes some known bugs (e.g. the 'Standard Five' in UKRS is now the correct colour)
peter1138
parents:
3684
diff
changeset
|
864 |
|
16627c28741d
(svn r4611) - NewGRF: introduce new vehicle sprite group resolver code. This also fixes some known bugs (e.g. the 'Standard Five' in UKRS is now the correct colour)
peter1138
parents:
3684
diff
changeset
|
865 |
|
4901
c07d76c5d3f7
(svn r6870) - Codechange: (re-)unify the code to retrieve the sprite group for a vehicle.
peter1138
parents:
4869
diff
changeset
|
866 |
/** Retrieve the SpriteGroup for the specified vehicle. |
c07d76c5d3f7
(svn r6870) - Codechange: (re-)unify the code to retrieve the sprite group for a vehicle.
peter1138
parents:
4869
diff
changeset
|
867 |
* If the vehicle is not specified, the purchase list group for the engine is |
c07d76c5d3f7
(svn r6870) - Codechange: (re-)unify the code to retrieve the sprite group for a vehicle.
peter1138
parents:
4869
diff
changeset
|
868 |
* chosen. For trains, an additional engine override lookup is performed. |
c07d76c5d3f7
(svn r6870) - Codechange: (re-)unify the code to retrieve the sprite group for a vehicle.
peter1138
parents:
4869
diff
changeset
|
869 |
* @param engine Engine type of the vehicle. |
c07d76c5d3f7
(svn r6870) - Codechange: (re-)unify the code to retrieve the sprite group for a vehicle.
peter1138
parents:
4869
diff
changeset
|
870 |
* @param v The vehicle itself. |
c07d76c5d3f7
(svn r6870) - Codechange: (re-)unify the code to retrieve the sprite group for a vehicle.
peter1138
parents:
4869
diff
changeset
|
871 |
* @returns The selected SpriteGroup for the vehicle. |
c07d76c5d3f7
(svn r6870) - Codechange: (re-)unify the code to retrieve the sprite group for a vehicle.
peter1138
parents:
4869
diff
changeset
|
872 |
*/ |
c07d76c5d3f7
(svn r6870) - Codechange: (re-)unify the code to retrieve the sprite group for a vehicle.
peter1138
parents:
4869
diff
changeset
|
873 |
static const SpriteGroup *GetVehicleSpriteGroup(EngineID engine, const Vehicle *v) |
c07d76c5d3f7
(svn r6870) - Codechange: (re-)unify the code to retrieve the sprite group for a vehicle.
peter1138
parents:
4869
diff
changeset
|
874 |
{ |
c07d76c5d3f7
(svn r6870) - Codechange: (re-)unify the code to retrieve the sprite group for a vehicle.
peter1138
parents:
4869
diff
changeset
|
875 |
const SpriteGroup *group; |
c07d76c5d3f7
(svn r6870) - Codechange: (re-)unify the code to retrieve the sprite group for a vehicle.
peter1138
parents:
4869
diff
changeset
|
876 |
CargoID cargo; |
c07d76c5d3f7
(svn r6870) - Codechange: (re-)unify the code to retrieve the sprite group for a vehicle.
peter1138
parents:
4869
diff
changeset
|
877 |
|
c07d76c5d3f7
(svn r6870) - Codechange: (re-)unify the code to retrieve the sprite group for a vehicle.
peter1138
parents:
4869
diff
changeset
|
878 |
if (v == NULL) { |
c07d76c5d3f7
(svn r6870) - Codechange: (re-)unify the code to retrieve the sprite group for a vehicle.
peter1138
parents:
4869
diff
changeset
|
879 |
cargo = GC_PURCHASE; |
c07d76c5d3f7
(svn r6870) - Codechange: (re-)unify the code to retrieve the sprite group for a vehicle.
peter1138
parents:
4869
diff
changeset
|
880 |
} else { |
c07d76c5d3f7
(svn r6870) - Codechange: (re-)unify the code to retrieve the sprite group for a vehicle.
peter1138
parents:
4869
diff
changeset
|
881 |
cargo = _global_cargo_id[_opt.landscape][v->cargo_type]; |
c07d76c5d3f7
(svn r6870) - Codechange: (re-)unify the code to retrieve the sprite group for a vehicle.
peter1138
parents:
4869
diff
changeset
|
882 |
assert(cargo != GC_INVALID); |
c07d76c5d3f7
(svn r6870) - Codechange: (re-)unify the code to retrieve the sprite group for a vehicle.
peter1138
parents:
4869
diff
changeset
|
883 |
|
c07d76c5d3f7
(svn r6870) - Codechange: (re-)unify the code to retrieve the sprite group for a vehicle.
peter1138
parents:
4869
diff
changeset
|
884 |
if (v->type == VEH_Train) { |
c07d76c5d3f7
(svn r6870) - Codechange: (re-)unify the code to retrieve the sprite group for a vehicle.
peter1138
parents:
4869
diff
changeset
|
885 |
group = GetWagonOverrideSpriteSet(engine, cargo, v->u.rail.first_engine); |
c07d76c5d3f7
(svn r6870) - Codechange: (re-)unify the code to retrieve the sprite group for a vehicle.
peter1138
parents:
4869
diff
changeset
|
886 |
|
c07d76c5d3f7
(svn r6870) - Codechange: (re-)unify the code to retrieve the sprite group for a vehicle.
peter1138
parents:
4869
diff
changeset
|
887 |
if (group != NULL) return group; |
c07d76c5d3f7
(svn r6870) - Codechange: (re-)unify the code to retrieve the sprite group for a vehicle.
peter1138
parents:
4869
diff
changeset
|
888 |
} |
c07d76c5d3f7
(svn r6870) - Codechange: (re-)unify the code to retrieve the sprite group for a vehicle.
peter1138
parents:
4869
diff
changeset
|
889 |
} |
c07d76c5d3f7
(svn r6870) - Codechange: (re-)unify the code to retrieve the sprite group for a vehicle.
peter1138
parents:
4869
diff
changeset
|
890 |
|
c07d76c5d3f7
(svn r6870) - Codechange: (re-)unify the code to retrieve the sprite group for a vehicle.
peter1138
parents:
4869
diff
changeset
|
891 |
group = engine_custom_sprites[engine][cargo]; |
c07d76c5d3f7
(svn r6870) - Codechange: (re-)unify the code to retrieve the sprite group for a vehicle.
peter1138
parents:
4869
diff
changeset
|
892 |
if (group != NULL) return group; |
c07d76c5d3f7
(svn r6870) - Codechange: (re-)unify the code to retrieve the sprite group for a vehicle.
peter1138
parents:
4869
diff
changeset
|
893 |
|
c07d76c5d3f7
(svn r6870) - Codechange: (re-)unify the code to retrieve the sprite group for a vehicle.
peter1138
parents:
4869
diff
changeset
|
894 |
/* Fall back to the default set if the selected cargo type is not defined */ |
c07d76c5d3f7
(svn r6870) - Codechange: (re-)unify the code to retrieve the sprite group for a vehicle.
peter1138
parents:
4869
diff
changeset
|
895 |
return engine_custom_sprites[engine][GC_DEFAULT]; |
c07d76c5d3f7
(svn r6870) - Codechange: (re-)unify the code to retrieve the sprite group for a vehicle.
peter1138
parents:
4869
diff
changeset
|
896 |
} |
c07d76c5d3f7
(svn r6870) - Codechange: (re-)unify the code to retrieve the sprite group for a vehicle.
peter1138
parents:
4869
diff
changeset
|
897 |
|
c07d76c5d3f7
(svn r6870) - Codechange: (re-)unify the code to retrieve the sprite group for a vehicle.
peter1138
parents:
4869
diff
changeset
|
898 |
|
3686
16627c28741d
(svn r4611) - NewGRF: introduce new vehicle sprite group resolver code. This also fixes some known bugs (e.g. the 'Standard Five' in UKRS is now the correct colour)
peter1138
parents:
3684
diff
changeset
|
899 |
SpriteID GetCustomEngineSprite(EngineID engine, const Vehicle *v, Direction direction) |
0 | 900 |
{ |
2242
512eae2cf006
(svn r2762) Simplify a loop, remove an unused variable and add many consts
tron
parents:
2204
diff
changeset
|
901 |
const SpriteGroup *group; |
3686
16627c28741d
(svn r4611) - NewGRF: introduce new vehicle sprite group resolver code. This also fixes some known bugs (e.g. the 'Standard Five' in UKRS is now the correct colour)
peter1138
parents:
3684
diff
changeset
|
902 |
ResolverObject object; |
0 | 903 |
|
4057
863fce30596d
(svn r5337) - NewGRF: pass the engine type to the engine resolver, to allow support for variable 7F for unbuilt vehicles (mart3p)
peter1138
parents:
4056
diff
changeset
|
904 |
NewVehicleResolver(&object, engine, v); |
3686
16627c28741d
(svn r4611) - NewGRF: introduce new vehicle sprite group resolver code. This also fixes some known bugs (e.g. the 'Standard Five' in UKRS is now the correct colour)
peter1138
parents:
3684
diff
changeset
|
905 |
|
4901
c07d76c5d3f7
(svn r6870) - Codechange: (re-)unify the code to retrieve the sprite group for a vehicle.
peter1138
parents:
4869
diff
changeset
|
906 |
group = Resolve(GetVehicleSpriteGroup(engine, v), &object); |
3686
16627c28741d
(svn r4611) - NewGRF: introduce new vehicle sprite group resolver code. This also fixes some known bugs (e.g. the 'Standard Five' in UKRS is now the correct colour)
peter1138
parents:
3684
diff
changeset
|
907 |
if (group == NULL || group->type != SGT_RESULT) return 0; |
3668
42325f12e7d8
(svn r4583) - NewGRF: Revamp sprite group loading to support advanced varadjusts and variable size. These are not yet processed, however.
peter1138
parents:
3648
diff
changeset
|
908 |
|
42325f12e7d8
(svn r4583) - NewGRF: Revamp sprite group loading to support advanced varadjusts and variable size. These are not yet processed, however.
peter1138
parents:
3648
diff
changeset
|
909 |
return group->g.result.sprite + (direction % group->g.result.num_sprites); |
0 | 910 |
} |
911 |
||
3686
16627c28741d
(svn r4611) - NewGRF: introduce new vehicle sprite group resolver code. This also fixes some known bugs (e.g. the 'Standard Five' in UKRS is now the correct colour)
peter1138
parents:
3684
diff
changeset
|
912 |
|
4056
7899dc230a12
(svn r5336) - NewGRF: draw custom helicopter rotor sprites in vehicle info window, ensuring the correct direction is used (inspiration from mart3p)
peter1138
parents:
4055
diff
changeset
|
913 |
SpriteID GetRotorOverrideSprite(EngineID engine, const Vehicle *v, bool info_view) |
3695
e1d5608f4d32
(svn r4632) - NewGRF: support loading of helicopter rotor sprites (mart3p)
peter1138
parents:
3693
diff
changeset
|
914 |
{ |
e1d5608f4d32
(svn r4632) - NewGRF: support loading of helicopter rotor sprites (mart3p)
peter1138
parents:
3693
diff
changeset
|
915 |
const SpriteGroup *group; |
e1d5608f4d32
(svn r4632) - NewGRF: support loading of helicopter rotor sprites (mart3p)
peter1138
parents:
3693
diff
changeset
|
916 |
ResolverObject object; |
e1d5608f4d32
(svn r4632) - NewGRF: support loading of helicopter rotor sprites (mart3p)
peter1138
parents:
3693
diff
changeset
|
917 |
|
e1d5608f4d32
(svn r4632) - NewGRF: support loading of helicopter rotor sprites (mart3p)
peter1138
parents:
3693
diff
changeset
|
918 |
assert(engine >= AIRCRAFT_ENGINES_INDEX); |
e1d5608f4d32
(svn r4632) - NewGRF: support loading of helicopter rotor sprites (mart3p)
peter1138
parents:
3693
diff
changeset
|
919 |
assert(engine < AIRCRAFT_ENGINES_INDEX + NUM_AIRCRAFT_ENGINES); |
e1d5608f4d32
(svn r4632) - NewGRF: support loading of helicopter rotor sprites (mart3p)
peter1138
parents:
3693
diff
changeset
|
920 |
|
e1d5608f4d32
(svn r4632) - NewGRF: support loading of helicopter rotor sprites (mart3p)
peter1138
parents:
3693
diff
changeset
|
921 |
/* Only valid for helicopters */ |
4023
5d84c056a2b1
(svn r5262) Add symbolic names for the aircraft subtypes. not perfect, but better than raw numbers
tron
parents:
3925
diff
changeset
|
922 |
assert(!(AircraftVehInfo(engine)->subtype & AIR_CTOL)); |
3695
e1d5608f4d32
(svn r4632) - NewGRF: support loading of helicopter rotor sprites (mart3p)
peter1138
parents:
3693
diff
changeset
|
923 |
|
4057
863fce30596d
(svn r5337) - NewGRF: pass the engine type to the engine resolver, to allow support for variable 7F for unbuilt vehicles (mart3p)
peter1138
parents:
4056
diff
changeset
|
924 |
NewVehicleResolver(&object, engine, v); |
3695
e1d5608f4d32
(svn r4632) - NewGRF: support loading of helicopter rotor sprites (mart3p)
peter1138
parents:
3693
diff
changeset
|
925 |
|
4056
7899dc230a12
(svn r5336) - NewGRF: draw custom helicopter rotor sprites in vehicle info window, ensuring the correct direction is used (inspiration from mart3p)
peter1138
parents:
4055
diff
changeset
|
926 |
object.info_view = info_view; |
7899dc230a12
(svn r5336) - NewGRF: draw custom helicopter rotor sprites in vehicle info window, ensuring the correct direction is used (inspiration from mart3p)
peter1138
parents:
4055
diff
changeset
|
927 |
|
3695
e1d5608f4d32
(svn r4632) - NewGRF: support loading of helicopter rotor sprites (mart3p)
peter1138
parents:
3693
diff
changeset
|
928 |
group = heli_rotor_custom_sprites[engine - AIRCRAFT_ENGINES_INDEX]; |
e1d5608f4d32
(svn r4632) - NewGRF: support loading of helicopter rotor sprites (mart3p)
peter1138
parents:
3693
diff
changeset
|
929 |
group = Resolve(group, &object); |
e1d5608f4d32
(svn r4632) - NewGRF: support loading of helicopter rotor sprites (mart3p)
peter1138
parents:
3693
diff
changeset
|
930 |
|
e1d5608f4d32
(svn r4632) - NewGRF: support loading of helicopter rotor sprites (mart3p)
peter1138
parents:
3693
diff
changeset
|
931 |
if (group == NULL || group->type != SGT_RESULT) return 0; |
e1d5608f4d32
(svn r4632) - NewGRF: support loading of helicopter rotor sprites (mart3p)
peter1138
parents:
3693
diff
changeset
|
932 |
|
e1d5608f4d32
(svn r4632) - NewGRF: support loading of helicopter rotor sprites (mart3p)
peter1138
parents:
3693
diff
changeset
|
933 |
if (v == NULL) return group->g.result.sprite; |
e1d5608f4d32
(svn r4632) - NewGRF: support loading of helicopter rotor sprites (mart3p)
peter1138
parents:
3693
diff
changeset
|
934 |
|
4056
7899dc230a12
(svn r5336) - NewGRF: draw custom helicopter rotor sprites in vehicle info window, ensuring the correct direction is used (inspiration from mart3p)
peter1138
parents:
4055
diff
changeset
|
935 |
return group->g.result.sprite + (info_view ? 0 : (v->next->next->u.air.state % group->g.result.num_sprites)); |
3695
e1d5608f4d32
(svn r4632) - NewGRF: support loading of helicopter rotor sprites (mart3p)
peter1138
parents:
3693
diff
changeset
|
936 |
} |
e1d5608f4d32
(svn r4632) - NewGRF: support loading of helicopter rotor sprites (mart3p)
peter1138
parents:
3693
diff
changeset
|
937 |
|
e1d5608f4d32
(svn r4632) - NewGRF: support loading of helicopter rotor sprites (mart3p)
peter1138
parents:
3693
diff
changeset
|
938 |
|
1883
ad68cd0a0a25
(svn r2389) - Feature: [newgrf] Implement the mechanism for handling newgrf callbacks.
hackykid
parents:
1881
diff
changeset
|
939 |
/** |
1908
2fa391fed79a
(svn r2414) - Feature: [newgrf] Implement powered wagons, and the callback that goes with it.
hackykid
parents:
1904
diff
changeset
|
940 |
* Check if a wagon is currently using a wagon override |
2fa391fed79a
(svn r2414) - Feature: [newgrf] Implement powered wagons, and the callback that goes with it.
hackykid
parents:
1904
diff
changeset
|
941 |
* @param v The wagon to check |
2fa391fed79a
(svn r2414) - Feature: [newgrf] Implement powered wagons, and the callback that goes with it.
hackykid
parents:
1904
diff
changeset
|
942 |
* @return true if it is using an override, false otherwise |
2fa391fed79a
(svn r2414) - Feature: [newgrf] Implement powered wagons, and the callback that goes with it.
hackykid
parents:
1904
diff
changeset
|
943 |
*/ |
2548
49c8a096033f
(svn r3077) static, const, bracing, indentation, 0 -> '\0'/NULL, typos in comments, excess empty lines, minor other changes
tron
parents:
2530
diff
changeset
|
944 |
bool UsesWagonOverride(const Vehicle* v) |
49c8a096033f
(svn r3077) static, const, bracing, indentation, 0 -> '\0'/NULL, typos in comments, excess empty lines, minor other changes
tron
parents:
2530
diff
changeset
|
945 |
{ |
1908
2fa391fed79a
(svn r2414) - Feature: [newgrf] Implement powered wagons, and the callback that goes with it.
hackykid
parents:
1904
diff
changeset
|
946 |
assert(v->type == VEH_Train); |
4869
3a75d9b3b5ea
(svn r6795) - NewGRF: Add support for cargo-specific wagon overrides.
peter1138
parents:
4832
diff
changeset
|
947 |
return GetWagonOverrideSpriteSet(v->engine_type, _global_cargo_id[_opt.landscape][v->cargo_type], v->u.rail.first_engine) != NULL; |
1908
2fa391fed79a
(svn r2414) - Feature: [newgrf] Implement powered wagons, and the callback that goes with it.
hackykid
parents:
1904
diff
changeset
|
948 |
} |
2fa391fed79a
(svn r2414) - Feature: [newgrf] Implement powered wagons, and the callback that goes with it.
hackykid
parents:
1904
diff
changeset
|
949 |
|
2fa391fed79a
(svn r2414) - Feature: [newgrf] Implement powered wagons, and the callback that goes with it.
hackykid
parents:
1904
diff
changeset
|
950 |
/** |
3390
ae4b0872dc78
(svn r4198) - NewGRF: Rename GetCallBackResult() to GetVehicleCallback(), as other types will exist later, and use separate parameters instead of bitshifting.
peter1138
parents:
3348
diff
changeset
|
951 |
* Evaluate a newgrf callback for vehicles |
ae4b0872dc78
(svn r4198) - NewGRF: Rename GetCallBackResult() to GetVehicleCallback(), as other types will exist later, and use separate parameters instead of bitshifting.
peter1138
parents:
3348
diff
changeset
|
952 |
* @param callback The callback to evalute |
ae4b0872dc78
(svn r4198) - NewGRF: Rename GetCallBackResult() to GetVehicleCallback(), as other types will exist later, and use separate parameters instead of bitshifting.
peter1138
parents:
3348
diff
changeset
|
953 |
* @param param1 First parameter of the callback |
ae4b0872dc78
(svn r4198) - NewGRF: Rename GetCallBackResult() to GetVehicleCallback(), as other types will exist later, and use separate parameters instead of bitshifting.
peter1138
parents:
3348
diff
changeset
|
954 |
* @param param2 Second parameter of the callback |
ae4b0872dc78
(svn r4198) - NewGRF: Rename GetCallBackResult() to GetVehicleCallback(), as other types will exist later, and use separate parameters instead of bitshifting.
peter1138
parents:
3348
diff
changeset
|
955 |
* @param engine Engine type of the vehicle to evaluate the callback for |
ae4b0872dc78
(svn r4198) - NewGRF: Rename GetCallBackResult() to GetVehicleCallback(), as other types will exist later, and use separate parameters instead of bitshifting.
peter1138
parents:
3348
diff
changeset
|
956 |
* @param vehicle The vehicle to evaluate the callback for, or NULL if it doesnt exist yet |
1883
ad68cd0a0a25
(svn r2389) - Feature: [newgrf] Implement the mechanism for handling newgrf callbacks.
hackykid
parents:
1881
diff
changeset
|
957 |
* @return The value the callback returned, or CALLBACK_FAILED if it failed |
ad68cd0a0a25
(svn r2389) - Feature: [newgrf] Implement the mechanism for handling newgrf callbacks.
hackykid
parents:
1881
diff
changeset
|
958 |
*/ |
3724
1b2d907fbd33
(svn r4697) - NewGRF: callback IDs can now be 16 bit values.
peter1138
parents:
3723
diff
changeset
|
959 |
uint16 GetVehicleCallback(uint16 callback, uint32 param1, uint32 param2, EngineID engine, const Vehicle *v) |
1883
ad68cd0a0a25
(svn r2389) - Feature: [newgrf] Implement the mechanism for handling newgrf callbacks.
hackykid
parents:
1881
diff
changeset
|
960 |
{ |
2242
512eae2cf006
(svn r2762) Simplify a loop, remove an unused variable and add many consts
tron
parents:
2204
diff
changeset
|
961 |
const SpriteGroup *group; |
3686
16627c28741d
(svn r4611) - NewGRF: introduce new vehicle sprite group resolver code. This also fixes some known bugs (e.g. the 'Standard Five' in UKRS is now the correct colour)
peter1138
parents:
3684
diff
changeset
|
962 |
ResolverObject object; |
16627c28741d
(svn r4611) - NewGRF: introduce new vehicle sprite group resolver code. This also fixes some known bugs (e.g. the 'Standard Five' in UKRS is now the correct colour)
peter1138
parents:
3684
diff
changeset
|
963 |
|
4057
863fce30596d
(svn r5337) - NewGRF: pass the engine type to the engine resolver, to allow support for variable 7F for unbuilt vehicles (mart3p)
peter1138
parents:
4056
diff
changeset
|
964 |
NewVehicleResolver(&object, engine, v); |
3686
16627c28741d
(svn r4611) - NewGRF: introduce new vehicle sprite group resolver code. This also fixes some known bugs (e.g. the 'Standard Five' in UKRS is now the correct colour)
peter1138
parents:
3684
diff
changeset
|
965 |
|
16627c28741d
(svn r4611) - NewGRF: introduce new vehicle sprite group resolver code. This also fixes some known bugs (e.g. the 'Standard Five' in UKRS is now the correct colour)
peter1138
parents:
3684
diff
changeset
|
966 |
object.callback = callback; |
16627c28741d
(svn r4611) - NewGRF: introduce new vehicle sprite group resolver code. This also fixes some known bugs (e.g. the 'Standard Five' in UKRS is now the correct colour)
peter1138
parents:
3684
diff
changeset
|
967 |
object.callback_param1 = param1; |
16627c28741d
(svn r4611) - NewGRF: introduce new vehicle sprite group resolver code. This also fixes some known bugs (e.g. the 'Standard Five' in UKRS is now the correct colour)
peter1138
parents:
3684
diff
changeset
|
968 |
object.callback_param2 = param2; |
1883
ad68cd0a0a25
(svn r2389) - Feature: [newgrf] Implement the mechanism for handling newgrf callbacks.
hackykid
parents:
1881
diff
changeset
|
969 |
|
4901
c07d76c5d3f7
(svn r6870) - Codechange: (re-)unify the code to retrieve the sprite group for a vehicle.
peter1138
parents:
4869
diff
changeset
|
970 |
group = Resolve(GetVehicleSpriteGroup(engine, v), &object); |
4811
94f23d625b95
(svn r6735) - Codestyle: Just some tidying up...
peter1138
parents:
4656
diff
changeset
|
971 |
if (group == NULL || group->type != SGT_CALLBACK) return CALLBACK_FAILED; |
1883
ad68cd0a0a25
(svn r2389) - Feature: [newgrf] Implement the mechanism for handling newgrf callbacks.
hackykid
parents:
1881
diff
changeset
|
972 |
|
ad68cd0a0a25
(svn r2389) - Feature: [newgrf] Implement the mechanism for handling newgrf callbacks.
hackykid
parents:
1881
diff
changeset
|
973 |
return group->g.callback.result; |
ad68cd0a0a25
(svn r2389) - Feature: [newgrf] Implement the mechanism for handling newgrf callbacks.
hackykid
parents:
1881
diff
changeset
|
974 |
} |
ad68cd0a0a25
(svn r2389) - Feature: [newgrf] Implement the mechanism for handling newgrf callbacks.
hackykid
parents:
1881
diff
changeset
|
975 |
|
3726
f44617056b8f
(svn r4702) - NewGRF: add support for 'special' vehicle callbacks that use a different vehicle for parent scope than the first vehicle in the consist.
peter1138
parents:
3724
diff
changeset
|
976 |
/** |
f44617056b8f
(svn r4702) - NewGRF: add support for 'special' vehicle callbacks that use a different vehicle for parent scope than the first vehicle in the consist.
peter1138
parents:
3724
diff
changeset
|
977 |
* Evaluate a newgrf callback for vehicles with a different vehicle for parent scope. |
f44617056b8f
(svn r4702) - NewGRF: add support for 'special' vehicle callbacks that use a different vehicle for parent scope than the first vehicle in the consist.
peter1138
parents:
3724
diff
changeset
|
978 |
* @param callback The callback to evalute |
f44617056b8f
(svn r4702) - NewGRF: add support for 'special' vehicle callbacks that use a different vehicle for parent scope than the first vehicle in the consist.
peter1138
parents:
3724
diff
changeset
|
979 |
* @param param1 First parameter of the callback |
f44617056b8f
(svn r4702) - NewGRF: add support for 'special' vehicle callbacks that use a different vehicle for parent scope than the first vehicle in the consist.
peter1138
parents:
3724
diff
changeset
|
980 |
* @param param2 Second parameter of the callback |
f44617056b8f
(svn r4702) - NewGRF: add support for 'special' vehicle callbacks that use a different vehicle for parent scope than the first vehicle in the consist.
peter1138
parents:
3724
diff
changeset
|
981 |
* @param engine Engine type of the vehicle to evaluate the callback for |
f44617056b8f
(svn r4702) - NewGRF: add support for 'special' vehicle callbacks that use a different vehicle for parent scope than the first vehicle in the consist.
peter1138
parents:
3724
diff
changeset
|
982 |
* @param v The vehicle to evaluate the callback for, or NULL if it doesnt exist yet |
f44617056b8f
(svn r4702) - NewGRF: add support for 'special' vehicle callbacks that use a different vehicle for parent scope than the first vehicle in the consist.
peter1138
parents:
3724
diff
changeset
|
983 |
* @param parent The vehicle to use for parent scope |
f44617056b8f
(svn r4702) - NewGRF: add support for 'special' vehicle callbacks that use a different vehicle for parent scope than the first vehicle in the consist.
peter1138
parents:
3724
diff
changeset
|
984 |
* @return The value the callback returned, or CALLBACK_FAILED if it failed |
f44617056b8f
(svn r4702) - NewGRF: add support for 'special' vehicle callbacks that use a different vehicle for parent scope than the first vehicle in the consist.
peter1138
parents:
3724
diff
changeset
|
985 |
*/ |
f44617056b8f
(svn r4702) - NewGRF: add support for 'special' vehicle callbacks that use a different vehicle for parent scope than the first vehicle in the consist.
peter1138
parents:
3724
diff
changeset
|
986 |
uint16 GetVehicleCallbackParent(uint16 callback, uint32 param1, uint32 param2, EngineID engine, const Vehicle *v, const Vehicle *parent) |
f44617056b8f
(svn r4702) - NewGRF: add support for 'special' vehicle callbacks that use a different vehicle for parent scope than the first vehicle in the consist.
peter1138
parents:
3724
diff
changeset
|
987 |
{ |
f44617056b8f
(svn r4702) - NewGRF: add support for 'special' vehicle callbacks that use a different vehicle for parent scope than the first vehicle in the consist.
peter1138
parents:
3724
diff
changeset
|
988 |
const SpriteGroup *group; |
f44617056b8f
(svn r4702) - NewGRF: add support for 'special' vehicle callbacks that use a different vehicle for parent scope than the first vehicle in the consist.
peter1138
parents:
3724
diff
changeset
|
989 |
ResolverObject object; |
f44617056b8f
(svn r4702) - NewGRF: add support for 'special' vehicle callbacks that use a different vehicle for parent scope than the first vehicle in the consist.
peter1138
parents:
3724
diff
changeset
|
990 |
|
4057
863fce30596d
(svn r5337) - NewGRF: pass the engine type to the engine resolver, to allow support for variable 7F for unbuilt vehicles (mart3p)
peter1138
parents:
4056
diff
changeset
|
991 |
NewVehicleResolver(&object, engine, v); |
3726
f44617056b8f
(svn r4702) - NewGRF: add support for 'special' vehicle callbacks that use a different vehicle for parent scope than the first vehicle in the consist.
peter1138
parents:
3724
diff
changeset
|
992 |
|
f44617056b8f
(svn r4702) - NewGRF: add support for 'special' vehicle callbacks that use a different vehicle for parent scope than the first vehicle in the consist.
peter1138
parents:
3724
diff
changeset
|
993 |
object.callback = callback; |
f44617056b8f
(svn r4702) - NewGRF: add support for 'special' vehicle callbacks that use a different vehicle for parent scope than the first vehicle in the consist.
peter1138
parents:
3724
diff
changeset
|
994 |
object.callback_param1 = param1; |
f44617056b8f
(svn r4702) - NewGRF: add support for 'special' vehicle callbacks that use a different vehicle for parent scope than the first vehicle in the consist.
peter1138
parents:
3724
diff
changeset
|
995 |
object.callback_param2 = param2; |
f44617056b8f
(svn r4702) - NewGRF: add support for 'special' vehicle callbacks that use a different vehicle for parent scope than the first vehicle in the consist.
peter1138
parents:
3724
diff
changeset
|
996 |
|
f44617056b8f
(svn r4702) - NewGRF: add support for 'special' vehicle callbacks that use a different vehicle for parent scope than the first vehicle in the consist.
peter1138
parents:
3724
diff
changeset
|
997 |
object.u.vehicle.parent = parent; |
f44617056b8f
(svn r4702) - NewGRF: add support for 'special' vehicle callbacks that use a different vehicle for parent scope than the first vehicle in the consist.
peter1138
parents:
3724
diff
changeset
|
998 |
|
4901
c07d76c5d3f7
(svn r6870) - Codechange: (re-)unify the code to retrieve the sprite group for a vehicle.
peter1138
parents:
4869
diff
changeset
|
999 |
group = Resolve(GetVehicleSpriteGroup(engine, v), &object); |
4811
94f23d625b95
(svn r6735) - Codestyle: Just some tidying up...
peter1138
parents:
4656
diff
changeset
|
1000 |
if (group == NULL || group->type != SGT_CALLBACK) return CALLBACK_FAILED; |
3726
f44617056b8f
(svn r4702) - NewGRF: add support for 'special' vehicle callbacks that use a different vehicle for parent scope than the first vehicle in the consist.
peter1138
parents:
3724
diff
changeset
|
1001 |
|
f44617056b8f
(svn r4702) - NewGRF: add support for 'special' vehicle callbacks that use a different vehicle for parent scope than the first vehicle in the consist.
peter1138
parents:
3724
diff
changeset
|
1002 |
return group->g.callback.result; |
f44617056b8f
(svn r4702) - NewGRF: add support for 'special' vehicle callbacks that use a different vehicle for parent scope than the first vehicle in the consist.
peter1138
parents:
3724
diff
changeset
|
1003 |
} |
1883
ad68cd0a0a25
(svn r2389) - Feature: [newgrf] Implement the mechanism for handling newgrf callbacks.
hackykid
parents:
1881
diff
changeset
|
1004 |
|
3680 | 1005 |
static void DoTriggerVehicle(Vehicle *v, VehicleTrigger trigger, byte base_random_bits, bool first) |
445
beafc0fb8f12
(svn r654) Hopefully complete support for randomized variational spritegroups (i.e. the cars transporter in DBSetXL gets different cars each time) (pasky)
tron
parents:
433
diff
changeset
|
1006 |
{ |
2242
512eae2cf006
(svn r2762) Simplify a loop, remove an unused variable and add many consts
tron
parents:
2204
diff
changeset
|
1007 |
const SpriteGroup *group; |
3686
16627c28741d
(svn r4611) - NewGRF: introduce new vehicle sprite group resolver code. This also fixes some known bugs (e.g. the 'Standard Five' in UKRS is now the correct colour)
peter1138
parents:
3684
diff
changeset
|
1008 |
ResolverObject object; |
445
beafc0fb8f12
(svn r654) Hopefully complete support for randomized variational spritegroups (i.e. the cars transporter in DBSetXL gets different cars each time) (pasky)
tron
parents:
433
diff
changeset
|
1009 |
byte new_random_bits; |
beafc0fb8f12
(svn r654) Hopefully complete support for randomized variational spritegroups (i.e. the cars transporter in DBSetXL gets different cars each time) (pasky)
tron
parents:
433
diff
changeset
|
1010 |
|
3686
16627c28741d
(svn r4611) - NewGRF: introduce new vehicle sprite group resolver code. This also fixes some known bugs (e.g. the 'Standard Five' in UKRS is now the correct colour)
peter1138
parents:
3684
diff
changeset
|
1011 |
/* We can't trigger a non-existent vehicle... */ |
16627c28741d
(svn r4611) - NewGRF: introduce new vehicle sprite group resolver code. This also fixes some known bugs (e.g. the 'Standard Five' in UKRS is now the correct colour)
peter1138
parents:
3684
diff
changeset
|
1012 |
assert(v != NULL); |
1883
ad68cd0a0a25
(svn r2389) - Feature: [newgrf] Implement the mechanism for handling newgrf callbacks.
hackykid
parents:
1881
diff
changeset
|
1013 |
|
4057
863fce30596d
(svn r5337) - NewGRF: pass the engine type to the engine resolver, to allow support for variable 7F for unbuilt vehicles (mart3p)
peter1138
parents:
4056
diff
changeset
|
1014 |
NewVehicleResolver(&object, v->engine_type, v); |
3686
16627c28741d
(svn r4611) - NewGRF: introduce new vehicle sprite group resolver code. This also fixes some known bugs (e.g. the 'Standard Five' in UKRS is now the correct colour)
peter1138
parents:
3684
diff
changeset
|
1015 |
|
16627c28741d
(svn r4611) - NewGRF: introduce new vehicle sprite group resolver code. This also fixes some known bugs (e.g. the 'Standard Five' in UKRS is now the correct colour)
peter1138
parents:
3684
diff
changeset
|
1016 |
object.trigger = trigger; |
16627c28741d
(svn r4611) - NewGRF: introduce new vehicle sprite group resolver code. This also fixes some known bugs (e.g. the 'Standard Five' in UKRS is now the correct colour)
peter1138
parents:
3684
diff
changeset
|
1017 |
|
4901
c07d76c5d3f7
(svn r6870) - Codechange: (re-)unify the code to retrieve the sprite group for a vehicle.
peter1138
parents:
4869
diff
changeset
|
1018 |
group = Resolve(GetVehicleSpriteGroup(v->engine_type, v), &object); |
1883
ad68cd0a0a25
(svn r2389) - Feature: [newgrf] Implement the mechanism for handling newgrf callbacks.
hackykid
parents:
1881
diff
changeset
|
1019 |
|
542 | 1020 |
new_random_bits = Random(); |
3686
16627c28741d
(svn r4611) - NewGRF: introduce new vehicle sprite group resolver code. This also fixes some known bugs (e.g. the 'Standard Five' in UKRS is now the correct colour)
peter1138
parents:
3684
diff
changeset
|
1021 |
v->random_bits &= ~object.reseed; |
16627c28741d
(svn r4611) - NewGRF: introduce new vehicle sprite group resolver code. This also fixes some known bugs (e.g. the 'Standard Five' in UKRS is now the correct colour)
peter1138
parents:
3684
diff
changeset
|
1022 |
v->random_bits |= (first ? new_random_bits : base_random_bits) & object.reseed; |
445
beafc0fb8f12
(svn r654) Hopefully complete support for randomized variational spritegroups (i.e. the cars transporter in DBSetXL gets different cars each time) (pasky)
tron
parents:
433
diff
changeset
|
1023 |
|
beafc0fb8f12
(svn r654) Hopefully complete support for randomized variational spritegroups (i.e. the cars transporter in DBSetXL gets different cars each time) (pasky)
tron
parents:
433
diff
changeset
|
1024 |
switch (trigger) { |
beafc0fb8f12
(svn r654) Hopefully complete support for randomized variational spritegroups (i.e. the cars transporter in DBSetXL gets different cars each time) (pasky)
tron
parents:
433
diff
changeset
|
1025 |
case VEHICLE_TRIGGER_NEW_CARGO: |
beafc0fb8f12
(svn r654) Hopefully complete support for randomized variational spritegroups (i.e. the cars transporter in DBSetXL gets different cars each time) (pasky)
tron
parents:
433
diff
changeset
|
1026 |
/* All vehicles in chain get ANY_NEW_CARGO trigger now. |
beafc0fb8f12
(svn r654) Hopefully complete support for randomized variational spritegroups (i.e. the cars transporter in DBSetXL gets different cars each time) (pasky)
tron
parents:
433
diff
changeset
|
1027 |
* So we call it for the first one and they will recurse. */ |
beafc0fb8f12
(svn r654) Hopefully complete support for randomized variational spritegroups (i.e. the cars transporter in DBSetXL gets different cars each time) (pasky)
tron
parents:
433
diff
changeset
|
1028 |
/* Indexing part of vehicle random bits needs to be |
beafc0fb8f12
(svn r654) Hopefully complete support for randomized variational spritegroups (i.e. the cars transporter in DBSetXL gets different cars each time) (pasky)
tron
parents:
433
diff
changeset
|
1029 |
* same for all triggered vehicles in the chain (to get |
beafc0fb8f12
(svn r654) Hopefully complete support for randomized variational spritegroups (i.e. the cars transporter in DBSetXL gets different cars each time) (pasky)
tron
parents:
433
diff
changeset
|
1030 |
* all the random-cargo wagons carry the same cargo, |
beafc0fb8f12
(svn r654) Hopefully complete support for randomized variational spritegroups (i.e. the cars transporter in DBSetXL gets different cars each time) (pasky)
tron
parents:
433
diff
changeset
|
1031 |
* i.e.), so we give them all the NEW_CARGO triggered |
beafc0fb8f12
(svn r654) Hopefully complete support for randomized variational spritegroups (i.e. the cars transporter in DBSetXL gets different cars each time) (pasky)
tron
parents:
433
diff
changeset
|
1032 |
* vehicle's portion of random bits. */ |
beafc0fb8f12
(svn r654) Hopefully complete support for randomized variational spritegroups (i.e. the cars transporter in DBSetXL gets different cars each time) (pasky)
tron
parents:
433
diff
changeset
|
1033 |
assert(first); |
3680 | 1034 |
DoTriggerVehicle(GetFirstVehicleInChain(v), VEHICLE_TRIGGER_ANY_NEW_CARGO, new_random_bits, false); |
445
beafc0fb8f12
(svn r654) Hopefully complete support for randomized variational spritegroups (i.e. the cars transporter in DBSetXL gets different cars each time) (pasky)
tron
parents:
433
diff
changeset
|
1035 |
break; |
3680 | 1036 |
|
445
beafc0fb8f12
(svn r654) Hopefully complete support for randomized variational spritegroups (i.e. the cars transporter in DBSetXL gets different cars each time) (pasky)
tron
parents:
433
diff
changeset
|
1037 |
case VEHICLE_TRIGGER_DEPOT: |
beafc0fb8f12
(svn r654) Hopefully complete support for randomized variational spritegroups (i.e. the cars transporter in DBSetXL gets different cars each time) (pasky)
tron
parents:
433
diff
changeset
|
1038 |
/* We now trigger the next vehicle in chain recursively. |
beafc0fb8f12
(svn r654) Hopefully complete support for randomized variational spritegroups (i.e. the cars transporter in DBSetXL gets different cars each time) (pasky)
tron
parents:
433
diff
changeset
|
1039 |
* The random bits portions may be different for each |
beafc0fb8f12
(svn r654) Hopefully complete support for randomized variational spritegroups (i.e. the cars transporter in DBSetXL gets different cars each time) (pasky)
tron
parents:
433
diff
changeset
|
1040 |
* vehicle in chain. */ |
3680 | 1041 |
if (v->next != NULL) DoTriggerVehicle(v->next, trigger, 0, true); |
445
beafc0fb8f12
(svn r654) Hopefully complete support for randomized variational spritegroups (i.e. the cars transporter in DBSetXL gets different cars each time) (pasky)
tron
parents:
433
diff
changeset
|
1042 |
break; |
3680 | 1043 |
|
445
beafc0fb8f12
(svn r654) Hopefully complete support for randomized variational spritegroups (i.e. the cars transporter in DBSetXL gets different cars each time) (pasky)
tron
parents:
433
diff
changeset
|
1044 |
case VEHICLE_TRIGGER_EMPTY: |
beafc0fb8f12
(svn r654) Hopefully complete support for randomized variational spritegroups (i.e. the cars transporter in DBSetXL gets different cars each time) (pasky)
tron
parents:
433
diff
changeset
|
1045 |
/* We now trigger the next vehicle in chain |
beafc0fb8f12
(svn r654) Hopefully complete support for randomized variational spritegroups (i.e. the cars transporter in DBSetXL gets different cars each time) (pasky)
tron
parents:
433
diff
changeset
|
1046 |
* recursively. The random bits portions must be same |
beafc0fb8f12
(svn r654) Hopefully complete support for randomized variational spritegroups (i.e. the cars transporter in DBSetXL gets different cars each time) (pasky)
tron
parents:
433
diff
changeset
|
1047 |
* for each vehicle in chain, so we give them all |
beafc0fb8f12
(svn r654) Hopefully complete support for randomized variational spritegroups (i.e. the cars transporter in DBSetXL gets different cars each time) (pasky)
tron
parents:
433
diff
changeset
|
1048 |
* first chained vehicle's portion of random bits. */ |
3680 | 1049 |
if (v->next != NULL) DoTriggerVehicle(v->next, trigger, first ? new_random_bits : base_random_bits, false); |
445
beafc0fb8f12
(svn r654) Hopefully complete support for randomized variational spritegroups (i.e. the cars transporter in DBSetXL gets different cars each time) (pasky)
tron
parents:
433
diff
changeset
|
1050 |
break; |
3680 | 1051 |
|
445
beafc0fb8f12
(svn r654) Hopefully complete support for randomized variational spritegroups (i.e. the cars transporter in DBSetXL gets different cars each time) (pasky)
tron
parents:
433
diff
changeset
|
1052 |
case VEHICLE_TRIGGER_ANY_NEW_CARGO: |
beafc0fb8f12
(svn r654) Hopefully complete support for randomized variational spritegroups (i.e. the cars transporter in DBSetXL gets different cars each time) (pasky)
tron
parents:
433
diff
changeset
|
1053 |
/* Now pass the trigger recursively to the next vehicle |
beafc0fb8f12
(svn r654) Hopefully complete support for randomized variational spritegroups (i.e. the cars transporter in DBSetXL gets different cars each time) (pasky)
tron
parents:
433
diff
changeset
|
1054 |
* in chain. */ |
beafc0fb8f12
(svn r654) Hopefully complete support for randomized variational spritegroups (i.e. the cars transporter in DBSetXL gets different cars each time) (pasky)
tron
parents:
433
diff
changeset
|
1055 |
assert(!first); |
3680 | 1056 |
if (v->next != NULL) DoTriggerVehicle(v->next, VEHICLE_TRIGGER_ANY_NEW_CARGO, base_random_bits, false); |
445
beafc0fb8f12
(svn r654) Hopefully complete support for randomized variational spritegroups (i.e. the cars transporter in DBSetXL gets different cars each time) (pasky)
tron
parents:
433
diff
changeset
|
1057 |
break; |
beafc0fb8f12
(svn r654) Hopefully complete support for randomized variational spritegroups (i.e. the cars transporter in DBSetXL gets different cars each time) (pasky)
tron
parents:
433
diff
changeset
|
1058 |
} |
beafc0fb8f12
(svn r654) Hopefully complete support for randomized variational spritegroups (i.e. the cars transporter in DBSetXL gets different cars each time) (pasky)
tron
parents:
433
diff
changeset
|
1059 |
} |
beafc0fb8f12
(svn r654) Hopefully complete support for randomized variational spritegroups (i.e. the cars transporter in DBSetXL gets different cars each time) (pasky)
tron
parents:
433
diff
changeset
|
1060 |
|
3680 | 1061 |
void TriggerVehicle(Vehicle *v, VehicleTrigger trigger) |
445
beafc0fb8f12
(svn r654) Hopefully complete support for randomized variational spritegroups (i.e. the cars transporter in DBSetXL gets different cars each time) (pasky)
tron
parents:
433
diff
changeset
|
1062 |
{ |
2589
3640c75148f2
(svn r3126) Autoreplace: Only the first vehicle in a chain should be marked as entering a depot, so call moved out of DoVehicleTrigger loop.
peter1138
parents:
2574
diff
changeset
|
1063 |
if (trigger == VEHICLE_TRIGGER_DEPOT) { |
3640c75148f2
(svn r3126) Autoreplace: Only the first vehicle in a chain should be marked as entering a depot, so call moved out of DoVehicleTrigger loop.
peter1138
parents:
2574
diff
changeset
|
1064 |
// store that the vehicle entered a depot this tick |
3680 | 1065 |
VehicleEnteredDepotThisTick(v); |
2589
3640c75148f2
(svn r3126) Autoreplace: Only the first vehicle in a chain should be marked as entering a depot, so call moved out of DoVehicleTrigger loop.
peter1138
parents:
2574
diff
changeset
|
1066 |
} |
3640c75148f2
(svn r3126) Autoreplace: Only the first vehicle in a chain should be marked as entering a depot, so call moved out of DoVehicleTrigger loop.
peter1138
parents:
2574
diff
changeset
|
1067 |
|
3680 | 1068 |
DoTriggerVehicle(v, trigger, 0, true); |
445
beafc0fb8f12
(svn r654) Hopefully complete support for randomized variational spritegroups (i.e. the cars transporter in DBSetXL gets different cars each time) (pasky)
tron
parents:
433
diff
changeset
|
1069 |
} |
beafc0fb8f12
(svn r654) Hopefully complete support for randomized variational spritegroups (i.e. the cars transporter in DBSetXL gets different cars each time) (pasky)
tron
parents:
433
diff
changeset
|
1070 |
|
3604
1e7d9f584f93
(svn r4496) - NewGRF: switch custom engine names from storing a char* to using the new StringID based text system. Vehicle name
peter1138
parents:
3595
diff
changeset
|
1071 |
StringID _engine_custom_names[TOTAL_NUM_ENGINES]; |
0 | 1072 |
|
3604
1e7d9f584f93
(svn r4496) - NewGRF: switch custom engine names from storing a char* to using the new StringID based text system. Vehicle name
peter1138
parents:
3595
diff
changeset
|
1073 |
void SetCustomEngineName(EngineID engine, StringID name) |
0 | 1074 |
{ |
3614 | 1075 |
assert(engine < lengthof(_engine_custom_names)); |
3604
1e7d9f584f93
(svn r4496) - NewGRF: switch custom engine names from storing a char* to using the new StringID based text system. Vehicle name
peter1138
parents:
3595
diff
changeset
|
1076 |
_engine_custom_names[engine] = name; |
0 | 1077 |
} |
1078 |
||
2769
eab49a86038e
(svn r3316) - NewGRF: Unload engine names before loading grf files. This fixes names in climates where the engines don't get loaded. Renamed function to reflect its purpose.
peter1138
parents:
2763
diff
changeset
|
1079 |
void UnloadCustomEngineNames(void) |
1474
a26a21fa10ef
(svn r1978) - Fix: Plug some memleaks; thanks Valgrind
Darkvater
parents:
1329
diff
changeset
|
1080 |
{ |
3604
1e7d9f584f93
(svn r4496) - NewGRF: switch custom engine names from storing a char* to using the new StringID based text system. Vehicle name
peter1138
parents:
3595
diff
changeset
|
1081 |
EngineID i; |
1e7d9f584f93
(svn r4496) - NewGRF: switch custom engine names from storing a char* to using the new StringID based text system. Vehicle name
peter1138
parents:
3595
diff
changeset
|
1082 |
for (i = 0; i < TOTAL_NUM_ENGINES; i++) { |
1e7d9f584f93
(svn r4496) - NewGRF: switch custom engine names from storing a char* to using the new StringID based text system. Vehicle name
peter1138
parents:
3595
diff
changeset
|
1083 |
_engine_custom_names[i] = 0; |
1474
a26a21fa10ef
(svn r1978) - Fix: Plug some memleaks; thanks Valgrind
Darkvater
parents:
1329
diff
changeset
|
1084 |
} |
a26a21fa10ef
(svn r1978) - Fix: Plug some memleaks; thanks Valgrind
Darkvater
parents:
1329
diff
changeset
|
1085 |
} |
a26a21fa10ef
(svn r1978) - Fix: Plug some memleaks; thanks Valgrind
Darkvater
parents:
1329
diff
changeset
|
1086 |
|
2477
225b2916fe2a
(svn r3003) Change int, uint, uin16 and byte to EngineID where appropriate, plus some related changes (mostly casts)
tron
parents:
2469
diff
changeset
|
1087 |
StringID GetCustomEngineName(EngineID engine) |
0 | 1088 |
{ |
3604
1e7d9f584f93
(svn r4496) - NewGRF: switch custom engine names from storing a char* to using the new StringID based text system. Vehicle name
peter1138
parents:
3595
diff
changeset
|
1089 |
return _engine_custom_names[engine] == 0 ? _engine_name_strings[engine] : _engine_custom_names[engine]; |
0 | 1090 |
} |
1091 |
||
2971
cae3a81e8674
(svn r3546) - NewGRF feature: Implement rail vehicle 'property' 0x1A: allows shuffling order of rail vehicle purchase list (and replace vehicle list)
peter1138
parents:
2962
diff
changeset
|
1092 |
// Functions for changing the order of vehicle purchase lists |
cae3a81e8674
(svn r3546) - NewGRF feature: Implement rail vehicle 'property' 0x1A: allows shuffling order of rail vehicle purchase list (and replace vehicle list)
peter1138
parents:
2962
diff
changeset
|
1093 |
// This is currently only implemented for rail vehicles. |
4811
94f23d625b95
(svn r6735) - Codestyle: Just some tidying up...
peter1138
parents:
4656
diff
changeset
|
1094 |
static EngineID _engine_list_order[NUM_TRAIN_ENGINES]; |
4812
d71b2e7d11e0
(svn r6736) - Add a function to get the list position of an engine ID, for use with sorting. This is basically a reversed version of GetRailVehAtPosition()
peter1138
parents:
4811
diff
changeset
|
1095 |
static byte _engine_list_position[NUM_TRAIN_ENGINES]; |
2971
cae3a81e8674
(svn r3546) - NewGRF feature: Implement rail vehicle 'property' 0x1A: allows shuffling order of rail vehicle purchase list (and replace vehicle list)
peter1138
parents:
2962
diff
changeset
|
1096 |
|
cae3a81e8674
(svn r3546) - NewGRF feature: Implement rail vehicle 'property' 0x1A: allows shuffling order of rail vehicle purchase list (and replace vehicle list)
peter1138
parents:
2962
diff
changeset
|
1097 |
void ResetEngineListOrder(void) |
cae3a81e8674
(svn r3546) - NewGRF feature: Implement rail vehicle 'property' 0x1A: allows shuffling order of rail vehicle purchase list (and replace vehicle list)
peter1138
parents:
2962
diff
changeset
|
1098 |
{ |
cae3a81e8674
(svn r3546) - NewGRF feature: Implement rail vehicle 'property' 0x1A: allows shuffling order of rail vehicle purchase list (and replace vehicle list)
peter1138
parents:
2962
diff
changeset
|
1099 |
EngineID i; |
cae3a81e8674
(svn r3546) - NewGRF feature: Implement rail vehicle 'property' 0x1A: allows shuffling order of rail vehicle purchase list (and replace vehicle list)
peter1138
parents:
2962
diff
changeset
|
1100 |
|
4811
94f23d625b95
(svn r6735) - Codestyle: Just some tidying up...
peter1138
parents:
4656
diff
changeset
|
1101 |
for (i = 0; i < NUM_TRAIN_ENGINES; i++) { |
94f23d625b95
(svn r6735) - Codestyle: Just some tidying up...
peter1138
parents:
4656
diff
changeset
|
1102 |
_engine_list_order[i] = i; |
4812
d71b2e7d11e0
(svn r6736) - Add a function to get the list position of an engine ID, for use with sorting. This is basically a reversed version of GetRailVehAtPosition()
peter1138
parents:
4811
diff
changeset
|
1103 |
_engine_list_position[i] = i; |
4811
94f23d625b95
(svn r6735) - Codestyle: Just some tidying up...
peter1138
parents:
4656
diff
changeset
|
1104 |
} |
2971
cae3a81e8674
(svn r3546) - NewGRF feature: Implement rail vehicle 'property' 0x1A: allows shuffling order of rail vehicle purchase list (and replace vehicle list)
peter1138
parents:
2962
diff
changeset
|
1105 |
} |
cae3a81e8674
(svn r3546) - NewGRF feature: Implement rail vehicle 'property' 0x1A: allows shuffling order of rail vehicle purchase list (and replace vehicle list)
peter1138
parents:
2962
diff
changeset
|
1106 |
|
4812
d71b2e7d11e0
(svn r6736) - Add a function to get the list position of an engine ID, for use with sorting. This is basically a reversed version of GetRailVehAtPosition()
peter1138
parents:
4811
diff
changeset
|
1107 |
/** |
d71b2e7d11e0
(svn r6736) - Add a function to get the list position of an engine ID, for use with sorting. This is basically a reversed version of GetRailVehAtPosition()
peter1138
parents:
4811
diff
changeset
|
1108 |
* Get the EngineID at position pos. |
d71b2e7d11e0
(svn r6736) - Add a function to get the list position of an engine ID, for use with sorting. This is basically a reversed version of GetRailVehAtPosition()
peter1138
parents:
4811
diff
changeset
|
1109 |
* Used when drawing a(n unsorted) list of engines. |
d71b2e7d11e0
(svn r6736) - Add a function to get the list position of an engine ID, for use with sorting. This is basically a reversed version of GetRailVehAtPosition()
peter1138
parents:
4811
diff
changeset
|
1110 |
* @param pos List position/ |
d71b2e7d11e0
(svn r6736) - Add a function to get the list position of an engine ID, for use with sorting. This is basically a reversed version of GetRailVehAtPosition()
peter1138
parents:
4811
diff
changeset
|
1111 |
* @return The EngineID at the requested position. |
d71b2e7d11e0
(svn r6736) - Add a function to get the list position of an engine ID, for use with sorting. This is basically a reversed version of GetRailVehAtPosition()
peter1138
parents:
4811
diff
changeset
|
1112 |
*/ |
2971
cae3a81e8674
(svn r3546) - NewGRF feature: Implement rail vehicle 'property' 0x1A: allows shuffling order of rail vehicle purchase list (and replace vehicle list)
peter1138
parents:
2962
diff
changeset
|
1113 |
EngineID GetRailVehAtPosition(EngineID pos) |
cae3a81e8674
(svn r3546) - NewGRF feature: Implement rail vehicle 'property' 0x1A: allows shuffling order of rail vehicle purchase list (and replace vehicle list)
peter1138
parents:
2962
diff
changeset
|
1114 |
{ |
4812
d71b2e7d11e0
(svn r6736) - Add a function to get the list position of an engine ID, for use with sorting. This is basically a reversed version of GetRailVehAtPosition()
peter1138
parents:
4811
diff
changeset
|
1115 |
if (pos < NUM_TRAIN_ENGINES) return _engine_list_order[pos]; |
d71b2e7d11e0
(svn r6736) - Add a function to get the list position of an engine ID, for use with sorting. This is basically a reversed version of GetRailVehAtPosition()
peter1138
parents:
4811
diff
changeset
|
1116 |
return pos; |
d71b2e7d11e0
(svn r6736) - Add a function to get the list position of an engine ID, for use with sorting. This is basically a reversed version of GetRailVehAtPosition()
peter1138
parents:
4811
diff
changeset
|
1117 |
} |
d71b2e7d11e0
(svn r6736) - Add a function to get the list position of an engine ID, for use with sorting. This is basically a reversed version of GetRailVehAtPosition()
peter1138
parents:
4811
diff
changeset
|
1118 |
|
d71b2e7d11e0
(svn r6736) - Add a function to get the list position of an engine ID, for use with sorting. This is basically a reversed version of GetRailVehAtPosition()
peter1138
parents:
4811
diff
changeset
|
1119 |
/** |
d71b2e7d11e0
(svn r6736) - Add a function to get the list position of an engine ID, for use with sorting. This is basically a reversed version of GetRailVehAtPosition()
peter1138
parents:
4811
diff
changeset
|
1120 |
* Get the list position of an engine. |
d71b2e7d11e0
(svn r6736) - Add a function to get the list position of an engine ID, for use with sorting. This is basically a reversed version of GetRailVehAtPosition()
peter1138
parents:
4811
diff
changeset
|
1121 |
* Used when sorting a list of engines. |
d71b2e7d11e0
(svn r6736) - Add a function to get the list position of an engine ID, for use with sorting. This is basically a reversed version of GetRailVehAtPosition()
peter1138
parents:
4811
diff
changeset
|
1122 |
* @param engine ID of the engine. |
d71b2e7d11e0
(svn r6736) - Add a function to get the list position of an engine ID, for use with sorting. This is basically a reversed version of GetRailVehAtPosition()
peter1138
parents:
4811
diff
changeset
|
1123 |
* @return The list position of the engine. |
d71b2e7d11e0
(svn r6736) - Add a function to get the list position of an engine ID, for use with sorting. This is basically a reversed version of GetRailVehAtPosition()
peter1138
parents:
4811
diff
changeset
|
1124 |
*/ |
d71b2e7d11e0
(svn r6736) - Add a function to get the list position of an engine ID, for use with sorting. This is basically a reversed version of GetRailVehAtPosition()
peter1138
parents:
4811
diff
changeset
|
1125 |
uint16 ListPositionOfEngine(EngineID engine) |
d71b2e7d11e0
(svn r6736) - Add a function to get the list position of an engine ID, for use with sorting. This is basically a reversed version of GetRailVehAtPosition()
peter1138
parents:
4811
diff
changeset
|
1126 |
{ |
d71b2e7d11e0
(svn r6736) - Add a function to get the list position of an engine ID, for use with sorting. This is basically a reversed version of GetRailVehAtPosition()
peter1138
parents:
4811
diff
changeset
|
1127 |
if (engine < NUM_TRAIN_ENGINES) return _engine_list_position[engine]; |
d71b2e7d11e0
(svn r6736) - Add a function to get the list position of an engine ID, for use with sorting. This is basically a reversed version of GetRailVehAtPosition()
peter1138
parents:
4811
diff
changeset
|
1128 |
return engine; |
2971
cae3a81e8674
(svn r3546) - NewGRF feature: Implement rail vehicle 'property' 0x1A: allows shuffling order of rail vehicle purchase list (and replace vehicle list)
peter1138
parents:
2962
diff
changeset
|
1129 |
} |
cae3a81e8674
(svn r3546) - NewGRF feature: Implement rail vehicle 'property' 0x1A: allows shuffling order of rail vehicle purchase list (and replace vehicle list)
peter1138
parents:
2962
diff
changeset
|
1130 |
|
cae3a81e8674
(svn r3546) - NewGRF feature: Implement rail vehicle 'property' 0x1A: allows shuffling order of rail vehicle purchase list (and replace vehicle list)
peter1138
parents:
2962
diff
changeset
|
1131 |
void AlterRailVehListOrder(EngineID engine, EngineID target) |
cae3a81e8674
(svn r3546) - NewGRF feature: Implement rail vehicle 'property' 0x1A: allows shuffling order of rail vehicle purchase list (and replace vehicle list)
peter1138
parents:
2962
diff
changeset
|
1132 |
{ |
cae3a81e8674
(svn r3546) - NewGRF feature: Implement rail vehicle 'property' 0x1A: allows shuffling order of rail vehicle purchase list (and replace vehicle list)
peter1138
parents:
2962
diff
changeset
|
1133 |
EngineID i; |
cae3a81e8674
(svn r3546) - NewGRF feature: Implement rail vehicle 'property' 0x1A: allows shuffling order of rail vehicle purchase list (and replace vehicle list)
peter1138
parents:
2962
diff
changeset
|
1134 |
bool moving = false; |
cae3a81e8674
(svn r3546) - NewGRF feature: Implement rail vehicle 'property' 0x1A: allows shuffling order of rail vehicle purchase list (and replace vehicle list)
peter1138
parents:
2962
diff
changeset
|
1135 |
|
cae3a81e8674
(svn r3546) - NewGRF feature: Implement rail vehicle 'property' 0x1A: allows shuffling order of rail vehicle purchase list (and replace vehicle list)
peter1138
parents:
2962
diff
changeset
|
1136 |
if (engine == target) return; |
cae3a81e8674
(svn r3546) - NewGRF feature: Implement rail vehicle 'property' 0x1A: allows shuffling order of rail vehicle purchase list (and replace vehicle list)
peter1138
parents:
2962
diff
changeset
|
1137 |
|
cae3a81e8674
(svn r3546) - NewGRF feature: Implement rail vehicle 'property' 0x1A: allows shuffling order of rail vehicle purchase list (and replace vehicle list)
peter1138
parents:
2962
diff
changeset
|
1138 |
// First, remove our ID from the list. |
cae3a81e8674
(svn r3546) - NewGRF feature: Implement rail vehicle 'property' 0x1A: allows shuffling order of rail vehicle purchase list (and replace vehicle list)
peter1138
parents:
2962
diff
changeset
|
1139 |
for (i = 0; i < NUM_TRAIN_ENGINES - 1; i++) { |
4811
94f23d625b95
(svn r6735) - Codestyle: Just some tidying up...
peter1138
parents:
4656
diff
changeset
|
1140 |
if (_engine_list_order[i] == engine) moving = true; |
94f23d625b95
(svn r6735) - Codestyle: Just some tidying up...
peter1138
parents:
4656
diff
changeset
|
1141 |
if (moving) _engine_list_order[i] = _engine_list_order[i + 1]; |
2971
cae3a81e8674
(svn r3546) - NewGRF feature: Implement rail vehicle 'property' 0x1A: allows shuffling order of rail vehicle purchase list (and replace vehicle list)
peter1138
parents:
2962
diff
changeset
|
1142 |
} |
cae3a81e8674
(svn r3546) - NewGRF feature: Implement rail vehicle 'property' 0x1A: allows shuffling order of rail vehicle purchase list (and replace vehicle list)
peter1138
parents:
2962
diff
changeset
|
1143 |
|
cae3a81e8674
(svn r3546) - NewGRF feature: Implement rail vehicle 'property' 0x1A: allows shuffling order of rail vehicle purchase list (and replace vehicle list)
peter1138
parents:
2962
diff
changeset
|
1144 |
// Now, insert it again, before the target engine. |
cae3a81e8674
(svn r3546) - NewGRF feature: Implement rail vehicle 'property' 0x1A: allows shuffling order of rail vehicle purchase list (and replace vehicle list)
peter1138
parents:
2962
diff
changeset
|
1145 |
for (i = NUM_TRAIN_ENGINES - 1; i > 0; i--) { |
4811
94f23d625b95
(svn r6735) - Codestyle: Just some tidying up...
peter1138
parents:
4656
diff
changeset
|
1146 |
_engine_list_order[i] = _engine_list_order[i - 1]; |
94f23d625b95
(svn r6735) - Codestyle: Just some tidying up...
peter1138
parents:
4656
diff
changeset
|
1147 |
if (_engine_list_order[i] == target) { |
94f23d625b95
(svn r6735) - Codestyle: Just some tidying up...
peter1138
parents:
4656
diff
changeset
|
1148 |
_engine_list_order[i - 1] = engine; |
2971
cae3a81e8674
(svn r3546) - NewGRF feature: Implement rail vehicle 'property' 0x1A: allows shuffling order of rail vehicle purchase list (and replace vehicle list)
peter1138
parents:
2962
diff
changeset
|
1149 |
break; |
cae3a81e8674
(svn r3546) - NewGRF feature: Implement rail vehicle 'property' 0x1A: allows shuffling order of rail vehicle purchase list (and replace vehicle list)
peter1138
parents:
2962
diff
changeset
|
1150 |
} |
cae3a81e8674
(svn r3546) - NewGRF feature: Implement rail vehicle 'property' 0x1A: allows shuffling order of rail vehicle purchase list (and replace vehicle list)
peter1138
parents:
2962
diff
changeset
|
1151 |
} |
4812
d71b2e7d11e0
(svn r6736) - Add a function to get the list position of an engine ID, for use with sorting. This is basically a reversed version of GetRailVehAtPosition()
peter1138
parents:
4811
diff
changeset
|
1152 |
|
d71b2e7d11e0
(svn r6736) - Add a function to get the list position of an engine ID, for use with sorting. This is basically a reversed version of GetRailVehAtPosition()
peter1138
parents:
4811
diff
changeset
|
1153 |
// Update the engine list position (a reverse of engine list order) |
d71b2e7d11e0
(svn r6736) - Add a function to get the list position of an engine ID, for use with sorting. This is basically a reversed version of GetRailVehAtPosition()
peter1138
parents:
4811
diff
changeset
|
1154 |
for (i = 0; i < NUM_TRAIN_ENGINES; i++) { |
d71b2e7d11e0
(svn r6736) - Add a function to get the list position of an engine ID, for use with sorting. This is basically a reversed version of GetRailVehAtPosition()
peter1138
parents:
4811
diff
changeset
|
1155 |
_engine_list_position[_engine_list_order[i]] = i; |
d71b2e7d11e0
(svn r6736) - Add a function to get the list position of an engine ID, for use with sorting. This is basically a reversed version of GetRailVehAtPosition()
peter1138
parents:
4811
diff
changeset
|
1156 |
} |
2971
cae3a81e8674
(svn r3546) - NewGRF feature: Implement rail vehicle 'property' 0x1A: allows shuffling order of rail vehicle purchase list (and replace vehicle list)
peter1138
parents:
2962
diff
changeset
|
1157 |
} |