| author | glx |
| Mon, 24 Sep 2007 03:08:47 +0000 | |
| branch | 0.5 |
| changeset 5545 | f42dc59a45f5 |
| parent 5511 | fee376b81447 |
| permissions | -rw-r--r-- |
| 2186 | 1 |
/* $Id$ */ |
2 |
||
| 0 | 3 |
#include "stdafx.h" |
|
1891
92a3b0aa0946
(svn r2397) - CodeChange: rename all "ttd" files to "openttd" files.
Darkvater
parents:
1802
diff
changeset
|
4 |
#include "openttd.h" |
|
3961
e2783f244ac6
(svn r5120) Add IsShipInDepot{Stopped,}() and remove some redundant checks
tron
parents:
3955
diff
changeset
|
5 |
#include "ship.h" |
|
507
8aa8100b0b22
(svn r815) Include strings.h only in the files which need it.
tron
parents:
445
diff
changeset
|
6 |
#include "table/strings.h" |
|
2163
637ec3c361f5
(svn r2673) Include functions.h directly, not globally via openttd.h
tron
parents:
2159
diff
changeset
|
7 |
#include "functions.h" |
|
679
e959706a3e4d
(svn r1117) Move map arrays and some related macros into their own files map.c and map.h
tron
parents:
593
diff
changeset
|
8 |
#include "map.h" |
|
1209
a1ac96655b79
(svn r1713) Split off several functions which query/set information about a single tile from map.h and put them into a seperate file tile.h
tron
parents:
1206
diff
changeset
|
9 |
#include "tile.h" |
| 0 | 10 |
#include "vehicle.h" |
11 |
#include "command.h" |
|
12 |
#include "pathfind.h" |
|
|
3442
c494e7246d7b
(svn r4272) -Codechange: Moved the map-accessing stuff from station.h into station_map.h
celestar
parents:
3421
diff
changeset
|
13 |
#include "station_map.h" |
| 0 | 14 |
#include "station.h" |
15 |
#include "news.h" |
|
16 |
#include "engine.h" |
|
17 |
#include "player.h" |
|
|
337
66647f97e7c0
(svn r513) Merge revisions 402, 416, 417, 478, 479, 511, 512 from map to trunk
tron
parents:
297
diff
changeset
|
18 |
#include "sound.h" |
| 1247 | 19 |
#include "npf.h" |
|
1313
bba6afb8a995
(svn r1817) -Codechange: Moved depot-functions to depot.c
truelight
parents:
1282
diff
changeset
|
20 |
#include "depot.h" |
|
2159
3b634157c3b2
(svn r2669) Shuffle some more stuff around to reduce dependencies
tron
parents:
2150
diff
changeset
|
21 |
#include "vehicle_gui.h" |
|
2962
dbd168a4703a
(svn r3524) - Split newgrf features from engine.[ch] into newgrf_engine.[ch], and add the new files to project files.
peter1138
parents:
2916
diff
changeset
|
22 |
#include "newgrf_engine.h" |
|
3454
c2447e8c1e23
(svn r4289) -Codechange: Make use of water_map accessors for ships. Make a mental note to clean ship_cmd
celestar
parents:
3442
diff
changeset
|
23 |
#include "water_map.h" |
|
3900
4984308f9125
(svn r4987) Feature: Merged YAPF into trunk. Thanks to devs for continuous support and users for testing.
KUDr
parents:
3870
diff
changeset
|
24 |
#include "yapf/yapf.h" |
|
4984308f9125
(svn r4987) Feature: Merged YAPF into trunk. Thanks to devs for continuous support and users for testing.
KUDr
parents:
3870
diff
changeset
|
25 |
#include "debug.h" |
|
3989
a5d50d90fd21
(svn r5188) - NewGRF: check refit capacity callback when refitting a ship
peter1138
parents:
3961
diff
changeset
|
26 |
#include "newgrf_callbacks.h" |
|
4244
44dcec623504
(svn r5822) - NewGRF: add support for callback 31, vehicle start/stop check. This allows a set to disallow a vehicle from being started, i.e. to not be able to leave the depot. This is almost a partner to callback 1D.
peter1138
parents:
4242
diff
changeset
|
27 |
#include "newgrf_text.h" |
|
4656
acffecd6f484
(svn r6532) - Feature: Add support for NewGRF sound effects. Currently sound priority isn't supported.
peter1138
parents:
4574
diff
changeset
|
28 |
#include "newgrf_sound.h" |
|
4261
2ec8f5a9747b
(svn r5887) -Cleanup: move date related functions, defines and variables to date.[ch]
rubidium
parents:
4244
diff
changeset
|
29 |
#include "date.h" |
| 0 | 30 |
|
31 |
static const uint16 _ship_sprites[] = {0x0E5D, 0x0E55, 0x0E65, 0x0E6D};
|
|
32 |
static const byte _ship_sometracks[4] = {0x19, 0x16, 0x25, 0x2A};
|
|
33 |
||
|
1977
4392ae3d8e31
(svn r2483) Replace almost 500 "uint tile" (and variants) with "TileIndex tile"
tron
parents:
1942
diff
changeset
|
34 |
static byte GetTileShipTrackStatus(TileIndex tile) |
|
4392ae3d8e31
(svn r2483) Replace almost 500 "uint tile" (and variants) with "TileIndex tile"
tron
parents:
1942
diff
changeset
|
35 |
{
|
|
159
139cf78bfb28
(svn r160) -Codechange: made GetTileTrackStatus more readable (blathijs)
truelight
parents:
156
diff
changeset
|
36 |
uint32 r = GetTileTrackStatus(tile, TRANSPORT_WATER); |
| 0 | 37 |
return r | r >> 8; |
38 |
} |
|
39 |
||
|
2477
d454d5152386
(svn r3003) Change int, uint, uin16 and byte to EngineID where appropriate, plus some related changes (mostly casts)
tron
parents:
2464
diff
changeset
|
40 |
void DrawShipEngine(int x, int y, EngineID engine, uint32 image_ormod) |
| 0 | 41 |
{
|
|
538
5dd99f3b7eca
(svn r920) Replace vehicle info macros with inline functions and add asserts to check limits
tron
parents:
534
diff
changeset
|
42 |
int spritenum = ShipVehInfo(engine)->image_index; |
| 0 | 43 |
|
44 |
if (is_custom_sprite(spritenum)) {
|
|
|
3186
5798593c2d95
(svn r3832) Replace some magic numbers by (Diag)Direction enums
tron
parents:
3157
diff
changeset
|
45 |
int sprite = GetCustomVehicleIcon(engine, DIR_W); |
| 0 | 46 |
|
| 2639 | 47 |
if (sprite != 0) {
|
| 0 | 48 |
DrawSprite(sprite | image_ormod, x, y); |
49 |
return; |
|
50 |
} |
|
|
2464
3dee59d241c0
(svn r2990) Remove _engine_original_sprites and replace all uses with references to our (new) original engine/vehicle tables.
peter1138
parents:
2214
diff
changeset
|
51 |
spritenum = orig_ship_vehicle_info[engine - SHIP_ENGINES_INDEX].image_index; |
| 0 | 52 |
} |
53 |
DrawSprite((6 + _ship_sprites[spritenum]) | image_ormod, x, y); |
|
54 |
} |
|
55 |
||
|
3157
40de8616c04c
(svn r3783) Replace further ints and magic numbers by Direction, DiagDirection and friends
tron
parents:
3147
diff
changeset
|
56 |
int GetShipImage(const Vehicle* v, Direction direction) |
| 0 | 57 |
{
|
58 |
int spritenum = v->spritenum; |
|
59 |
||
60 |
if (is_custom_sprite(spritenum)) {
|
|
61 |
int sprite = GetCustomVehicleSprite(v, direction); |
|
62 |
||
| 2639 | 63 |
if (sprite != 0) return sprite; |
|
2464
3dee59d241c0
(svn r2990) Remove _engine_original_sprites and replace all uses with references to our (new) original engine/vehicle tables.
peter1138
parents:
2214
diff
changeset
|
64 |
spritenum = orig_ship_vehicle_info[v->engine_type - SHIP_ENGINES_INDEX].image_index; |
| 0 | 65 |
} |
66 |
return _ship_sprites[spritenum] + direction; |
|
67 |
} |
|
68 |
||
| 2630 | 69 |
static const Depot* FindClosestShipDepot(const Vehicle* v) |
| 0 | 70 |
{
|
| 2630 | 71 |
const Depot* depot; |
72 |
const Depot* best_depot = NULL; |
|
|
1977
4392ae3d8e31
(svn r2483) Replace almost 500 "uint tile" (and variants) with "TileIndex tile"
tron
parents:
1942
diff
changeset
|
73 |
uint dist; |
|
4392ae3d8e31
(svn r2483) Replace almost 500 "uint tile" (and variants) with "TileIndex tile"
tron
parents:
1942
diff
changeset
|
74 |
uint best_dist = (uint)-1; |
|
4392ae3d8e31
(svn r2483) Replace almost 500 "uint tile" (and variants) with "TileIndex tile"
tron
parents:
1942
diff
changeset
|
75 |
TileIndex tile; |
|
4392ae3d8e31
(svn r2483) Replace almost 500 "uint tile" (and variants) with "TileIndex tile"
tron
parents:
1942
diff
changeset
|
76 |
TileIndex tile2 = v->tile; |
| 0 | 77 |
|
| 1247 | 78 |
if (_patches.new_pathfinding_all) {
|
79 |
NPFFoundTargetData ftd; |
|
|
1752
cdbfb2f23e72
(svn r2256) - Fix: Trains cannot find a depot when they are in a tunnel. (glx)
matthijs
parents:
1751
diff
changeset
|
80 |
byte trackdir = GetVehicleTrackdir(v); |
|
2006
324916f22a8a
(svn r2514) - Codechange: [NPF] Move the checking of railtype into a funciton IsCompatibleRail().
matthijs
parents:
1998
diff
changeset
|
81 |
ftd = NPFRouteToDepotTrialError(v->tile, trackdir, TRANSPORT_WATER, v->owner, INVALID_RAILTYPE); |
| 2639 | 82 |
if (ftd.best_bird_dist == 0) {
|
|
1313
bba6afb8a995
(svn r1817) -Codechange: Moved depot-functions to depot.c
truelight
parents:
1282
diff
changeset
|
83 |
best_depot = GetDepotByTile(ftd.node.tile); /* Found target */ |
| 2639 | 84 |
} else {
|
|
1313
bba6afb8a995
(svn r1817) -Codechange: Moved depot-functions to depot.c
truelight
parents:
1282
diff
changeset
|
85 |
best_depot = NULL; /* Did not find target */ |
| 2639 | 86 |
} |
| 1247 | 87 |
} else {
|
|
1313
bba6afb8a995
(svn r1817) -Codechange: Moved depot-functions to depot.c
truelight
parents:
1282
diff
changeset
|
88 |
FOR_ALL_DEPOTS(depot) {
|
|
bba6afb8a995
(svn r1817) -Codechange: Moved depot-functions to depot.c
truelight
parents:
1282
diff
changeset
|
89 |
tile = depot->xy; |
|
4346
3f00094f2670
(svn r6047) -Codechange: FOR_ALL now _only_ loops valid items, and skips invalid ones
truelight
parents:
4344
diff
changeset
|
90 |
if (IsTileDepotType(tile, TRANSPORT_WATER) && IsTileOwner(tile, v->owner)) {
|
| 1247 | 91 |
dist = DistanceManhattan(tile, tile2); |
92 |
if (dist < best_dist) {
|
|
93 |
best_dist = dist; |
|
|
1313
bba6afb8a995
(svn r1817) -Codechange: Moved depot-functions to depot.c
truelight
parents:
1282
diff
changeset
|
94 |
best_depot = depot; |
| 1247 | 95 |
} |
| 0 | 96 |
} |
97 |
} |
|
98 |
} |
|
99 |
return best_depot; |
|
100 |
} |
|
101 |
||
102 |
static void CheckIfShipNeedsService(Vehicle *v) |
|
103 |
{
|
|
| 2630 | 104 |
const Depot* depot; |
| 0 | 105 |
|
| 2639 | 106 |
if (_patches.servint_ships == 0) return; |
107 |
if (!VehicleNeedsService(v)) return; |
|
108 |
if (v->vehstatus & VS_STOPPED) return; |
|
|
193
0a7025304867
(svn r194) -Codechange: stripping trailing-spaces. Please keep this that way!
truelight
parents:
164
diff
changeset
|
109 |
|
|
555
eec6c0294435
(svn r955) Replace uint16 for orders with struct Order
tron
parents:
541
diff
changeset
|
110 |
if (v->current_order.type == OT_GOTO_DEPOT && |
|
1530
caa16c506a22
(svn r2034) -Codechange: Replaced the rather meaningless LOAD and UNLOAD flags for depots by something more meaningful
celestar
parents:
1520
diff
changeset
|
111 |
v->current_order.flags & OF_HALT_IN_DEPOT) |
| 0 | 112 |
return; |
113 |
||
| 2639 | 114 |
if (_patches.gotodepot && VehicleHasDepotOrders(v)) return; |
| 0 | 115 |
|
|
4529
2bfac24af02a
(svn r6356) -Fix: FS#263 planes come out of hangar and drive back into hangar
bjarni
parents:
4527
diff
changeset
|
116 |
if (IsShipInDepot(v)) {
|
|
2bfac24af02a
(svn r6356) -Fix: FS#263 planes come out of hangar and drive back into hangar
bjarni
parents:
4527
diff
changeset
|
117 |
VehicleServiceInDepot(v); |
|
2bfac24af02a
(svn r6356) -Fix: FS#263 planes come out of hangar and drive back into hangar
bjarni
parents:
4527
diff
changeset
|
118 |
return; |
|
2bfac24af02a
(svn r6356) -Fix: FS#263 planes come out of hangar and drive back into hangar
bjarni
parents:
4527
diff
changeset
|
119 |
} |
|
2bfac24af02a
(svn r6356) -Fix: FS#263 planes come out of hangar and drive back into hangar
bjarni
parents:
4527
diff
changeset
|
120 |
|
|
1313
bba6afb8a995
(svn r1817) -Codechange: Moved depot-functions to depot.c
truelight
parents:
1282
diff
changeset
|
121 |
depot = FindClosestShipDepot(v); |
| 0 | 122 |
|
|
1313
bba6afb8a995
(svn r1817) -Codechange: Moved depot-functions to depot.c
truelight
parents:
1282
diff
changeset
|
123 |
if (depot == NULL || DistanceManhattan(v->tile, depot->xy) > 12) {
|
|
555
eec6c0294435
(svn r955) Replace uint16 for orders with struct Order
tron
parents:
541
diff
changeset
|
124 |
if (v->current_order.type == OT_GOTO_DEPOT) {
|
|
eec6c0294435
(svn r955) Replace uint16 for orders with struct Order
tron
parents:
541
diff
changeset
|
125 |
v->current_order.type = OT_DUMMY; |
|
eec6c0294435
(svn r955) Replace uint16 for orders with struct Order
tron
parents:
541
diff
changeset
|
126 |
v->current_order.flags = 0; |
|
755
823358e83abf
(svn r1211) -Feature: Introduce sticky windows to all vehicle windows...Just make sure you do not sticky more than 23 at a time. Also a lot of places in the code invalidated the 'status bar' of the vehicle, referring to it as widget 4. This is now widget 5 and has been #definitized
darkvater
parents:
679
diff
changeset
|
127 |
InvalidateWindowWidget(WC_VEHICLE_VIEW, v->index, STATUS_BAR); |
| 0 | 128 |
} |
129 |
return; |
|
130 |
} |
|
131 |
||
|
555
eec6c0294435
(svn r955) Replace uint16 for orders with struct Order
tron
parents:
541
diff
changeset
|
132 |
v->current_order.type = OT_GOTO_DEPOT; |
|
eec6c0294435
(svn r955) Replace uint16 for orders with struct Order
tron
parents:
541
diff
changeset
|
133 |
v->current_order.flags = OF_NON_STOP; |
|
4527
b18634a31a4a
(svn r6353) -Codechange: Make DestinationID a typedef of uin16, which is as large as any type of destinataion (StationID, DepotID, WaypointID) it can hold
tron
parents:
4526
diff
changeset
|
134 |
v->current_order.dest = depot->index; |
|
1313
bba6afb8a995
(svn r1817) -Codechange: Moved depot-functions to depot.c
truelight
parents:
1282
diff
changeset
|
135 |
v->dest_tile = depot->xy; |
|
755
823358e83abf
(svn r1211) -Feature: Introduce sticky windows to all vehicle windows...Just make sure you do not sticky more than 23 at a time. Also a lot of places in the code invalidated the 'status bar' of the vehicle, referring to it as widget 4. This is now widget 5 and has been #definitized
darkvater
parents:
679
diff
changeset
|
136 |
InvalidateWindowWidget(WC_VEHICLE_VIEW, v->index, STATUS_BAR); |
| 0 | 137 |
} |
138 |
||
139 |
void OnNewDay_Ship(Vehicle *v) |
|
140 |
{
|
|
141 |
int32 cost; |
|
142 |
||
143 |
if ((++v->day_counter & 7) == 0) |
|
144 |
DecreaseVehicleValue(v); |
|
145 |
||
146 |
CheckVehicleBreakdown(v); |
|
147 |
AgeVehicle(v); |
|
148 |
CheckIfShipNeedsService(v); |
|
149 |
||
|
3140
69cb681c6d86
(svn r3758) Remove the news validation callback. It is superseded by r3757.
tron
parents:
3139
diff
changeset
|
150 |
CheckOrders(v); |
|
193
0a7025304867
(svn r194) -Codechange: stripping trailing-spaces. Please keep this that way!
truelight
parents:
164
diff
changeset
|
151 |
|
| 2639 | 152 |
if (v->vehstatus & VS_STOPPED) return; |
|
19
6080d2b6a959
(svn r20) Feature: warning when a vehicle has invalid orders (celestar)
dominik
parents:
11
diff
changeset
|
153 |
|
|
538
5dd99f3b7eca
(svn r920) Replace vehicle info macros with inline functions and add asserts to check limits
tron
parents:
534
diff
changeset
|
154 |
cost = ShipVehInfo(v->engine_type)->running_cost * _price.ship_running / 364; |
| 0 | 155 |
v->profit_this_year -= cost >> 8; |
156 |
||
157 |
SET_EXPENSES_TYPE(EXPENSES_SHIP_RUN); |
|
158 |
SubtractMoneyFromPlayerFract(v->owner, cost); |
|
159 |
||
160 |
InvalidateWindow(WC_VEHICLE_DETAILS, v->index); |
|
|
1055
3aae1d6f12aa
(svn r1556) -Fix: Vehicle list updates should now really work
Celestar
parents:
1053
diff
changeset
|
161 |
//we need this for the profit |
|
3aae1d6f12aa
(svn r1556) -Fix: Vehicle list updates should now really work
Celestar
parents:
1053
diff
changeset
|
162 |
InvalidateWindowClasses(WC_SHIPS_LIST); |
| 0 | 163 |
} |
164 |
||
165 |
static void HandleBrokenShip(Vehicle *v) |
|
166 |
{
|
|
167 |
if (v->breakdown_ctr != 1) {
|
|
168 |
v->breakdown_ctr = 1; |
|
169 |
v->cur_speed = 0; |
|
170 |
||
171 |
if (v->breakdowns_since_last_service != 255) |
|
172 |
v->breakdowns_since_last_service++; |
|
|
193
0a7025304867
(svn r194) -Codechange: stripping trailing-spaces. Please keep this that way!
truelight
parents:
164
diff
changeset
|
173 |
|
| 0 | 174 |
InvalidateWindow(WC_VEHICLE_VIEW, v->index); |
175 |
InvalidateWindow(WC_VEHICLE_DETAILS, v->index); |
|
|
193
0a7025304867
(svn r194) -Codechange: stripping trailing-spaces. Please keep this that way!
truelight
parents:
164
diff
changeset
|
176 |
|
|
4656
acffecd6f484
(svn r6532) - Feature: Add support for NewGRF sound effects. Currently sound priority isn't supported.
peter1138
parents:
4574
diff
changeset
|
177 |
if (!PlayVehicleSound(v, VSE_BREAKDOWN)) {
|
|
acffecd6f484
(svn r6532) - Feature: Add support for NewGRF sound effects. Currently sound priority isn't supported.
peter1138
parents:
4574
diff
changeset
|
178 |
SndPlayVehicleFx((_opt.landscape != LT_CANDY) ? |
|
acffecd6f484
(svn r6532) - Feature: Add support for NewGRF sound effects. Currently sound priority isn't supported.
peter1138
parents:
4574
diff
changeset
|
179 |
SND_10_TRAIN_BREAKDOWN : SND_3A_COMEDY_BREAKDOWN_2, v); |
|
acffecd6f484
(svn r6532) - Feature: Add support for NewGRF sound effects. Currently sound priority isn't supported.
peter1138
parents:
4574
diff
changeset
|
180 |
} |
| 0 | 181 |
|
182 |
if (!(v->vehstatus & VS_HIDDEN)) {
|
|
183 |
Vehicle *u = CreateEffectVehicleRel(v, 4, 4, 5, EV_BREAKDOWN_SMOKE); |
|
| 2639 | 184 |
if (u != NULL) u->u.special.unk0 = v->breakdown_delay * 2; |
| 0 | 185 |
} |
186 |
} |
|
187 |
||
188 |
if (!(v->tick_counter & 1)) {
|
|
189 |
if (!--v->breakdown_delay) {
|
|
190 |
v->breakdown_ctr = 0; |
|
|
1151
614cbcb5b9fe
(svn r1652) Fix: train and road vehicle lists are now redrawn when vehicles enters/leaves a depot (Hackykid)
bjarni
parents:
1128
diff
changeset
|
191 |
InvalidateWindow(WC_VEHICLE_VIEW, v->index); |
| 0 | 192 |
} |
193 |
} |
|
194 |
} |
|
195 |
||
196 |
static void MarkShipDirty(Vehicle *v) |
|
197 |
{
|
|
198 |
v->cur_image = GetShipImage(v, v->direction); |
|
199 |
MarkAllViewportsDirty(v->left_coord, v->top_coord, v->right_coord + 1, v->bottom_coord + 1); |
|
200 |
} |
|
201 |
||
202 |
static void PlayShipSound(Vehicle *v) |
|
203 |
{
|
|
|
4656
acffecd6f484
(svn r6532) - Feature: Add support for NewGRF sound effects. Currently sound priority isn't supported.
peter1138
parents:
4574
diff
changeset
|
204 |
if (!PlayVehicleSound(v, VSE_START)) {
|
|
acffecd6f484
(svn r6532) - Feature: Add support for NewGRF sound effects. Currently sound priority isn't supported.
peter1138
parents:
4574
diff
changeset
|
205 |
SndPlayVehicleFx(ShipVehInfo(v->engine_type)->sfx, v); |
|
acffecd6f484
(svn r6532) - Feature: Add support for NewGRF sound effects. Currently sound priority isn't supported.
peter1138
parents:
4574
diff
changeset
|
206 |
} |
| 0 | 207 |
} |
208 |
||
209 |
static void ProcessShipOrder(Vehicle *v) |
|
210 |
{
|
|
|
1024
9b06b01490a4
(svn r1525) -Codechange: rewrote the _order_array, now it can be made dynamic.
truelight
parents:
1020
diff
changeset
|
211 |
const Order *order; |
| 0 | 212 |
|
|
3005
db4007baa0ab
(svn r3585) Similar changes to the order handlers of the other vehicle types like r3584
tron
parents:
2962
diff
changeset
|
213 |
switch (v->current_order.type) {
|
|
db4007baa0ab
(svn r3585) Similar changes to the order handlers of the other vehicle types like r3584
tron
parents:
2962
diff
changeset
|
214 |
case OT_GOTO_DEPOT: |
|
db4007baa0ab
(svn r3585) Similar changes to the order handlers of the other vehicle types like r3584
tron
parents:
2962
diff
changeset
|
215 |
if (!(v->current_order.flags & OF_PART_OF_ORDERS)) return; |
|
db4007baa0ab
(svn r3585) Similar changes to the order handlers of the other vehicle types like r3584
tron
parents:
2962
diff
changeset
|
216 |
if (v->current_order.flags & OF_SERVICE_IF_NEEDED && |
|
db4007baa0ab
(svn r3585) Similar changes to the order handlers of the other vehicle types like r3584
tron
parents:
2962
diff
changeset
|
217 |
!VehicleNeedsService(v)) {
|
|
db4007baa0ab
(svn r3585) Similar changes to the order handlers of the other vehicle types like r3584
tron
parents:
2962
diff
changeset
|
218 |
v->cur_order_index++; |
|
db4007baa0ab
(svn r3585) Similar changes to the order handlers of the other vehicle types like r3584
tron
parents:
2962
diff
changeset
|
219 |
} |
|
db4007baa0ab
(svn r3585) Similar changes to the order handlers of the other vehicle types like r3584
tron
parents:
2962
diff
changeset
|
220 |
break; |
|
db4007baa0ab
(svn r3585) Similar changes to the order handlers of the other vehicle types like r3584
tron
parents:
2962
diff
changeset
|
221 |
|
|
db4007baa0ab
(svn r3585) Similar changes to the order handlers of the other vehicle types like r3584
tron
parents:
2962
diff
changeset
|
222 |
case OT_LOADING: |
|
db4007baa0ab
(svn r3585) Similar changes to the order handlers of the other vehicle types like r3584
tron
parents:
2962
diff
changeset
|
223 |
case OT_LEAVESTATION: |
| 0 | 224 |
return; |
|
4351
63ae31104f07
(svn r6052) -Codechange: change OrderType (order->type) in a typedef
truelight
parents:
4346
diff
changeset
|
225 |
|
|
63ae31104f07
(svn r6052) -Codechange: change OrderType (order->type) in a typedef
truelight
parents:
4346
diff
changeset
|
226 |
default: break; |
| 0 | 227 |
} |
228 |
||
|
3005
db4007baa0ab
(svn r3585) Similar changes to the order handlers of the other vehicle types like r3584
tron
parents:
2962
diff
changeset
|
229 |
if (v->cur_order_index >= v->num_orders) v->cur_order_index = 0; |
| 0 | 230 |
|
|
1024
9b06b01490a4
(svn r1525) -Codechange: rewrote the _order_array, now it can be made dynamic.
truelight
parents:
1020
diff
changeset
|
231 |
order = GetVehicleOrder(v, v->cur_order_index); |
| 0 | 232 |
|
|
1024
9b06b01490a4
(svn r1525) -Codechange: rewrote the _order_array, now it can be made dynamic.
truelight
parents:
1020
diff
changeset
|
233 |
if (order == NULL) {
|
|
9b06b01490a4
(svn r1525) -Codechange: rewrote the _order_array, now it can be made dynamic.
truelight
parents:
1020
diff
changeset
|
234 |
v->current_order.type = OT_NOTHING; |
|
555
eec6c0294435
(svn r955) Replace uint16 for orders with struct Order
tron
parents:
541
diff
changeset
|
235 |
v->current_order.flags = 0; |
| 0 | 236 |
v->dest_tile = 0; |
237 |
return; |
|
238 |
} |
|
239 |
||
|
4527
b18634a31a4a
(svn r6353) -Codechange: Make DestinationID a typedef of uin16, which is as large as any type of destinataion (StationID, DepotID, WaypointID) it can hold
tron
parents:
4526
diff
changeset
|
240 |
if (order->type == v->current_order.type && |
|
b18634a31a4a
(svn r6353) -Codechange: Make DestinationID a typedef of uin16, which is as large as any type of destinataion (StationID, DepotID, WaypointID) it can hold
tron
parents:
4526
diff
changeset
|
241 |
order->flags == v->current_order.flags && |
|
5511
fee376b81447
(svn r10277) [0.5] -Backport from trunk (10116, r10128, r10130, r10131, r10137, r10138):
rubidium
parents:
5259
diff
changeset
|
242 |
order->dest == v->current_order.dest && |
|
fee376b81447
(svn r10277) [0.5] -Backport from trunk (10116, r10128, r10130, r10131, r10137, r10138):
rubidium
parents:
5259
diff
changeset
|
243 |
(order->type != OT_GOTO_STATION || GetStation(order->dest)->dock_tile != 0)) |
| 0 | 244 |
return; |
245 |
||
|
1024
9b06b01490a4
(svn r1525) -Codechange: rewrote the _order_array, now it can be made dynamic.
truelight
parents:
1020
diff
changeset
|
246 |
v->current_order = *order; |
| 0 | 247 |
|
|
1024
9b06b01490a4
(svn r1525) -Codechange: rewrote the _order_array, now it can be made dynamic.
truelight
parents:
1020
diff
changeset
|
248 |
if (order->type == OT_GOTO_STATION) {
|
|
9b06b01490a4
(svn r1525) -Codechange: rewrote the _order_array, now it can be made dynamic.
truelight
parents:
1020
diff
changeset
|
249 |
const Station *st; |
|
9b06b01490a4
(svn r1525) -Codechange: rewrote the _order_array, now it can be made dynamic.
truelight
parents:
1020
diff
changeset
|
250 |
|
|
4527
b18634a31a4a
(svn r6353) -Codechange: Make DestinationID a typedef of uin16, which is as large as any type of destinataion (StationID, DepotID, WaypointID) it can hold
tron
parents:
4526
diff
changeset
|
251 |
if (order->dest == v->last_station_visited) |
|
1266
9dc5638fe8cc
(svn r1770) -Fix: Hopefully last pieces of code that are containing a station-id
truelight
parents:
1247
diff
changeset
|
252 |
v->last_station_visited = INVALID_STATION; |
|
193
0a7025304867
(svn r194) -Codechange: stripping trailing-spaces. Please keep this that way!
truelight
parents:
164
diff
changeset
|
253 |
|
|
4527
b18634a31a4a
(svn r6353) -Codechange: Make DestinationID a typedef of uin16, which is as large as any type of destinataion (StationID, DepotID, WaypointID) it can hold
tron
parents:
4526
diff
changeset
|
254 |
st = GetStation(order->dest); |
| 0 | 255 |
if (st->dock_tile != 0) {
|
|
3472
7ef2b2d6a632
(svn r4317) -Codechange: More map accessors for ship_cmd. it is now map-access free, but still requires a huge cleanup
celestar
parents:
3454
diff
changeset
|
256 |
v->dest_tile = TILE_ADD(st->dock_tile, ToTileIndexDiff(GetDockOffset(st->dock_tile))); |
|
5511
fee376b81447
(svn r10277) [0.5] -Backport from trunk (10116, r10128, r10130, r10131, r10137, r10138):
rubidium
parents:
5259
diff
changeset
|
257 |
} else {
|
|
fee376b81447
(svn r10277) [0.5] -Backport from trunk (10116, r10128, r10130, r10131, r10137, r10138):
rubidium
parents:
5259
diff
changeset
|
258 |
v->cur_order_index++; |
| 0 | 259 |
} |
|
1024
9b06b01490a4
(svn r1525) -Codechange: rewrote the _order_array, now it can be made dynamic.
truelight
parents:
1020
diff
changeset
|
260 |
} else if (order->type == OT_GOTO_DEPOT) {
|
|
4527
b18634a31a4a
(svn r6353) -Codechange: Make DestinationID a typedef of uin16, which is as large as any type of destinataion (StationID, DepotID, WaypointID) it can hold
tron
parents:
4526
diff
changeset
|
261 |
v->dest_tile = GetDepot(order->dest)->xy; |
| 0 | 262 |
} else {
|
263 |
v->dest_tile = 0; |
|
264 |
} |
|
|
1024
9b06b01490a4
(svn r1525) -Codechange: rewrote the _order_array, now it can be made dynamic.
truelight
parents:
1020
diff
changeset
|
265 |
|
|
9b06b01490a4
(svn r1525) -Codechange: rewrote the _order_array, now it can be made dynamic.
truelight
parents:
1020
diff
changeset
|
266 |
InvalidateVehicleOrder(v); |
|
1020
1223cd937174
(svn r1521) -Fix: Ship Vehicle Lists are now redrawn correctly
celestar
parents:
926
diff
changeset
|
267 |
|
|
1055
3aae1d6f12aa
(svn r1556) -Fix: Vehicle list updates should now really work
Celestar
parents:
1053
diff
changeset
|
268 |
InvalidateWindowClasses(WC_SHIPS_LIST); |
| 0 | 269 |
} |
270 |
||
271 |
static void HandleShipLoading(Vehicle *v) |
|
272 |
{
|
|
| 2639 | 273 |
if (v->current_order.type == OT_NOTHING) return; |
|
193
0a7025304867
(svn r194) -Codechange: stripping trailing-spaces. Please keep this that way!
truelight
parents:
164
diff
changeset
|
274 |
|
|
555
eec6c0294435
(svn r955) Replace uint16 for orders with struct Order
tron
parents:
541
diff
changeset
|
275 |
if (v->current_order.type != OT_DUMMY) {
|
| 2639 | 276 |
if (v->current_order.type != OT_LOADING) return; |
277 |
if (--v->load_unload_time_rem) return; |
|
| 0 | 278 |
|
|
5211
651c9272ad22
(svn r7326) -Feature: Add support for gradual (un)loading of vehicles (Maedhros)
peter1138
parents:
5198
diff
changeset
|
279 |
if (CanFillVehicle(v) && (v->current_order.flags & OF_FULL_LOAD || |
|
651c9272ad22
(svn r7326) -Feature: Add support for gradual (un)loading of vehicles (Maedhros)
peter1138
parents:
5198
diff
changeset
|
280 |
(_patches.gradual_loading && !HASBIT(v->load_status, LS_LOADING_FINISHED)))) {
|
| 0 | 281 |
SET_EXPENSES_TYPE(EXPENSES_SHIP_INC); |
|
5211
651c9272ad22
(svn r7326) -Feature: Add support for gradual (un)loading of vehicles (Maedhros)
peter1138
parents:
5198
diff
changeset
|
282 |
if (LoadUnloadVehicle(v, false)) {
|
| 0 | 283 |
InvalidateWindow(WC_SHIPS_LIST, v->owner); |
284 |
MarkShipDirty(v); |
|
285 |
} |
|
286 |
return; |
|
287 |
} |
|
288 |
PlayShipSound(v); |
|
|
193
0a7025304867
(svn r194) -Codechange: stripping trailing-spaces. Please keep this that way!
truelight
parents:
164
diff
changeset
|
289 |
|
| 0 | 290 |
{
|
|
555
eec6c0294435
(svn r955) Replace uint16 for orders with struct Order
tron
parents:
541
diff
changeset
|
291 |
Order b = v->current_order; |
|
eec6c0294435
(svn r955) Replace uint16 for orders with struct Order
tron
parents:
541
diff
changeset
|
292 |
v->current_order.type = OT_LEAVESTATION; |
|
eec6c0294435
(svn r955) Replace uint16 for orders with struct Order
tron
parents:
541
diff
changeset
|
293 |
v->current_order.flags = 0; |
| 2639 | 294 |
if (!(b.flags & OF_NON_STOP)) return; |
| 0 | 295 |
} |
296 |
} |
|
297 |
||
298 |
v->cur_order_index++; |
|
|
1024
9b06b01490a4
(svn r1525) -Codechange: rewrote the _order_array, now it can be made dynamic.
truelight
parents:
1020
diff
changeset
|
299 |
InvalidateVehicleOrder(v); |
| 0 | 300 |
} |
301 |
||
302 |
static void UpdateShipDeltaXY(Vehicle *v, int dir) |
|
303 |
{
|
|
304 |
#define MKIT(d,c,b,a) ((a&0xFF)<<24) | ((b&0xFF)<<16) | ((c&0xFF)<<8) | ((d&0xFF)<<0) |
|
305 |
static const uint32 _delta_xy_table[8] = {
|
|
|
4344
5d0e40cd67b9
(svn r6045) -Cleanup: align all table-like structures using spaces, i.e. whitespace fixes only except for a few comments to make them uniform for the whole enum/struct.
rubidium
parents:
4329
diff
changeset
|
306 |
MKIT( -3, -3, 6, 6), |
|
5d0e40cd67b9
(svn r6045) -Cleanup: align all table-like structures using spaces, i.e. whitespace fixes only except for a few comments to make them uniform for the whole enum/struct.
rubidium
parents:
4329
diff
changeset
|
307 |
MKIT(-16, -3, 32, 6), |
|
5d0e40cd67b9
(svn r6045) -Cleanup: align all table-like structures using spaces, i.e. whitespace fixes only except for a few comments to make them uniform for the whole enum/struct.
rubidium
parents:
4329
diff
changeset
|
308 |
MKIT( -3, -3, 6, 6), |
|
5d0e40cd67b9
(svn r6045) -Cleanup: align all table-like structures using spaces, i.e. whitespace fixes only except for a few comments to make them uniform for the whole enum/struct.
rubidium
parents:
4329
diff
changeset
|
309 |
MKIT( -3, -16, 6, 32), |
|
5d0e40cd67b9
(svn r6045) -Cleanup: align all table-like structures using spaces, i.e. whitespace fixes only except for a few comments to make them uniform for the whole enum/struct.
rubidium
parents:
4329
diff
changeset
|
310 |
MKIT( -3, -3, 6, 6), |
|
5d0e40cd67b9
(svn r6045) -Cleanup: align all table-like structures using spaces, i.e. whitespace fixes only except for a few comments to make them uniform for the whole enum/struct.
rubidium
parents:
4329
diff
changeset
|
311 |
MKIT(-16, -3, 32, 6), |
|
5d0e40cd67b9
(svn r6045) -Cleanup: align all table-like structures using spaces, i.e. whitespace fixes only except for a few comments to make them uniform for the whole enum/struct.
rubidium
parents:
4329
diff
changeset
|
312 |
MKIT( -3, -3, 6, 6), |
|
5d0e40cd67b9
(svn r6045) -Cleanup: align all table-like structures using spaces, i.e. whitespace fixes only except for a few comments to make them uniform for the whole enum/struct.
rubidium
parents:
4329
diff
changeset
|
313 |
MKIT( -3, -16, 6, 32), |
| 0 | 314 |
}; |
315 |
#undef MKIT |
|
316 |
uint32 x = _delta_xy_table[dir]; |
|
|
2150
010d923a81a9
(svn r2660) Get rid of some more shifting/anding/casting
tron
parents:
2049
diff
changeset
|
317 |
v->x_offs = GB(x, 0, 8); |
|
010d923a81a9
(svn r2660) Get rid of some more shifting/anding/casting
tron
parents:
2049
diff
changeset
|
318 |
v->y_offs = GB(x, 8, 8); |
|
010d923a81a9
(svn r2660) Get rid of some more shifting/anding/casting
tron
parents:
2049
diff
changeset
|
319 |
v->sprite_width = GB(x, 16, 8); |
|
010d923a81a9
(svn r2660) Get rid of some more shifting/anding/casting
tron
parents:
2049
diff
changeset
|
320 |
v->sprite_height = GB(x, 24, 8); |
| 0 | 321 |
} |
322 |
||
|
4725
f7284b86833f
(svn r6637) -Codechange: merged all (vehicle type)EnterDepot into VehicleEnterDepot()
bjarni
parents:
4712
diff
changeset
|
323 |
void RecalcShipStuff(Vehicle *v) |
| 0 | 324 |
{
|
325 |
UpdateShipDeltaXY(v, v->direction); |
|
326 |
v->cur_image = GetShipImage(v, v->direction); |
|
327 |
MarkShipDirty(v); |
|
328 |
InvalidateWindow(WC_VEHICLE_DEPOT, v->tile); |
|
329 |
} |
|
330 |
||
|
909
81bc9ef93f50
(svn r1396) Introduce TileIndexDiffC - the compile time version of TileIndexDiff
tron
parents:
900
diff
changeset
|
331 |
static const TileIndexDiffC _ship_leave_depot_offs[] = {
|
|
81bc9ef93f50
(svn r1396) Introduce TileIndexDiffC - the compile time version of TileIndexDiff
tron
parents:
900
diff
changeset
|
332 |
{-1, 0},
|
|
81bc9ef93f50
(svn r1396) Introduce TileIndexDiffC - the compile time version of TileIndexDiff
tron
parents:
900
diff
changeset
|
333 |
{ 0, -1}
|
| 0 | 334 |
}; |
335 |
||
336 |
static void CheckShipLeaveDepot(Vehicle *v) |
|
337 |
{
|
|
|
1977
4392ae3d8e31
(svn r2483) Replace almost 500 "uint tile" (and variants) with "TileIndex tile"
tron
parents:
1942
diff
changeset
|
338 |
TileIndex tile; |
|
3454
c2447e8c1e23
(svn r4289) -Codechange: Make use of water_map accessors for ships. Make a mental note to clean ship_cmd
celestar
parents:
3442
diff
changeset
|
339 |
Axis axis; |
| 0 | 340 |
uint m; |
341 |
||
|
3961
e2783f244ac6
(svn r5120) Add IsShipInDepot{Stopped,}() and remove some redundant checks
tron
parents:
3955
diff
changeset
|
342 |
if (!IsShipInDepot(v)) return; |
| 0 | 343 |
|
344 |
tile = v->tile; |
|
|
3454
c2447e8c1e23
(svn r4289) -Codechange: Make use of water_map accessors for ships. Make a mental note to clean ship_cmd
celestar
parents:
3442
diff
changeset
|
345 |
axis = GetShipDepotAxis(tile); |
| 0 | 346 |
|
347 |
// Check first side |
|
|
3454
c2447e8c1e23
(svn r4289) -Codechange: Make use of water_map accessors for ships. Make a mental note to clean ship_cmd
celestar
parents:
3442
diff
changeset
|
348 |
if (_ship_sometracks[axis] & GetTileShipTrackStatus(TILE_ADD(tile, ToTileIndexDiff(_ship_leave_depot_offs[axis])))) {
|
|
c2447e8c1e23
(svn r4289) -Codechange: Make use of water_map accessors for ships. Make a mental note to clean ship_cmd
celestar
parents:
3442
diff
changeset
|
349 |
m = (axis == AXIS_X) ? 0x101 : 0x207; |
| 0 | 350 |
// Check second side |
|
3454
c2447e8c1e23
(svn r4289) -Codechange: Make use of water_map accessors for ships. Make a mental note to clean ship_cmd
celestar
parents:
3442
diff
changeset
|
351 |
} else if (_ship_sometracks[axis + 2] & GetTileShipTrackStatus(TILE_ADD(tile, -2 * ToTileIndexDiff(_ship_leave_depot_offs[axis])))) {
|
|
c2447e8c1e23
(svn r4289) -Codechange: Make use of water_map accessors for ships. Make a mental note to clean ship_cmd
celestar
parents:
3442
diff
changeset
|
352 |
m = (axis == AXIS_X) ? 0x105 : 0x203; |
| 0 | 353 |
} else {
|
354 |
return; |
|
355 |
} |
|
| 2635 | 356 |
v->direction = GB(m, 0, 8); |
357 |
v->u.ship.state = GB(m, 8, 8); |
|
| 0 | 358 |
v->vehstatus &= ~VS_HIDDEN; |
359 |
||
360 |
v->cur_speed = 0; |
|
361 |
RecalcShipStuff(v); |
|
362 |
||
363 |
PlayShipSound(v); |
|
|
578
86e352980acd
(svn r998) now vehicles are serviced both when entering and when leaving depots to prevent that vehicles might need service when leaving after a long stay (ln--)
bjarni
parents:
555
diff
changeset
|
364 |
VehicleServiceInDepot(v); |
|
4739
bd535b408617
(svn r6651) -Coding feature: added the windowevent WE_INVALIDATE_DATA
bjarni
parents:
4725
diff
changeset
|
365 |
InvalidateWindowData(WC_VEHICLE_DEPOT, v->tile); |
|
1055
3aae1d6f12aa
(svn r1556) -Fix: Vehicle list updates should now really work
Celestar
parents:
1053
diff
changeset
|
366 |
InvalidateWindowClasses(WC_SHIPS_LIST); |
| 0 | 367 |
} |
368 |
||
369 |
static bool ShipAccelerate(Vehicle *v) |
|
370 |
{
|
|
371 |
uint spd; |
|
372 |
byte t; |
|
373 |
||
374 |
spd = min(v->cur_speed + 1, v->max_speed); |
|
375 |
||
376 |
//updates statusbar only if speed have changed to save CPU time |
|
377 |
if (spd != v->cur_speed) {
|
|
|
193
0a7025304867
(svn r194) -Codechange: stripping trailing-spaces. Please keep this that way!
truelight
parents:
164
diff
changeset
|
378 |
v->cur_speed = spd; |
| 0 | 379 |
if (_patches.vehicle_speed) |
|
755
823358e83abf
(svn r1211) -Feature: Introduce sticky windows to all vehicle windows...Just make sure you do not sticky more than 23 at a time. Also a lot of places in the code invalidated the 'status bar' of the vehicle, referring to it as widget 4. This is now widget 5 and has been #definitized
darkvater
parents:
679
diff
changeset
|
380 |
InvalidateWindowWidget(WC_VEHICLE_VIEW, v->index, STATUS_BAR); |
| 0 | 381 |
} |
382 |
||
383 |
// Decrease somewhat when turning |
|
| 2639 | 384 |
if (!(v->direction & 1)) spd = spd * 3 / 4; |
| 0 | 385 |
|
| 2639 | 386 |
if (spd == 0) return false; |
387 |
if ((byte)++spd == 0) return true; |
|
| 0 | 388 |
|
389 |
v->progress = (t = v->progress) - (byte)spd; |
|
390 |
||
391 |
return (t < v->progress); |
|
392 |
} |
|
393 |
||
| 2817 | 394 |
static int32 EstimateShipCost(EngineID engine_type) |
|
1793
8ac8a8c9ec0f
(svn r2297) - CodeChange: server-check the next batch of commands.
Darkvater
parents:
1790
diff
changeset
|
395 |
{
|
|
8ac8a8c9ec0f
(svn r2297) - CodeChange: server-check the next batch of commands.
Darkvater
parents:
1790
diff
changeset
|
396 |
return ShipVehInfo(engine_type)->base_cost * (_price.ship_base>>3)>>5; |
|
8ac8a8c9ec0f
(svn r2297) - CodeChange: server-check the next batch of commands.
Darkvater
parents:
1790
diff
changeset
|
397 |
} |
| 0 | 398 |
|
| 2630 | 399 |
static void ShipArrivesAt(const Vehicle* v, Station* st) |
| 0 | 400 |
{
|
401 |
/* Check if station was ever visited before */ |
|
402 |
if (!(st->had_vehicle_of_type & HVOT_SHIP)) {
|
|
403 |
uint32 flags; |
|
| 2639 | 404 |
|
| 0 | 405 |
st->had_vehicle_of_type |= HVOT_SHIP; |
| 2639 | 406 |
|
|
534
17ab2f22ff74
(svn r901) Small step in the process to clean up the DPARAM mess:
tron
parents:
507
diff
changeset
|
407 |
SetDParam(0, st->index); |
| 0 | 408 |
flags = (v->owner == _local_player) ? NEWS_FLAGS(NM_THIN, NF_VIEWPORT|NF_VEHICLE, NT_ARRIVAL_PLAYER, 0) : NEWS_FLAGS(NM_THIN, NF_VIEWPORT|NF_VEHICLE, NT_ARRIVAL_OTHER, 0); |
409 |
AddNewsItem( |
|
410 |
STR_9833_CITIZENS_CELEBRATE_FIRST, |
|
411 |
flags, |
|
412 |
v->index, |
|
413 |
0); |
|
414 |
} |
|
415 |
} |
|
416 |
||
417 |
typedef struct {
|
|
|
1977
4392ae3d8e31
(svn r2483) Replace almost 500 "uint tile" (and variants) with "TileIndex tile"
tron
parents:
1942
diff
changeset
|
418 |
TileIndex skiptile; |
|
4392ae3d8e31
(svn r2483) Replace almost 500 "uint tile" (and variants) with "TileIndex tile"
tron
parents:
1942
diff
changeset
|
419 |
TileIndex dest_coords; |
| 0 | 420 |
uint best_bird_dist; |
421 |
uint best_length; |
|
422 |
} PathFindShip; |
|
423 |
||
|
1977
4392ae3d8e31
(svn r2483) Replace almost 500 "uint tile" (and variants) with "TileIndex tile"
tron
parents:
1942
diff
changeset
|
424 |
static bool ShipTrackFollower(TileIndex tile, PathFindShip *pfs, int track, uint length, byte *state) |
| 0 | 425 |
{
|
426 |
// Found dest? |
|
427 |
if (tile == pfs->dest_coords) {
|
|
428 |
pfs->best_bird_dist = 0; |
|
|
193
0a7025304867
(svn r194) -Codechange: stripping trailing-spaces. Please keep this that way!
truelight
parents:
164
diff
changeset
|
429 |
|
| 0 | 430 |
pfs->best_length = minu(pfs->best_length, length); |
431 |
return true; |
|
432 |
} |
|
433 |
||
434 |
// Skip this tile in the calculation |
|
435 |
if (tile != pfs->skiptile) {
|
|
|
1245
768d9bc95aaa
(svn r1749) Move the functions which calculate distances to map.[ch] and give the more meaningful names
tron
parents:
1237
diff
changeset
|
436 |
pfs->best_bird_dist = minu(pfs->best_bird_dist, DistanceMaxPlusManhattan(pfs->dest_coords, tile)); |
| 0 | 437 |
} |
|
193
0a7025304867
(svn r194) -Codechange: stripping trailing-spaces. Please keep this that way!
truelight
parents:
164
diff
changeset
|
438 |
|
| 0 | 439 |
return false; |
440 |
} |
|
441 |
||
442 |
static const byte _ship_search_directions[6][4] = {
|
|
443 |
{ 0, 9, 2, 9 },
|
|
444 |
{ 9, 1, 9, 3 },
|
|
445 |
{ 9, 0, 3, 9 },
|
|
446 |
{ 1, 9, 9, 2 },
|
|
447 |
{ 3, 2, 9, 9 },
|
|
448 |
{ 9, 9, 1, 0 },
|
|
449 |
}; |
|
450 |
||
451 |
static const byte _pick_shiptrack_table[6] = {1, 3, 2, 2, 0, 0};
|
|
452 |
||
|
1977
4392ae3d8e31
(svn r2483) Replace almost 500 "uint tile" (and variants) with "TileIndex tile"
tron
parents:
1942
diff
changeset
|
453 |
static uint FindShipTrack(Vehicle *v, TileIndex tile, int dir, uint bits, TileIndex skiptile, int *track) |
| 0 | 454 |
{
|
455 |
PathFindShip pfs; |
|
456 |
int i, best_track; |
|
457 |
uint best_bird_dist = 0; |
|
458 |
uint best_length = 0; |
|
459 |
uint r; |
|
460 |
byte ship_dir = v->direction & 3; |
|
461 |
||
462 |
pfs.dest_coords = v->dest_tile; |
|
463 |
pfs.skiptile = skiptile; |
|
464 |
||
465 |
best_track = -1; |
|
466 |
||
467 |
do {
|
|
468 |
i = FIND_FIRST_BIT(bits); |
|
469 |
bits = KILL_FIRST_BIT(bits); |
|
|
193
0a7025304867
(svn r194) -Codechange: stripping trailing-spaces. Please keep this that way!
truelight
parents:
164
diff
changeset
|
470 |
|
| 0 | 471 |
pfs.best_bird_dist = (uint)-1; |
472 |
pfs.best_length = (uint)-1; |
|
473 |
||
|
159
139cf78bfb28
(svn r160) -Codechange: made GetTileTrackStatus more readable (blathijs)
truelight
parents:
156
diff
changeset
|
474 |
FollowTrack(tile, 0x3800 | TRANSPORT_WATER, _ship_search_directions[i][dir], (TPFEnumProc*)ShipTrackFollower, NULL, &pfs); |
|
193
0a7025304867
(svn r194) -Codechange: stripping trailing-spaces. Please keep this that way!
truelight
parents:
164
diff
changeset
|
475 |
|
| 0 | 476 |
if (best_track >= 0) {
|
477 |
if (pfs.best_bird_dist != 0) {
|
|
478 |
/* neither reached the destination, pick the one with the smallest bird dist */ |
|
479 |
if (pfs.best_bird_dist > best_bird_dist) goto bad; |
|
480 |
if (pfs.best_bird_dist < best_bird_dist) goto good; |
|
481 |
} else {
|
|
482 |
if (pfs.best_length > best_length) goto bad; |
|
483 |
if (pfs.best_length < best_length) goto good; |
|
484 |
} |
|
|
193
0a7025304867
(svn r194) -Codechange: stripping trailing-spaces. Please keep this that way!
truelight
parents:
164
diff
changeset
|
485 |
|
|
0a7025304867
(svn r194) -Codechange: stripping trailing-spaces. Please keep this that way!
truelight
parents:
164
diff
changeset
|
486 |
/* if we reach this position, there's two paths of equal value so far. |
| 0 | 487 |
* pick one randomly. */ |
|
2150
010d923a81a9
(svn r2660) Get rid of some more shifting/anding/casting
tron
parents:
2049
diff
changeset
|
488 |
r = GB(Random(), 0, 8); |
| 0 | 489 |
if (_pick_shiptrack_table[i] == ship_dir) r += 80; |
490 |
if (_pick_shiptrack_table[best_track] == ship_dir) r -= 80; |
|
491 |
if (r <= 127) goto bad; |
|
492 |
} |
|
493 |
good:; |
|
494 |
best_track = i; |
|
495 |
best_bird_dist = pfs.best_bird_dist; |
|
496 |
best_length = pfs.best_length; |
|
497 |
bad:; |
|
498 |
||
499 |
} while (bits != 0); |
|
500 |
||
501 |
*track = best_track; |
|
502 |
return best_bird_dist; |
|
503 |
} |
|
504 |
||
|
3900
4984308f9125
(svn r4987) Feature: Merged YAPF into trunk. Thanks to devs for continuous support and users for testing.
KUDr
parents:
3870
diff
changeset
|
505 |
static inline NPFFoundTargetData PerfNPFRouteToStationOrTile(TileIndex tile, Trackdir trackdir, NPFFindStationOrTileData* target, TransportType type, Owner owner, RailTypeMask railtypes) |
|
4984308f9125
(svn r4987) Feature: Merged YAPF into trunk. Thanks to devs for continuous support and users for testing.
KUDr
parents:
3870
diff
changeset
|
506 |
{
|
|
4984308f9125
(svn r4987) Feature: Merged YAPF into trunk. Thanks to devs for continuous support and users for testing.
KUDr
parents:
3870
diff
changeset
|
507 |
|
|
4984308f9125
(svn r4987) Feature: Merged YAPF into trunk. Thanks to devs for continuous support and users for testing.
KUDr
parents:
3870
diff
changeset
|
508 |
void* perf = NpfBeginInterval(); |
|
4984308f9125
(svn r4987) Feature: Merged YAPF into trunk. Thanks to devs for continuous support and users for testing.
KUDr
parents:
3870
diff
changeset
|
509 |
NPFFoundTargetData ret = NPFRouteToStationOrTile(tile, trackdir, target, type, owner, railtypes); |
|
4984308f9125
(svn r4987) Feature: Merged YAPF into trunk. Thanks to devs for continuous support and users for testing.
KUDr
parents:
3870
diff
changeset
|
510 |
int t = NpfEndInterval(perf); |
|
3947
7ab994b0fe9c
(svn r5093) -CodeChange: [YAPF] min. debug level changed from 1 to 3 and 4 for frequent debug messages (performance stats)
KUDr
parents:
3900
diff
changeset
|
511 |
DEBUG(yapf, 4)("[YAPF][NPFW] %d us - %d rounds - %d open - %d closed -- ", t, 0, _aystar_stats_open_size, _aystar_stats_closed_size);
|
|
3900
4984308f9125
(svn r4987) Feature: Merged YAPF into trunk. Thanks to devs for continuous support and users for testing.
KUDr
parents:
3870
diff
changeset
|
512 |
return ret; |
|
4984308f9125
(svn r4987) Feature: Merged YAPF into trunk. Thanks to devs for continuous support and users for testing.
KUDr
parents:
3870
diff
changeset
|
513 |
} |
|
4984308f9125
(svn r4987) Feature: Merged YAPF into trunk. Thanks to devs for continuous support and users for testing.
KUDr
parents:
3870
diff
changeset
|
514 |
|
| 1247 | 515 |
/* returns the track to choose on the next tile, or -1 when it's better to |
516 |
* reverse. The tile given is the tile we are about to enter, enterdir is the |
|
517 |
* direction in which we are entering the tile */ |
|
|
1977
4392ae3d8e31
(svn r2483) Replace almost 500 "uint tile" (and variants) with "TileIndex tile"
tron
parents:
1942
diff
changeset
|
518 |
static int ChooseShipTrack(Vehicle *v, TileIndex tile, int enterdir, uint tracks) |
| 0 | 519 |
{
|
| 1247 | 520 |
assert(enterdir>=0 && enterdir<=3); |
| 0 | 521 |
|
|
3900
4984308f9125
(svn r4987) Feature: Merged YAPF into trunk. Thanks to devs for continuous support and users for testing.
KUDr
parents:
3870
diff
changeset
|
522 |
if (_patches.yapf.ship_use_yapf) {
|
|
4984308f9125
(svn r4987) Feature: Merged YAPF into trunk. Thanks to devs for continuous support and users for testing.
KUDr
parents:
3870
diff
changeset
|
523 |
Trackdir trackdir = YapfChooseShipTrack(v, tile, enterdir, tracks); |
|
4984308f9125
(svn r4987) Feature: Merged YAPF into trunk. Thanks to devs for continuous support and users for testing.
KUDr
parents:
3870
diff
changeset
|
524 |
return (trackdir != INVALID_TRACKDIR) ? (int)TrackdirToTrack(trackdir) : -1; |
|
4984308f9125
(svn r4987) Feature: Merged YAPF into trunk. Thanks to devs for continuous support and users for testing.
KUDr
parents:
3870
diff
changeset
|
525 |
} else if (_patches.new_pathfinding_all) {
|
| 1247 | 526 |
NPFFindStationOrTileData fstd; |
527 |
NPFFoundTargetData ftd; |
|
|
4559
c853d2440065
(svn r6406) -Codechange: Rename TileOffsByDir to TileOffsByDiagDir because it accepts
Darkvater
parents:
4546
diff
changeset
|
528 |
TileIndex src_tile = TILE_ADD(tile, TileOffsByDiagDir(ReverseDiagDir(enterdir))); |
|
1752
cdbfb2f23e72
(svn r2256) - Fix: Trains cannot find a depot when they are in a tunnel. (glx)
matthijs
parents:
1751
diff
changeset
|
529 |
byte trackdir = GetVehicleTrackdir(v); |
|
cdbfb2f23e72
(svn r2256) - Fix: Trains cannot find a depot when they are in a tunnel. (glx)
matthijs
parents:
1751
diff
changeset
|
530 |
assert (trackdir != 0xFF); /* Check that we are not in a depot */ |
| 1247 | 531 |
|
532 |
NPFFillWithOrderData(&fstd, v); |
|
533 |
||
|
3900
4984308f9125
(svn r4987) Feature: Merged YAPF into trunk. Thanks to devs for continuous support and users for testing.
KUDr
parents:
3870
diff
changeset
|
534 |
ftd = PerfNPFRouteToStationOrTile(src_tile, trackdir, &fstd, TRANSPORT_WATER, v->owner, INVALID_RAILTYPE); |
| 1247 | 535 |
|
| 2639 | 536 |
if (ftd.best_trackdir != 0xff) {
|
|
1698
bf364c664a60
(svn r2202) - Fix: [NPF] When a vehicle could not reach its target, it would choose a random direction. It will now try to get as close as possible.
matthijs
parents:
1530
diff
changeset
|
537 |
/* If ftd.best_bird_dist is 0, we found our target and ftd.best_trackdir contains |
|
bf364c664a60
(svn r2202) - Fix: [NPF] When a vehicle could not reach its target, it would choose a random direction. It will now try to get as close as possible.
matthijs
parents:
1530
diff
changeset
|
538 |
the direction we need to take to get there, if ftd.best_bird_dist is not 0, |
|
bf364c664a60
(svn r2202) - Fix: [NPF] When a vehicle could not reach its target, it would choose a random direction. It will now try to get as close as possible.
matthijs
parents:
1530
diff
changeset
|
539 |
we did not find our target, but ftd.best_trackdir contains the direction leading |
|
bf364c664a60
(svn r2202) - Fix: [NPF] When a vehicle could not reach its target, it would choose a random direction. It will now try to get as close as possible.
matthijs
parents:
1530
diff
changeset
|
540 |
to the tile closest to our target. */ |
| 1247 | 541 |
return ftd.best_trackdir & 7; /* TODO: Wrapper function? */ |
| 2639 | 542 |
} else {
|
|
1698
bf364c664a60
(svn r2202) - Fix: [NPF] When a vehicle could not reach its target, it would choose a random direction. It will now try to get as close as possible.
matthijs
parents:
1530
diff
changeset
|
543 |
return -1; /* Already at target, reverse? */ |
| 2639 | 544 |
} |
| 1247 | 545 |
} else {
|
546 |
uint b; |
|
547 |
uint tot_dist, dist; |
|
548 |
int track; |
|
|
1977
4392ae3d8e31
(svn r2483) Replace almost 500 "uint tile" (and variants) with "TileIndex tile"
tron
parents:
1942
diff
changeset
|
549 |
TileIndex tile2; |
| 1247 | 550 |
|
|
4559
c853d2440065
(svn r6406) -Codechange: Rename TileOffsByDir to TileOffsByDiagDir because it accepts
Darkvater
parents:
4546
diff
changeset
|
551 |
tile2 = TILE_ADD(tile, -TileOffsByDiagDir(enterdir)); |
| 1247 | 552 |
tot_dist = (uint)-1; |
553 |
||
554 |
/* Let's find out how far it would be if we would reverse first */ |
|
|
3147
0a09ce6d651a
(svn r3767) Move all direction related enums and functions to a separate header
tron
parents:
3140
diff
changeset
|
555 |
b = GetTileShipTrackStatus(tile2) & _ship_sometracks[ReverseDiagDir(enterdir)] & v->u.ship.state; |
| 1247 | 556 |
if (b != 0) {
|
|
3147
0a09ce6d651a
(svn r3767) Move all direction related enums and functions to a separate header
tron
parents:
3140
diff
changeset
|
557 |
dist = FindShipTrack(v, tile2, ReverseDiagDir(enterdir), b, tile, &track); |
| 1247 | 558 |
if (dist != (uint)-1) |
559 |
tot_dist = dist + 1; |
|
560 |
} |
|
561 |
/* And if we would not reverse? */ |
|
562 |
dist = FindShipTrack(v, tile, enterdir, tracks, 0, &track); |
|
563 |
if (dist > tot_dist) |
|
564 |
/* We could better reverse */ |
|
565 |
return -1; |
|
566 |
return track; |
|
| 0 | 567 |
} |
568 |
} |
|
569 |
||
|
3157
40de8616c04c
(svn r3783) Replace further ints and magic numbers by Direction, DiagDirection and friends
tron
parents:
3147
diff
changeset
|
570 |
static const Direction _new_vehicle_direction_table[] = {
|
|
40de8616c04c
(svn r3783) Replace further ints and magic numbers by Direction, DiagDirection and friends
tron
parents:
3147
diff
changeset
|
571 |
DIR_N , DIR_NW, DIR_W , 0, |
|
40de8616c04c
(svn r3783) Replace further ints and magic numbers by Direction, DiagDirection and friends
tron
parents:
3147
diff
changeset
|
572 |
DIR_NE, DIR_N , DIR_SW, 0, |
|
40de8616c04c
(svn r3783) Replace further ints and magic numbers by Direction, DiagDirection and friends
tron
parents:
3147
diff
changeset
|
573 |
DIR_E , DIR_SE, DIR_S |
| 0 | 574 |
}; |
575 |
||
|
1977
4392ae3d8e31
(svn r2483) Replace almost 500 "uint tile" (and variants) with "TileIndex tile"
tron
parents:
1942
diff
changeset
|
576 |
static int ShipGetNewDirectionFromTiles(TileIndex new_tile, TileIndex old_tile) |
| 0 | 577 |
{
|
|
926
bd4312619522
(svn r1414) Move TileIndex, TILE_MASK and GET_TILE_[XY] to map.h and turn the latter into inline functions names Tile[XY]
tron
parents:
919
diff
changeset
|
578 |
uint offs = (TileY(new_tile) - TileY(old_tile) + 1) * 4 + |
|
bd4312619522
(svn r1414) Move TileIndex, TILE_MASK and GET_TILE_[XY] to map.h and turn the latter into inline functions names Tile[XY]
tron
parents:
919
diff
changeset
|
579 |
TileX(new_tile) - TileX(old_tile) + 1; |
| 0 | 580 |
assert(offs < 11 && offs != 3 && offs != 7); |
581 |
return _new_vehicle_direction_table[offs]; |
|
582 |
} |
|
583 |
||
584 |
static int ShipGetNewDirection(Vehicle *v, int x, int y) |
|
585 |
{
|
|
586 |
uint offs = (y - v->y_pos + 1) * 4 + (x - v->x_pos + 1); |
|
587 |
assert(offs < 11 && offs != 3 && offs != 7); |
|
588 |
return _new_vehicle_direction_table[offs]; |
|
589 |
} |
|
590 |
||
|
1977
4392ae3d8e31
(svn r2483) Replace almost 500 "uint tile" (and variants) with "TileIndex tile"
tron
parents:
1942
diff
changeset
|
591 |
static int GetAvailShipTracks(TileIndex tile, int dir) |
| 0 | 592 |
{
|
|
159
139cf78bfb28
(svn r160) -Codechange: made GetTileTrackStatus more readable (blathijs)
truelight
parents:
156
diff
changeset
|
593 |
uint32 r = GetTileTrackStatus(tile, TRANSPORT_WATER); |
| 0 | 594 |
return (byte) ((r | r >> 8)) & _ship_sometracks[dir]; |
595 |
} |
|
596 |
||
597 |
static const byte _ship_subcoord[4][6][3] = {
|
|
598 |
{
|
|
599 |
{15, 8, 1},
|
|
600 |
{ 0, 0, 0},
|
|
601 |
{ 0, 0, 0},
|
|
602 |
{15, 8, 2},
|
|
603 |
{15, 7, 0},
|
|
604 |
{ 0, 0, 0},
|
|
605 |
}, |
|
606 |
{
|
|
607 |
{ 0, 0, 0},
|
|
608 |
{ 8, 0, 3},
|
|
609 |
{ 7, 0, 2},
|
|
610 |
{ 0, 0, 0},
|
|
611 |
{ 8, 0, 4},
|
|
612 |
{ 0, 0, 0},
|
|
613 |
}, |
|
614 |
{
|
|
615 |
{ 0, 8, 5},
|
|
616 |
{ 0, 0, 0},
|
|
617 |
{ 0, 7, 6},
|
|
618 |
{ 0, 0, 0},
|
|
619 |
{ 0, 0, 0},
|
|
620 |
{ 0, 8, 4},
|
|
621 |
}, |
|
622 |
{
|
|
623 |
{ 0, 0, 0},
|
|
624 |
{ 8,15, 7},
|
|
625 |
{ 0, 0, 0},
|
|
626 |
{ 8,15, 6},
|
|
627 |
{ 0, 0, 0},
|
|
628 |
{ 7,15, 0},
|
|
629 |
} |
|
630 |
}; |
|
631 |
||
632 |
static void ShipController(Vehicle *v) |
|
633 |
{
|
|
634 |
GetNewVehiclePosResult gp; |
|
635 |
uint32 r; |
|
636 |
const byte *b; |
|
|
3157
40de8616c04c
(svn r3783) Replace further ints and magic numbers by Direction, DiagDirection and friends
tron
parents:
3147
diff
changeset
|
637 |
Direction dir; |
|
40de8616c04c
(svn r3783) Replace further ints and magic numbers by Direction, DiagDirection and friends
tron
parents:
3147
diff
changeset
|
638 |
int track; |
|
40de8616c04c
(svn r3783) Replace further ints and magic numbers by Direction, DiagDirection and friends
tron
parents:
3147
diff
changeset
|
639 |
int tracks; |
| 0 | 640 |
|
641 |
v->tick_counter++; |
|
642 |
||
643 |
if (v->breakdown_ctr != 0) {
|
|
644 |
if (v->breakdown_ctr <= 2) {
|
|
645 |
HandleBrokenShip(v); |
|
646 |
return; |
|
647 |
} |
|
648 |
v->breakdown_ctr--; |
|
649 |
} |
|
650 |
||
| 2639 | 651 |
if (v->vehstatus & VS_STOPPED) return; |
| 0 | 652 |
|
653 |
ProcessShipOrder(v); |
|
654 |
HandleShipLoading(v); |
|
655 |
||
| 2639 | 656 |
if (v->current_order.type == OT_LOADING) return; |
| 0 | 657 |
|
658 |
CheckShipLeaveDepot(v); |
|
659 |
||
| 2639 | 660 |
if (!ShipAccelerate(v)) return; |
| 0 | 661 |
|
662 |
BeginVehicleMove(v); |
|
663 |
||
664 |
if (GetNewVehiclePos(v, &gp)) {
|
|
665 |
// staying in tile |
|
|
3961
e2783f244ac6
(svn r5120) Add IsShipInDepot{Stopped,}() and remove some redundant checks
tron
parents:
3955
diff
changeset
|
666 |
if (IsShipInDepot(v)) {
|
| 0 | 667 |
gp.x = v->x_pos; |
668 |
gp.y = v->y_pos; |
|
669 |
} else {
|
|
670 |
/* isnot inside depot */ |
|
671 |
r = VehicleEnterTile(v, gp.new_tile, gp.x, gp.y); |
|
672 |
if (r & 0x8) goto reverse_direction; |
|
673 |
||
|
1751
954dd2900ac9
(svn r2255) - Fix: [ 9680363 ] [NPF] Broken buoy handling for ships
matthijs
parents:
1698
diff
changeset
|
674 |
/* A leave station order only needs one tick to get processed, so we can |
|
954dd2900ac9
(svn r2255) - Fix: [ 9680363 ] [NPF] Broken buoy handling for ships
matthijs
parents:
1698
diff
changeset
|
675 |
* always skip ahead. */ |
|
555
eec6c0294435
(svn r955) Replace uint16 for orders with struct Order
tron
parents:
541
diff
changeset
|
676 |
if (v->current_order.type == OT_LEAVESTATION) {
|
|
eec6c0294435
(svn r955) Replace uint16 for orders with struct Order
tron
parents:
541
diff
changeset
|
677 |
v->current_order.type = OT_NOTHING; |
|
eec6c0294435
(svn r955) Replace uint16 for orders with struct Order
tron
parents:
541
diff
changeset
|
678 |
v->current_order.flags = 0; |
|
755
823358e83abf
(svn r1211) -Feature: Introduce sticky windows to all vehicle windows...Just make sure you do not sticky more than 23 at a time. Also a lot of places in the code invalidated the 'status bar' of the vehicle, referring to it as widget 4. This is now widget 5 and has been #definitized
darkvater
parents:
679
diff
changeset
|
679 |
InvalidateWindowWidget(WC_VEHICLE_VIEW, v->index, STATUS_BAR); |
|
1751
954dd2900ac9
(svn r2255) - Fix: [ 9680363 ] [NPF] Broken buoy handling for ships
matthijs
parents:
1698
diff
changeset
|
680 |
} else if (v->dest_tile != 0) {
|
|
954dd2900ac9
(svn r2255) - Fix: [ 9680363 ] [NPF] Broken buoy handling for ships
matthijs
parents:
1698
diff
changeset
|
681 |
/* We have a target, let's see if we reached it... */ |
|
954dd2900ac9
(svn r2255) - Fix: [ 9680363 ] [NPF] Broken buoy handling for ships
matthijs
parents:
1698
diff
changeset
|
682 |
if (v->current_order.type == OT_GOTO_STATION && |
|
954dd2900ac9
(svn r2255) - Fix: [ 9680363 ] [NPF] Broken buoy handling for ships
matthijs
parents:
1698
diff
changeset
|
683 |
IsBuoyTile(v->dest_tile) && |
|
954dd2900ac9
(svn r2255) - Fix: [ 9680363 ] [NPF] Broken buoy handling for ships
matthijs
parents:
1698
diff
changeset
|
684 |
DistanceManhattan(v->dest_tile, gp.new_tile) <= 3) {
|
|
954dd2900ac9
(svn r2255) - Fix: [ 9680363 ] [NPF] Broken buoy handling for ships
matthijs
parents:
1698
diff
changeset
|
685 |
/* We got within 3 tiles of our target buoy, so let's skip to our |
|
954dd2900ac9
(svn r2255) - Fix: [ 9680363 ] [NPF] Broken buoy handling for ships
matthijs
parents:
1698
diff
changeset
|
686 |
* next order */ |
|
954dd2900ac9
(svn r2255) - Fix: [ 9680363 ] [NPF] Broken buoy handling for ships
matthijs
parents:
1698
diff
changeset
|
687 |
v->cur_order_index++; |
|
954dd2900ac9
(svn r2255) - Fix: [ 9680363 ] [NPF] Broken buoy handling for ships
matthijs
parents:
1698
diff
changeset
|
688 |
v->current_order.type = OT_DUMMY; |
|
954dd2900ac9
(svn r2255) - Fix: [ 9680363 ] [NPF] Broken buoy handling for ships
matthijs
parents:
1698
diff
changeset
|
689 |
InvalidateVehicleOrder(v); |
|
954dd2900ac9
(svn r2255) - Fix: [ 9680363 ] [NPF] Broken buoy handling for ships
matthijs
parents:
1698
diff
changeset
|
690 |
} else {
|
|
954dd2900ac9
(svn r2255) - Fix: [ 9680363 ] [NPF] Broken buoy handling for ships
matthijs
parents:
1698
diff
changeset
|
691 |
/* Non-buoy orders really need to reach the tile */ |
|
954dd2900ac9
(svn r2255) - Fix: [ 9680363 ] [NPF] Broken buoy handling for ships
matthijs
parents:
1698
diff
changeset
|
692 |
if (v->dest_tile == gp.new_tile) {
|
|
954dd2900ac9
(svn r2255) - Fix: [ 9680363 ] [NPF] Broken buoy handling for ships
matthijs
parents:
1698
diff
changeset
|
693 |
if (v->current_order.type == OT_GOTO_DEPOT) {
|
|
954dd2900ac9
(svn r2255) - Fix: [ 9680363 ] [NPF] Broken buoy handling for ships
matthijs
parents:
1698
diff
changeset
|
694 |
if ((gp.x&0xF)==8 && (gp.y&0xF)==8) {
|
|
4725
f7284b86833f
(svn r6637) -Codechange: merged all (vehicle type)EnterDepot into VehicleEnterDepot()
bjarni
parents:
4712
diff
changeset
|
695 |
VehicleEnterDepot(v); |
|
1751
954dd2900ac9
(svn r2255) - Fix: [ 9680363 ] [NPF] Broken buoy handling for ships
matthijs
parents:
1698
diff
changeset
|
696 |
return; |
|
954dd2900ac9
(svn r2255) - Fix: [ 9680363 ] [NPF] Broken buoy handling for ships
matthijs
parents:
1698
diff
changeset
|
697 |
} |
|
954dd2900ac9
(svn r2255) - Fix: [ 9680363 ] [NPF] Broken buoy handling for ships
matthijs
parents:
1698
diff
changeset
|
698 |
} else if (v->current_order.type == OT_GOTO_STATION) {
|
|
954dd2900ac9
(svn r2255) - Fix: [ 9680363 ] [NPF] Broken buoy handling for ships
matthijs
parents:
1698
diff
changeset
|
699 |
Station *st; |
|
954dd2900ac9
(svn r2255) - Fix: [ 9680363 ] [NPF] Broken buoy handling for ships
matthijs
parents:
1698
diff
changeset
|
700 |
|
|
4527
b18634a31a4a
(svn r6353) -Codechange: Make DestinationID a typedef of uin16, which is as large as any type of destinataion (StationID, DepotID, WaypointID) it can hold
tron
parents:
4526
diff
changeset
|
701 |
v->last_station_visited = v->current_order.dest; |
|
1751
954dd2900ac9
(svn r2255) - Fix: [ 9680363 ] [NPF] Broken buoy handling for ships
matthijs
parents:
1698
diff
changeset
|
702 |
|
|
954dd2900ac9
(svn r2255) - Fix: [ 9680363 ] [NPF] Broken buoy handling for ships
matthijs
parents:
1698
diff
changeset
|
703 |
/* Process station in the orderlist. */ |
|
4527
b18634a31a4a
(svn r6353) -Codechange: Make DestinationID a typedef of uin16, which is as large as any type of destinataion (StationID, DepotID, WaypointID) it can hold
tron
parents:
4526
diff
changeset
|
704 |
st = GetStation(v->current_order.dest); |
|
1751
954dd2900ac9
(svn r2255) - Fix: [ 9680363 ] [NPF] Broken buoy handling for ships
matthijs
parents:
1698
diff
changeset
|
705 |
if (st->facilities & FACIL_DOCK) { /* ugly, ugly workaround for problem with ships able to drop off cargo at wrong stations */
|
|
954dd2900ac9
(svn r2255) - Fix: [ 9680363 ] [NPF] Broken buoy handling for ships
matthijs
parents:
1698
diff
changeset
|
706 |
v->current_order.type = OT_LOADING; |
|
3610
d33499b2250c
(svn r4505) -Fix (FS#94) Ships can now be used to set up feeders as well.
celestar
parents:
3491
diff
changeset
|
707 |
v->current_order.flags &= OF_FULL_LOAD | OF_UNLOAD | OF_TRANSFER; |
|
1751
954dd2900ac9
(svn r2255) - Fix: [ 9680363 ] [NPF] Broken buoy handling for ships
matthijs
parents:
1698
diff
changeset
|
708 |
v->current_order.flags |= OF_NON_STOP; |
|
954dd2900ac9
(svn r2255) - Fix: [ 9680363 ] [NPF] Broken buoy handling for ships
matthijs
parents:
1698
diff
changeset
|
709 |
ShipArrivesAt(v, st); |
|
954dd2900ac9
(svn r2255) - Fix: [ 9680363 ] [NPF] Broken buoy handling for ships
matthijs
parents:
1698
diff
changeset
|
710 |
|
|
954dd2900ac9
(svn r2255) - Fix: [ 9680363 ] [NPF] Broken buoy handling for ships
matthijs
parents:
1698
diff
changeset
|
711 |
SET_EXPENSES_TYPE(EXPENSES_SHIP_INC); |
|
5211
651c9272ad22
(svn r7326) -Feature: Add support for gradual (un)loading of vehicles (Maedhros)
peter1138
parents:
5198
diff
changeset
|
712 |
if (LoadUnloadVehicle(v, true)) {
|
|
1751
954dd2900ac9
(svn r2255) - Fix: [ 9680363 ] [NPF] Broken buoy handling for ships
matthijs
parents:
1698
diff
changeset
|
713 |
InvalidateWindow(WC_SHIPS_LIST, v->owner); |
|
954dd2900ac9
(svn r2255) - Fix: [ 9680363 ] [NPF] Broken buoy handling for ships
matthijs
parents:
1698
diff
changeset
|
714 |
MarkShipDirty(v); |
|
954dd2900ac9
(svn r2255) - Fix: [ 9680363 ] [NPF] Broken buoy handling for ships
matthijs
parents:
1698
diff
changeset
|
715 |
} |
|
954dd2900ac9
(svn r2255) - Fix: [ 9680363 ] [NPF] Broken buoy handling for ships
matthijs
parents:
1698
diff
changeset
|
716 |
InvalidateWindowWidget(WC_VEHICLE_VIEW, v->index, STATUS_BAR); |
|
954dd2900ac9
(svn r2255) - Fix: [ 9680363 ] [NPF] Broken buoy handling for ships
matthijs
parents:
1698
diff
changeset
|
717 |
} else { /* leave stations without docks right aways */
|
|
954dd2900ac9
(svn r2255) - Fix: [ 9680363 ] [NPF] Broken buoy handling for ships
matthijs
parents:
1698
diff
changeset
|
718 |
v->current_order.type = OT_LEAVESTATION; |
|
954dd2900ac9
(svn r2255) - Fix: [ 9680363 ] [NPF] Broken buoy handling for ships
matthijs
parents:
1698
diff
changeset
|
719 |
v->current_order.flags = 0; |
|
954dd2900ac9
(svn r2255) - Fix: [ 9680363 ] [NPF] Broken buoy handling for ships
matthijs
parents:
1698
diff
changeset
|
720 |
v->cur_order_index++; |
|
954dd2900ac9
(svn r2255) - Fix: [ 9680363 ] [NPF] Broken buoy handling for ships
matthijs
parents:
1698
diff
changeset
|
721 |
InvalidateVehicleOrder(v); |
|
954dd2900ac9
(svn r2255) - Fix: [ 9680363 ] [NPF] Broken buoy handling for ships
matthijs
parents:
1698
diff
changeset
|
722 |
} |
|
954dd2900ac9
(svn r2255) - Fix: [ 9680363 ] [NPF] Broken buoy handling for ships
matthijs
parents:
1698
diff
changeset
|
723 |
} |
|
954dd2900ac9
(svn r2255) - Fix: [ 9680363 ] [NPF] Broken buoy handling for ships
matthijs
parents:
1698
diff
changeset
|
724 |
} |
|
954dd2900ac9
(svn r2255) - Fix: [ 9680363 ] [NPF] Broken buoy handling for ships
matthijs
parents:
1698
diff
changeset
|
725 |
} |
| 0 | 726 |
} |
727 |
} |
|
728 |
} else {
|
|
|
3157
40de8616c04c
(svn r3783) Replace further ints and magic numbers by Direction, DiagDirection and friends
tron
parents:
3147
diff
changeset
|
729 |
DiagDirection diagdir; |
| 0 | 730 |
// new tile |
|
1401
56d372a75b74
(svn r1905) - Fix: [ 1118810 ] openttd: ship_cmd.c:642 ... Assertion failed. Mapwrap fixed in ship_cmd.c (was implicitely ok before biggermaps).
Darkvater
parents:
1330
diff
changeset
|
731 |
if (TileX(gp.new_tile) >= MapMaxX() || TileY(gp.new_tile) >= MapMaxY()) |
|
926
bd4312619522
(svn r1414) Move TileIndex, TILE_MASK and GET_TILE_[XY] to map.h and turn the latter into inline functions names Tile[XY]
tron
parents:
919
diff
changeset
|
732 |
goto reverse_direction; |
| 0 | 733 |
|
734 |
dir = ShipGetNewDirectionFromTiles(gp.new_tile, gp.old_tile); |
|
|
3157
40de8616c04c
(svn r3783) Replace further ints and magic numbers by Direction, DiagDirection and friends
tron
parents:
3147
diff
changeset
|
735 |
assert(dir == DIR_NE || dir == DIR_SE || dir == DIR_SW || dir == DIR_NW); |
|
40de8616c04c
(svn r3783) Replace further ints and magic numbers by Direction, DiagDirection and friends
tron
parents:
3147
diff
changeset
|
736 |
diagdir = DirToDiagDir(dir); |
|
40de8616c04c
(svn r3783) Replace further ints and magic numbers by Direction, DiagDirection and friends
tron
parents:
3147
diff
changeset
|
737 |
tracks = GetAvailShipTracks(gp.new_tile, diagdir); |
| 0 | 738 |
if (tracks == 0) |
739 |
goto reverse_direction; |
|
740 |
||
741 |
// Choose a direction, and continue if we find one |
|
|
3157
40de8616c04c
(svn r3783) Replace further ints and magic numbers by Direction, DiagDirection and friends
tron
parents:
3147
diff
changeset
|
742 |
track = ChooseShipTrack(v, gp.new_tile, diagdir, tracks); |
| 0 | 743 |
if (track < 0) |
744 |
goto reverse_direction; |
|
745 |
||
|
3157
40de8616c04c
(svn r3783) Replace further ints and magic numbers by Direction, DiagDirection and friends
tron
parents:
3147
diff
changeset
|
746 |
b = _ship_subcoord[diagdir][track]; |
|
193
0a7025304867
(svn r194) -Codechange: stripping trailing-spaces. Please keep this that way!
truelight
parents:
164
diff
changeset
|
747 |
|
| 0 | 748 |
gp.x = (gp.x&~0xF) | b[0]; |
749 |
gp.y = (gp.y&~0xF) | b[1]; |
|
750 |
||
751 |
/* Call the landscape function and tell it that the vehicle entered the tile */ |
|
752 |
r = VehicleEnterTile(v, gp.new_tile, gp.x, gp.y); |
|
753 |
if (r&0x8) goto reverse_direction; |
|
754 |
||
755 |
if (!(r&0x4)) {
|
|
756 |
v->tile = gp.new_tile; |
|
757 |
v->u.ship.state = 1 << track; |
|
758 |
} |
|
759 |
||
760 |
v->direction = b[2]; |
|
761 |
} |
|
762 |
||
763 |
/* update image of ship, as well as delta XY */ |
|
764 |
dir = ShipGetNewDirection(v, gp.x, gp.y); |
|
765 |
v->x_pos = gp.x; |
|
766 |
v->y_pos = gp.y; |
|
767 |
v->z_pos = GetSlopeZ(gp.x, gp.y); |
|
768 |
||
769 |
getout: |
|
770 |
UpdateShipDeltaXY(v, dir); |
|
771 |
v->cur_image = GetShipImage(v, dir); |
|
772 |
VehiclePositionChanged(v); |
|
773 |
EndVehicleMove(v); |
|
774 |
return; |
|
775 |
||
776 |
reverse_direction: |
|
|
3157
40de8616c04c
(svn r3783) Replace further ints and magic numbers by Direction, DiagDirection and friends
tron
parents:
3147
diff
changeset
|
777 |
dir = ReverseDir(v->direction); |
| 0 | 778 |
v->direction = dir; |
779 |
goto getout; |
|
780 |
} |
|
781 |
||
782 |
static void AgeShipCargo(Vehicle *v) |
|
783 |
{
|
|
| 2639 | 784 |
if (_age_cargo_skip_counter != 0) return; |
785 |
if (v->cargo_days != 255) v->cargo_days++; |
|
| 0 | 786 |
} |
787 |
||
788 |
void Ship_Tick(Vehicle *v) |
|
789 |
{
|
|
790 |
AgeShipCargo(v); |
|
791 |
ShipController(v); |
|
792 |
} |
|
793 |
||
794 |
||
|
1093
e8d26c7dc42f
(svn r1594) Convert all undefined parameter lists to (void) and add the appropriate warning flags in the Makefile
tron
parents:
1055
diff
changeset
|
795 |
void ShipsYearlyLoop(void) |
| 0 | 796 |
{
|
797 |
Vehicle *v; |
|
798 |
||
799 |
FOR_ALL_VEHICLES(v) {
|
|
800 |
if (v->type == VEH_Ship) {
|
|
801 |
v->profit_last_year = v->profit_this_year; |
|
802 |
v->profit_this_year = 0; |
|
803 |
InvalidateWindow(WC_VEHICLE_DETAILS, v->index); |
|
804 |
} |
|
805 |
} |
|
806 |
} |
|
807 |
||
|
1793
8ac8a8c9ec0f
(svn r2297) - CodeChange: server-check the next batch of commands.
Darkvater
parents:
1790
diff
changeset
|
808 |
/** Build a ship. |
|
3491
4c8427796c64
(svn r4342) Change the first two parameters of commands - virtual pixel coordinates of the tile to operate on - to a TileIndex
tron
parents:
3476
diff
changeset
|
809 |
* @param tile tile of depot where ship is built |
|
1793
8ac8a8c9ec0f
(svn r2297) - CodeChange: server-check the next batch of commands.
Darkvater
parents:
1790
diff
changeset
|
810 |
* @param p1 ship type being built (engine) |
|
3816
2cdb29b57c1f
(svn r4826) -Fix: [autoreplace] fixed possible problem when autoreplacing and was number of vehicles (of a type, not total) was reached
bjarni
parents:
3645
diff
changeset
|
811 |
* @param p2 bit 0 when set, the unitnumber will be 0, otherwise it will be a free number |
|
1793
8ac8a8c9ec0f
(svn r2297) - CodeChange: server-check the next batch of commands.
Darkvater
parents:
1790
diff
changeset
|
812 |
*/ |
|
3491
4c8427796c64
(svn r4342) Change the first two parameters of commands - virtual pixel coordinates of the tile to operate on - to a TileIndex
tron
parents:
3476
diff
changeset
|
813 |
int32 CmdBuildShip(TileIndex tile, uint32 flags, uint32 p1, uint32 p2) |
| 0 | 814 |
{
|
815 |
int32 value; |
|
816 |
Vehicle *v; |
|
|
1282
e7a73ee62d2f
(svn r1786) -Fix: unitnumber is increased to 16bit, so now you can have up to 5000
truelight
parents:
1266
diff
changeset
|
817 |
UnitID unit_num; |
| 0 | 818 |
Engine *e; |
|
193
0a7025304867
(svn r194) -Codechange: stripping trailing-spaces. Please keep this that way!
truelight
parents:
164
diff
changeset
|
819 |
|
|
5215
439d5ca71311
(svn r7330) -Fix (r7304): Data invalidation doesn't always happen as the local
peter1138
parents:
5211
diff
changeset
|
820 |
if (!IsEngineBuildable(p1, VEH_Ship, _current_player)) return_cmd_error(STR_ENGINE_NOT_BUILDABLE); |
|
1196
115f46e3807d
(svn r1700) - Fix: Hacked clients can no longer be used to build vehicles that are not available yet (Hackykid)
bjarni
parents:
1151
diff
changeset
|
821 |
|
| 0 | 822 |
SET_EXPENSES_TYPE(EXPENSES_NEW_VEHICLES); |
823 |
||
824 |
value = EstimateShipCost(p1); |
|
|
1793
8ac8a8c9ec0f
(svn r2297) - CodeChange: server-check the next batch of commands.
Darkvater
parents:
1790
diff
changeset
|
825 |
if (flags & DC_QUERY_COST) return value; |
| 0 | 826 |
|
|
1443
d9c101f7634b
(svn r1947) As in r1946, permit DC_QUERY_COST even on non-depot tiles - so that it works for the ai_new. It is de iure not a bug yet but let's be safe against future annoying headaches. Signed-Off-By: TrueLight
pasky
parents:
1401
diff
changeset
|
827 |
/* The ai_new queries the vehicle cost before building the route, |
|
d9c101f7634b
(svn r1947) As in r1946, permit DC_QUERY_COST even on non-depot tiles - so that it works for the ai_new. It is de iure not a bug yet but let's be safe against future annoying headaches. Signed-Off-By: TrueLight
pasky
parents:
1401
diff
changeset
|
828 |
* so we must check against cheaters no sooner than now. --pasky */ |
|
d9c101f7634b
(svn r1947) As in r1946, permit DC_QUERY_COST even on non-depot tiles - so that it works for the ai_new. It is de iure not a bug yet but let's be safe against future annoying headaches. Signed-Off-By: TrueLight
pasky
parents:
1401
diff
changeset
|
829 |
if (!IsTileDepotType(tile, TRANSPORT_WATER)) return CMD_ERROR; |
|
1901
fb05044cf5c3
(svn r2407) Use {Get,Is}TileOwner to get/check the owner of a tile and fix some bogus reads of _map_owner
tron
parents:
1891
diff
changeset
|
830 |
if (!IsTileOwner(tile, _current_player)) return CMD_ERROR; |
|
1443
d9c101f7634b
(svn r1947) As in r1946, permit DC_QUERY_COST even on non-depot tiles - so that it works for the ai_new. It is de iure not a bug yet but let's be safe against future annoying headaches. Signed-Off-By: TrueLight
pasky
parents:
1401
diff
changeset
|
831 |
|
| 0 | 832 |
v = AllocateVehicle(); |
|
4095
55a5642143f1
(svn r5427) - Codechange: testing for "== true" is redundant.
peter1138
parents:
3989
diff
changeset
|
833 |
unit_num = HASBIT(p2, 0) ? 0 : GetFreeUnitNumber(VEH_Ship); |
|
3816
2cdb29b57c1f
(svn r4826) -Fix: [autoreplace] fixed possible problem when autoreplacing and was number of vehicles (of a type, not total) was reached
bjarni
parents:
3645
diff
changeset
|
834 |
|
|
2cdb29b57c1f
(svn r4826) -Fix: [autoreplace] fixed possible problem when autoreplacing and was number of vehicles (of a type, not total) was reached
bjarni
parents:
3645
diff
changeset
|
835 |
if (v == NULL || IsOrderPoolFull() || unit_num > _patches.max_ships) |
| 0 | 836 |
return_cmd_error(STR_00E1_TOO_MANY_VEHICLES_IN_GAME); |
|
193
0a7025304867
(svn r194) -Codechange: stripping trailing-spaces. Please keep this that way!
truelight
parents:
164
diff
changeset
|
837 |
|
| 0 | 838 |
if (flags & DC_EXEC) {
|
|
3491
4c8427796c64
(svn r4342) Change the first two parameters of commands - virtual pixel coordinates of the tile to operate on - to a TileIndex
tron
parents:
3476
diff
changeset
|
839 |
int x; |
|
4c8427796c64
(svn r4342) Change the first two parameters of commands - virtual pixel coordinates of the tile to operate on - to a TileIndex
tron
parents:
3476
diff
changeset
|
840 |
int y; |
|
4c8427796c64
(svn r4342) Change the first two parameters of commands - virtual pixel coordinates of the tile to operate on - to a TileIndex
tron
parents:
3476
diff
changeset
|
841 |
|
|
538
5dd99f3b7eca
(svn r920) Replace vehicle info macros with inline functions and add asserts to check limits
tron
parents:
534
diff
changeset
|
842 |
const ShipVehicleInfo *svi = ShipVehInfo(p1); |
|
5dd99f3b7eca
(svn r920) Replace vehicle info macros with inline functions and add asserts to check limits
tron
parents:
534
diff
changeset
|
843 |
|
| 0 | 844 |
v->unitnumber = unit_num; |
845 |
||
846 |
v->owner = _current_player; |
|
847 |
v->tile = tile; |
|
|
3645
86af43f87885
(svn r4554) Replace magic numbers by TILE_{HEIGHT,SIZE}
tron
parents:
3610
diff
changeset
|
848 |
x = TileX(tile) * TILE_SIZE + TILE_SIZE / 2; |
|
86af43f87885
(svn r4554) Replace magic numbers by TILE_{HEIGHT,SIZE}
tron
parents:
3610
diff
changeset
|
849 |
y = TileY(tile) * TILE_SIZE + TILE_SIZE / 2; |
| 0 | 850 |
v->x_pos = x; |
851 |
v->y_pos = y; |
|
852 |
v->z_pos = GetSlopeZ(x,y); |
|
853 |
||
854 |
v->z_height = 6; |
|
855 |
v->sprite_width = 6; |
|
856 |
v->sprite_height = 6; |
|
857 |
v->x_offs = -3; |
|
858 |
v->y_offs = -3; |
|
859 |
v->vehstatus = VS_HIDDEN | VS_STOPPED | VS_DEFPAL; |
|
|
193
0a7025304867
(svn r194) -Codechange: stripping trailing-spaces. Please keep this that way!
truelight
parents:
164
diff
changeset
|
860 |
|
|
538
5dd99f3b7eca
(svn r920) Replace vehicle info macros with inline functions and add asserts to check limits
tron
parents:
534
diff
changeset
|
861 |
v->spritenum = svi->image_index; |
|
5dd99f3b7eca
(svn r920) Replace vehicle info macros with inline functions and add asserts to check limits
tron
parents:
534
diff
changeset
|
862 |
v->cargo_type = svi->cargo_type; |
|
3870
766d7bd6c299
(svn r4910) - NewGRF: add and initialize cargo subtype for vehicle visual variations
peter1138
parents:
3816
diff
changeset
|
863 |
v->cargo_subtype = 0; |
|
538
5dd99f3b7eca
(svn r920) Replace vehicle info macros with inline functions and add asserts to check limits
tron
parents:
534
diff
changeset
|
864 |
v->cargo_cap = svi->capacity; |
| 0 | 865 |
v->value = value; |
|
193
0a7025304867
(svn r194) -Codechange: stripping trailing-spaces. Please keep this that way!
truelight
parents:
164
diff
changeset
|
866 |
|
|
1266
9dc5638fe8cc
(svn r1770) -Fix: Hopefully last pieces of code that are containing a station-id
truelight
parents:
1247
diff
changeset
|
867 |
v->last_station_visited = INVALID_STATION; |
|
538
5dd99f3b7eca
(svn r920) Replace vehicle info macros with inline functions and add asserts to check limits
tron
parents:
534
diff
changeset
|
868 |
v->max_speed = svi->max_speed; |
|
2477
d454d5152386
(svn r3003) Change int, uint, uin16 and byte to EngineID where appropriate, plus some related changes (mostly casts)
tron
parents:
2464
diff
changeset
|
869 |
v->engine_type = p1; |
| 0 | 870 |
|
|
1926
68d60188a22f
(svn r2432) Use GetEngine() instead of DEREF_ENGINE() or even _engines[]
tron
parents:
1901
diff
changeset
|
871 |
e = GetEngine(p1); |
| 0 | 872 |
v->reliability = e->reliability; |
873 |
v->reliability_spd_dec = e->reliability_spd_dec; |
|
874 |
v->max_age = e->lifelength * 366; |
|
| 2564 | 875 |
_new_vehicle_id = v->index; |
| 0 | 876 |
|
877 |
v->string_id = STR_SV_SHIP_NAME; |
|
878 |
v->u.ship.state = 0x80; |
|
879 |
||
880 |
v->service_interval = _patches.servint_ships; |
|
881 |
v->date_of_last_service = _date; |
|
|
4329
9759d5c52010
(svn r6002) -Cleanup: remove the now redundant BASE_YEAR constant.
rubidium
parents:
4293
diff
changeset
|
882 |
v->build_year = _cur_year; |
| 0 | 883 |
v->cur_image = 0x0E5E; |
884 |
v->type = VEH_Ship; |
|
|
2804
b932fe148d36
(svn r3352) - NewGRF: Move initialization of vehicle random_bits to DC_EXEC blocks to allow use of Random() instead of InteractiveRandom(), which will alleviate some possible network desyncs.
peter1138
parents:
2791
diff
changeset
|
885 |
v->random_bits = VehicleRandomBits(); |
| 0 | 886 |
|
887 |
VehiclePositionChanged(v); |
|
|
4574
497540b4a75f
(svn r6424) -Codechange: [autoreplace] removed a loop though all vehicles from each time the window is redrawn
bjarni
parents:
4559
diff
changeset
|
888 |
GetPlayer(_current_player)->num_engines[p1]++; |
| 0 | 889 |
|
|
4739
bd535b408617
(svn r6651) -Coding feature: added the windowevent WE_INVALIDATE_DATA
bjarni
parents:
4725
diff
changeset
|
890 |
InvalidateWindowData(WC_VEHICLE_DEPOT, v->tile); |
| 588 | 891 |
RebuildVehicleLists(); |
| 0 | 892 |
InvalidateWindow(WC_COMPANY, v->owner); |
|
2618
7546b838230b
(svn r3156) -Fix: removed some cases where autoreplace windows were redrawn when nothing was changed
bjarni
parents:
2574
diff
changeset
|
893 |
if (IsLocalPlayer()) |
|
7546b838230b
(svn r3156) -Fix: removed some cases where autoreplace windows were redrawn when nothing was changed
bjarni
parents:
2574
diff
changeset
|
894 |
InvalidateWindow(WC_REPLACE_VEHICLE, VEH_Ship); // updates the replace Ship window |
| 0 | 895 |
} |
|
193
0a7025304867
(svn r194) -Codechange: stripping trailing-spaces. Please keep this that way!
truelight
parents:
164
diff
changeset
|
896 |
|
| 0 | 897 |
return value; |
898 |
} |
|
899 |
||
|
1793
8ac8a8c9ec0f
(svn r2297) - CodeChange: server-check the next batch of commands.
Darkvater
parents:
1790
diff
changeset
|
900 |
/** Sell a ship. |
|
3491
4c8427796c64
(svn r4342) Change the first two parameters of commands - virtual pixel coordinates of the tile to operate on - to a TileIndex
tron
parents:
3476
diff
changeset
|
901 |
* @param tile unused |
|
1793
8ac8a8c9ec0f
(svn r2297) - CodeChange: server-check the next batch of commands.
Darkvater
parents:
1790
diff
changeset
|
902 |
* @param p1 vehicle ID to be sold |
|
8ac8a8c9ec0f
(svn r2297) - CodeChange: server-check the next batch of commands.
Darkvater
parents:
1790
diff
changeset
|
903 |
* @param p2 unused |
|
8ac8a8c9ec0f
(svn r2297) - CodeChange: server-check the next batch of commands.
Darkvater
parents:
1790
diff
changeset
|
904 |
*/ |
|
3491
4c8427796c64
(svn r4342) Change the first two parameters of commands - virtual pixel coordinates of the tile to operate on - to a TileIndex
tron
parents:
3476
diff
changeset
|
905 |
int32 CmdSellShip(TileIndex tile, uint32 flags, uint32 p1, uint32 p2) |
| 0 | 906 |
{
|
907 |
Vehicle *v; |
|
908 |
||
|
4352
8ddb01bc6075
(svn r6053) -Codechange: renamed all IsXXXIndex to IsValidXXXID
truelight
parents:
4351
diff
changeset
|
909 |
if (!IsValidVehicleID(p1)) return CMD_ERROR; |
|
193
0a7025304867
(svn r194) -Codechange: stripping trailing-spaces. Please keep this that way!
truelight
parents:
164
diff
changeset
|
910 |
|
|
919
b0d6c7642f99
(svn r1407) -Codechange: changed a lot around _stations, _vehicles, _towns and _industries
truelight
parents:
915
diff
changeset
|
911 |
v = GetVehicle(p1); |
| 0 | 912 |
|
|
1793
8ac8a8c9ec0f
(svn r2297) - CodeChange: server-check the next batch of commands.
Darkvater
parents:
1790
diff
changeset
|
913 |
if (v->type != VEH_Ship || !CheckOwnership(v->owner)) return CMD_ERROR; |
| 0 | 914 |
|
|
1237
0a1ce05c3d45
(svn r1741) - Fix: added IsVehicleIndex() so it's possible to protect GetVehicle() from reading an invalid vehicle index
bjarni
parents:
1235
diff
changeset
|
915 |
SET_EXPENSES_TYPE(EXPENSES_NEW_VEHICLES); |
|
0a1ce05c3d45
(svn r1741) - Fix: added IsVehicleIndex() so it's possible to protect GetVehicle() from reading an invalid vehicle index
bjarni
parents:
1235
diff
changeset
|
916 |
|
|
3961
e2783f244ac6
(svn r5120) Add IsShipInDepot{Stopped,}() and remove some redundant checks
tron
parents:
3955
diff
changeset
|
917 |
if (!IsShipInDepotStopped(v)) {
|
| 0 | 918 |
return_cmd_error(STR_980B_SHIP_MUST_BE_STOPPED_IN); |
|
3961
e2783f244ac6
(svn r5120) Add IsShipInDepot{Stopped,}() and remove some redundant checks
tron
parents:
3955
diff
changeset
|
919 |
} |
|
193
0a7025304867
(svn r194) -Codechange: stripping trailing-spaces. Please keep this that way!
truelight
parents:
164
diff
changeset
|
920 |
|
| 0 | 921 |
if (flags & DC_EXEC) {
|
922 |
InvalidateWindow(WC_VEHICLE_DEPOT, v->tile); |
|
| 588 | 923 |
RebuildVehicleLists(); |
| 0 | 924 |
InvalidateWindow(WC_COMPANY, v->owner); |
925 |
DeleteWindowById(WC_VEHICLE_VIEW, v->index); |
|
|
5256
90226d8da8fb
(svn r7386) -Codechange r7385: moved deletion of the vehicle highlight from DeleteVehicle to the sell commands as they are not called as often
bjarni
parents:
5215
diff
changeset
|
926 |
DeleteDepotHighlightOfVehicle(v); |
| 0 | 927 |
DeleteVehicle(v); |
|
2618
7546b838230b
(svn r3156) -Fix: removed some cases where autoreplace windows were redrawn when nothing was changed
bjarni
parents:
2574
diff
changeset
|
928 |
if (IsLocalPlayer()) |
|
7546b838230b
(svn r3156) -Fix: removed some cases where autoreplace windows were redrawn when nothing was changed
bjarni
parents:
2574
diff
changeset
|
929 |
InvalidateWindow(WC_REPLACE_VEHICLE, VEH_Ship); // updates the replace Ship window |
| 0 | 930 |
} |
|
193
0a7025304867
(svn r194) -Codechange: stripping trailing-spaces. Please keep this that way!
truelight
parents:
164
diff
changeset
|
931 |
|
| 0 | 932 |
return -(int32)v->value; |
933 |
} |
|
934 |
||
|
1793
8ac8a8c9ec0f
(svn r2297) - CodeChange: server-check the next batch of commands.
Darkvater
parents:
1790
diff
changeset
|
935 |
/** Start/Stop a ship. |
|
3491
4c8427796c64
(svn r4342) Change the first two parameters of commands - virtual pixel coordinates of the tile to operate on - to a TileIndex
tron
parents:
3476
diff
changeset
|
936 |
* @param tile unused |
|
1793
8ac8a8c9ec0f
(svn r2297) - CodeChange: server-check the next batch of commands.
Darkvater
parents:
1790
diff
changeset
|
937 |
* @param p1 ship ID to start/stop |
|
8ac8a8c9ec0f
(svn r2297) - CodeChange: server-check the next batch of commands.
Darkvater
parents:
1790
diff
changeset
|
938 |
* @param p2 unused |
|
8ac8a8c9ec0f
(svn r2297) - CodeChange: server-check the next batch of commands.
Darkvater
parents:
1790
diff
changeset
|
939 |
*/ |
|
3491
4c8427796c64
(svn r4342) Change the first two parameters of commands - virtual pixel coordinates of the tile to operate on - to a TileIndex
tron
parents:
3476
diff
changeset
|
940 |
int32 CmdStartStopShip(TileIndex tile, uint32 flags, uint32 p1, uint32 p2) |
| 0 | 941 |
{
|
942 |
Vehicle *v; |
|
|
4244
44dcec623504
(svn r5822) - NewGRF: add support for callback 31, vehicle start/stop check. This allows a set to disallow a vehicle from being started, i.e. to not be able to leave the depot. This is almost a partner to callback 1D.
peter1138
parents:
4242
diff
changeset
|
943 |
uint16 callback; |
| 0 | 944 |
|
|
4352
8ddb01bc6075
(svn r6053) -Codechange: renamed all IsXXXIndex to IsValidXXXID
truelight
parents:
4351
diff
changeset
|
945 |
if (!IsValidVehicleID(p1)) return CMD_ERROR; |
|
1237
0a1ce05c3d45
(svn r1741) - Fix: added IsVehicleIndex() so it's possible to protect GetVehicle() from reading an invalid vehicle index
bjarni
parents:
1235
diff
changeset
|
946 |
|
|
919
b0d6c7642f99
(svn r1407) -Codechange: changed a lot around _stations, _vehicles, _towns and _industries
truelight
parents:
915
diff
changeset
|
947 |
v = GetVehicle(p1); |
| 0 | 948 |
|
|
1793
8ac8a8c9ec0f
(svn r2297) - CodeChange: server-check the next batch of commands.
Darkvater
parents:
1790
diff
changeset
|
949 |
if (v->type != VEH_Ship || !CheckOwnership(v->owner)) return CMD_ERROR; |
| 0 | 950 |
|
|
4244
44dcec623504
(svn r5822) - NewGRF: add support for callback 31, vehicle start/stop check. This allows a set to disallow a vehicle from being started, i.e. to not be able to leave the depot. This is almost a partner to callback 1D.
peter1138
parents:
4242
diff
changeset
|
951 |
/* Check if this ship can be started/stopped. The callback will fail or |
|
44dcec623504
(svn r5822) - NewGRF: add support for callback 31, vehicle start/stop check. This allows a set to disallow a vehicle from being started, i.e. to not be able to leave the depot. This is almost a partner to callback 1D.
peter1138
parents:
4242
diff
changeset
|
952 |
* return 0xFF if it can. */ |
|
44dcec623504
(svn r5822) - NewGRF: add support for callback 31, vehicle start/stop check. This allows a set to disallow a vehicle from being started, i.e. to not be able to leave the depot. This is almost a partner to callback 1D.
peter1138
parents:
4242
diff
changeset
|
953 |
callback = GetVehicleCallback(CBID_VEHICLE_START_STOP_CHECK, 0, 0, v->engine_type, v); |
|
44dcec623504
(svn r5822) - NewGRF: add support for callback 31, vehicle start/stop check. This allows a set to disallow a vehicle from being started, i.e. to not be able to leave the depot. This is almost a partner to callback 1D.
peter1138
parents:
4242
diff
changeset
|
954 |
if (callback != CALLBACK_FAILED && callback != 0xFF) {
|
|
44dcec623504
(svn r5822) - NewGRF: add support for callback 31, vehicle start/stop check. This allows a set to disallow a vehicle from being started, i.e. to not be able to leave the depot. This is almost a partner to callback 1D.
peter1138
parents:
4242
diff
changeset
|
955 |
StringID error = GetGRFStringID(GetEngineGRFID(v->engine_type), 0xD000 + callback); |
|
44dcec623504
(svn r5822) - NewGRF: add support for callback 31, vehicle start/stop check. This allows a set to disallow a vehicle from being started, i.e. to not be able to leave the depot. This is almost a partner to callback 1D.
peter1138
parents:
4242
diff
changeset
|
956 |
return_cmd_error(error); |
|
44dcec623504
(svn r5822) - NewGRF: add support for callback 31, vehicle start/stop check. This allows a set to disallow a vehicle from being started, i.e. to not be able to leave the depot. This is almost a partner to callback 1D.
peter1138
parents:
4242
diff
changeset
|
957 |
} |
|
44dcec623504
(svn r5822) - NewGRF: add support for callback 31, vehicle start/stop check. This allows a set to disallow a vehicle from being started, i.e. to not be able to leave the depot. This is almost a partner to callback 1D.
peter1138
parents:
4242
diff
changeset
|
958 |
|
| 0 | 959 |
if (flags & DC_EXEC) {
|
|
3961
e2783f244ac6
(svn r5120) Add IsShipInDepot{Stopped,}() and remove some redundant checks
tron
parents:
3955
diff
changeset
|
960 |
if (IsShipInDepotStopped(v)) {
|
|
3139
4c950c7ec5c9
(svn r3757) -Feature: Delete news items about vehicles, when they get stale
tron
parents:
3005
diff
changeset
|
961 |
DeleteVehicleNews(p1, STR_981C_SHIP_IS_WAITING_IN_DEPOT); |
|
4c950c7ec5c9
(svn r3757) -Feature: Delete news items about vehicles, when they get stale
tron
parents:
3005
diff
changeset
|
962 |
} |
|
4c950c7ec5c9
(svn r3757) -Feature: Delete news items about vehicles, when they get stale
tron
parents:
3005
diff
changeset
|
963 |
|
| 0 | 964 |
v->vehstatus ^= VS_STOPPED; |
|
755
823358e83abf
(svn r1211) -Feature: Introduce sticky windows to all vehicle windows...Just make sure you do not sticky more than 23 at a time. Also a lot of places in the code invalidated the 'status bar' of the vehicle, referring to it as widget 4. This is now widget 5 and has been #definitized
darkvater
parents:
679
diff
changeset
|
965 |
InvalidateWindowWidget(WC_VEHICLE_VIEW, v->index, STATUS_BAR); |
| 0 | 966 |
InvalidateWindow(WC_VEHICLE_DEPOT, v->tile); |
|
1793
8ac8a8c9ec0f
(svn r2297) - CodeChange: server-check the next batch of commands.
Darkvater
parents:
1790
diff
changeset
|
967 |
InvalidateWindowClasses(WC_SHIPS_LIST); |
| 0 | 968 |
} |
969 |
||
970 |
return 0; |
|
971 |
} |
|
972 |
||
|
1793
8ac8a8c9ec0f
(svn r2297) - CodeChange: server-check the next batch of commands.
Darkvater
parents:
1790
diff
changeset
|
973 |
/** Send a ship to the depot. |
|
3491
4c8427796c64
(svn r4342) Change the first two parameters of commands - virtual pixel coordinates of the tile to operate on - to a TileIndex
tron
parents:
3476
diff
changeset
|
974 |
* @param tile unused |
|
1793
8ac8a8c9ec0f
(svn r2297) - CodeChange: server-check the next batch of commands.
Darkvater
parents:
1790
diff
changeset
|
975 |
* @param p1 vehicle ID to send to the depot |
|
4451
66603f0f732e
(svn r6229) -Feature: Shared order lists now got a "goto depot" button
bjarni
parents:
4412
diff
changeset
|
976 |
* @param p2 various bitmasked elements |
|
4506
0d8fcc0a4e49
(svn r6291) -Feature: Vehicle lists from the station window now also got the goto depot button
bjarni
parents:
4463
diff
changeset
|
977 |
* - p2 bit 0-3 - DEPOT_ flags (see vehicle.h) |
|
0d8fcc0a4e49
(svn r6291) -Feature: Vehicle lists from the station window now also got the goto depot button
bjarni
parents:
4463
diff
changeset
|
978 |
* - p2 bit 8-10 - VLW flag (for mass goto depot) |
|
1793
8ac8a8c9ec0f
(svn r2297) - CodeChange: server-check the next batch of commands.
Darkvater
parents:
1790
diff
changeset
|
979 |
*/ |
|
3491
4c8427796c64
(svn r4342) Change the first two parameters of commands - virtual pixel coordinates of the tile to operate on - to a TileIndex
tron
parents:
3476
diff
changeset
|
980 |
int32 CmdSendShipToDepot(TileIndex tile, uint32 flags, uint32 p1, uint32 p2) |
| 0 | 981 |
{
|
982 |
Vehicle *v; |
|
|
1793
8ac8a8c9ec0f
(svn r2297) - CodeChange: server-check the next batch of commands.
Darkvater
parents:
1790
diff
changeset
|
983 |
const Depot *dep; |
| 0 | 984 |
|
|
4506
0d8fcc0a4e49
(svn r6291) -Feature: Vehicle lists from the station window now also got the goto depot button
bjarni
parents:
4463
diff
changeset
|
985 |
if (p2 & DEPOT_MASS_SEND) {
|
|
0d8fcc0a4e49
(svn r6291) -Feature: Vehicle lists from the station window now also got the goto depot button
bjarni
parents:
4463
diff
changeset
|
986 |
/* Mass goto depot requested */ |
|
4546
9345e0569655
(svn r6378) -Codechange: Rename VLW_FLAGS to VLW_MASK as it is a mask
Darkvater
parents:
4544
diff
changeset
|
987 |
if (!ValidVLWFlags(p2 & VLW_MASK)) return CMD_ERROR; |
|
9345e0569655
(svn r6378) -Codechange: Rename VLW_FLAGS to VLW_MASK as it is a mask
Darkvater
parents:
4544
diff
changeset
|
988 |
return SendAllVehiclesToDepot(VEH_Ship, flags, p2 & DEPOT_SERVICE, _current_player, (p2 & VLW_MASK), p1); |
|
4463
3a70624c40eb
(svn r6246) -Feature: added the many times requested "send all vehicle to depot" button
bjarni
parents:
4451
diff
changeset
|
989 |
} |
|
3a70624c40eb
(svn r6246) -Feature: added the many times requested "send all vehicle to depot" button
bjarni
parents:
4451
diff
changeset
|
990 |
|
|
4506
0d8fcc0a4e49
(svn r6291) -Feature: Vehicle lists from the station window now also got the goto depot button
bjarni
parents:
4463
diff
changeset
|
991 |
if (!IsValidVehicleID(p1)) return CMD_ERROR; |
|
1237
0a1ce05c3d45
(svn r1741) - Fix: added IsVehicleIndex() so it's possible to protect GetVehicle() from reading an invalid vehicle index
bjarni
parents:
1235
diff
changeset
|
992 |
|
|
919
b0d6c7642f99
(svn r1407) -Codechange: changed a lot around _stations, _vehicles, _towns and _industries
truelight
parents:
915
diff
changeset
|
993 |
v = GetVehicle(p1); |
| 0 | 994 |
|
|
4506
0d8fcc0a4e49
(svn r6291) -Feature: Vehicle lists from the station window now also got the goto depot button
bjarni
parents:
4463
diff
changeset
|
995 |
if (v->type != VEH_Ship || !CheckOwnership(v->owner)) return CMD_ERROR; |
| 0 | 996 |
|
|
4506
0d8fcc0a4e49
(svn r6291) -Feature: Vehicle lists from the station window now also got the goto depot button
bjarni
parents:
4463
diff
changeset
|
997 |
if (v->vehstatus & VS_CRASHED) return CMD_ERROR; |
|
1757
b179d50241dc
(svn r2261) - Fix: When crashed vehicles try to find a depot for servicing, openttd asserts.
matthijs
parents:
1752
diff
changeset
|
998 |
|
| 4526 | 999 |
if (IsShipInDepot(v)) return CMD_ERROR; |
1000 |
||
|
1793
8ac8a8c9ec0f
(svn r2297) - CodeChange: server-check the next batch of commands.
Darkvater
parents:
1790
diff
changeset
|
1001 |
/* If the current orders are already goto-depot */ |
|
555
eec6c0294435
(svn r955) Replace uint16 for orders with struct Order
tron
parents:
541
diff
changeset
|
1002 |
if (v->current_order.type == OT_GOTO_DEPOT) {
|
|
4519
1437b1e7416c
(svn r6304) -Codechange r6295: Use !! instead of (bool) in commands to send vehicles to depots
bjarni
parents:
4510
diff
changeset
|
1003 |
if (!!(p2 & DEPOT_SERVICE) == HASBIT(v->current_order.flags, OFB_HALT_IN_DEPOT)) {
|
|
4510
071bca98c577
(svn r6295) -Feature: using goto depot with a different control selection will now alter the service/stopping in depot flag instead of cancelling the goto depot order
bjarni
parents:
4506
diff
changeset
|
1004 |
/* We called with a different DEPOT_SERVICE setting. |
|
071bca98c577
(svn r6295) -Feature: using goto depot with a different control selection will now alter the service/stopping in depot flag instead of cancelling the goto depot order
bjarni
parents:
4506
diff
changeset
|
1005 |
* Now we change the setting to apply the new one and let the vehicle head for the same depot. |
|
071bca98c577
(svn r6295) -Feature: using goto depot with a different control selection will now alter the service/stopping in depot flag instead of cancelling the goto depot order
bjarni
parents:
4506
diff
changeset
|
1006 |
* Note: the if is (true for requesting service == true for ordered to stop in depot) */ |
|
071bca98c577
(svn r6295) -Feature: using goto depot with a different control selection will now alter the service/stopping in depot flag instead of cancelling the goto depot order
bjarni
parents:
4506
diff
changeset
|
1007 |
if (flags & DC_EXEC) {
|
|
071bca98c577
(svn r6295) -Feature: using goto depot with a different control selection will now alter the service/stopping in depot flag instead of cancelling the goto depot order
bjarni
parents:
4506
diff
changeset
|
1008 |
TOGGLEBIT(v->current_order.flags, OFB_HALT_IN_DEPOT); |
|
071bca98c577
(svn r6295) -Feature: using goto depot with a different control selection will now alter the service/stopping in depot flag instead of cancelling the goto depot order
bjarni
parents:
4506
diff
changeset
|
1009 |
InvalidateWindowWidget(WC_VEHICLE_VIEW, v->index, STATUS_BAR); |
|
071bca98c577
(svn r6295) -Feature: using goto depot with a different control selection will now alter the service/stopping in depot flag instead of cancelling the goto depot order
bjarni
parents:
4506
diff
changeset
|
1010 |
} |
|
071bca98c577
(svn r6295) -Feature: using goto depot with a different control selection will now alter the service/stopping in depot flag instead of cancelling the goto depot order
bjarni
parents:
4506
diff
changeset
|
1011 |
return 0; |
|
071bca98c577
(svn r6295) -Feature: using goto depot with a different control selection will now alter the service/stopping in depot flag instead of cancelling the goto depot order
bjarni
parents:
4506
diff
changeset
|
1012 |
} |
|
071bca98c577
(svn r6295) -Feature: using goto depot with a different control selection will now alter the service/stopping in depot flag instead of cancelling the goto depot order
bjarni
parents:
4506
diff
changeset
|
1013 |
|
|
4506
0d8fcc0a4e49
(svn r6291) -Feature: Vehicle lists from the station window now also got the goto depot button
bjarni
parents:
4463
diff
changeset
|
1014 |
if (p2 & DEPOT_DONT_CANCEL) return CMD_ERROR; // Requested no cancelation of depot orders |
| 0 | 1015 |
if (flags & DC_EXEC) {
|
|
1793
8ac8a8c9ec0f
(svn r2297) - CodeChange: server-check the next batch of commands.
Darkvater
parents:
1790
diff
changeset
|
1016 |
/* If the orders to 'goto depot' are in the orders list (forced servicing), |
|
8ac8a8c9ec0f
(svn r2297) - CodeChange: server-check the next batch of commands.
Darkvater
parents:
1790
diff
changeset
|
1017 |
* then skip to the next order; effectively cancelling this forced service */ |
|
1530
caa16c506a22
(svn r2034) -Codechange: Replaced the rather meaningless LOAD and UNLOAD flags for depots by something more meaningful
celestar
parents:
1520
diff
changeset
|
1018 |
if (HASBIT(v->current_order.flags, OFB_PART_OF_ORDERS)) |
|
caa16c506a22
(svn r2034) -Codechange: Replaced the rather meaningless LOAD and UNLOAD flags for depots by something more meaningful
celestar
parents:
1520
diff
changeset
|
1019 |
v->cur_order_index++; |
|
caa16c506a22
(svn r2034) -Codechange: Replaced the rather meaningless LOAD and UNLOAD flags for depots by something more meaningful
celestar
parents:
1520
diff
changeset
|
1020 |
|
|
555
eec6c0294435
(svn r955) Replace uint16 for orders with struct Order
tron
parents:
541
diff
changeset
|
1021 |
v->current_order.type = OT_DUMMY; |
|
eec6c0294435
(svn r955) Replace uint16 for orders with struct Order
tron
parents:
541
diff
changeset
|
1022 |
v->current_order.flags = 0; |
|
755
823358e83abf
(svn r1211) -Feature: Introduce sticky windows to all vehicle windows...Just make sure you do not sticky more than 23 at a time. Also a lot of places in the code invalidated the 'status bar' of the vehicle, referring to it as widget 4. This is now widget 5 and has been #definitized
darkvater
parents:
679
diff
changeset
|
1023 |
InvalidateWindowWidget(WC_VEHICLE_VIEW, v->index, STATUS_BAR); |
| 0 | 1024 |
} |
|
1793
8ac8a8c9ec0f
(svn r2297) - CodeChange: server-check the next batch of commands.
Darkvater
parents:
1790
diff
changeset
|
1025 |
return 0; |
|
8ac8a8c9ec0f
(svn r2297) - CodeChange: server-check the next batch of commands.
Darkvater
parents:
1790
diff
changeset
|
1026 |
} |
| 0 | 1027 |
|
|
1793
8ac8a8c9ec0f
(svn r2297) - CodeChange: server-check the next batch of commands.
Darkvater
parents:
1790
diff
changeset
|
1028 |
dep = FindClosestShipDepot(v); |
|
4506
0d8fcc0a4e49
(svn r6291) -Feature: Vehicle lists from the station window now also got the goto depot button
bjarni
parents:
4463
diff
changeset
|
1029 |
if (dep == NULL) return_cmd_error(STR_981A_UNABLE_TO_FIND_LOCAL_DEPOT); |
|
1793
8ac8a8c9ec0f
(svn r2297) - CodeChange: server-check the next batch of commands.
Darkvater
parents:
1790
diff
changeset
|
1030 |
|
|
8ac8a8c9ec0f
(svn r2297) - CodeChange: server-check the next batch of commands.
Darkvater
parents:
1790
diff
changeset
|
1031 |
if (flags & DC_EXEC) {
|
|
8ac8a8c9ec0f
(svn r2297) - CodeChange: server-check the next batch of commands.
Darkvater
parents:
1790
diff
changeset
|
1032 |
v->dest_tile = dep->xy; |
|
8ac8a8c9ec0f
(svn r2297) - CodeChange: server-check the next batch of commands.
Darkvater
parents:
1790
diff
changeset
|
1033 |
v->current_order.type = OT_GOTO_DEPOT; |
|
4412
945e8a9bb89a
(svn r6165) -Feature: control click Goto Depot will now make the vehicle service
bjarni
parents:
4389
diff
changeset
|
1034 |
v->current_order.flags = OF_NON_STOP; |
|
4506
0d8fcc0a4e49
(svn r6291) -Feature: Vehicle lists from the station window now also got the goto depot button
bjarni
parents:
4463
diff
changeset
|
1035 |
if (!(p2 & DEPOT_SERVICE)) SETBIT(v->current_order.flags, OFB_HALT_IN_DEPOT); |
|
5259
08336337aae0
(svn r7389) -Fix: when forcing a vehicle to go to a depot, clear refit orders from current orders (caused refit error popup when not having no orders)
bjarni
parents:
5256
diff
changeset
|
1036 |
v->current_order.refit_cargo = CT_INVALID; |
|
4527
b18634a31a4a
(svn r6353) -Codechange: Make DestinationID a typedef of uin16, which is as large as any type of destinataion (StationID, DepotID, WaypointID) it can hold
tron
parents:
4526
diff
changeset
|
1037 |
v->current_order.dest = dep->index; |
|
1793
8ac8a8c9ec0f
(svn r2297) - CodeChange: server-check the next batch of commands.
Darkvater
parents:
1790
diff
changeset
|
1038 |
InvalidateWindowWidget(WC_VEHICLE_VIEW, v->index, STATUS_BAR); |
| 0 | 1039 |
} |
1040 |
||
1041 |
return 0; |
|
1042 |
} |
|
1043 |
||
1044 |
||
|
1802
448f187042d3
(svn r2306) - CodeChange: Check the last commands; refits. This needed an extensive rewrite and global/local-cargo ID juggling and bitmasking. However with this done it looks better as well and is compatible with newgrf handling. Big thanks to HackyKid for doing most of the work. This also closes patch "[ 1199277 ] Command checks"
Darkvater
parents:
1793
diff
changeset
|
1045 |
/** Refits a ship to the specified cargo type. |
|
3491
4c8427796c64
(svn r4342) Change the first two parameters of commands - virtual pixel coordinates of the tile to operate on - to a TileIndex
tron
parents:
3476
diff
changeset
|
1046 |
* @param tile unused |
|
1802
448f187042d3
(svn r2306) - CodeChange: Check the last commands; refits. This needed an extensive rewrite and global/local-cargo ID juggling and bitmasking. However with this done it looks better as well and is compatible with newgrf handling. Big thanks to HackyKid for doing most of the work. This also closes patch "[ 1199277 ] Command checks"
Darkvater
parents:
1793
diff
changeset
|
1047 |
* @param p1 vehicle ID of the ship to refit |
|
448f187042d3
(svn r2306) - CodeChange: Check the last commands; refits. This needed an extensive rewrite and global/local-cargo ID juggling and bitmasking. However with this done it looks better as well and is compatible with newgrf handling. Big thanks to HackyKid for doing most of the work. This also closes patch "[ 1199277 ] Command checks"
Darkvater
parents:
1793
diff
changeset
|
1048 |
* @param p2 various bitstuffed elements |
|
448f187042d3
(svn r2306) - CodeChange: Check the last commands; refits. This needed an extensive rewrite and global/local-cargo ID juggling and bitmasking. However with this done it looks better as well and is compatible with newgrf handling. Big thanks to HackyKid for doing most of the work. This also closes patch "[ 1199277 ] Command checks"
Darkvater
parents:
1793
diff
changeset
|
1049 |
* - p2 = (bit 0-7) - the new cargo type to refit to (p2 & 0xFF) |
|
3954
634cd5e35803
(svn r5103) - Add cargo subtype parameter to refit commands (mart3p)
peter1138
parents:
3948
diff
changeset
|
1050 |
* - p2 = (bit 8-15) - the new cargo subtype to refit to |
|
1802
448f187042d3
(svn r2306) - CodeChange: Check the last commands; refits. This needed an extensive rewrite and global/local-cargo ID juggling and bitmasking. However with this done it looks better as well and is compatible with newgrf handling. Big thanks to HackyKid for doing most of the work. This also closes patch "[ 1199277 ] Command checks"
Darkvater
parents:
1793
diff
changeset
|
1051 |
*/ |
|
3491
4c8427796c64
(svn r4342) Change the first two parameters of commands - virtual pixel coordinates of the tile to operate on - to a TileIndex
tron
parents:
3476
diff
changeset
|
1052 |
int32 CmdRefitShip(TileIndex tile, uint32 flags, uint32 p1, uint32 p2) |
| 0 | 1053 |
{
|
1054 |
Vehicle *v; |
|
1055 |
int32 cost; |
|
|
3954
634cd5e35803
(svn r5103) - Add cargo subtype parameter to refit commands (mart3p)
peter1138
parents:
3948
diff
changeset
|
1056 |
CargoID new_cid = GB(p2, 0, 8); //gets the cargo number |
|
634cd5e35803
(svn r5103) - Add cargo subtype parameter to refit commands (mart3p)
peter1138
parents:
3948
diff
changeset
|
1057 |
byte new_subtype = GB(p2, 8, 8); |
|
3989
a5d50d90fd21
(svn r5188) - NewGRF: check refit capacity callback when refitting a ship
peter1138
parents:
3961
diff
changeset
|
1058 |
uint16 capacity = CALLBACK_FAILED; |
|
1237
0a1ce05c3d45
(svn r1741) - Fix: added IsVehicleIndex() so it's possible to protect GetVehicle() from reading an invalid vehicle index
bjarni
parents:
1235
diff
changeset
|
1059 |
|
|
4352
8ddb01bc6075
(svn r6053) -Codechange: renamed all IsXXXIndex to IsValidXXXID
truelight
parents:
4351
diff
changeset
|
1060 |
if (!IsValidVehicleID(p1)) return CMD_ERROR; |
|
193
0a7025304867
(svn r194) -Codechange: stripping trailing-spaces. Please keep this that way!
truelight
parents:
164
diff
changeset
|
1061 |
|
|
919
b0d6c7642f99
(svn r1407) -Codechange: changed a lot around _stations, _vehicles, _towns and _industries
truelight
parents:
915
diff
changeset
|
1062 |
v = GetVehicle(p1); |
|
1237
0a1ce05c3d45
(svn r1741) - Fix: added IsVehicleIndex() so it's possible to protect GetVehicle() from reading an invalid vehicle index
bjarni
parents:
1235
diff
changeset
|
1063 |
|
|
1802
448f187042d3
(svn r2306) - CodeChange: Check the last commands; refits. This needed an extensive rewrite and global/local-cargo ID juggling and bitmasking. However with this done it looks better as well and is compatible with newgrf handling. Big thanks to HackyKid for doing most of the work. This also closes patch "[ 1199277 ] Command checks"
Darkvater
parents:
1793
diff
changeset
|
1064 |
if (v->type != VEH_Ship || !CheckOwnership(v->owner)) return CMD_ERROR; |
|
2567
735280bafe7a
(svn r3104) -Codechange: [refit] removed now obsolite code that the old autoreplace needed
bjarni
parents:
2564
diff
changeset
|
1065 |
|
|
3961
e2783f244ac6
(svn r5120) Add IsShipInDepot{Stopped,}() and remove some redundant checks
tron
parents:
3955
diff
changeset
|
1066 |
if (!IsShipInDepotStopped(v)) {
|
|
e2783f244ac6
(svn r5120) Add IsShipInDepot{Stopped,}() and remove some redundant checks
tron
parents:
3955
diff
changeset
|
1067 |
return_cmd_error(STR_980B_SHIP_MUST_BE_STOPPED_IN); |
|
e2783f244ac6
(svn r5120) Add IsShipInDepot{Stopped,}() and remove some redundant checks
tron
parents:
3955
diff
changeset
|
1068 |
} |
| 0 | 1069 |
|
|
1802
448f187042d3
(svn r2306) - CodeChange: Check the last commands; refits. This needed an extensive rewrite and global/local-cargo ID juggling and bitmasking. However with this done it looks better as well and is compatible with newgrf handling. Big thanks to HackyKid for doing most of the work. This also closes patch "[ 1199277 ] Command checks"
Darkvater
parents:
1793
diff
changeset
|
1070 |
/* Check cargo */ |
|
448f187042d3
(svn r2306) - CodeChange: Check the last commands; refits. This needed an extensive rewrite and global/local-cargo ID juggling and bitmasking. However with this done it looks better as well and is compatible with newgrf handling. Big thanks to HackyKid for doing most of the work. This also closes patch "[ 1199277 ] Command checks"
Darkvater
parents:
1793
diff
changeset
|
1071 |
if (!ShipVehInfo(v->engine_type)->refittable) return CMD_ERROR; |
|
2704
dc9ae68dfd74
(svn r3248) - Codechange: Change interface of CanRefitTo() to supply the engine type directly instead of getting it from a vehicle. This allows the function to be used before vehicles are involved.
peter1138
parents:
2662
diff
changeset
|
1072 |
if (new_cid > NUM_CARGO || !CanRefitTo(v->engine_type, new_cid)) return CMD_ERROR; |
| 915 | 1073 |
|
|
1237
0a1ce05c3d45
(svn r1741) - Fix: added IsVehicleIndex() so it's possible to protect GetVehicle() from reading an invalid vehicle index
bjarni
parents:
1235
diff
changeset
|
1074 |
SET_EXPENSES_TYPE(EXPENSES_SHIP_RUN); |
|
0a1ce05c3d45
(svn r1741) - Fix: added IsVehicleIndex() so it's possible to protect GetVehicle() from reading an invalid vehicle index
bjarni
parents:
1235
diff
changeset
|
1075 |
|
|
3989
a5d50d90fd21
(svn r5188) - NewGRF: check refit capacity callback when refitting a ship
peter1138
parents:
3961
diff
changeset
|
1076 |
/* Check the refit capacity callback */ |
|
a5d50d90fd21
(svn r5188) - NewGRF: check refit capacity callback when refitting a ship
peter1138
parents:
3961
diff
changeset
|
1077 |
if (HASBIT(EngInfo(v->engine_type)->callbackmask, CBM_REFIT_CAPACITY)) {
|
|
a5d50d90fd21
(svn r5188) - NewGRF: check refit capacity callback when refitting a ship
peter1138
parents:
3961
diff
changeset
|
1078 |
/* Back up the existing cargo type */ |
|
a5d50d90fd21
(svn r5188) - NewGRF: check refit capacity callback when refitting a ship
peter1138
parents:
3961
diff
changeset
|
1079 |
CargoID temp_cid = v->cargo_type; |
|
a5d50d90fd21
(svn r5188) - NewGRF: check refit capacity callback when refitting a ship
peter1138
parents:
3961
diff
changeset
|
1080 |
byte temp_subtype = v->cargo_subtype; |
|
a5d50d90fd21
(svn r5188) - NewGRF: check refit capacity callback when refitting a ship
peter1138
parents:
3961
diff
changeset
|
1081 |
v->cargo_type = new_cid; |
|
a5d50d90fd21
(svn r5188) - NewGRF: check refit capacity callback when refitting a ship
peter1138
parents:
3961
diff
changeset
|
1082 |
v->cargo_subtype = new_subtype; |
|
a5d50d90fd21
(svn r5188) - NewGRF: check refit capacity callback when refitting a ship
peter1138
parents:
3961
diff
changeset
|
1083 |
|
|
a5d50d90fd21
(svn r5188) - NewGRF: check refit capacity callback when refitting a ship
peter1138
parents:
3961
diff
changeset
|
1084 |
capacity = GetVehicleCallback(CBID_VEHICLE_REFIT_CAPACITY, 0, 0, v->engine_type, v); |
|
a5d50d90fd21
(svn r5188) - NewGRF: check refit capacity callback when refitting a ship
peter1138
parents:
3961
diff
changeset
|
1085 |
|
|
a5d50d90fd21
(svn r5188) - NewGRF: check refit capacity callback when refitting a ship
peter1138
parents:
3961
diff
changeset
|
1086 |
/* Restore the cargo type */ |
|
a5d50d90fd21
(svn r5188) - NewGRF: check refit capacity callback when refitting a ship
peter1138
parents:
3961
diff
changeset
|
1087 |
v->cargo_type = temp_cid; |
|
a5d50d90fd21
(svn r5188) - NewGRF: check refit capacity callback when refitting a ship
peter1138
parents:
3961
diff
changeset
|
1088 |
v->cargo_subtype = temp_subtype; |
|
a5d50d90fd21
(svn r5188) - NewGRF: check refit capacity callback when refitting a ship
peter1138
parents:
3961
diff
changeset
|
1089 |
} |
|
a5d50d90fd21
(svn r5188) - NewGRF: check refit capacity callback when refitting a ship
peter1138
parents:
3961
diff
changeset
|
1090 |
|
|
a5d50d90fd21
(svn r5188) - NewGRF: check refit capacity callback when refitting a ship
peter1138
parents:
3961
diff
changeset
|
1091 |
if (capacity == CALLBACK_FAILED) {
|
|
a5d50d90fd21
(svn r5188) - NewGRF: check refit capacity callback when refitting a ship
peter1138
parents:
3961
diff
changeset
|
1092 |
capacity = ShipVehInfo(v->engine_type)->capacity; |
|
a5d50d90fd21
(svn r5188) - NewGRF: check refit capacity callback when refitting a ship
peter1138
parents:
3961
diff
changeset
|
1093 |
} |
|
a5d50d90fd21
(svn r5188) - NewGRF: check refit capacity callback when refitting a ship
peter1138
parents:
3961
diff
changeset
|
1094 |
_returned_refit_capacity = capacity; |
|
a5d50d90fd21
(svn r5188) - NewGRF: check refit capacity callback when refitting a ship
peter1138
parents:
3961
diff
changeset
|
1095 |
|
| 0 | 1096 |
cost = 0; |
|
4845
49105d3b5a9a
(svn r6771) -Codechange: Replace two macros with functions. IS_HUMAN_PLAYER and
Darkvater
parents:
4739
diff
changeset
|
1097 |
if (IsHumanPlayer(v->owner) && new_cid != v->cargo_type) {
|
|
4544
b2d5ad597e4d
(svn r6376) -Codechange: [vehicle refit] moved all refit cost calculations into GetRefitCost()
bjarni
parents:
4529
diff
changeset
|
1098 |
cost = GetRefitCost(v->engine_type); |
| 0 | 1099 |
} |
1100 |
||
1101 |
if (flags & DC_EXEC) {
|
|
|
3989
a5d50d90fd21
(svn r5188) - NewGRF: check refit capacity callback when refitting a ship
peter1138
parents:
3961
diff
changeset
|
1102 |
v->cargo_cap = capacity; |
|
3955
81e7e25e4599
(svn r5104) - When refitting a vehicle to its existing cargo type, don't lose the cargo onboard (useful when adding wagons to a train)
peter1138
parents:
3954
diff
changeset
|
1103 |
v->cargo_count = (v->cargo_type == new_cid) ? min(v->cargo_cap, v->cargo_count) : 0; |
|
1802
448f187042d3
(svn r2306) - CodeChange: Check the last commands; refits. This needed an extensive rewrite and global/local-cargo ID juggling and bitmasking. However with this done it looks better as well and is compatible with newgrf handling. Big thanks to HackyKid for doing most of the work. This also closes patch "[ 1199277 ] Command checks"
Darkvater
parents:
1793
diff
changeset
|
1104 |
v->cargo_type = new_cid; |
|
3954
634cd5e35803
(svn r5103) - Add cargo subtype parameter to refit commands (mart3p)
peter1138
parents:
3948
diff
changeset
|
1105 |
v->cargo_subtype = new_subtype; |
| 0 | 1106 |
InvalidateWindow(WC_VEHICLE_DETAILS, v->index); |
|
3954
634cd5e35803
(svn r5103) - Add cargo subtype parameter to refit commands (mart3p)
peter1138
parents:
3948
diff
changeset
|
1107 |
InvalidateWindow(WC_VEHICLE_DEPOT, v->tile); |
|
634cd5e35803
(svn r5103) - Add cargo subtype parameter to refit commands (mart3p)
peter1138
parents:
3948
diff
changeset
|
1108 |
RebuildVehicleLists(); |
| 0 | 1109 |
} |
1110 |
||
1111 |
return cost; |
|
1112 |
||
1113 |
} |