| author | tron |
| Sat, 05 Aug 2006 16:57:39 +0000 | |
| changeset 4226 | 10d7608f4c6c |
| parent 4095 | ad7a6bc2bf80 |
| child 4242 | 5738cbc9b2bd |
| permissions | -rw-r--r-- |
| 2186 | 1 |
/* $Id$ */ |
2 |
||
| 0 | 3 |
#include "stdafx.h" |
|
1891
862800791170
(svn r2397) - CodeChange: rename all "ttd" files to "openttd" files.
Darkvater
parents:
1802
diff
changeset
|
4 |
#include "openttd.h" |
|
3961
9868b766fda7
(svn r5120) Add IsShipInDepot{Stopped,}() and remove some redundant checks
tron
parents:
3955
diff
changeset
|
5 |
#include "ship.h" |
|
507
04b5403aaf6b
(svn r815) Include strings.h only in the files which need it.
tron
parents:
445
diff
changeset
|
6 |
#include "table/strings.h" |
|
2163
b17b313113a0
(svn r2673) Include functions.h directly, not globally via openttd.h
tron
parents:
2159
diff
changeset
|
7 |
#include "functions.h" |
|
679
04ca2cd69420
(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
2e00193652b2
(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
41d828e2d5ab
(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
cbe0c766c947
(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
f1013ec3d318
(svn r1817) -Codechange: Moved depot-functions to depot.c
truelight
parents:
1282
diff
changeset
|
20 |
#include "depot.h" |
|
2159
f6284cf5fab0
(svn r2669) Shuffle some more stuff around to reduce dependencies
tron
parents:
2150
diff
changeset
|
21 |
#include "vehicle_gui.h" |
|
2962
f0a49b646c48
(svn r3524) - Split newgrf features from engine.[ch] into newgrf_engine.[ch], and add the new files to project files.
peter1138
parents:
2916
diff
changeset
|
22 |
#include "newgrf_engine.h" |
|
3454
8dfe8de79c02
(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
2c84ed52709d
(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" |
|
2c84ed52709d
(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
9b99f0898ca2
(svn r5188) - NewGRF: check refit capacity callback when refitting a ship
peter1138
parents:
3961
diff
changeset
|
26 |
#include "newgrf_callbacks.h" |
| 0 | 27 |
|
28 |
static const uint16 _ship_sprites[] = {0x0E5D, 0x0E55, 0x0E65, 0x0E6D};
|
|
29 |
static const byte _ship_sometracks[4] = {0x19, 0x16, 0x25, 0x2A};
|
|
30 |
||
|
1977
37bbebf94434
(svn r2483) Replace almost 500 "uint tile" (and variants) with "TileIndex tile"
tron
parents:
1942
diff
changeset
|
31 |
static byte GetTileShipTrackStatus(TileIndex tile) |
|
37bbebf94434
(svn r2483) Replace almost 500 "uint tile" (and variants) with "TileIndex tile"
tron
parents:
1942
diff
changeset
|
32 |
{
|
|
159
139cf78bfb28
(svn r160) -Codechange: made GetTileTrackStatus more readable (blathijs)
truelight
parents:
156
diff
changeset
|
33 |
uint32 r = GetTileTrackStatus(tile, TRANSPORT_WATER); |
| 0 | 34 |
return r | r >> 8; |
35 |
} |
|
36 |
||
|
2477
225b2916fe2a
(svn r3003) Change int, uint, uin16 and byte to EngineID where appropriate, plus some related changes (mostly casts)
tron
parents:
2464
diff
changeset
|
37 |
void DrawShipEngine(int x, int y, EngineID engine, uint32 image_ormod) |
| 0 | 38 |
{
|
|
538
24fdb517fbe5
(svn r920) Replace vehicle info macros with inline functions and add asserts to check limits
tron
parents:
534
diff
changeset
|
39 |
int spritenum = ShipVehInfo(engine)->image_index; |
| 0 | 40 |
|
41 |
if (is_custom_sprite(spritenum)) {
|
|
|
3186
4317b5b295c4
(svn r3832) Replace some magic numbers by (Diag)Direction enums
tron
parents:
3157
diff
changeset
|
42 |
int sprite = GetCustomVehicleIcon(engine, DIR_W); |
| 0 | 43 |
|
| 2639 | 44 |
if (sprite != 0) {
|
| 0 | 45 |
DrawSprite(sprite | image_ormod, x, y); |
46 |
return; |
|
47 |
} |
|
|
2464
e3054f0f0627
(svn r2990) Remove _engine_original_sprites and replace all uses with references to our (new) original engine/vehicle tables.
peter1138
parents:
2214
diff
changeset
|
48 |
spritenum = orig_ship_vehicle_info[engine - SHIP_ENGINES_INDEX].image_index; |
| 0 | 49 |
} |
50 |
DrawSprite((6 + _ship_sprites[spritenum]) | image_ormod, x, y); |
|
51 |
} |
|
52 |
||
|
3157
3f35e2d9c8e3
(svn r3783) Replace further ints and magic numbers by Direction, DiagDirection and friends
tron
parents:
3147
diff
changeset
|
53 |
int GetShipImage(const Vehicle* v, Direction direction) |
| 0 | 54 |
{
|
55 |
int spritenum = v->spritenum; |
|
56 |
||
57 |
if (is_custom_sprite(spritenum)) {
|
|
58 |
int sprite = GetCustomVehicleSprite(v, direction); |
|
59 |
||
| 2639 | 60 |
if (sprite != 0) return sprite; |
|
2464
e3054f0f0627
(svn r2990) Remove _engine_original_sprites and replace all uses with references to our (new) original engine/vehicle tables.
peter1138
parents:
2214
diff
changeset
|
61 |
spritenum = orig_ship_vehicle_info[v->engine_type - SHIP_ENGINES_INDEX].image_index; |
| 0 | 62 |
} |
63 |
return _ship_sprites[spritenum] + direction; |
|
64 |
} |
|
65 |
||
| 2630 | 66 |
static const Depot* FindClosestShipDepot(const Vehicle* v) |
| 0 | 67 |
{
|
| 2630 | 68 |
const Depot* depot; |
69 |
const Depot* best_depot = NULL; |
|
|
1977
37bbebf94434
(svn r2483) Replace almost 500 "uint tile" (and variants) with "TileIndex tile"
tron
parents:
1942
diff
changeset
|
70 |
uint dist; |
|
37bbebf94434
(svn r2483) Replace almost 500 "uint tile" (and variants) with "TileIndex tile"
tron
parents:
1942
diff
changeset
|
71 |
uint best_dist = (uint)-1; |
|
37bbebf94434
(svn r2483) Replace almost 500 "uint tile" (and variants) with "TileIndex tile"
tron
parents:
1942
diff
changeset
|
72 |
TileIndex tile; |
|
37bbebf94434
(svn r2483) Replace almost 500 "uint tile" (and variants) with "TileIndex tile"
tron
parents:
1942
diff
changeset
|
73 |
TileIndex tile2 = v->tile; |
| 0 | 74 |
|
| 1247 | 75 |
if (_patches.new_pathfinding_all) {
|
76 |
NPFFoundTargetData ftd; |
|
|
1752
d65cd19f7117
(svn r2256) - Fix: Trains cannot find a depot when they are in a tunnel. (glx)
matthijs
parents:
1751
diff
changeset
|
77 |
byte trackdir = GetVehicleTrackdir(v); |
|
2006
9d5d7fd428c2
(svn r2514) - Codechange: [NPF] Move the checking of railtype into a funciton IsCompatibleRail().
matthijs
parents:
1998
diff
changeset
|
78 |
ftd = NPFRouteToDepotTrialError(v->tile, trackdir, TRANSPORT_WATER, v->owner, INVALID_RAILTYPE); |
| 2639 | 79 |
if (ftd.best_bird_dist == 0) {
|
|
1313
f1013ec3d318
(svn r1817) -Codechange: Moved depot-functions to depot.c
truelight
parents:
1282
diff
changeset
|
80 |
best_depot = GetDepotByTile(ftd.node.tile); /* Found target */ |
| 2639 | 81 |
} else {
|
|
1313
f1013ec3d318
(svn r1817) -Codechange: Moved depot-functions to depot.c
truelight
parents:
1282
diff
changeset
|
82 |
best_depot = NULL; /* Did not find target */ |
| 2639 | 83 |
} |
| 1247 | 84 |
} else {
|
|
1313
f1013ec3d318
(svn r1817) -Codechange: Moved depot-functions to depot.c
truelight
parents:
1282
diff
changeset
|
85 |
FOR_ALL_DEPOTS(depot) {
|
|
f1013ec3d318
(svn r1817) -Codechange: Moved depot-functions to depot.c
truelight
parents:
1282
diff
changeset
|
86 |
tile = depot->xy; |
|
1330
5d76a0522a11
(svn r1834) - Fix: NPF does not check the owner of its target, busses try to enter other players' depots. TODO
matthijs
parents:
1313
diff
changeset
|
87 |
if (IsValidDepot(depot) && IsTileDepotType(tile, TRANSPORT_WATER) && IsTileOwner(tile, v->owner)) {
|
| 1247 | 88 |
dist = DistanceManhattan(tile, tile2); |
89 |
if (dist < best_dist) {
|
|
90 |
best_dist = dist; |
|
|
1313
f1013ec3d318
(svn r1817) -Codechange: Moved depot-functions to depot.c
truelight
parents:
1282
diff
changeset
|
91 |
best_depot = depot; |
| 1247 | 92 |
} |
| 0 | 93 |
} |
94 |
} |
|
95 |
} |
|
96 |
return best_depot; |
|
97 |
} |
|
98 |
||
99 |
static void CheckIfShipNeedsService(Vehicle *v) |
|
100 |
{
|
|
| 2630 | 101 |
const Depot* depot; |
| 0 | 102 |
|
| 2639 | 103 |
if (_patches.servint_ships == 0) return; |
104 |
if (!VehicleNeedsService(v)) return; |
|
105 |
if (v->vehstatus & VS_STOPPED) return; |
|
|
193
0a7025304867
(svn r194) -Codechange: stripping trailing-spaces. Please keep this that way!
truelight
parents:
164
diff
changeset
|
106 |
|
|
555
02df8a1b7f33
(svn r955) Replace uint16 for orders with struct Order
tron
parents:
541
diff
changeset
|
107 |
if (v->current_order.type == OT_GOTO_DEPOT && |
|
1530
2b46869fc0d4
(svn r2034) -Codechange: Replaced the rather meaningless LOAD and UNLOAD flags for depots by something more meaningful
celestar
parents:
1520
diff
changeset
|
108 |
v->current_order.flags & OF_HALT_IN_DEPOT) |
| 0 | 109 |
return; |
110 |
||
| 2639 | 111 |
if (_patches.gotodepot && VehicleHasDepotOrders(v)) return; |
| 0 | 112 |
|
|
1313
f1013ec3d318
(svn r1817) -Codechange: Moved depot-functions to depot.c
truelight
parents:
1282
diff
changeset
|
113 |
depot = FindClosestShipDepot(v); |
| 0 | 114 |
|
|
1313
f1013ec3d318
(svn r1817) -Codechange: Moved depot-functions to depot.c
truelight
parents:
1282
diff
changeset
|
115 |
if (depot == NULL || DistanceManhattan(v->tile, depot->xy) > 12) {
|
|
555
02df8a1b7f33
(svn r955) Replace uint16 for orders with struct Order
tron
parents:
541
diff
changeset
|
116 |
if (v->current_order.type == OT_GOTO_DEPOT) {
|
|
02df8a1b7f33
(svn r955) Replace uint16 for orders with struct Order
tron
parents:
541
diff
changeset
|
117 |
v->current_order.type = OT_DUMMY; |
|
02df8a1b7f33
(svn r955) Replace uint16 for orders with struct Order
tron
parents:
541
diff
changeset
|
118 |
v->current_order.flags = 0; |
|
755
80091de50044
(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
|
119 |
InvalidateWindowWidget(WC_VEHICLE_VIEW, v->index, STATUS_BAR); |
| 0 | 120 |
} |
121 |
return; |
|
122 |
} |
|
123 |
||
|
555
02df8a1b7f33
(svn r955) Replace uint16 for orders with struct Order
tron
parents:
541
diff
changeset
|
124 |
v->current_order.type = OT_GOTO_DEPOT; |
|
02df8a1b7f33
(svn r955) Replace uint16 for orders with struct Order
tron
parents:
541
diff
changeset
|
125 |
v->current_order.flags = OF_NON_STOP; |
|
1313
f1013ec3d318
(svn r1817) -Codechange: Moved depot-functions to depot.c
truelight
parents:
1282
diff
changeset
|
126 |
v->current_order.station = depot->index; |
|
f1013ec3d318
(svn r1817) -Codechange: Moved depot-functions to depot.c
truelight
parents:
1282
diff
changeset
|
127 |
v->dest_tile = depot->xy; |
|
755
80091de50044
(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
|
128 |
InvalidateWindowWidget(WC_VEHICLE_VIEW, v->index, STATUS_BAR); |
| 0 | 129 |
} |
130 |
||
131 |
void OnNewDay_Ship(Vehicle *v) |
|
132 |
{
|
|
133 |
int32 cost; |
|
134 |
||
135 |
if ((++v->day_counter & 7) == 0) |
|
136 |
DecreaseVehicleValue(v); |
|
137 |
||
138 |
CheckVehicleBreakdown(v); |
|
139 |
AgeVehicle(v); |
|
140 |
CheckIfShipNeedsService(v); |
|
141 |
||
|
3140
5555cc95043a
(svn r3758) Remove the news validation callback. It is superseded by r3757.
tron
parents:
3139
diff
changeset
|
142 |
CheckOrders(v); |
|
193
0a7025304867
(svn r194) -Codechange: stripping trailing-spaces. Please keep this that way!
truelight
parents:
164
diff
changeset
|
143 |
|
| 2639 | 144 |
if (v->vehstatus & VS_STOPPED) return; |
|
19
6080d2b6a959
(svn r20) Feature: warning when a vehicle has invalid orders (celestar)
dominik
parents:
11
diff
changeset
|
145 |
|
|
538
24fdb517fbe5
(svn r920) Replace vehicle info macros with inline functions and add asserts to check limits
tron
parents:
534
diff
changeset
|
146 |
cost = ShipVehInfo(v->engine_type)->running_cost * _price.ship_running / 364; |
| 0 | 147 |
v->profit_this_year -= cost >> 8; |
148 |
||
149 |
SET_EXPENSES_TYPE(EXPENSES_SHIP_RUN); |
|
150 |
SubtractMoneyFromPlayerFract(v->owner, cost); |
|
151 |
||
152 |
InvalidateWindow(WC_VEHICLE_DETAILS, v->index); |
|
|
1055
cc4f60cc9102
(svn r1556) -Fix: Vehicle list updates should now really work
Celestar
parents:
1053
diff
changeset
|
153 |
//we need this for the profit |
|
cc4f60cc9102
(svn r1556) -Fix: Vehicle list updates should now really work
Celestar
parents:
1053
diff
changeset
|
154 |
InvalidateWindowClasses(WC_SHIPS_LIST); |
| 0 | 155 |
} |
156 |
||
157 |
static void HandleBrokenShip(Vehicle *v) |
|
158 |
{
|
|
159 |
if (v->breakdown_ctr != 1) {
|
|
160 |
v->breakdown_ctr = 1; |
|
161 |
v->cur_speed = 0; |
|
162 |
||
163 |
if (v->breakdowns_since_last_service != 255) |
|
164 |
v->breakdowns_since_last_service++; |
|
|
193
0a7025304867
(svn r194) -Codechange: stripping trailing-spaces. Please keep this that way!
truelight
parents:
164
diff
changeset
|
165 |
|
| 0 | 166 |
InvalidateWindow(WC_VEHICLE_VIEW, v->index); |
167 |
InvalidateWindow(WC_VEHICLE_DETAILS, v->index); |
|
|
193
0a7025304867
(svn r194) -Codechange: stripping trailing-spaces. Please keep this that way!
truelight
parents:
164
diff
changeset
|
168 |
|
| 541 | 169 |
SndPlayVehicleFx((_opt.landscape != LT_CANDY) ? |
170 |
SND_10_TRAIN_BREAKDOWN : SND_3A_COMEDY_BREAKDOWN_2, v); |
|
| 0 | 171 |
|
172 |
if (!(v->vehstatus & VS_HIDDEN)) {
|
|
173 |
Vehicle *u = CreateEffectVehicleRel(v, 4, 4, 5, EV_BREAKDOWN_SMOKE); |
|
| 2639 | 174 |
if (u != NULL) u->u.special.unk0 = v->breakdown_delay * 2; |
| 0 | 175 |
} |
176 |
} |
|
177 |
||
178 |
if (!(v->tick_counter & 1)) {
|
|
179 |
if (!--v->breakdown_delay) {
|
|
180 |
v->breakdown_ctr = 0; |
|
|
1151
06c115ce7b7a
(svn r1652) Fix: train and road vehicle lists are now redrawn when vehicles enters/leaves a depot (Hackykid)
bjarni
parents:
1128
diff
changeset
|
181 |
InvalidateWindow(WC_VEHICLE_VIEW, v->index); |
| 0 | 182 |
} |
183 |
} |
|
184 |
} |
|
185 |
||
186 |
static void MarkShipDirty(Vehicle *v) |
|
187 |
{
|
|
188 |
v->cur_image = GetShipImage(v, v->direction); |
|
189 |
MarkAllViewportsDirty(v->left_coord, v->top_coord, v->right_coord + 1, v->bottom_coord + 1); |
|
190 |
} |
|
191 |
||
192 |
static void PlayShipSound(Vehicle *v) |
|
193 |
{
|
|
|
538
24fdb517fbe5
(svn r920) Replace vehicle info macros with inline functions and add asserts to check limits
tron
parents:
534
diff
changeset
|
194 |
SndPlayVehicleFx(ShipVehInfo(v->engine_type)->sfx, v); |
| 0 | 195 |
} |
196 |
||
197 |
static void ProcessShipOrder(Vehicle *v) |
|
198 |
{
|
|
|
1024
5e446b5b3ec5
(svn r1525) -Codechange: rewrote the _order_array, now it can be made dynamic.
truelight
parents:
1020
diff
changeset
|
199 |
const Order *order; |
| 0 | 200 |
|
|
3005
2590b9b4823b
(svn r3585) Similar changes to the order handlers of the other vehicle types like r3584
tron
parents:
2962
diff
changeset
|
201 |
switch (v->current_order.type) {
|
|
2590b9b4823b
(svn r3585) Similar changes to the order handlers of the other vehicle types like r3584
tron
parents:
2962
diff
changeset
|
202 |
case OT_GOTO_DEPOT: |
|
2590b9b4823b
(svn r3585) Similar changes to the order handlers of the other vehicle types like r3584
tron
parents:
2962
diff
changeset
|
203 |
if (!(v->current_order.flags & OF_PART_OF_ORDERS)) return; |
|
2590b9b4823b
(svn r3585) Similar changes to the order handlers of the other vehicle types like r3584
tron
parents:
2962
diff
changeset
|
204 |
if (v->current_order.flags & OF_SERVICE_IF_NEEDED && |
|
2590b9b4823b
(svn r3585) Similar changes to the order handlers of the other vehicle types like r3584
tron
parents:
2962
diff
changeset
|
205 |
!VehicleNeedsService(v)) {
|
|
2590b9b4823b
(svn r3585) Similar changes to the order handlers of the other vehicle types like r3584
tron
parents:
2962
diff
changeset
|
206 |
v->cur_order_index++; |
|
2590b9b4823b
(svn r3585) Similar changes to the order handlers of the other vehicle types like r3584
tron
parents:
2962
diff
changeset
|
207 |
} |
|
2590b9b4823b
(svn r3585) Similar changes to the order handlers of the other vehicle types like r3584
tron
parents:
2962
diff
changeset
|
208 |
break; |
|
2590b9b4823b
(svn r3585) Similar changes to the order handlers of the other vehicle types like r3584
tron
parents:
2962
diff
changeset
|
209 |
|
|
2590b9b4823b
(svn r3585) Similar changes to the order handlers of the other vehicle types like r3584
tron
parents:
2962
diff
changeset
|
210 |
case OT_LOADING: |
|
2590b9b4823b
(svn r3585) Similar changes to the order handlers of the other vehicle types like r3584
tron
parents:
2962
diff
changeset
|
211 |
case OT_LEAVESTATION: |
| 0 | 212 |
return; |
213 |
} |
|
214 |
||
|
3005
2590b9b4823b
(svn r3585) Similar changes to the order handlers of the other vehicle types like r3584
tron
parents:
2962
diff
changeset
|
215 |
if (v->cur_order_index >= v->num_orders) v->cur_order_index = 0; |
| 0 | 216 |
|
|
1024
5e446b5b3ec5
(svn r1525) -Codechange: rewrote the _order_array, now it can be made dynamic.
truelight
parents:
1020
diff
changeset
|
217 |
order = GetVehicleOrder(v, v->cur_order_index); |
| 0 | 218 |
|
|
1024
5e446b5b3ec5
(svn r1525) -Codechange: rewrote the _order_array, now it can be made dynamic.
truelight
parents:
1020
diff
changeset
|
219 |
if (order == NULL) {
|
|
5e446b5b3ec5
(svn r1525) -Codechange: rewrote the _order_array, now it can be made dynamic.
truelight
parents:
1020
diff
changeset
|
220 |
v->current_order.type = OT_NOTHING; |
|
555
02df8a1b7f33
(svn r955) Replace uint16 for orders with struct Order
tron
parents:
541
diff
changeset
|
221 |
v->current_order.flags = 0; |
| 0 | 222 |
v->dest_tile = 0; |
223 |
return; |
|
224 |
} |
|
225 |
||
|
1024
5e446b5b3ec5
(svn r1525) -Codechange: rewrote the _order_array, now it can be made dynamic.
truelight
parents:
1020
diff
changeset
|
226 |
if (order->type == v->current_order.type && |
|
5e446b5b3ec5
(svn r1525) -Codechange: rewrote the _order_array, now it can be made dynamic.
truelight
parents:
1020
diff
changeset
|
227 |
order->flags == v->current_order.flags && |
|
5e446b5b3ec5
(svn r1525) -Codechange: rewrote the _order_array, now it can be made dynamic.
truelight
parents:
1020
diff
changeset
|
228 |
order->station == v->current_order.station) |
| 0 | 229 |
return; |
230 |
||
|
1024
5e446b5b3ec5
(svn r1525) -Codechange: rewrote the _order_array, now it can be made dynamic.
truelight
parents:
1020
diff
changeset
|
231 |
v->current_order = *order; |
| 0 | 232 |
|
|
1024
5e446b5b3ec5
(svn r1525) -Codechange: rewrote the _order_array, now it can be made dynamic.
truelight
parents:
1020
diff
changeset
|
233 |
if (order->type == OT_GOTO_STATION) {
|
|
5e446b5b3ec5
(svn r1525) -Codechange: rewrote the _order_array, now it can be made dynamic.
truelight
parents:
1020
diff
changeset
|
234 |
const Station *st; |
|
5e446b5b3ec5
(svn r1525) -Codechange: rewrote the _order_array, now it can be made dynamic.
truelight
parents:
1020
diff
changeset
|
235 |
|
|
5e446b5b3ec5
(svn r1525) -Codechange: rewrote the _order_array, now it can be made dynamic.
truelight
parents:
1020
diff
changeset
|
236 |
if (order->station == v->last_station_visited) |
|
1266
eccd576e322f
(svn r1770) -Fix: Hopefully last pieces of code that are containing a station-id
truelight
parents:
1247
diff
changeset
|
237 |
v->last_station_visited = INVALID_STATION; |
|
193
0a7025304867
(svn r194) -Codechange: stripping trailing-spaces. Please keep this that way!
truelight
parents:
164
diff
changeset
|
238 |
|
|
1024
5e446b5b3ec5
(svn r1525) -Codechange: rewrote the _order_array, now it can be made dynamic.
truelight
parents:
1020
diff
changeset
|
239 |
st = GetStation(order->station); |
| 0 | 240 |
if (st->dock_tile != 0) {
|
|
3472
04173b5ed0d2
(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
|
241 |
v->dest_tile = TILE_ADD(st->dock_tile, ToTileIndexDiff(GetDockOffset(st->dock_tile))); |
| 0 | 242 |
} |
|
1024
5e446b5b3ec5
(svn r1525) -Codechange: rewrote the _order_array, now it can be made dynamic.
truelight
parents:
1020
diff
changeset
|
243 |
} else if (order->type == OT_GOTO_DEPOT) {
|
|
1313
f1013ec3d318
(svn r1817) -Codechange: Moved depot-functions to depot.c
truelight
parents:
1282
diff
changeset
|
244 |
v->dest_tile = GetDepot(order->station)->xy; |
| 0 | 245 |
} else {
|
246 |
v->dest_tile = 0; |
|
247 |
} |
|
|
1024
5e446b5b3ec5
(svn r1525) -Codechange: rewrote the _order_array, now it can be made dynamic.
truelight
parents:
1020
diff
changeset
|
248 |
|
|
5e446b5b3ec5
(svn r1525) -Codechange: rewrote the _order_array, now it can be made dynamic.
truelight
parents:
1020
diff
changeset
|
249 |
InvalidateVehicleOrder(v); |
|
1020
59ee8ceac74c
(svn r1521) -Fix: Ship Vehicle Lists are now redrawn correctly
celestar
parents:
926
diff
changeset
|
250 |
|
|
1055
cc4f60cc9102
(svn r1556) -Fix: Vehicle list updates should now really work
Celestar
parents:
1053
diff
changeset
|
251 |
InvalidateWindowClasses(WC_SHIPS_LIST); |
| 0 | 252 |
} |
253 |
||
254 |
static void HandleShipLoading(Vehicle *v) |
|
255 |
{
|
|
| 2639 | 256 |
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
|
257 |
|
|
555
02df8a1b7f33
(svn r955) Replace uint16 for orders with struct Order
tron
parents:
541
diff
changeset
|
258 |
if (v->current_order.type != OT_DUMMY) {
|
| 2639 | 259 |
if (v->current_order.type != OT_LOADING) return; |
260 |
if (--v->load_unload_time_rem) return; |
|
| 0 | 261 |
|
|
555
02df8a1b7f33
(svn r955) Replace uint16 for orders with struct Order
tron
parents:
541
diff
changeset
|
262 |
if (v->current_order.flags & OF_FULL_LOAD && CanFillVehicle(v)) {
|
| 0 | 263 |
SET_EXPENSES_TYPE(EXPENSES_SHIP_INC); |
264 |
if (LoadUnloadVehicle(v)) {
|
|
265 |
InvalidateWindow(WC_SHIPS_LIST, v->owner); |
|
266 |
MarkShipDirty(v); |
|
267 |
} |
|
268 |
return; |
|
269 |
} |
|
270 |
PlayShipSound(v); |
|
|
193
0a7025304867
(svn r194) -Codechange: stripping trailing-spaces. Please keep this that way!
truelight
parents:
164
diff
changeset
|
271 |
|
| 0 | 272 |
{
|
|
555
02df8a1b7f33
(svn r955) Replace uint16 for orders with struct Order
tron
parents:
541
diff
changeset
|
273 |
Order b = v->current_order; |
|
02df8a1b7f33
(svn r955) Replace uint16 for orders with struct Order
tron
parents:
541
diff
changeset
|
274 |
v->current_order.type = OT_LEAVESTATION; |
|
02df8a1b7f33
(svn r955) Replace uint16 for orders with struct Order
tron
parents:
541
diff
changeset
|
275 |
v->current_order.flags = 0; |
| 2639 | 276 |
if (!(b.flags & OF_NON_STOP)) return; |
| 0 | 277 |
} |
278 |
} |
|
279 |
||
280 |
v->cur_order_index++; |
|
|
1024
5e446b5b3ec5
(svn r1525) -Codechange: rewrote the _order_array, now it can be made dynamic.
truelight
parents:
1020
diff
changeset
|
281 |
InvalidateVehicleOrder(v); |
| 0 | 282 |
} |
283 |
||
284 |
static void UpdateShipDeltaXY(Vehicle *v, int dir) |
|
285 |
{
|
|
286 |
#define MKIT(d,c,b,a) ((a&0xFF)<<24) | ((b&0xFF)<<16) | ((c&0xFF)<<8) | ((d&0xFF)<<0) |
|
287 |
static const uint32 _delta_xy_table[8] = {
|
|
288 |
MKIT( -3, -3, 6, 6), |
|
289 |
MKIT(-16, -3, 32, 6), |
|
290 |
MKIT( -3, -3, 6, 6), |
|
291 |
MKIT( -3,-16, 6, 32), |
|
292 |
MKIT( -3, -3, 6, 6), |
|
293 |
MKIT(-16, -3, 32, 6), |
|
294 |
MKIT( -3, -3, 6, 6), |
|
295 |
MKIT( -3,-16, 6, 32), |
|
296 |
}; |
|
297 |
#undef MKIT |
|
298 |
uint32 x = _delta_xy_table[dir]; |
|
|
2150
f710b959b1c4
(svn r2660) Get rid of some more shifting/anding/casting
tron
parents:
2049
diff
changeset
|
299 |
v->x_offs = GB(x, 0, 8); |
|
f710b959b1c4
(svn r2660) Get rid of some more shifting/anding/casting
tron
parents:
2049
diff
changeset
|
300 |
v->y_offs = GB(x, 8, 8); |
|
f710b959b1c4
(svn r2660) Get rid of some more shifting/anding/casting
tron
parents:
2049
diff
changeset
|
301 |
v->sprite_width = GB(x, 16, 8); |
|
f710b959b1c4
(svn r2660) Get rid of some more shifting/anding/casting
tron
parents:
2049
diff
changeset
|
302 |
v->sprite_height = GB(x, 24, 8); |
| 0 | 303 |
} |
304 |
||
305 |
static void RecalcShipStuff(Vehicle *v) |
|
306 |
{
|
|
307 |
UpdateShipDeltaXY(v, v->direction); |
|
308 |
v->cur_image = GetShipImage(v, v->direction); |
|
309 |
MarkShipDirty(v); |
|
310 |
InvalidateWindow(WC_VEHICLE_DEPOT, v->tile); |
|
311 |
} |
|
312 |
||
|
909
65cdb609b7a6
(svn r1396) Introduce TileIndexDiffC - the compile time version of TileIndexDiff
tron
parents:
900
diff
changeset
|
313 |
static const TileIndexDiffC _ship_leave_depot_offs[] = {
|
|
65cdb609b7a6
(svn r1396) Introduce TileIndexDiffC - the compile time version of TileIndexDiff
tron
parents:
900
diff
changeset
|
314 |
{-1, 0},
|
|
65cdb609b7a6
(svn r1396) Introduce TileIndexDiffC - the compile time version of TileIndexDiff
tron
parents:
900
diff
changeset
|
315 |
{ 0, -1}
|
| 0 | 316 |
}; |
317 |
||
318 |
static void CheckShipLeaveDepot(Vehicle *v) |
|
319 |
{
|
|
|
1977
37bbebf94434
(svn r2483) Replace almost 500 "uint tile" (and variants) with "TileIndex tile"
tron
parents:
1942
diff
changeset
|
320 |
TileIndex tile; |
|
3454
8dfe8de79c02
(svn r4289) -Codechange: Make use of water_map accessors for ships. Make a mental note to clean ship_cmd
celestar
parents:
3442
diff
changeset
|
321 |
Axis axis; |
| 0 | 322 |
uint m; |
323 |
||
|
3961
9868b766fda7
(svn r5120) Add IsShipInDepot{Stopped,}() and remove some redundant checks
tron
parents:
3955
diff
changeset
|
324 |
if (!IsShipInDepot(v)) return; |
| 0 | 325 |
|
326 |
tile = v->tile; |
|
|
3454
8dfe8de79c02
(svn r4289) -Codechange: Make use of water_map accessors for ships. Make a mental note to clean ship_cmd
celestar
parents:
3442
diff
changeset
|
327 |
axis = GetShipDepotAxis(tile); |
| 0 | 328 |
|
329 |
// Check first side |
|
|
3454
8dfe8de79c02
(svn r4289) -Codechange: Make use of water_map accessors for ships. Make a mental note to clean ship_cmd
celestar
parents:
3442
diff
changeset
|
330 |
if (_ship_sometracks[axis] & GetTileShipTrackStatus(TILE_ADD(tile, ToTileIndexDiff(_ship_leave_depot_offs[axis])))) {
|
|
8dfe8de79c02
(svn r4289) -Codechange: Make use of water_map accessors for ships. Make a mental note to clean ship_cmd
celestar
parents:
3442
diff
changeset
|
331 |
m = (axis == AXIS_X) ? 0x101 : 0x207; |
| 0 | 332 |
// Check second side |
|
3454
8dfe8de79c02
(svn r4289) -Codechange: Make use of water_map accessors for ships. Make a mental note to clean ship_cmd
celestar
parents:
3442
diff
changeset
|
333 |
} else if (_ship_sometracks[axis + 2] & GetTileShipTrackStatus(TILE_ADD(tile, -2 * ToTileIndexDiff(_ship_leave_depot_offs[axis])))) {
|
|
8dfe8de79c02
(svn r4289) -Codechange: Make use of water_map accessors for ships. Make a mental note to clean ship_cmd
celestar
parents:
3442
diff
changeset
|
334 |
m = (axis == AXIS_X) ? 0x105 : 0x203; |
| 0 | 335 |
} else {
|
336 |
return; |
|
337 |
} |
|
| 2635 | 338 |
v->direction = GB(m, 0, 8); |
339 |
v->u.ship.state = GB(m, 8, 8); |
|
| 0 | 340 |
v->vehstatus &= ~VS_HIDDEN; |
341 |
||
342 |
v->cur_speed = 0; |
|
343 |
RecalcShipStuff(v); |
|
344 |
||
345 |
PlayShipSound(v); |
|
|
578
1e66514eb621
(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
|
346 |
VehicleServiceInDepot(v); |
|
1055
cc4f60cc9102
(svn r1556) -Fix: Vehicle list updates should now really work
Celestar
parents:
1053
diff
changeset
|
347 |
InvalidateWindowClasses(WC_SHIPS_LIST); |
| 0 | 348 |
} |
349 |
||
350 |
static bool ShipAccelerate(Vehicle *v) |
|
351 |
{
|
|
352 |
uint spd; |
|
353 |
byte t; |
|
354 |
||
355 |
spd = min(v->cur_speed + 1, v->max_speed); |
|
356 |
||
357 |
//updates statusbar only if speed have changed to save CPU time |
|
358 |
if (spd != v->cur_speed) {
|
|
|
193
0a7025304867
(svn r194) -Codechange: stripping trailing-spaces. Please keep this that way!
truelight
parents:
164
diff
changeset
|
359 |
v->cur_speed = spd; |
| 0 | 360 |
if (_patches.vehicle_speed) |
|
755
80091de50044
(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
|
361 |
InvalidateWindowWidget(WC_VEHICLE_VIEW, v->index, STATUS_BAR); |
| 0 | 362 |
} |
363 |
||
364 |
// Decrease somewhat when turning |
|
| 2639 | 365 |
if (!(v->direction & 1)) spd = spd * 3 / 4; |
| 0 | 366 |
|
| 2639 | 367 |
if (spd == 0) return false; |
368 |
if ((byte)++spd == 0) return true; |
|
| 0 | 369 |
|
370 |
v->progress = (t = v->progress) - (byte)spd; |
|
371 |
||
372 |
return (t < v->progress); |
|
373 |
} |
|
374 |
||
| 2817 | 375 |
static int32 EstimateShipCost(EngineID engine_type) |
|
1793
b9a37c98b468
(svn r2297) - CodeChange: server-check the next batch of commands.
Darkvater
parents:
1790
diff
changeset
|
376 |
{
|
|
b9a37c98b468
(svn r2297) - CodeChange: server-check the next batch of commands.
Darkvater
parents:
1790
diff
changeset
|
377 |
return ShipVehInfo(engine_type)->base_cost * (_price.ship_base>>3)>>5; |
|
b9a37c98b468
(svn r2297) - CodeChange: server-check the next batch of commands.
Darkvater
parents:
1790
diff
changeset
|
378 |
} |
| 0 | 379 |
|
380 |
static void ShipEnterDepot(Vehicle *v) |
|
381 |
{
|
|
382 |
v->u.ship.state = 0x80; |
|
383 |
v->vehstatus |= VS_HIDDEN; |
|
384 |
v->cur_speed = 0; |
|
385 |
RecalcShipStuff(v); |
|
|
193
0a7025304867
(svn r194) -Codechange: stripping trailing-spaces. Please keep this that way!
truelight
parents:
164
diff
changeset
|
386 |
|
|
578
1e66514eb621
(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
|
387 |
VehicleServiceInDepot(v); |
|
1e66514eb621
(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
|
388 |
|
| 0 | 389 |
InvalidateWindow(WC_VEHICLE_DETAILS, v->index); |
390 |
||
|
445
beafc0fb8f12
(svn r654) Hopefully complete support for randomized variational spritegroups (i.e. the cars transporter in DBSetXL gets different cars each time) (pasky)
tron
parents:
410
diff
changeset
|
391 |
TriggerVehicle(v, VEHICLE_TRIGGER_DEPOT); |
|
beafc0fb8f12
(svn r654) Hopefully complete support for randomized variational spritegroups (i.e. the cars transporter in DBSetXL gets different cars each time) (pasky)
tron
parents:
410
diff
changeset
|
392 |
|
|
555
02df8a1b7f33
(svn r955) Replace uint16 for orders with struct Order
tron
parents:
541
diff
changeset
|
393 |
if (v->current_order.type == OT_GOTO_DEPOT) {
|
|
02df8a1b7f33
(svn r955) Replace uint16 for orders with struct Order
tron
parents:
541
diff
changeset
|
394 |
Order t; |
|
02df8a1b7f33
(svn r955) Replace uint16 for orders with struct Order
tron
parents:
541
diff
changeset
|
395 |
|
| 0 | 396 |
InvalidateWindow(WC_VEHICLE_VIEW, v->index); |
|
193
0a7025304867
(svn r194) -Codechange: stripping trailing-spaces. Please keep this that way!
truelight
parents:
164
diff
changeset
|
397 |
|
|
555
02df8a1b7f33
(svn r955) Replace uint16 for orders with struct Order
tron
parents:
541
diff
changeset
|
398 |
t = v->current_order; |
|
02df8a1b7f33
(svn r955) Replace uint16 for orders with struct Order
tron
parents:
541
diff
changeset
|
399 |
v->current_order.type = OT_DUMMY; |
|
02df8a1b7f33
(svn r955) Replace uint16 for orders with struct Order
tron
parents:
541
diff
changeset
|
400 |
v->current_order.flags = 0; |
| 0 | 401 |
|
|
1530
2b46869fc0d4
(svn r2034) -Codechange: Replaced the rather meaningless LOAD and UNLOAD flags for depots by something more meaningful
celestar
parents:
1520
diff
changeset
|
402 |
if (HASBIT(t.flags, OFB_PART_OF_ORDERS)) {
|
|
555
02df8a1b7f33
(svn r955) Replace uint16 for orders with struct Order
tron
parents:
541
diff
changeset
|
403 |
v->cur_order_index++; |
|
1530
2b46869fc0d4
(svn r2034) -Codechange: Replaced the rather meaningless LOAD and UNLOAD flags for depots by something more meaningful
celestar
parents:
1520
diff
changeset
|
404 |
} else if (HASBIT(t.flags, OFB_HALT_IN_DEPOT)) {
|
| 0 | 405 |
v->vehstatus |= VS_STOPPED; |
406 |
if (v->owner == _local_player) {
|
|
|
534
306bc86eb23e
(svn r901) Small step in the process to clean up the DPARAM mess:
tron
parents:
507
diff
changeset
|
407 |
SetDParam(0, v->unitnumber); |
| 0 | 408 |
AddNewsItem( |
409 |
STR_981C_SHIP_IS_WAITING_IN_DEPOT, |
|
410 |
NEWS_FLAGS(NM_SMALL, NF_VIEWPORT|NF_VEHICLE, NT_ADVICE, 0), |
|
411 |
v->index, |
|
412 |
0); |
|
413 |
} |
|
414 |
} |
|
415 |
} |
|
|
1055
cc4f60cc9102
(svn r1556) -Fix: Vehicle list updates should now really work
Celestar
parents:
1053
diff
changeset
|
416 |
InvalidateWindowClasses(WC_SHIPS_LIST); |
| 0 | 417 |
} |
418 |
||
| 2630 | 419 |
static void ShipArrivesAt(const Vehicle* v, Station* st) |
| 0 | 420 |
{
|
421 |
/* Check if station was ever visited before */ |
|
422 |
if (!(st->had_vehicle_of_type & HVOT_SHIP)) {
|
|
423 |
uint32 flags; |
|
| 2639 | 424 |
|
| 0 | 425 |
st->had_vehicle_of_type |= HVOT_SHIP; |
| 2639 | 426 |
|
|
534
306bc86eb23e
(svn r901) Small step in the process to clean up the DPARAM mess:
tron
parents:
507
diff
changeset
|
427 |
SetDParam(0, st->index); |
| 0 | 428 |
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); |
429 |
AddNewsItem( |
|
430 |
STR_9833_CITIZENS_CELEBRATE_FIRST, |
|
431 |
flags, |
|
432 |
v->index, |
|
433 |
0); |
|
434 |
} |
|
435 |
} |
|
436 |
||
437 |
typedef struct {
|
|
|
1977
37bbebf94434
(svn r2483) Replace almost 500 "uint tile" (and variants) with "TileIndex tile"
tron
parents:
1942
diff
changeset
|
438 |
TileIndex skiptile; |
|
37bbebf94434
(svn r2483) Replace almost 500 "uint tile" (and variants) with "TileIndex tile"
tron
parents:
1942
diff
changeset
|
439 |
TileIndex dest_coords; |
| 0 | 440 |
uint best_bird_dist; |
441 |
uint best_length; |
|
442 |
} PathFindShip; |
|
443 |
||
|
1977
37bbebf94434
(svn r2483) Replace almost 500 "uint tile" (and variants) with "TileIndex tile"
tron
parents:
1942
diff
changeset
|
444 |
static bool ShipTrackFollower(TileIndex tile, PathFindShip *pfs, int track, uint length, byte *state) |
| 0 | 445 |
{
|
446 |
// Found dest? |
|
447 |
if (tile == pfs->dest_coords) {
|
|
448 |
pfs->best_bird_dist = 0; |
|
|
193
0a7025304867
(svn r194) -Codechange: stripping trailing-spaces. Please keep this that way!
truelight
parents:
164
diff
changeset
|
449 |
|
| 0 | 450 |
pfs->best_length = minu(pfs->best_length, length); |
451 |
return true; |
|
452 |
} |
|
453 |
||
454 |
// Skip this tile in the calculation |
|
455 |
if (tile != pfs->skiptile) {
|
|
|
1245
3822f77cbc53
(svn r1749) Move the functions which calculate distances to map.[ch] and give the more meaningful names
tron
parents:
1237
diff
changeset
|
456 |
pfs->best_bird_dist = minu(pfs->best_bird_dist, DistanceMaxPlusManhattan(pfs->dest_coords, tile)); |
| 0 | 457 |
} |
|
193
0a7025304867
(svn r194) -Codechange: stripping trailing-spaces. Please keep this that way!
truelight
parents:
164
diff
changeset
|
458 |
|
| 0 | 459 |
return false; |
460 |
} |
|
461 |
||
462 |
static const byte _ship_search_directions[6][4] = {
|
|
463 |
{ 0, 9, 2, 9 },
|
|
464 |
{ 9, 1, 9, 3 },
|
|
465 |
{ 9, 0, 3, 9 },
|
|
466 |
{ 1, 9, 9, 2 },
|
|
467 |
{ 3, 2, 9, 9 },
|
|
468 |
{ 9, 9, 1, 0 },
|
|
469 |
}; |
|
470 |
||
471 |
static const byte _pick_shiptrack_table[6] = {1, 3, 2, 2, 0, 0};
|
|
472 |
||
|
1977
37bbebf94434
(svn r2483) Replace almost 500 "uint tile" (and variants) with "TileIndex tile"
tron
parents:
1942
diff
changeset
|
473 |
static uint FindShipTrack(Vehicle *v, TileIndex tile, int dir, uint bits, TileIndex skiptile, int *track) |
| 0 | 474 |
{
|
475 |
PathFindShip pfs; |
|
476 |
int i, best_track; |
|
477 |
uint best_bird_dist = 0; |
|
478 |
uint best_length = 0; |
|
479 |
uint r; |
|
480 |
byte ship_dir = v->direction & 3; |
|
481 |
||
482 |
pfs.dest_coords = v->dest_tile; |
|
483 |
pfs.skiptile = skiptile; |
|
484 |
||
485 |
best_track = -1; |
|
486 |
||
487 |
do {
|
|
488 |
i = FIND_FIRST_BIT(bits); |
|
489 |
bits = KILL_FIRST_BIT(bits); |
|
|
193
0a7025304867
(svn r194) -Codechange: stripping trailing-spaces. Please keep this that way!
truelight
parents:
164
diff
changeset
|
490 |
|
| 0 | 491 |
pfs.best_bird_dist = (uint)-1; |
492 |
pfs.best_length = (uint)-1; |
|
493 |
||
|
159
139cf78bfb28
(svn r160) -Codechange: made GetTileTrackStatus more readable (blathijs)
truelight
parents:
156
diff
changeset
|
494 |
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
|
495 |
|
| 0 | 496 |
if (best_track >= 0) {
|
497 |
if (pfs.best_bird_dist != 0) {
|
|
498 |
/* neither reached the destination, pick the one with the smallest bird dist */ |
|
499 |
if (pfs.best_bird_dist > best_bird_dist) goto bad; |
|
500 |
if (pfs.best_bird_dist < best_bird_dist) goto good; |
|
501 |
} else {
|
|
502 |
if (pfs.best_length > best_length) goto bad; |
|
503 |
if (pfs.best_length < best_length) goto good; |
|
504 |
} |
|
|
193
0a7025304867
(svn r194) -Codechange: stripping trailing-spaces. Please keep this that way!
truelight
parents:
164
diff
changeset
|
505 |
|
|
0a7025304867
(svn r194) -Codechange: stripping trailing-spaces. Please keep this that way!
truelight
parents:
164
diff
changeset
|
506 |
/* if we reach this position, there's two paths of equal value so far. |
| 0 | 507 |
* pick one randomly. */ |
|
2150
f710b959b1c4
(svn r2660) Get rid of some more shifting/anding/casting
tron
parents:
2049
diff
changeset
|
508 |
r = GB(Random(), 0, 8); |
| 0 | 509 |
if (_pick_shiptrack_table[i] == ship_dir) r += 80; |
510 |
if (_pick_shiptrack_table[best_track] == ship_dir) r -= 80; |
|
511 |
if (r <= 127) goto bad; |
|
512 |
} |
|
513 |
good:; |
|
514 |
best_track = i; |
|
515 |
best_bird_dist = pfs.best_bird_dist; |
|
516 |
best_length = pfs.best_length; |
|
517 |
bad:; |
|
518 |
||
519 |
} while (bits != 0); |
|
520 |
||
521 |
*track = best_track; |
|
522 |
return best_bird_dist; |
|
523 |
} |
|
524 |
||
|
3900
2c84ed52709d
(svn r4987) Feature: Merged YAPF into trunk. Thanks to devs for continuous support and users for testing.
KUDr
parents:
3870
diff
changeset
|
525 |
static inline NPFFoundTargetData PerfNPFRouteToStationOrTile(TileIndex tile, Trackdir trackdir, NPFFindStationOrTileData* target, TransportType type, Owner owner, RailTypeMask railtypes) |
|
2c84ed52709d
(svn r4987) Feature: Merged YAPF into trunk. Thanks to devs for continuous support and users for testing.
KUDr
parents:
3870
diff
changeset
|
526 |
{
|
|
2c84ed52709d
(svn r4987) Feature: Merged YAPF into trunk. Thanks to devs for continuous support and users for testing.
KUDr
parents:
3870
diff
changeset
|
527 |
|
|
2c84ed52709d
(svn r4987) Feature: Merged YAPF into trunk. Thanks to devs for continuous support and users for testing.
KUDr
parents:
3870
diff
changeset
|
528 |
void* perf = NpfBeginInterval(); |
|
2c84ed52709d
(svn r4987) Feature: Merged YAPF into trunk. Thanks to devs for continuous support and users for testing.
KUDr
parents:
3870
diff
changeset
|
529 |
NPFFoundTargetData ret = NPFRouteToStationOrTile(tile, trackdir, target, type, owner, railtypes); |
|
2c84ed52709d
(svn r4987) Feature: Merged YAPF into trunk. Thanks to devs for continuous support and users for testing.
KUDr
parents:
3870
diff
changeset
|
530 |
int t = NpfEndInterval(perf); |
|
3947
e0c77288dd56
(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
|
531 |
DEBUG(yapf, 4)("[YAPF][NPFW] %d us - %d rounds - %d open - %d closed -- ", t, 0, _aystar_stats_open_size, _aystar_stats_closed_size);
|
|
3900
2c84ed52709d
(svn r4987) Feature: Merged YAPF into trunk. Thanks to devs for continuous support and users for testing.
KUDr
parents:
3870
diff
changeset
|
532 |
return ret; |
|
2c84ed52709d
(svn r4987) Feature: Merged YAPF into trunk. Thanks to devs for continuous support and users for testing.
KUDr
parents:
3870
diff
changeset
|
533 |
} |
|
2c84ed52709d
(svn r4987) Feature: Merged YAPF into trunk. Thanks to devs for continuous support and users for testing.
KUDr
parents:
3870
diff
changeset
|
534 |
|
| 1247 | 535 |
/* returns the track to choose on the next tile, or -1 when it's better to |
536 |
* reverse. The tile given is the tile we are about to enter, enterdir is the |
|
537 |
* direction in which we are entering the tile */ |
|
|
1977
37bbebf94434
(svn r2483) Replace almost 500 "uint tile" (and variants) with "TileIndex tile"
tron
parents:
1942
diff
changeset
|
538 |
static int ChooseShipTrack(Vehicle *v, TileIndex tile, int enterdir, uint tracks) |
| 0 | 539 |
{
|
| 1247 | 540 |
assert(enterdir>=0 && enterdir<=3); |
| 0 | 541 |
|
|
3900
2c84ed52709d
(svn r4987) Feature: Merged YAPF into trunk. Thanks to devs for continuous support and users for testing.
KUDr
parents:
3870
diff
changeset
|
542 |
if (_patches.yapf.ship_use_yapf) {
|
|
2c84ed52709d
(svn r4987) Feature: Merged YAPF into trunk. Thanks to devs for continuous support and users for testing.
KUDr
parents:
3870
diff
changeset
|
543 |
Trackdir trackdir = YapfChooseShipTrack(v, tile, enterdir, tracks); |
|
2c84ed52709d
(svn r4987) Feature: Merged YAPF into trunk. Thanks to devs for continuous support and users for testing.
KUDr
parents:
3870
diff
changeset
|
544 |
return (trackdir != INVALID_TRACKDIR) ? (int)TrackdirToTrack(trackdir) : -1; |
|
2c84ed52709d
(svn r4987) Feature: Merged YAPF into trunk. Thanks to devs for continuous support and users for testing.
KUDr
parents:
3870
diff
changeset
|
545 |
} else if (_patches.new_pathfinding_all) {
|
| 1247 | 546 |
NPFFindStationOrTileData fstd; |
547 |
NPFFoundTargetData ftd; |
|
|
3147
fc76d566a68e
(svn r3767) Move all direction related enums and functions to a separate header
tron
parents:
3140
diff
changeset
|
548 |
TileIndex src_tile = TILE_ADD(tile, TileOffsByDir(ReverseDiagDir(enterdir))); |
|
1752
d65cd19f7117
(svn r2256) - Fix: Trains cannot find a depot when they are in a tunnel. (glx)
matthijs
parents:
1751
diff
changeset
|
549 |
byte trackdir = GetVehicleTrackdir(v); |
|
d65cd19f7117
(svn r2256) - Fix: Trains cannot find a depot when they are in a tunnel. (glx)
matthijs
parents:
1751
diff
changeset
|
550 |
assert (trackdir != 0xFF); /* Check that we are not in a depot */ |
| 1247 | 551 |
|
552 |
NPFFillWithOrderData(&fstd, v); |
|
553 |
||
|
3900
2c84ed52709d
(svn r4987) Feature: Merged YAPF into trunk. Thanks to devs for continuous support and users for testing.
KUDr
parents:
3870
diff
changeset
|
554 |
ftd = PerfNPFRouteToStationOrTile(src_tile, trackdir, &fstd, TRANSPORT_WATER, v->owner, INVALID_RAILTYPE); |
| 1247 | 555 |
|
| 2639 | 556 |
if (ftd.best_trackdir != 0xff) {
|
|
1698
3f979f9ecf6c
(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
|
557 |
/* If ftd.best_bird_dist is 0, we found our target and ftd.best_trackdir contains |
|
3f979f9ecf6c
(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
|
558 |
the direction we need to take to get there, if ftd.best_bird_dist is not 0, |
|
3f979f9ecf6c
(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
|
559 |
we did not find our target, but ftd.best_trackdir contains the direction leading |
|
3f979f9ecf6c
(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
|
560 |
to the tile closest to our target. */ |
| 1247 | 561 |
return ftd.best_trackdir & 7; /* TODO: Wrapper function? */ |
| 2639 | 562 |
} else {
|
|
1698
3f979f9ecf6c
(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
|
563 |
return -1; /* Already at target, reverse? */ |
| 2639 | 564 |
} |
| 1247 | 565 |
} else {
|
566 |
uint b; |
|
567 |
uint tot_dist, dist; |
|
568 |
int track; |
|
|
1977
37bbebf94434
(svn r2483) Replace almost 500 "uint tile" (and variants) with "TileIndex tile"
tron
parents:
1942
diff
changeset
|
569 |
TileIndex tile2; |
| 1247 | 570 |
|
571 |
tile2 = TILE_ADD(tile, -TileOffsByDir(enterdir)); |
|
572 |
tot_dist = (uint)-1; |
|
573 |
||
574 |
/* Let's find out how far it would be if we would reverse first */ |
|
|
3147
fc76d566a68e
(svn r3767) Move all direction related enums and functions to a separate header
tron
parents:
3140
diff
changeset
|
575 |
b = GetTileShipTrackStatus(tile2) & _ship_sometracks[ReverseDiagDir(enterdir)] & v->u.ship.state; |
| 1247 | 576 |
if (b != 0) {
|
|
3147
fc76d566a68e
(svn r3767) Move all direction related enums and functions to a separate header
tron
parents:
3140
diff
changeset
|
577 |
dist = FindShipTrack(v, tile2, ReverseDiagDir(enterdir), b, tile, &track); |
| 1247 | 578 |
if (dist != (uint)-1) |
579 |
tot_dist = dist + 1; |
|
580 |
} |
|
581 |
/* And if we would not reverse? */ |
|
582 |
dist = FindShipTrack(v, tile, enterdir, tracks, 0, &track); |
|
583 |
if (dist > tot_dist) |
|
584 |
/* We could better reverse */ |
|
585 |
return -1; |
|
586 |
return track; |
|
| 0 | 587 |
} |
588 |
} |
|
589 |
||
|
3157
3f35e2d9c8e3
(svn r3783) Replace further ints and magic numbers by Direction, DiagDirection and friends
tron
parents:
3147
diff
changeset
|
590 |
static const Direction _new_vehicle_direction_table[] = {
|
|
3f35e2d9c8e3
(svn r3783) Replace further ints and magic numbers by Direction, DiagDirection and friends
tron
parents:
3147
diff
changeset
|
591 |
DIR_N , DIR_NW, DIR_W , 0, |
|
3f35e2d9c8e3
(svn r3783) Replace further ints and magic numbers by Direction, DiagDirection and friends
tron
parents:
3147
diff
changeset
|
592 |
DIR_NE, DIR_N , DIR_SW, 0, |
|
3f35e2d9c8e3
(svn r3783) Replace further ints and magic numbers by Direction, DiagDirection and friends
tron
parents:
3147
diff
changeset
|
593 |
DIR_E , DIR_SE, DIR_S |
| 0 | 594 |
}; |
595 |
||
|
1977
37bbebf94434
(svn r2483) Replace almost 500 "uint tile" (and variants) with "TileIndex tile"
tron
parents:
1942
diff
changeset
|
596 |
static int ShipGetNewDirectionFromTiles(TileIndex new_tile, TileIndex old_tile) |
| 0 | 597 |
{
|
|
926
a6d140a6a4de
(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
|
598 |
uint offs = (TileY(new_tile) - TileY(old_tile) + 1) * 4 + |
|
a6d140a6a4de
(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
|
599 |
TileX(new_tile) - TileX(old_tile) + 1; |
| 0 | 600 |
assert(offs < 11 && offs != 3 && offs != 7); |
601 |
return _new_vehicle_direction_table[offs]; |
|
602 |
} |
|
603 |
||
604 |
static int ShipGetNewDirection(Vehicle *v, int x, int y) |
|
605 |
{
|
|
606 |
uint offs = (y - v->y_pos + 1) * 4 + (x - v->x_pos + 1); |
|
607 |
assert(offs < 11 && offs != 3 && offs != 7); |
|
608 |
return _new_vehicle_direction_table[offs]; |
|
609 |
} |
|
610 |
||
|
1977
37bbebf94434
(svn r2483) Replace almost 500 "uint tile" (and variants) with "TileIndex tile"
tron
parents:
1942
diff
changeset
|
611 |
static int GetAvailShipTracks(TileIndex tile, int dir) |
| 0 | 612 |
{
|
|
159
139cf78bfb28
(svn r160) -Codechange: made GetTileTrackStatus more readable (blathijs)
truelight
parents:
156
diff
changeset
|
613 |
uint32 r = GetTileTrackStatus(tile, TRANSPORT_WATER); |
| 0 | 614 |
return (byte) ((r | r >> 8)) & _ship_sometracks[dir]; |
615 |
} |
|
616 |
||
617 |
static const byte _ship_subcoord[4][6][3] = {
|
|
618 |
{
|
|
619 |
{15, 8, 1},
|
|
620 |
{ 0, 0, 0},
|
|
621 |
{ 0, 0, 0},
|
|
622 |
{15, 8, 2},
|
|
623 |
{15, 7, 0},
|
|
624 |
{ 0, 0, 0},
|
|
625 |
}, |
|
626 |
{
|
|
627 |
{ 0, 0, 0},
|
|
628 |
{ 8, 0, 3},
|
|
629 |
{ 7, 0, 2},
|
|
630 |
{ 0, 0, 0},
|
|
631 |
{ 8, 0, 4},
|
|
632 |
{ 0, 0, 0},
|
|
633 |
}, |
|
634 |
{
|
|
635 |
{ 0, 8, 5},
|
|
636 |
{ 0, 0, 0},
|
|
637 |
{ 0, 7, 6},
|
|
638 |
{ 0, 0, 0},
|
|
639 |
{ 0, 0, 0},
|
|
640 |
{ 0, 8, 4},
|
|
641 |
}, |
|
642 |
{
|
|
643 |
{ 0, 0, 0},
|
|
644 |
{ 8,15, 7},
|
|
645 |
{ 0, 0, 0},
|
|
646 |
{ 8,15, 6},
|
|
647 |
{ 0, 0, 0},
|
|
648 |
{ 7,15, 0},
|
|
649 |
} |
|
650 |
}; |
|
651 |
||
652 |
static void ShipController(Vehicle *v) |
|
653 |
{
|
|
654 |
GetNewVehiclePosResult gp; |
|
655 |
uint32 r; |
|
656 |
const byte *b; |
|
|
3157
3f35e2d9c8e3
(svn r3783) Replace further ints and magic numbers by Direction, DiagDirection and friends
tron
parents:
3147
diff
changeset
|
657 |
Direction dir; |
|
3f35e2d9c8e3
(svn r3783) Replace further ints and magic numbers by Direction, DiagDirection and friends
tron
parents:
3147
diff
changeset
|
658 |
int track; |
|
3f35e2d9c8e3
(svn r3783) Replace further ints and magic numbers by Direction, DiagDirection and friends
tron
parents:
3147
diff
changeset
|
659 |
int tracks; |
| 0 | 660 |
|
661 |
v->tick_counter++; |
|
662 |
||
663 |
if (v->breakdown_ctr != 0) {
|
|
664 |
if (v->breakdown_ctr <= 2) {
|
|
665 |
HandleBrokenShip(v); |
|
666 |
return; |
|
667 |
} |
|
668 |
v->breakdown_ctr--; |
|
669 |
} |
|
670 |
||
| 2639 | 671 |
if (v->vehstatus & VS_STOPPED) return; |
| 0 | 672 |
|
673 |
ProcessShipOrder(v); |
|
674 |
HandleShipLoading(v); |
|
675 |
||
| 2639 | 676 |
if (v->current_order.type == OT_LOADING) return; |
| 0 | 677 |
|
678 |
CheckShipLeaveDepot(v); |
|
679 |
||
| 2639 | 680 |
if (!ShipAccelerate(v)) return; |
| 0 | 681 |
|
682 |
BeginVehicleMove(v); |
|
683 |
||
684 |
if (GetNewVehiclePos(v, &gp)) {
|
|
685 |
// staying in tile |
|
|
3961
9868b766fda7
(svn r5120) Add IsShipInDepot{Stopped,}() and remove some redundant checks
tron
parents:
3955
diff
changeset
|
686 |
if (IsShipInDepot(v)) {
|
| 0 | 687 |
gp.x = v->x_pos; |
688 |
gp.y = v->y_pos; |
|
689 |
} else {
|
|
690 |
/* isnot inside depot */ |
|
691 |
r = VehicleEnterTile(v, gp.new_tile, gp.x, gp.y); |
|
692 |
if (r & 0x8) goto reverse_direction; |
|
693 |
||
|
1751
009a240d035a
(svn r2255) - Fix: [ 9680363 ] [NPF] Broken buoy handling for ships
matthijs
parents:
1698
diff
changeset
|
694 |
/* A leave station order only needs one tick to get processed, so we can |
|
009a240d035a
(svn r2255) - Fix: [ 9680363 ] [NPF] Broken buoy handling for ships
matthijs
parents:
1698
diff
changeset
|
695 |
* always skip ahead. */ |
|
555
02df8a1b7f33
(svn r955) Replace uint16 for orders with struct Order
tron
parents:
541
diff
changeset
|
696 |
if (v->current_order.type == OT_LEAVESTATION) {
|
|
02df8a1b7f33
(svn r955) Replace uint16 for orders with struct Order
tron
parents:
541
diff
changeset
|
697 |
v->current_order.type = OT_NOTHING; |
|
02df8a1b7f33
(svn r955) Replace uint16 for orders with struct Order
tron
parents:
541
diff
changeset
|
698 |
v->current_order.flags = 0; |
|
755
80091de50044
(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
|
699 |
InvalidateWindowWidget(WC_VEHICLE_VIEW, v->index, STATUS_BAR); |
|
1751
009a240d035a
(svn r2255) - Fix: [ 9680363 ] [NPF] Broken buoy handling for ships
matthijs
parents:
1698
diff
changeset
|
700 |
} else if (v->dest_tile != 0) {
|
|
009a240d035a
(svn r2255) - Fix: [ 9680363 ] [NPF] Broken buoy handling for ships
matthijs
parents:
1698
diff
changeset
|
701 |
/* We have a target, let's see if we reached it... */ |
|
009a240d035a
(svn r2255) - Fix: [ 9680363 ] [NPF] Broken buoy handling for ships
matthijs
parents:
1698
diff
changeset
|
702 |
if (v->current_order.type == OT_GOTO_STATION && |
|
009a240d035a
(svn r2255) - Fix: [ 9680363 ] [NPF] Broken buoy handling for ships
matthijs
parents:
1698
diff
changeset
|
703 |
IsBuoyTile(v->dest_tile) && |
|
009a240d035a
(svn r2255) - Fix: [ 9680363 ] [NPF] Broken buoy handling for ships
matthijs
parents:
1698
diff
changeset
|
704 |
DistanceManhattan(v->dest_tile, gp.new_tile) <= 3) {
|
|
009a240d035a
(svn r2255) - Fix: [ 9680363 ] [NPF] Broken buoy handling for ships
matthijs
parents:
1698
diff
changeset
|
705 |
/* We got within 3 tiles of our target buoy, so let's skip to our |
|
009a240d035a
(svn r2255) - Fix: [ 9680363 ] [NPF] Broken buoy handling for ships
matthijs
parents:
1698
diff
changeset
|
706 |
* next order */ |
|
009a240d035a
(svn r2255) - Fix: [ 9680363 ] [NPF] Broken buoy handling for ships
matthijs
parents:
1698
diff
changeset
|
707 |
v->cur_order_index++; |
|
009a240d035a
(svn r2255) - Fix: [ 9680363 ] [NPF] Broken buoy handling for ships
matthijs
parents:
1698
diff
changeset
|
708 |
v->current_order.type = OT_DUMMY; |
|
009a240d035a
(svn r2255) - Fix: [ 9680363 ] [NPF] Broken buoy handling for ships
matthijs
parents:
1698
diff
changeset
|
709 |
InvalidateVehicleOrder(v); |
|
009a240d035a
(svn r2255) - Fix: [ 9680363 ] [NPF] Broken buoy handling for ships
matthijs
parents:
1698
diff
changeset
|
710 |
} else {
|
|
009a240d035a
(svn r2255) - Fix: [ 9680363 ] [NPF] Broken buoy handling for ships
matthijs
parents:
1698
diff
changeset
|
711 |
/* Non-buoy orders really need to reach the tile */ |
|
009a240d035a
(svn r2255) - Fix: [ 9680363 ] [NPF] Broken buoy handling for ships
matthijs
parents:
1698
diff
changeset
|
712 |
if (v->dest_tile == gp.new_tile) {
|
|
009a240d035a
(svn r2255) - Fix: [ 9680363 ] [NPF] Broken buoy handling for ships
matthijs
parents:
1698
diff
changeset
|
713 |
if (v->current_order.type == OT_GOTO_DEPOT) {
|
|
009a240d035a
(svn r2255) - Fix: [ 9680363 ] [NPF] Broken buoy handling for ships
matthijs
parents:
1698
diff
changeset
|
714 |
if ((gp.x&0xF)==8 && (gp.y&0xF)==8) {
|
|
009a240d035a
(svn r2255) - Fix: [ 9680363 ] [NPF] Broken buoy handling for ships
matthijs
parents:
1698
diff
changeset
|
715 |
ShipEnterDepot(v); |
|
009a240d035a
(svn r2255) - Fix: [ 9680363 ] [NPF] Broken buoy handling for ships
matthijs
parents:
1698
diff
changeset
|
716 |
return; |
|
009a240d035a
(svn r2255) - Fix: [ 9680363 ] [NPF] Broken buoy handling for ships
matthijs
parents:
1698
diff
changeset
|
717 |
} |
|
009a240d035a
(svn r2255) - Fix: [ 9680363 ] [NPF] Broken buoy handling for ships
matthijs
parents:
1698
diff
changeset
|
718 |
} else if (v->current_order.type == OT_GOTO_STATION) {
|
|
009a240d035a
(svn r2255) - Fix: [ 9680363 ] [NPF] Broken buoy handling for ships
matthijs
parents:
1698
diff
changeset
|
719 |
Station *st; |
|
009a240d035a
(svn r2255) - Fix: [ 9680363 ] [NPF] Broken buoy handling for ships
matthijs
parents:
1698
diff
changeset
|
720 |
|
|
009a240d035a
(svn r2255) - Fix: [ 9680363 ] [NPF] Broken buoy handling for ships
matthijs
parents:
1698
diff
changeset
|
721 |
v->last_station_visited = v->current_order.station; |
|
009a240d035a
(svn r2255) - Fix: [ 9680363 ] [NPF] Broken buoy handling for ships
matthijs
parents:
1698
diff
changeset
|
722 |
|
|
009a240d035a
(svn r2255) - Fix: [ 9680363 ] [NPF] Broken buoy handling for ships
matthijs
parents:
1698
diff
changeset
|
723 |
/* Process station in the orderlist. */ |
|
009a240d035a
(svn r2255) - Fix: [ 9680363 ] [NPF] Broken buoy handling for ships
matthijs
parents:
1698
diff
changeset
|
724 |
st = GetStation(v->current_order.station); |
|
009a240d035a
(svn r2255) - Fix: [ 9680363 ] [NPF] Broken buoy handling for ships
matthijs
parents:
1698
diff
changeset
|
725 |
if (st->facilities & FACIL_DOCK) { /* ugly, ugly workaround for problem with ships able to drop off cargo at wrong stations */
|
|
009a240d035a
(svn r2255) - Fix: [ 9680363 ] [NPF] Broken buoy handling for ships
matthijs
parents:
1698
diff
changeset
|
726 |
v->current_order.type = OT_LOADING; |
|
3610
1dbc985e1f23
(svn r4505) -Fix (FS#94) Ships can now be used to set up feeders as well.
celestar
parents:
3491
diff
changeset
|
727 |
v->current_order.flags &= OF_FULL_LOAD | OF_UNLOAD | OF_TRANSFER; |
|
1751
009a240d035a
(svn r2255) - Fix: [ 9680363 ] [NPF] Broken buoy handling for ships
matthijs
parents:
1698
diff
changeset
|
728 |
v->current_order.flags |= OF_NON_STOP; |
|
009a240d035a
(svn r2255) - Fix: [ 9680363 ] [NPF] Broken buoy handling for ships
matthijs
parents:
1698
diff
changeset
|
729 |
ShipArrivesAt(v, st); |
|
009a240d035a
(svn r2255) - Fix: [ 9680363 ] [NPF] Broken buoy handling for ships
matthijs
parents:
1698
diff
changeset
|
730 |
|
|
009a240d035a
(svn r2255) - Fix: [ 9680363 ] [NPF] Broken buoy handling for ships
matthijs
parents:
1698
diff
changeset
|
731 |
SET_EXPENSES_TYPE(EXPENSES_SHIP_INC); |
|
009a240d035a
(svn r2255) - Fix: [ 9680363 ] [NPF] Broken buoy handling for ships
matthijs
parents:
1698
diff
changeset
|
732 |
if (LoadUnloadVehicle(v)) {
|
|
009a240d035a
(svn r2255) - Fix: [ 9680363 ] [NPF] Broken buoy handling for ships
matthijs
parents:
1698
diff
changeset
|
733 |
InvalidateWindow(WC_SHIPS_LIST, v->owner); |
|
009a240d035a
(svn r2255) - Fix: [ 9680363 ] [NPF] Broken buoy handling for ships
matthijs
parents:
1698
diff
changeset
|
734 |
MarkShipDirty(v); |
|
009a240d035a
(svn r2255) - Fix: [ 9680363 ] [NPF] Broken buoy handling for ships
matthijs
parents:
1698
diff
changeset
|
735 |
} |
|
009a240d035a
(svn r2255) - Fix: [ 9680363 ] [NPF] Broken buoy handling for ships
matthijs
parents:
1698
diff
changeset
|
736 |
InvalidateWindowWidget(WC_VEHICLE_VIEW, v->index, STATUS_BAR); |
|
009a240d035a
(svn r2255) - Fix: [ 9680363 ] [NPF] Broken buoy handling for ships
matthijs
parents:
1698
diff
changeset
|
737 |
} else { /* leave stations without docks right aways */
|
|
009a240d035a
(svn r2255) - Fix: [ 9680363 ] [NPF] Broken buoy handling for ships
matthijs
parents:
1698
diff
changeset
|
738 |
v->current_order.type = OT_LEAVESTATION; |
|
009a240d035a
(svn r2255) - Fix: [ 9680363 ] [NPF] Broken buoy handling for ships
matthijs
parents:
1698
diff
changeset
|
739 |
v->current_order.flags = 0; |
|
009a240d035a
(svn r2255) - Fix: [ 9680363 ] [NPF] Broken buoy handling for ships
matthijs
parents:
1698
diff
changeset
|
740 |
v->cur_order_index++; |
|
009a240d035a
(svn r2255) - Fix: [ 9680363 ] [NPF] Broken buoy handling for ships
matthijs
parents:
1698
diff
changeset
|
741 |
InvalidateVehicleOrder(v); |
|
009a240d035a
(svn r2255) - Fix: [ 9680363 ] [NPF] Broken buoy handling for ships
matthijs
parents:
1698
diff
changeset
|
742 |
} |
|
009a240d035a
(svn r2255) - Fix: [ 9680363 ] [NPF] Broken buoy handling for ships
matthijs
parents:
1698
diff
changeset
|
743 |
} |
|
009a240d035a
(svn r2255) - Fix: [ 9680363 ] [NPF] Broken buoy handling for ships
matthijs
parents:
1698
diff
changeset
|
744 |
} |
|
009a240d035a
(svn r2255) - Fix: [ 9680363 ] [NPF] Broken buoy handling for ships
matthijs
parents:
1698
diff
changeset
|
745 |
} |
| 0 | 746 |
} |
747 |
} |
|
748 |
} else {
|
|
|
3157
3f35e2d9c8e3
(svn r3783) Replace further ints and magic numbers by Direction, DiagDirection and friends
tron
parents:
3147
diff
changeset
|
749 |
DiagDirection diagdir; |
| 0 | 750 |
// new tile |
|
1401
44a7e0f04d28
(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
|
751 |
if (TileX(gp.new_tile) >= MapMaxX() || TileY(gp.new_tile) >= MapMaxY()) |
|
926
a6d140a6a4de
(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
|
752 |
goto reverse_direction; |
| 0 | 753 |
|
754 |
dir = ShipGetNewDirectionFromTiles(gp.new_tile, gp.old_tile); |
|
|
3157
3f35e2d9c8e3
(svn r3783) Replace further ints and magic numbers by Direction, DiagDirection and friends
tron
parents:
3147
diff
changeset
|
755 |
assert(dir == DIR_NE || dir == DIR_SE || dir == DIR_SW || dir == DIR_NW); |
|
3f35e2d9c8e3
(svn r3783) Replace further ints and magic numbers by Direction, DiagDirection and friends
tron
parents:
3147
diff
changeset
|
756 |
diagdir = DirToDiagDir(dir); |
|
3f35e2d9c8e3
(svn r3783) Replace further ints and magic numbers by Direction, DiagDirection and friends
tron
parents:
3147
diff
changeset
|
757 |
tracks = GetAvailShipTracks(gp.new_tile, diagdir); |
| 0 | 758 |
if (tracks == 0) |
759 |
goto reverse_direction; |
|
760 |
||
761 |
// Choose a direction, and continue if we find one |
|
|
3157
3f35e2d9c8e3
(svn r3783) Replace further ints and magic numbers by Direction, DiagDirection and friends
tron
parents:
3147
diff
changeset
|
762 |
track = ChooseShipTrack(v, gp.new_tile, diagdir, tracks); |
| 0 | 763 |
if (track < 0) |
764 |
goto reverse_direction; |
|
765 |
||
|
3157
3f35e2d9c8e3
(svn r3783) Replace further ints and magic numbers by Direction, DiagDirection and friends
tron
parents:
3147
diff
changeset
|
766 |
b = _ship_subcoord[diagdir][track]; |
|
193
0a7025304867
(svn r194) -Codechange: stripping trailing-spaces. Please keep this that way!
truelight
parents:
164
diff
changeset
|
767 |
|
| 0 | 768 |
gp.x = (gp.x&~0xF) | b[0]; |
769 |
gp.y = (gp.y&~0xF) | b[1]; |
|
770 |
||
771 |
/* Call the landscape function and tell it that the vehicle entered the tile */ |
|
772 |
r = VehicleEnterTile(v, gp.new_tile, gp.x, gp.y); |
|
773 |
if (r&0x8) goto reverse_direction; |
|
774 |
||
775 |
if (!(r&0x4)) {
|
|
776 |
v->tile = gp.new_tile; |
|
777 |
v->u.ship.state = 1 << track; |
|
778 |
} |
|
779 |
||
780 |
v->direction = b[2]; |
|
781 |
} |
|
782 |
||
783 |
/* update image of ship, as well as delta XY */ |
|
784 |
dir = ShipGetNewDirection(v, gp.x, gp.y); |
|
785 |
v->x_pos = gp.x; |
|
786 |
v->y_pos = gp.y; |
|
787 |
v->z_pos = GetSlopeZ(gp.x, gp.y); |
|
788 |
||
789 |
getout: |
|
790 |
UpdateShipDeltaXY(v, dir); |
|
791 |
v->cur_image = GetShipImage(v, dir); |
|
792 |
VehiclePositionChanged(v); |
|
793 |
EndVehicleMove(v); |
|
794 |
return; |
|
795 |
||
796 |
reverse_direction: |
|
|
3157
3f35e2d9c8e3
(svn r3783) Replace further ints and magic numbers by Direction, DiagDirection and friends
tron
parents:
3147
diff
changeset
|
797 |
dir = ReverseDir(v->direction); |
| 0 | 798 |
v->direction = dir; |
799 |
goto getout; |
|
800 |
} |
|
801 |
||
802 |
static void AgeShipCargo(Vehicle *v) |
|
803 |
{
|
|
| 2639 | 804 |
if (_age_cargo_skip_counter != 0) return; |
805 |
if (v->cargo_days != 255) v->cargo_days++; |
|
| 0 | 806 |
} |
807 |
||
808 |
void Ship_Tick(Vehicle *v) |
|
809 |
{
|
|
810 |
AgeShipCargo(v); |
|
811 |
ShipController(v); |
|
812 |
} |
|
813 |
||
814 |
||
|
1093
4fdc46eaf423
(svn r1594) Convert all undefined parameter lists to (void) and add the appropriate warning flags in the Makefile
tron
parents:
1055
diff
changeset
|
815 |
void ShipsYearlyLoop(void) |
| 0 | 816 |
{
|
817 |
Vehicle *v; |
|
818 |
||
819 |
FOR_ALL_VEHICLES(v) {
|
|
820 |
if (v->type == VEH_Ship) {
|
|
821 |
v->profit_last_year = v->profit_this_year; |
|
822 |
v->profit_this_year = 0; |
|
823 |
InvalidateWindow(WC_VEHICLE_DETAILS, v->index); |
|
824 |
} |
|
825 |
} |
|
826 |
} |
|
827 |
||
|
1793
b9a37c98b468
(svn r2297) - CodeChange: server-check the next batch of commands.
Darkvater
parents:
1790
diff
changeset
|
828 |
/** Build a ship. |
|
3491
35d747bb5e82
(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
|
829 |
* @param tile tile of depot where ship is built |
|
1793
b9a37c98b468
(svn r2297) - CodeChange: server-check the next batch of commands.
Darkvater
parents:
1790
diff
changeset
|
830 |
* @param p1 ship type being built (engine) |
|
3816
28ee8b8c2522
(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
|
831 |
* @param p2 bit 0 when set, the unitnumber will be 0, otherwise it will be a free number |
|
1793
b9a37c98b468
(svn r2297) - CodeChange: server-check the next batch of commands.
Darkvater
parents:
1790
diff
changeset
|
832 |
*/ |
|
3491
35d747bb5e82
(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
|
833 |
int32 CmdBuildShip(TileIndex tile, uint32 flags, uint32 p1, uint32 p2) |
| 0 | 834 |
{
|
835 |
int32 value; |
|
836 |
Vehicle *v; |
|
|
1282
ea2ae881814c
(svn r1786) -Fix: unitnumber is increased to 16bit, so now you can have up to 5000
truelight
parents:
1266
diff
changeset
|
837 |
UnitID unit_num; |
| 0 | 838 |
Engine *e; |
|
193
0a7025304867
(svn r194) -Codechange: stripping trailing-spaces. Please keep this that way!
truelight
parents:
164
diff
changeset
|
839 |
|
|
2854
b3527fde3ff7
(svn r3402) -Fix: [building/cloning] added a string telling if build failed due to not being able to build a vehicle. Triggered when cloning a retired design
bjarni
parents:
2819
diff
changeset
|
840 |
if (!IsEngineBuildable(p1, VEH_Ship)) return_cmd_error(STR_ENGINE_NOT_BUILDABLE); |
|
1196
67f7f3017d99
(svn r1700) - Fix: Hacked clients can no longer be used to build vehicles that are not available yet (Hackykid)
bjarni
parents:
1151
diff
changeset
|
841 |
|
| 0 | 842 |
SET_EXPENSES_TYPE(EXPENSES_NEW_VEHICLES); |
843 |
||
844 |
value = EstimateShipCost(p1); |
|
|
1793
b9a37c98b468
(svn r2297) - CodeChange: server-check the next batch of commands.
Darkvater
parents:
1790
diff
changeset
|
845 |
if (flags & DC_QUERY_COST) return value; |
| 0 | 846 |
|
|
1443
2b8e1b123d91
(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
|
847 |
/* The ai_new queries the vehicle cost before building the route, |
|
2b8e1b123d91
(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
|
848 |
* so we must check against cheaters no sooner than now. --pasky */ |
|
2b8e1b123d91
(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
|
849 |
if (!IsTileDepotType(tile, TRANSPORT_WATER)) return CMD_ERROR; |
|
1901
03bf9bf99319
(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
|
850 |
if (!IsTileOwner(tile, _current_player)) return CMD_ERROR; |
|
1443
2b8e1b123d91
(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
|
851 |
|
| 0 | 852 |
v = AllocateVehicle(); |
|
4095
ad7a6bc2bf80
(svn r5427) - Codechange: testing for "== true" is redundant.
peter1138
parents:
3989
diff
changeset
|
853 |
unit_num = HASBIT(p2, 0) ? 0 : GetFreeUnitNumber(VEH_Ship); |
|
3816
28ee8b8c2522
(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
|
854 |
|
|
28ee8b8c2522
(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
|
855 |
if (v == NULL || IsOrderPoolFull() || unit_num > _patches.max_ships) |
| 0 | 856 |
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
|
857 |
|
| 0 | 858 |
if (flags & DC_EXEC) {
|
|
3491
35d747bb5e82
(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
|
859 |
int x; |
|
35d747bb5e82
(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
|
860 |
int y; |
|
35d747bb5e82
(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
|
861 |
|
|
538
24fdb517fbe5
(svn r920) Replace vehicle info macros with inline functions and add asserts to check limits
tron
parents:
534
diff
changeset
|
862 |
const ShipVehicleInfo *svi = ShipVehInfo(p1); |
|
24fdb517fbe5
(svn r920) Replace vehicle info macros with inline functions and add asserts to check limits
tron
parents:
534
diff
changeset
|
863 |
|
| 0 | 864 |
v->unitnumber = unit_num; |
865 |
||
866 |
v->owner = _current_player; |
|
867 |
v->tile = tile; |
|
|
3645
7f950533d510
(svn r4554) Replace magic numbers by TILE_{HEIGHT,SIZE}
tron
parents:
3610
diff
changeset
|
868 |
x = TileX(tile) * TILE_SIZE + TILE_SIZE / 2; |
|
7f950533d510
(svn r4554) Replace magic numbers by TILE_{HEIGHT,SIZE}
tron
parents:
3610
diff
changeset
|
869 |
y = TileY(tile) * TILE_SIZE + TILE_SIZE / 2; |
| 0 | 870 |
v->x_pos = x; |
871 |
v->y_pos = y; |
|
872 |
v->z_pos = GetSlopeZ(x,y); |
|
873 |
||
874 |
v->z_height = 6; |
|
875 |
v->sprite_width = 6; |
|
876 |
v->sprite_height = 6; |
|
877 |
v->x_offs = -3; |
|
878 |
v->y_offs = -3; |
|
879 |
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
|
880 |
|
|
538
24fdb517fbe5
(svn r920) Replace vehicle info macros with inline functions and add asserts to check limits
tron
parents:
534
diff
changeset
|
881 |
v->spritenum = svi->image_index; |
|
24fdb517fbe5
(svn r920) Replace vehicle info macros with inline functions and add asserts to check limits
tron
parents:
534
diff
changeset
|
882 |
v->cargo_type = svi->cargo_type; |
|
3870
d9ebc4ea750a
(svn r4910) - NewGRF: add and initialize cargo subtype for vehicle visual variations
peter1138
parents:
3816
diff
changeset
|
883 |
v->cargo_subtype = 0; |
|
538
24fdb517fbe5
(svn r920) Replace vehicle info macros with inline functions and add asserts to check limits
tron
parents:
534
diff
changeset
|
884 |
v->cargo_cap = svi->capacity; |
| 0 | 885 |
v->value = value; |
|
193
0a7025304867
(svn r194) -Codechange: stripping trailing-spaces. Please keep this that way!
truelight
parents:
164
diff
changeset
|
886 |
|
|
1266
eccd576e322f
(svn r1770) -Fix: Hopefully last pieces of code that are containing a station-id
truelight
parents:
1247
diff
changeset
|
887 |
v->last_station_visited = INVALID_STATION; |
|
538
24fdb517fbe5
(svn r920) Replace vehicle info macros with inline functions and add asserts to check limits
tron
parents:
534
diff
changeset
|
888 |
v->max_speed = svi->max_speed; |
|
2477
225b2916fe2a
(svn r3003) Change int, uint, uin16 and byte to EngineID where appropriate, plus some related changes (mostly casts)
tron
parents:
2464
diff
changeset
|
889 |
v->engine_type = p1; |
| 0 | 890 |
|
|
1926
530480d14685
(svn r2432) Use GetEngine() instead of DEREF_ENGINE() or even _engines[]
tron
parents:
1901
diff
changeset
|
891 |
e = GetEngine(p1); |
| 0 | 892 |
v->reliability = e->reliability; |
893 |
v->reliability_spd_dec = e->reliability_spd_dec; |
|
894 |
v->max_age = e->lifelength * 366; |
|
| 2564 | 895 |
_new_vehicle_id = v->index; |
| 0 | 896 |
|
897 |
v->string_id = STR_SV_SHIP_NAME; |
|
898 |
v->u.ship.state = 0x80; |
|
899 |
||
900 |
v->service_interval = _patches.servint_ships; |
|
901 |
v->date_of_last_service = _date; |
|
902 |
v->build_year = _cur_year; |
|
903 |
v->cur_image = 0x0E5E; |
|
904 |
v->type = VEH_Ship; |
|
|
2804
ea4080819175
(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
|
905 |
v->random_bits = VehicleRandomBits(); |
| 0 | 906 |
|
907 |
VehiclePositionChanged(v); |
|
908 |
||
909 |
InvalidateWindow(WC_VEHICLE_DEPOT, v->tile); |
|
| 588 | 910 |
RebuildVehicleLists(); |
| 0 | 911 |
InvalidateWindow(WC_COMPANY, v->owner); |
|
2618
9691753519ac
(svn r3156) -Fix: removed some cases where autoreplace windows were redrawn when nothing was changed
bjarni
parents:
2574
diff
changeset
|
912 |
if (IsLocalPlayer()) |
|
9691753519ac
(svn r3156) -Fix: removed some cases where autoreplace windows were redrawn when nothing was changed
bjarni
parents:
2574
diff
changeset
|
913 |
InvalidateWindow(WC_REPLACE_VEHICLE, VEH_Ship); // updates the replace Ship window |
| 0 | 914 |
} |
|
193
0a7025304867
(svn r194) -Codechange: stripping trailing-spaces. Please keep this that way!
truelight
parents:
164
diff
changeset
|
915 |
|
| 0 | 916 |
return value; |
917 |
} |
|
918 |
||
|
1793
b9a37c98b468
(svn r2297) - CodeChange: server-check the next batch of commands.
Darkvater
parents:
1790
diff
changeset
|
919 |
/** Sell a ship. |
|
3491
35d747bb5e82
(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
|
920 |
* @param tile unused |
|
1793
b9a37c98b468
(svn r2297) - CodeChange: server-check the next batch of commands.
Darkvater
parents:
1790
diff
changeset
|
921 |
* @param p1 vehicle ID to be sold |
|
b9a37c98b468
(svn r2297) - CodeChange: server-check the next batch of commands.
Darkvater
parents:
1790
diff
changeset
|
922 |
* @param p2 unused |
|
b9a37c98b468
(svn r2297) - CodeChange: server-check the next batch of commands.
Darkvater
parents:
1790
diff
changeset
|
923 |
*/ |
|
3491
35d747bb5e82
(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
|
924 |
int32 CmdSellShip(TileIndex tile, uint32 flags, uint32 p1, uint32 p2) |
| 0 | 925 |
{
|
926 |
Vehicle *v; |
|
927 |
||
|
1237
1c7a3f9c94b9
(svn r1741) - Fix: added IsVehicleIndex() so it's possible to protect GetVehicle() from reading an invalid vehicle index
bjarni
parents:
1235
diff
changeset
|
928 |
if (!IsVehicleIndex(p1)) return CMD_ERROR; |
|
193
0a7025304867
(svn r194) -Codechange: stripping trailing-spaces. Please keep this that way!
truelight
parents:
164
diff
changeset
|
929 |
|
|
919
544f374ee392
(svn r1407) -Codechange: changed a lot around _stations, _vehicles, _towns and _industries
truelight
parents:
915
diff
changeset
|
930 |
v = GetVehicle(p1); |
| 0 | 931 |
|
|
1793
b9a37c98b468
(svn r2297) - CodeChange: server-check the next batch of commands.
Darkvater
parents:
1790
diff
changeset
|
932 |
if (v->type != VEH_Ship || !CheckOwnership(v->owner)) return CMD_ERROR; |
| 0 | 933 |
|
|
1237
1c7a3f9c94b9
(svn r1741) - Fix: added IsVehicleIndex() so it's possible to protect GetVehicle() from reading an invalid vehicle index
bjarni
parents:
1235
diff
changeset
|
934 |
SET_EXPENSES_TYPE(EXPENSES_NEW_VEHICLES); |
|
1c7a3f9c94b9
(svn r1741) - Fix: added IsVehicleIndex() so it's possible to protect GetVehicle() from reading an invalid vehicle index
bjarni
parents:
1235
diff
changeset
|
935 |
|
|
3961
9868b766fda7
(svn r5120) Add IsShipInDepot{Stopped,}() and remove some redundant checks
tron
parents:
3955
diff
changeset
|
936 |
if (!IsShipInDepotStopped(v)) {
|
| 0 | 937 |
return_cmd_error(STR_980B_SHIP_MUST_BE_STOPPED_IN); |
|
3961
9868b766fda7
(svn r5120) Add IsShipInDepot{Stopped,}() and remove some redundant checks
tron
parents:
3955
diff
changeset
|
938 |
} |
|
193
0a7025304867
(svn r194) -Codechange: stripping trailing-spaces. Please keep this that way!
truelight
parents:
164
diff
changeset
|
939 |
|
| 0 | 940 |
if (flags & DC_EXEC) {
|
941 |
InvalidateWindow(WC_VEHICLE_DEPOT, v->tile); |
|
| 588 | 942 |
RebuildVehicleLists(); |
| 0 | 943 |
InvalidateWindow(WC_COMPANY, v->owner); |
944 |
DeleteWindowById(WC_VEHICLE_VIEW, v->index); |
|
945 |
DeleteVehicle(v); |
|
|
2618
9691753519ac
(svn r3156) -Fix: removed some cases where autoreplace windows were redrawn when nothing was changed
bjarni
parents:
2574
diff
changeset
|
946 |
if (IsLocalPlayer()) |
|
9691753519ac
(svn r3156) -Fix: removed some cases where autoreplace windows were redrawn when nothing was changed
bjarni
parents:
2574
diff
changeset
|
947 |
InvalidateWindow(WC_REPLACE_VEHICLE, VEH_Ship); // updates the replace Ship window |
| 0 | 948 |
} |
|
193
0a7025304867
(svn r194) -Codechange: stripping trailing-spaces. Please keep this that way!
truelight
parents:
164
diff
changeset
|
949 |
|
| 0 | 950 |
return -(int32)v->value; |
951 |
} |
|
952 |
||
|
1793
b9a37c98b468
(svn r2297) - CodeChange: server-check the next batch of commands.
Darkvater
parents:
1790
diff
changeset
|
953 |
/** Start/Stop a ship. |
|
3491
35d747bb5e82
(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
|
954 |
* @param tile unused |
|
1793
b9a37c98b468
(svn r2297) - CodeChange: server-check the next batch of commands.
Darkvater
parents:
1790
diff
changeset
|
955 |
* @param p1 ship ID to start/stop |
|
b9a37c98b468
(svn r2297) - CodeChange: server-check the next batch of commands.
Darkvater
parents:
1790
diff
changeset
|
956 |
* @param p2 unused |
|
b9a37c98b468
(svn r2297) - CodeChange: server-check the next batch of commands.
Darkvater
parents:
1790
diff
changeset
|
957 |
*/ |
|
3491
35d747bb5e82
(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
|
958 |
int32 CmdStartStopShip(TileIndex tile, uint32 flags, uint32 p1, uint32 p2) |
| 0 | 959 |
{
|
960 |
Vehicle *v; |
|
961 |
||
|
1237
1c7a3f9c94b9
(svn r1741) - Fix: added IsVehicleIndex() so it's possible to protect GetVehicle() from reading an invalid vehicle index
bjarni
parents:
1235
diff
changeset
|
962 |
if (!IsVehicleIndex(p1)) return CMD_ERROR; |
|
1c7a3f9c94b9
(svn r1741) - Fix: added IsVehicleIndex() so it's possible to protect GetVehicle() from reading an invalid vehicle index
bjarni
parents:
1235
diff
changeset
|
963 |
|
|
919
544f374ee392
(svn r1407) -Codechange: changed a lot around _stations, _vehicles, _towns and _industries
truelight
parents:
915
diff
changeset
|
964 |
v = GetVehicle(p1); |
| 0 | 965 |
|
|
1793
b9a37c98b468
(svn r2297) - CodeChange: server-check the next batch of commands.
Darkvater
parents:
1790
diff
changeset
|
966 |
if (v->type != VEH_Ship || !CheckOwnership(v->owner)) return CMD_ERROR; |
| 0 | 967 |
|
968 |
if (flags & DC_EXEC) {
|
|
|
3961
9868b766fda7
(svn r5120) Add IsShipInDepot{Stopped,}() and remove some redundant checks
tron
parents:
3955
diff
changeset
|
969 |
if (IsShipInDepotStopped(v)) {
|
|
3139
b17abef09e15
(svn r3757) -Feature: Delete news items about vehicles, when they get stale
tron
parents:
3005
diff
changeset
|
970 |
DeleteVehicleNews(p1, STR_981C_SHIP_IS_WAITING_IN_DEPOT); |
|
b17abef09e15
(svn r3757) -Feature: Delete news items about vehicles, when they get stale
tron
parents:
3005
diff
changeset
|
971 |
} |
|
b17abef09e15
(svn r3757) -Feature: Delete news items about vehicles, when they get stale
tron
parents:
3005
diff
changeset
|
972 |
|
| 0 | 973 |
v->vehstatus ^= VS_STOPPED; |
|
755
80091de50044
(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
|
974 |
InvalidateWindowWidget(WC_VEHICLE_VIEW, v->index, STATUS_BAR); |
| 0 | 975 |
InvalidateWindow(WC_VEHICLE_DEPOT, v->tile); |
|
1793
b9a37c98b468
(svn r2297) - CodeChange: server-check the next batch of commands.
Darkvater
parents:
1790
diff
changeset
|
976 |
InvalidateWindowClasses(WC_SHIPS_LIST); |
| 0 | 977 |
} |
978 |
||
979 |
return 0; |
|
980 |
} |
|
981 |
||
|
1793
b9a37c98b468
(svn r2297) - CodeChange: server-check the next batch of commands.
Darkvater
parents:
1790
diff
changeset
|
982 |
/** Send a ship to the depot. |
|
3491
35d747bb5e82
(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
|
983 |
* @param tile unused |
|
1793
b9a37c98b468
(svn r2297) - CodeChange: server-check the next batch of commands.
Darkvater
parents:
1790
diff
changeset
|
984 |
* @param p1 vehicle ID to send to the depot |
|
b9a37c98b468
(svn r2297) - CodeChange: server-check the next batch of commands.
Darkvater
parents:
1790
diff
changeset
|
985 |
* @param p2 unused |
|
b9a37c98b468
(svn r2297) - CodeChange: server-check the next batch of commands.
Darkvater
parents:
1790
diff
changeset
|
986 |
*/ |
|
3491
35d747bb5e82
(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
|
987 |
int32 CmdSendShipToDepot(TileIndex tile, uint32 flags, uint32 p1, uint32 p2) |
| 0 | 988 |
{
|
989 |
Vehicle *v; |
|
|
1793
b9a37c98b468
(svn r2297) - CodeChange: server-check the next batch of commands.
Darkvater
parents:
1790
diff
changeset
|
990 |
const Depot *dep; |
| 0 | 991 |
|
|
1237
1c7a3f9c94b9
(svn r1741) - Fix: added IsVehicleIndex() so it's possible to protect GetVehicle() from reading an invalid vehicle index
bjarni
parents:
1235
diff
changeset
|
992 |
if (!IsVehicleIndex(p1)) return CMD_ERROR; |
|
1c7a3f9c94b9
(svn r1741) - Fix: added IsVehicleIndex() so it's possible to protect GetVehicle() from reading an invalid vehicle index
bjarni
parents:
1235
diff
changeset
|
993 |
|
|
919
544f374ee392
(svn r1407) -Codechange: changed a lot around _stations, _vehicles, _towns and _industries
truelight
parents:
915
diff
changeset
|
994 |
v = GetVehicle(p1); |
| 0 | 995 |
|
|
1793
b9a37c98b468
(svn r2297) - CodeChange: server-check the next batch of commands.
Darkvater
parents:
1790
diff
changeset
|
996 |
if (v->type != VEH_Ship || !CheckOwnership(v->owner)) return CMD_ERROR; |
| 0 | 997 |
|
|
1793
b9a37c98b468
(svn r2297) - CodeChange: server-check the next batch of commands.
Darkvater
parents:
1790
diff
changeset
|
998 |
if (v->vehstatus & VS_CRASHED) return CMD_ERROR; |
|
1757
89f63a75ffd2
(svn r2261) - Fix: When crashed vehicles try to find a depot for servicing, openttd asserts.
matthijs
parents:
1752
diff
changeset
|
999 |
|
|
1793
b9a37c98b468
(svn r2297) - CodeChange: server-check the next batch of commands.
Darkvater
parents:
1790
diff
changeset
|
1000 |
/* If the current orders are already goto-depot */ |
|
555
02df8a1b7f33
(svn r955) Replace uint16 for orders with struct Order
tron
parents:
541
diff
changeset
|
1001 |
if (v->current_order.type == OT_GOTO_DEPOT) {
|
| 0 | 1002 |
if (flags & DC_EXEC) {
|
|
1793
b9a37c98b468
(svn r2297) - CodeChange: server-check the next batch of commands.
Darkvater
parents:
1790
diff
changeset
|
1003 |
/* If the orders to 'goto depot' are in the orders list (forced servicing), |
|
b9a37c98b468
(svn r2297) - CodeChange: server-check the next batch of commands.
Darkvater
parents:
1790
diff
changeset
|
1004 |
* then skip to the next order; effectively cancelling this forced service */ |
|
1530
2b46869fc0d4
(svn r2034) -Codechange: Replaced the rather meaningless LOAD and UNLOAD flags for depots by something more meaningful
celestar
parents:
1520
diff
changeset
|
1005 |
if (HASBIT(v->current_order.flags, OFB_PART_OF_ORDERS)) |
|
2b46869fc0d4
(svn r2034) -Codechange: Replaced the rather meaningless LOAD and UNLOAD flags for depots by something more meaningful
celestar
parents:
1520
diff
changeset
|
1006 |
v->cur_order_index++; |
|
2b46869fc0d4
(svn r2034) -Codechange: Replaced the rather meaningless LOAD and UNLOAD flags for depots by something more meaningful
celestar
parents:
1520
diff
changeset
|
1007 |
|
|
555
02df8a1b7f33
(svn r955) Replace uint16 for orders with struct Order
tron
parents:
541
diff
changeset
|
1008 |
v->current_order.type = OT_DUMMY; |
|
02df8a1b7f33
(svn r955) Replace uint16 for orders with struct Order
tron
parents:
541
diff
changeset
|
1009 |
v->current_order.flags = 0; |
|
755
80091de50044
(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
|
1010 |
InvalidateWindowWidget(WC_VEHICLE_VIEW, v->index, STATUS_BAR); |
| 0 | 1011 |
} |
|
1793
b9a37c98b468
(svn r2297) - CodeChange: server-check the next batch of commands.
Darkvater
parents:
1790
diff
changeset
|
1012 |
return 0; |
|
b9a37c98b468
(svn r2297) - CodeChange: server-check the next batch of commands.
Darkvater
parents:
1790
diff
changeset
|
1013 |
} |
| 0 | 1014 |
|
|
1793
b9a37c98b468
(svn r2297) - CodeChange: server-check the next batch of commands.
Darkvater
parents:
1790
diff
changeset
|
1015 |
dep = FindClosestShipDepot(v); |
|
b9a37c98b468
(svn r2297) - CodeChange: server-check the next batch of commands.
Darkvater
parents:
1790
diff
changeset
|
1016 |
if (dep == NULL) |
|
b9a37c98b468
(svn r2297) - CodeChange: server-check the next batch of commands.
Darkvater
parents:
1790
diff
changeset
|
1017 |
return_cmd_error(STR_981A_UNABLE_TO_FIND_LOCAL_DEPOT); |
|
b9a37c98b468
(svn r2297) - CodeChange: server-check the next batch of commands.
Darkvater
parents:
1790
diff
changeset
|
1018 |
|
|
b9a37c98b468
(svn r2297) - CodeChange: server-check the next batch of commands.
Darkvater
parents:
1790
diff
changeset
|
1019 |
if (flags & DC_EXEC) {
|
|
b9a37c98b468
(svn r2297) - CodeChange: server-check the next batch of commands.
Darkvater
parents:
1790
diff
changeset
|
1020 |
v->dest_tile = dep->xy; |
|
b9a37c98b468
(svn r2297) - CodeChange: server-check the next batch of commands.
Darkvater
parents:
1790
diff
changeset
|
1021 |
v->current_order.type = OT_GOTO_DEPOT; |
|
b9a37c98b468
(svn r2297) - CodeChange: server-check the next batch of commands.
Darkvater
parents:
1790
diff
changeset
|
1022 |
v->current_order.flags = OF_NON_STOP | OF_HALT_IN_DEPOT; |
|
b9a37c98b468
(svn r2297) - CodeChange: server-check the next batch of commands.
Darkvater
parents:
1790
diff
changeset
|
1023 |
v->current_order.station = dep->index; |
|
b9a37c98b468
(svn r2297) - CodeChange: server-check the next batch of commands.
Darkvater
parents:
1790
diff
changeset
|
1024 |
InvalidateWindowWidget(WC_VEHICLE_VIEW, v->index, STATUS_BAR); |
| 0 | 1025 |
} |
1026 |
||
1027 |
return 0; |
|
1028 |
} |
|
1029 |
||
1030 |
||
|
1802
da61740cc1e7
(svn r2306) - CodeChange: Check the last commands; refits. This needed an extensive rewrite and global/local-cargo ID juggling and bitmasking. However with this done it looks better as well and is compatible with newgrf handling. Big thanks to HackyKid for doing most of the work. This also closes patch "[ 1199277 ] Command checks"
Darkvater
parents:
1793
diff
changeset
|
1031 |
/** Refits a ship to the specified cargo type. |
|
3491
35d747bb5e82
(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
|
1032 |
* @param tile unused |
|
1802
da61740cc1e7
(svn r2306) - CodeChange: Check the last commands; refits. This needed an extensive rewrite and global/local-cargo ID juggling and bitmasking. However with this done it looks better as well and is compatible with newgrf handling. Big thanks to HackyKid for doing most of the work. This also closes patch "[ 1199277 ] Command checks"
Darkvater
parents:
1793
diff
changeset
|
1033 |
* @param p1 vehicle ID of the ship to refit |
|
da61740cc1e7
(svn r2306) - CodeChange: Check the last commands; refits. This needed an extensive rewrite and global/local-cargo ID juggling and bitmasking. However with this done it looks better as well and is compatible with newgrf handling. Big thanks to HackyKid for doing most of the work. This also closes patch "[ 1199277 ] Command checks"
Darkvater
parents:
1793
diff
changeset
|
1034 |
* @param p2 various bitstuffed elements |
|
da61740cc1e7
(svn r2306) - CodeChange: Check the last commands; refits. This needed an extensive rewrite and global/local-cargo ID juggling and bitmasking. However with this done it looks better as well and is compatible with newgrf handling. Big thanks to HackyKid for doing most of the work. This also closes patch "[ 1199277 ] Command checks"
Darkvater
parents:
1793
diff
changeset
|
1035 |
* - p2 = (bit 0-7) - the new cargo type to refit to (p2 & 0xFF) |
|
3954
7b51d0046efb
(svn r5103) - Add cargo subtype parameter to refit commands (mart3p)
peter1138
parents:
3948
diff
changeset
|
1036 |
* - p2 = (bit 8-15) - the new cargo subtype to refit to |
|
1802
da61740cc1e7
(svn r2306) - CodeChange: Check the last commands; refits. This needed an extensive rewrite and global/local-cargo ID juggling and bitmasking. However with this done it looks better as well and is compatible with newgrf handling. Big thanks to HackyKid for doing most of the work. This also closes patch "[ 1199277 ] Command checks"
Darkvater
parents:
1793
diff
changeset
|
1037 |
*/ |
|
3491
35d747bb5e82
(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
|
1038 |
int32 CmdRefitShip(TileIndex tile, uint32 flags, uint32 p1, uint32 p2) |
| 0 | 1039 |
{
|
1040 |
Vehicle *v; |
|
1041 |
int32 cost; |
|
|
3954
7b51d0046efb
(svn r5103) - Add cargo subtype parameter to refit commands (mart3p)
peter1138
parents:
3948
diff
changeset
|
1042 |
CargoID new_cid = GB(p2, 0, 8); //gets the cargo number |
|
7b51d0046efb
(svn r5103) - Add cargo subtype parameter to refit commands (mart3p)
peter1138
parents:
3948
diff
changeset
|
1043 |
byte new_subtype = GB(p2, 8, 8); |
|
3989
9b99f0898ca2
(svn r5188) - NewGRF: check refit capacity callback when refitting a ship
peter1138
parents:
3961
diff
changeset
|
1044 |
uint16 capacity = CALLBACK_FAILED; |
|
1237
1c7a3f9c94b9
(svn r1741) - Fix: added IsVehicleIndex() so it's possible to protect GetVehicle() from reading an invalid vehicle index
bjarni
parents:
1235
diff
changeset
|
1045 |
|
|
1c7a3f9c94b9
(svn r1741) - Fix: added IsVehicleIndex() so it's possible to protect GetVehicle() from reading an invalid vehicle index
bjarni
parents:
1235
diff
changeset
|
1046 |
if (!IsVehicleIndex(p1)) return CMD_ERROR; |
|
193
0a7025304867
(svn r194) -Codechange: stripping trailing-spaces. Please keep this that way!
truelight
parents:
164
diff
changeset
|
1047 |
|
|
919
544f374ee392
(svn r1407) -Codechange: changed a lot around _stations, _vehicles, _towns and _industries
truelight
parents:
915
diff
changeset
|
1048 |
v = GetVehicle(p1); |
|
1237
1c7a3f9c94b9
(svn r1741) - Fix: added IsVehicleIndex() so it's possible to protect GetVehicle() from reading an invalid vehicle index
bjarni
parents:
1235
diff
changeset
|
1049 |
|
|
1802
da61740cc1e7
(svn r2306) - CodeChange: Check the last commands; refits. This needed an extensive rewrite and global/local-cargo ID juggling and bitmasking. However with this done it looks better as well and is compatible with newgrf handling. Big thanks to HackyKid for doing most of the work. This also closes patch "[ 1199277 ] Command checks"
Darkvater
parents:
1793
diff
changeset
|
1050 |
if (v->type != VEH_Ship || !CheckOwnership(v->owner)) return CMD_ERROR; |
|
2567
ee48d423f868
(svn r3104) -Codechange: [refit] removed now obsolite code that the old autoreplace needed
bjarni
parents:
2564
diff
changeset
|
1051 |
|
|
3961
9868b766fda7
(svn r5120) Add IsShipInDepot{Stopped,}() and remove some redundant checks
tron
parents:
3955
diff
changeset
|
1052 |
if (!IsShipInDepotStopped(v)) {
|
|
9868b766fda7
(svn r5120) Add IsShipInDepot{Stopped,}() and remove some redundant checks
tron
parents:
3955
diff
changeset
|
1053 |
return_cmd_error(STR_980B_SHIP_MUST_BE_STOPPED_IN); |
|
9868b766fda7
(svn r5120) Add IsShipInDepot{Stopped,}() and remove some redundant checks
tron
parents:
3955
diff
changeset
|
1054 |
} |
| 0 | 1055 |
|
|
1802
da61740cc1e7
(svn r2306) - CodeChange: Check the last commands; refits. This needed an extensive rewrite and global/local-cargo ID juggling and bitmasking. However with this done it looks better as well and is compatible with newgrf handling. Big thanks to HackyKid for doing most of the work. This also closes patch "[ 1199277 ] Command checks"
Darkvater
parents:
1793
diff
changeset
|
1056 |
/* Check cargo */ |
|
da61740cc1e7
(svn r2306) - CodeChange: Check the last commands; refits. This needed an extensive rewrite and global/local-cargo ID juggling and bitmasking. However with this done it looks better as well and is compatible with newgrf handling. Big thanks to HackyKid for doing most of the work. This also closes patch "[ 1199277 ] Command checks"
Darkvater
parents:
1793
diff
changeset
|
1057 |
if (!ShipVehInfo(v->engine_type)->refittable) return CMD_ERROR; |
|
2704
bdf6ae0cb27c
(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
|
1058 |
if (new_cid > NUM_CARGO || !CanRefitTo(v->engine_type, new_cid)) return CMD_ERROR; |
| 915 | 1059 |
|
|
1237
1c7a3f9c94b9
(svn r1741) - Fix: added IsVehicleIndex() so it's possible to protect GetVehicle() from reading an invalid vehicle index
bjarni
parents:
1235
diff
changeset
|
1060 |
SET_EXPENSES_TYPE(EXPENSES_SHIP_RUN); |
|
1c7a3f9c94b9
(svn r1741) - Fix: added IsVehicleIndex() so it's possible to protect GetVehicle() from reading an invalid vehicle index
bjarni
parents:
1235
diff
changeset
|
1061 |
|
|
3989
9b99f0898ca2
(svn r5188) - NewGRF: check refit capacity callback when refitting a ship
peter1138
parents:
3961
diff
changeset
|
1062 |
/* Check the refit capacity callback */ |
|
9b99f0898ca2
(svn r5188) - NewGRF: check refit capacity callback when refitting a ship
peter1138
parents:
3961
diff
changeset
|
1063 |
if (HASBIT(EngInfo(v->engine_type)->callbackmask, CBM_REFIT_CAPACITY)) {
|
|
9b99f0898ca2
(svn r5188) - NewGRF: check refit capacity callback when refitting a ship
peter1138
parents:
3961
diff
changeset
|
1064 |
/* Back up the existing cargo type */ |
|
9b99f0898ca2
(svn r5188) - NewGRF: check refit capacity callback when refitting a ship
peter1138
parents:
3961
diff
changeset
|
1065 |
CargoID temp_cid = v->cargo_type; |
|
9b99f0898ca2
(svn r5188) - NewGRF: check refit capacity callback when refitting a ship
peter1138
parents:
3961
diff
changeset
|
1066 |
byte temp_subtype = v->cargo_subtype; |
|
9b99f0898ca2
(svn r5188) - NewGRF: check refit capacity callback when refitting a ship
peter1138
parents:
3961
diff
changeset
|
1067 |
v->cargo_type = new_cid; |
|
9b99f0898ca2
(svn r5188) - NewGRF: check refit capacity callback when refitting a ship
peter1138
parents:
3961
diff
changeset
|
1068 |
v->cargo_subtype = new_subtype; |
|
9b99f0898ca2
(svn r5188) - NewGRF: check refit capacity callback when refitting a ship
peter1138
parents:
3961
diff
changeset
|
1069 |
|
|
9b99f0898ca2
(svn r5188) - NewGRF: check refit capacity callback when refitting a ship
peter1138
parents:
3961
diff
changeset
|
1070 |
capacity = GetVehicleCallback(CBID_VEHICLE_REFIT_CAPACITY, 0, 0, v->engine_type, v); |
|
9b99f0898ca2
(svn r5188) - NewGRF: check refit capacity callback when refitting a ship
peter1138
parents:
3961
diff
changeset
|
1071 |
|
|
9b99f0898ca2
(svn r5188) - NewGRF: check refit capacity callback when refitting a ship
peter1138
parents:
3961
diff
changeset
|
1072 |
/* Restore the cargo type */ |
|
9b99f0898ca2
(svn r5188) - NewGRF: check refit capacity callback when refitting a ship
peter1138
parents:
3961
diff
changeset
|
1073 |
v->cargo_type = temp_cid; |
|
9b99f0898ca2
(svn r5188) - NewGRF: check refit capacity callback when refitting a ship
peter1138
parents:
3961
diff
changeset
|
1074 |
v->cargo_subtype = temp_subtype; |
|
9b99f0898ca2
(svn r5188) - NewGRF: check refit capacity callback when refitting a ship
peter1138
parents:
3961
diff
changeset
|
1075 |
} |
|
9b99f0898ca2
(svn r5188) - NewGRF: check refit capacity callback when refitting a ship
peter1138
parents:
3961
diff
changeset
|
1076 |
|
|
9b99f0898ca2
(svn r5188) - NewGRF: check refit capacity callback when refitting a ship
peter1138
parents:
3961
diff
changeset
|
1077 |
if (capacity == CALLBACK_FAILED) {
|
|
9b99f0898ca2
(svn r5188) - NewGRF: check refit capacity callback when refitting a ship
peter1138
parents:
3961
diff
changeset
|
1078 |
capacity = ShipVehInfo(v->engine_type)->capacity; |
|
9b99f0898ca2
(svn r5188) - NewGRF: check refit capacity callback when refitting a ship
peter1138
parents:
3961
diff
changeset
|
1079 |
} |
|
9b99f0898ca2
(svn r5188) - NewGRF: check refit capacity callback when refitting a ship
peter1138
parents:
3961
diff
changeset
|
1080 |
_returned_refit_capacity = capacity; |
|
9b99f0898ca2
(svn r5188) - NewGRF: check refit capacity callback when refitting a ship
peter1138
parents:
3961
diff
changeset
|
1081 |
|
| 0 | 1082 |
cost = 0; |
|
1802
da61740cc1e7
(svn r2306) - CodeChange: Check the last commands; refits. This needed an extensive rewrite and global/local-cargo ID juggling and bitmasking. However with this done it looks better as well and is compatible with newgrf handling. Big thanks to HackyKid for doing most of the work. This also closes patch "[ 1199277 ] Command checks"
Darkvater
parents:
1793
diff
changeset
|
1083 |
if (IS_HUMAN_PLAYER(v->owner) && new_cid != v->cargo_type) {
|
| 0 | 1084 |
cost = _price.ship_base >> 7; |
1085 |
} |
|
1086 |
||
1087 |
if (flags & DC_EXEC) {
|
|
|
3989
9b99f0898ca2
(svn r5188) - NewGRF: check refit capacity callback when refitting a ship
peter1138
parents:
3961
diff
changeset
|
1088 |
v->cargo_cap = capacity; |
|
3955
b96f96b31403
(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
|
1089 |
v->cargo_count = (v->cargo_type == new_cid) ? min(v->cargo_cap, v->cargo_count) : 0; |
|
1802
da61740cc1e7
(svn r2306) - CodeChange: Check the last commands; refits. This needed an extensive rewrite and global/local-cargo ID juggling and bitmasking. However with this done it looks better as well and is compatible with newgrf handling. Big thanks to HackyKid for doing most of the work. This also closes patch "[ 1199277 ] Command checks"
Darkvater
parents:
1793
diff
changeset
|
1090 |
v->cargo_type = new_cid; |
|
3954
7b51d0046efb
(svn r5103) - Add cargo subtype parameter to refit commands (mart3p)
peter1138
parents:
3948
diff
changeset
|
1091 |
v->cargo_subtype = new_subtype; |
| 0 | 1092 |
InvalidateWindow(WC_VEHICLE_DETAILS, v->index); |
|
3954
7b51d0046efb
(svn r5103) - Add cargo subtype parameter to refit commands (mart3p)
peter1138
parents:
3948
diff
changeset
|
1093 |
InvalidateWindow(WC_VEHICLE_DEPOT, v->tile); |
|
7b51d0046efb
(svn r5103) - Add cargo subtype parameter to refit commands (mart3p)
peter1138
parents:
3948
diff
changeset
|
1094 |
RebuildVehicleLists(); |
| 0 | 1095 |
} |
1096 |
||
1097 |
return cost; |
|
1098 |
||
1099 |
} |