| author | matthijs |
| Wed, 22 Mar 2006 22:26:16 +0000 | |
| branch | 0.4.5 |
| changeset 9958 | bed516c67d61 |
| parent 2916 | 8f1aa489701f |
| child 2962 | dbd168a4703a |
| permissions | -rw-r--r-- |
| 2186 | 1 |
/* $Id$ */ |
2 |
||
| 0 | 3 |
#include "stdafx.h" |
|
1891
92a3b0aa0946
(svn r2397) - CodeChange: rename all "ttd" files to "openttd" files.
Darkvater
parents:
1802
diff
changeset
|
4 |
#include "openttd.h" |
|
507
8aa8100b0b22
(svn r815) Include strings.h only in the files which need it.
tron
parents:
445
diff
changeset
|
5 |
#include "table/strings.h" |
|
2163
637ec3c361f5
(svn r2673) Include functions.h directly, not globally via openttd.h
tron
parents:
2159
diff
changeset
|
6 |
#include "functions.h" |
|
679
e959706a3e4d
(svn r1117) Move map arrays and some related macros into their own files map.c and map.h
tron
parents:
593
diff
changeset
|
7 |
#include "map.h" |
|
1209
a1ac96655b79
(svn r1713) Split off several functions which query/set information about a single tile from map.h and put them into a seperate file tile.h
tron
parents:
1206
diff
changeset
|
8 |
#include "tile.h" |
| 0 | 9 |
#include "vehicle.h" |
10 |
#include "command.h" |
|
11 |
#include "pathfind.h" |
|
12 |
#include "station.h" |
|
13 |
#include "news.h" |
|
14 |
#include "engine.h" |
|
15 |
#include "player.h" |
|
|
337
66647f97e7c0
(svn r513) Merge revisions 402, 416, 417, 478, 479, 511, 512 from map to trunk
tron
parents:
297
diff
changeset
|
16 |
#include "sound.h" |
| 1247 | 17 |
#include "npf.h" |
|
1313
bba6afb8a995
(svn r1817) -Codechange: Moved depot-functions to depot.c
truelight
parents:
1282
diff
changeset
|
18 |
#include "depot.h" |
|
2159
3b634157c3b2
(svn r2669) Shuffle some more stuff around to reduce dependencies
tron
parents:
2150
diff
changeset
|
19 |
#include "vehicle_gui.h" |
| 0 | 20 |
|
21 |
static const uint16 _ship_sprites[] = {0x0E5D, 0x0E55, 0x0E65, 0x0E6D};
|
|
22 |
static const byte _ship_sometracks[4] = {0x19, 0x16, 0x25, 0x2A};
|
|
23 |
||
|
1977
4392ae3d8e31
(svn r2483) Replace almost 500 "uint tile" (and variants) with "TileIndex tile"
tron
parents:
1942
diff
changeset
|
24 |
static byte GetTileShipTrackStatus(TileIndex tile) |
|
4392ae3d8e31
(svn r2483) Replace almost 500 "uint tile" (and variants) with "TileIndex tile"
tron
parents:
1942
diff
changeset
|
25 |
{
|
|
159
139cf78bfb28
(svn r160) -Codechange: made GetTileTrackStatus more readable (blathijs)
truelight
parents:
156
diff
changeset
|
26 |
uint32 r = GetTileTrackStatus(tile, TRANSPORT_WATER); |
| 0 | 27 |
return r | r >> 8; |
28 |
} |
|
29 |
||
|
2477
d454d5152386
(svn r3003) Change int, uint, uin16 and byte to EngineID where appropriate, plus some related changes (mostly casts)
tron
parents:
2464
diff
changeset
|
30 |
void DrawShipEngine(int x, int y, EngineID engine, uint32 image_ormod) |
| 0 | 31 |
{
|
|
538
5dd99f3b7eca
(svn r920) Replace vehicle info macros with inline functions and add asserts to check limits
tron
parents:
534
diff
changeset
|
32 |
int spritenum = ShipVehInfo(engine)->image_index; |
| 0 | 33 |
|
34 |
if (is_custom_sprite(spritenum)) {
|
|
|
358
6eb0d5ec99b1
(svn r546) -newgrf: Use GetCustomVehicleIcon() for fetching sprites for vehicle selection dialogs. (Idea by octo, done by pasky).
darkvater
parents:
337
diff
changeset
|
35 |
int sprite = GetCustomVehicleIcon(engine, 6); |
| 0 | 36 |
|
| 2639 | 37 |
if (sprite != 0) {
|
| 0 | 38 |
DrawSprite(sprite | image_ormod, x, y); |
39 |
return; |
|
40 |
} |
|
|
2464
3dee59d241c0
(svn r2990) Remove _engine_original_sprites and replace all uses with references to our (new) original engine/vehicle tables.
peter1138
parents:
2214
diff
changeset
|
41 |
spritenum = orig_ship_vehicle_info[engine - SHIP_ENGINES_INDEX].image_index; |
| 0 | 42 |
} |
43 |
DrawSprite((6 + _ship_sprites[spritenum]) | image_ormod, x, y); |
|
44 |
} |
|
45 |
||
|
1790
4afb4b4e4278
(svn r2294) - CodeChange: check the service interval settings when changing of all vehicle-types. To simplify things introduce GetServiceIntervalClamped() that returns the same or clamped value of the new service interval. There were some inconsistencies in the gui files so I had to change those, and const correctness kicked in, so it's a bit messy at certain points.
Darkvater
parents:
1757
diff
changeset
|
46 |
int GetShipImage(const Vehicle *v, byte direction) |
| 0 | 47 |
{
|
48 |
int spritenum = v->spritenum; |
|
49 |
||
50 |
if (is_custom_sprite(spritenum)) {
|
|
51 |
int sprite = GetCustomVehicleSprite(v, direction); |
|
52 |
||
| 2639 | 53 |
if (sprite != 0) return sprite; |
|
2464
3dee59d241c0
(svn r2990) Remove _engine_original_sprites and replace all uses with references to our (new) original engine/vehicle tables.
peter1138
parents:
2214
diff
changeset
|
54 |
spritenum = orig_ship_vehicle_info[v->engine_type - SHIP_ENGINES_INDEX].image_index; |
| 0 | 55 |
} |
56 |
return _ship_sprites[spritenum] + direction; |
|
57 |
} |
|
58 |
||
| 2630 | 59 |
static const Depot* FindClosestShipDepot(const Vehicle* v) |
| 0 | 60 |
{
|
| 2630 | 61 |
const Depot* depot; |
62 |
const Depot* best_depot = NULL; |
|
|
1977
4392ae3d8e31
(svn r2483) Replace almost 500 "uint tile" (and variants) with "TileIndex tile"
tron
parents:
1942
diff
changeset
|
63 |
uint dist; |
|
4392ae3d8e31
(svn r2483) Replace almost 500 "uint tile" (and variants) with "TileIndex tile"
tron
parents:
1942
diff
changeset
|
64 |
uint best_dist = (uint)-1; |
|
4392ae3d8e31
(svn r2483) Replace almost 500 "uint tile" (and variants) with "TileIndex tile"
tron
parents:
1942
diff
changeset
|
65 |
TileIndex tile; |
|
4392ae3d8e31
(svn r2483) Replace almost 500 "uint tile" (and variants) with "TileIndex tile"
tron
parents:
1942
diff
changeset
|
66 |
TileIndex tile2 = v->tile; |
| 0 | 67 |
|
| 1247 | 68 |
if (_patches.new_pathfinding_all) {
|
69 |
NPFFoundTargetData ftd; |
|
|
1752
cdbfb2f23e72
(svn r2256) - Fix: Trains cannot find a depot when they are in a tunnel. (glx)
matthijs
parents:
1751
diff
changeset
|
70 |
byte trackdir = GetVehicleTrackdir(v); |
|
2006
324916f22a8a
(svn r2514) - Codechange: [NPF] Move the checking of railtype into a funciton IsCompatibleRail().
matthijs
parents:
1998
diff
changeset
|
71 |
ftd = NPFRouteToDepotTrialError(v->tile, trackdir, TRANSPORT_WATER, v->owner, INVALID_RAILTYPE); |
| 2639 | 72 |
if (ftd.best_bird_dist == 0) {
|
|
1313
bba6afb8a995
(svn r1817) -Codechange: Moved depot-functions to depot.c
truelight
parents:
1282
diff
changeset
|
73 |
best_depot = GetDepotByTile(ftd.node.tile); /* Found target */ |
| 2639 | 74 |
} else {
|
|
1313
bba6afb8a995
(svn r1817) -Codechange: Moved depot-functions to depot.c
truelight
parents:
1282
diff
changeset
|
75 |
best_depot = NULL; /* Did not find target */ |
| 2639 | 76 |
} |
| 1247 | 77 |
} else {
|
|
1313
bba6afb8a995
(svn r1817) -Codechange: Moved depot-functions to depot.c
truelight
parents:
1282
diff
changeset
|
78 |
FOR_ALL_DEPOTS(depot) {
|
|
bba6afb8a995
(svn r1817) -Codechange: Moved depot-functions to depot.c
truelight
parents:
1282
diff
changeset
|
79 |
tile = depot->xy; |
|
1330
8a67d04016ce
(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
|
80 |
if (IsValidDepot(depot) && IsTileDepotType(tile, TRANSPORT_WATER) && IsTileOwner(tile, v->owner)) {
|
| 1247 | 81 |
dist = DistanceManhattan(tile, tile2); |
82 |
if (dist < best_dist) {
|
|
83 |
best_dist = dist; |
|
|
1313
bba6afb8a995
(svn r1817) -Codechange: Moved depot-functions to depot.c
truelight
parents:
1282
diff
changeset
|
84 |
best_depot = depot; |
| 1247 | 85 |
} |
| 0 | 86 |
} |
87 |
} |
|
88 |
} |
|
89 |
return best_depot; |
|
90 |
} |
|
91 |
||
92 |
static void CheckIfShipNeedsService(Vehicle *v) |
|
93 |
{
|
|
| 2630 | 94 |
const Depot* depot; |
| 0 | 95 |
|
| 2639 | 96 |
if (_patches.servint_ships == 0) return; |
97 |
if (!VehicleNeedsService(v)) return; |
|
98 |
if (v->vehstatus & VS_STOPPED) return; |
|
|
193
0a7025304867
(svn r194) -Codechange: stripping trailing-spaces. Please keep this that way!
truelight
parents:
164
diff
changeset
|
99 |
|
|
555
eec6c0294435
(svn r955) Replace uint16 for orders with struct Order
tron
parents:
541
diff
changeset
|
100 |
if (v->current_order.type == OT_GOTO_DEPOT && |
|
1530
caa16c506a22
(svn r2034) -Codechange: Replaced the rather meaningless LOAD and UNLOAD flags for depots by something more meaningful
celestar
parents:
1520
diff
changeset
|
101 |
v->current_order.flags & OF_HALT_IN_DEPOT) |
| 0 | 102 |
return; |
103 |
||
| 2639 | 104 |
if (_patches.gotodepot && VehicleHasDepotOrders(v)) return; |
| 0 | 105 |
|
|
1313
bba6afb8a995
(svn r1817) -Codechange: Moved depot-functions to depot.c
truelight
parents:
1282
diff
changeset
|
106 |
depot = FindClosestShipDepot(v); |
| 0 | 107 |
|
|
1313
bba6afb8a995
(svn r1817) -Codechange: Moved depot-functions to depot.c
truelight
parents:
1282
diff
changeset
|
108 |
if (depot == NULL || DistanceManhattan(v->tile, depot->xy) > 12) {
|
|
555
eec6c0294435
(svn r955) Replace uint16 for orders with struct Order
tron
parents:
541
diff
changeset
|
109 |
if (v->current_order.type == OT_GOTO_DEPOT) {
|
|
eec6c0294435
(svn r955) Replace uint16 for orders with struct Order
tron
parents:
541
diff
changeset
|
110 |
v->current_order.type = OT_DUMMY; |
|
eec6c0294435
(svn r955) Replace uint16 for orders with struct Order
tron
parents:
541
diff
changeset
|
111 |
v->current_order.flags = 0; |
|
755
823358e83abf
(svn r1211) -Feature: Introduce sticky windows to all vehicle windows...Just make sure you do not sticky more than 23 at a time. Also a lot of places in the code invalidated the 'status bar' of the vehicle, referring to it as widget 4. This is now widget 5 and has been #definitized
darkvater
parents:
679
diff
changeset
|
112 |
InvalidateWindowWidget(WC_VEHICLE_VIEW, v->index, STATUS_BAR); |
| 0 | 113 |
} |
114 |
return; |
|
115 |
} |
|
116 |
||
|
555
eec6c0294435
(svn r955) Replace uint16 for orders with struct Order
tron
parents:
541
diff
changeset
|
117 |
v->current_order.type = OT_GOTO_DEPOT; |
|
eec6c0294435
(svn r955) Replace uint16 for orders with struct Order
tron
parents:
541
diff
changeset
|
118 |
v->current_order.flags = OF_NON_STOP; |
|
1313
bba6afb8a995
(svn r1817) -Codechange: Moved depot-functions to depot.c
truelight
parents:
1282
diff
changeset
|
119 |
v->current_order.station = depot->index; |
|
bba6afb8a995
(svn r1817) -Codechange: Moved depot-functions to depot.c
truelight
parents:
1282
diff
changeset
|
120 |
v->dest_tile = depot->xy; |
|
755
823358e83abf
(svn r1211) -Feature: Introduce sticky windows to all vehicle windows...Just make sure you do not sticky more than 23 at a time. Also a lot of places in the code invalidated the 'status bar' of the vehicle, referring to it as widget 4. This is now widget 5 and has been #definitized
darkvater
parents:
679
diff
changeset
|
121 |
InvalidateWindowWidget(WC_VEHICLE_VIEW, v->index, STATUS_BAR); |
| 0 | 122 |
} |
123 |
||
124 |
void OnNewDay_Ship(Vehicle *v) |
|
125 |
{
|
|
126 |
int32 cost; |
|
127 |
||
128 |
if ((++v->day_counter & 7) == 0) |
|
129 |
DecreaseVehicleValue(v); |
|
130 |
||
131 |
CheckVehicleBreakdown(v); |
|
132 |
AgeVehicle(v); |
|
133 |
CheckIfShipNeedsService(v); |
|
134 |
||
|
1053
dfb5243315f1
(svn r1554) -Fix: [ 1103187 ] Order Check messages are now validated before
celestar
parents:
1035
diff
changeset
|
135 |
CheckOrders(v->index, OC_INIT); |
|
193
0a7025304867
(svn r194) -Codechange: stripping trailing-spaces. Please keep this that way!
truelight
parents:
164
diff
changeset
|
136 |
|
| 2639 | 137 |
if (v->vehstatus & VS_STOPPED) return; |
|
19
6080d2b6a959
(svn r20) Feature: warning when a vehicle has invalid orders (celestar)
dominik
parents:
11
diff
changeset
|
138 |
|
|
538
5dd99f3b7eca
(svn r920) Replace vehicle info macros with inline functions and add asserts to check limits
tron
parents:
534
diff
changeset
|
139 |
cost = ShipVehInfo(v->engine_type)->running_cost * _price.ship_running / 364; |
| 0 | 140 |
v->profit_this_year -= cost >> 8; |
141 |
||
142 |
SET_EXPENSES_TYPE(EXPENSES_SHIP_RUN); |
|
143 |
SubtractMoneyFromPlayerFract(v->owner, cost); |
|
144 |
||
145 |
InvalidateWindow(WC_VEHICLE_DETAILS, v->index); |
|
|
1055
3aae1d6f12aa
(svn r1556) -Fix: Vehicle list updates should now really work
Celestar
parents:
1053
diff
changeset
|
146 |
//we need this for the profit |
|
3aae1d6f12aa
(svn r1556) -Fix: Vehicle list updates should now really work
Celestar
parents:
1053
diff
changeset
|
147 |
InvalidateWindowClasses(WC_SHIPS_LIST); |
| 0 | 148 |
} |
149 |
||
150 |
static void HandleBrokenShip(Vehicle *v) |
|
151 |
{
|
|
152 |
if (v->breakdown_ctr != 1) {
|
|
153 |
v->breakdown_ctr = 1; |
|
154 |
v->cur_speed = 0; |
|
155 |
||
156 |
if (v->breakdowns_since_last_service != 255) |
|
157 |
v->breakdowns_since_last_service++; |
|
|
193
0a7025304867
(svn r194) -Codechange: stripping trailing-spaces. Please keep this that way!
truelight
parents:
164
diff
changeset
|
158 |
|
| 0 | 159 |
InvalidateWindow(WC_VEHICLE_VIEW, v->index); |
160 |
InvalidateWindow(WC_VEHICLE_DETAILS, v->index); |
|
|
193
0a7025304867
(svn r194) -Codechange: stripping trailing-spaces. Please keep this that way!
truelight
parents:
164
diff
changeset
|
161 |
|
| 541 | 162 |
SndPlayVehicleFx((_opt.landscape != LT_CANDY) ? |
163 |
SND_10_TRAIN_BREAKDOWN : SND_3A_COMEDY_BREAKDOWN_2, v); |
|
| 0 | 164 |
|
165 |
if (!(v->vehstatus & VS_HIDDEN)) {
|
|
166 |
Vehicle *u = CreateEffectVehicleRel(v, 4, 4, 5, EV_BREAKDOWN_SMOKE); |
|
| 2639 | 167 |
if (u != NULL) u->u.special.unk0 = v->breakdown_delay * 2; |
| 0 | 168 |
} |
169 |
} |
|
170 |
||
171 |
if (!(v->tick_counter & 1)) {
|
|
172 |
if (!--v->breakdown_delay) {
|
|
173 |
v->breakdown_ctr = 0; |
|
|
1151
614cbcb5b9fe
(svn r1652) Fix: train and road vehicle lists are now redrawn when vehicles enters/leaves a depot (Hackykid)
bjarni
parents:
1128
diff
changeset
|
174 |
InvalidateWindow(WC_VEHICLE_VIEW, v->index); |
| 0 | 175 |
} |
176 |
} |
|
177 |
} |
|
178 |
||
179 |
static void MarkShipDirty(Vehicle *v) |
|
180 |
{
|
|
181 |
v->cur_image = GetShipImage(v, v->direction); |
|
182 |
MarkAllViewportsDirty(v->left_coord, v->top_coord, v->right_coord + 1, v->bottom_coord + 1); |
|
183 |
} |
|
184 |
||
185 |
static void PlayShipSound(Vehicle *v) |
|
186 |
{
|
|
|
538
5dd99f3b7eca
(svn r920) Replace vehicle info macros with inline functions and add asserts to check limits
tron
parents:
534
diff
changeset
|
187 |
SndPlayVehicleFx(ShipVehInfo(v->engine_type)->sfx, v); |
| 0 | 188 |
} |
189 |
||
|
909
81bc9ef93f50
(svn r1396) Introduce TileIndexDiffC - the compile time version of TileIndexDiff
tron
parents:
900
diff
changeset
|
190 |
static const TileIndexDiffC _dock_offs[] = {
|
|
81bc9ef93f50
(svn r1396) Introduce TileIndexDiffC - the compile time version of TileIndexDiff
tron
parents:
900
diff
changeset
|
191 |
{ 2, 0},
|
|
81bc9ef93f50
(svn r1396) Introduce TileIndexDiffC - the compile time version of TileIndexDiff
tron
parents:
900
diff
changeset
|
192 |
{-2, 0},
|
|
81bc9ef93f50
(svn r1396) Introduce TileIndexDiffC - the compile time version of TileIndexDiff
tron
parents:
900
diff
changeset
|
193 |
{ 0, 2},
|
|
81bc9ef93f50
(svn r1396) Introduce TileIndexDiffC - the compile time version of TileIndexDiff
tron
parents:
900
diff
changeset
|
194 |
{ 2, 0},
|
|
81bc9ef93f50
(svn r1396) Introduce TileIndexDiffC - the compile time version of TileIndexDiff
tron
parents:
900
diff
changeset
|
195 |
{ 0, -2},
|
|
81bc9ef93f50
(svn r1396) Introduce TileIndexDiffC - the compile time version of TileIndexDiff
tron
parents:
900
diff
changeset
|
196 |
{ 0, 0},
|
|
81bc9ef93f50
(svn r1396) Introduce TileIndexDiffC - the compile time version of TileIndexDiff
tron
parents:
900
diff
changeset
|
197 |
{ 0, 0},
|
|
81bc9ef93f50
(svn r1396) Introduce TileIndexDiffC - the compile time version of TileIndexDiff
tron
parents:
900
diff
changeset
|
198 |
{ 0, 0}
|
| 0 | 199 |
}; |
200 |
||
201 |
static void ProcessShipOrder(Vehicle *v) |
|
202 |
{
|
|
|
1024
9b06b01490a4
(svn r1525) -Codechange: rewrote the _order_array, now it can be made dynamic.
truelight
parents:
1020
diff
changeset
|
203 |
const Order *order; |
| 0 | 204 |
|
|
555
eec6c0294435
(svn r955) Replace uint16 for orders with struct Order
tron
parents:
541
diff
changeset
|
205 |
if (v->current_order.type >= OT_GOTO_DEPOT && |
|
eec6c0294435
(svn r955) Replace uint16 for orders with struct Order
tron
parents:
541
diff
changeset
|
206 |
v->current_order.type <= OT_LEAVESTATION) {
|
|
eec6c0294435
(svn r955) Replace uint16 for orders with struct Order
tron
parents:
541
diff
changeset
|
207 |
if (v->current_order.type != OT_GOTO_DEPOT || |
|
eec6c0294435
(svn r955) Replace uint16 for orders with struct Order
tron
parents:
541
diff
changeset
|
208 |
!(v->current_order.flags & OF_UNLOAD)) |
| 0 | 209 |
return; |
210 |
} |
|
211 |
||
|
555
eec6c0294435
(svn r955) Replace uint16 for orders with struct Order
tron
parents:
541
diff
changeset
|
212 |
if (v->current_order.type == OT_GOTO_DEPOT && |
|
2214
75d037f8dcc4
(svn r2732) -Codechange: Cleaned the order flags some more. Hit some inconsistencies while trying to locate bug 1244167
celestar
parents:
2186
diff
changeset
|
213 |
(v->current_order.flags & (OF_PART_OF_ORDERS | OF_SERVICE_IF_NEEDED)) == (OF_PART_OF_ORDERS | OF_SERVICE_IF_NEEDED) && |
|
1520
c85dc79795e0
(svn r2024) -Fix: [autoreplace] reverted all changes involving v->set_for_replacement as they caused desyncs.
bjarni
parents:
1443
diff
changeset
|
214 |
!VehicleNeedsService(v)) {
|
| 0 | 215 |
v->cur_order_index++; |
216 |
} |
|
217 |
||
218 |
||
219 |
if (v->cur_order_index >= v->num_orders) |
|
220 |
v->cur_order_index = 0; |
|
221 |
||
|
1024
9b06b01490a4
(svn r1525) -Codechange: rewrote the _order_array, now it can be made dynamic.
truelight
parents:
1020
diff
changeset
|
222 |
order = GetVehicleOrder(v, v->cur_order_index); |
| 0 | 223 |
|
|
1024
9b06b01490a4
(svn r1525) -Codechange: rewrote the _order_array, now it can be made dynamic.
truelight
parents:
1020
diff
changeset
|
224 |
if (order == NULL) {
|
|
9b06b01490a4
(svn r1525) -Codechange: rewrote the _order_array, now it can be made dynamic.
truelight
parents:
1020
diff
changeset
|
225 |
v->current_order.type = OT_NOTHING; |
|
555
eec6c0294435
(svn r955) Replace uint16 for orders with struct Order
tron
parents:
541
diff
changeset
|
226 |
v->current_order.flags = 0; |
| 0 | 227 |
v->dest_tile = 0; |
228 |
return; |
|
229 |
} |
|
230 |
||
|
1024
9b06b01490a4
(svn r1525) -Codechange: rewrote the _order_array, now it can be made dynamic.
truelight
parents:
1020
diff
changeset
|
231 |
if (order->type == v->current_order.type && |
|
9b06b01490a4
(svn r1525) -Codechange: rewrote the _order_array, now it can be made dynamic.
truelight
parents:
1020
diff
changeset
|
232 |
order->flags == v->current_order.flags && |
|
9b06b01490a4
(svn r1525) -Codechange: rewrote the _order_array, now it can be made dynamic.
truelight
parents:
1020
diff
changeset
|
233 |
order->station == v->current_order.station) |
| 0 | 234 |
return; |
235 |
||
|
1024
9b06b01490a4
(svn r1525) -Codechange: rewrote the _order_array, now it can be made dynamic.
truelight
parents:
1020
diff
changeset
|
236 |
v->current_order = *order; |
| 0 | 237 |
|
|
1024
9b06b01490a4
(svn r1525) -Codechange: rewrote the _order_array, now it can be made dynamic.
truelight
parents:
1020
diff
changeset
|
238 |
if (order->type == OT_GOTO_STATION) {
|
|
9b06b01490a4
(svn r1525) -Codechange: rewrote the _order_array, now it can be made dynamic.
truelight
parents:
1020
diff
changeset
|
239 |
const Station *st; |
|
9b06b01490a4
(svn r1525) -Codechange: rewrote the _order_array, now it can be made dynamic.
truelight
parents:
1020
diff
changeset
|
240 |
|
|
9b06b01490a4
(svn r1525) -Codechange: rewrote the _order_array, now it can be made dynamic.
truelight
parents:
1020
diff
changeset
|
241 |
if (order->station == v->last_station_visited) |
|
1266
9dc5638fe8cc
(svn r1770) -Fix: Hopefully last pieces of code that are containing a station-id
truelight
parents:
1247
diff
changeset
|
242 |
v->last_station_visited = INVALID_STATION; |
|
193
0a7025304867
(svn r194) -Codechange: stripping trailing-spaces. Please keep this that way!
truelight
parents:
164
diff
changeset
|
243 |
|
|
1024
9b06b01490a4
(svn r1525) -Codechange: rewrote the _order_array, now it can be made dynamic.
truelight
parents:
1020
diff
changeset
|
244 |
st = GetStation(order->station); |
| 0 | 245 |
if (st->dock_tile != 0) {
|
|
2049
ad0d49c916d4
(svn r2558) Change the internal map format from 7 arrays to one array of structs, this doesn't change the saved format for now. It's a stepping stone for further changes.
tron
parents:
2008
diff
changeset
|
246 |
v->dest_tile = TILE_ADD(st->dock_tile, ToTileIndexDiff(_dock_offs[_m[st->dock_tile].m5-0x4B])); |
| 0 | 247 |
} |
|
1024
9b06b01490a4
(svn r1525) -Codechange: rewrote the _order_array, now it can be made dynamic.
truelight
parents:
1020
diff
changeset
|
248 |
} else if (order->type == OT_GOTO_DEPOT) {
|
|
1313
bba6afb8a995
(svn r1817) -Codechange: Moved depot-functions to depot.c
truelight
parents:
1282
diff
changeset
|
249 |
v->dest_tile = GetDepot(order->station)->xy; |
| 0 | 250 |
} else {
|
251 |
v->dest_tile = 0; |
|
252 |
} |
|
|
1024
9b06b01490a4
(svn r1525) -Codechange: rewrote the _order_array, now it can be made dynamic.
truelight
parents:
1020
diff
changeset
|
253 |
|
|
9b06b01490a4
(svn r1525) -Codechange: rewrote the _order_array, now it can be made dynamic.
truelight
parents:
1020
diff
changeset
|
254 |
InvalidateVehicleOrder(v); |
|
1020
1223cd937174
(svn r1521) -Fix: Ship Vehicle Lists are now redrawn correctly
celestar
parents:
926
diff
changeset
|
255 |
|
|
1055
3aae1d6f12aa
(svn r1556) -Fix: Vehicle list updates should now really work
Celestar
parents:
1053
diff
changeset
|
256 |
InvalidateWindowClasses(WC_SHIPS_LIST); |
| 0 | 257 |
} |
258 |
||
259 |
static void HandleShipLoading(Vehicle *v) |
|
260 |
{
|
|
| 2639 | 261 |
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
|
262 |
|
|
555
eec6c0294435
(svn r955) Replace uint16 for orders with struct Order
tron
parents:
541
diff
changeset
|
263 |
if (v->current_order.type != OT_DUMMY) {
|
| 2639 | 264 |
if (v->current_order.type != OT_LOADING) return; |
265 |
if (--v->load_unload_time_rem) return; |
|
| 0 | 266 |
|
|
555
eec6c0294435
(svn r955) Replace uint16 for orders with struct Order
tron
parents:
541
diff
changeset
|
267 |
if (v->current_order.flags & OF_FULL_LOAD && CanFillVehicle(v)) {
|
| 0 | 268 |
SET_EXPENSES_TYPE(EXPENSES_SHIP_INC); |
269 |
if (LoadUnloadVehicle(v)) {
|
|
270 |
InvalidateWindow(WC_SHIPS_LIST, v->owner); |
|
271 |
MarkShipDirty(v); |
|
272 |
} |
|
273 |
return; |
|
274 |
} |
|
275 |
PlayShipSound(v); |
|
|
193
0a7025304867
(svn r194) -Codechange: stripping trailing-spaces. Please keep this that way!
truelight
parents:
164
diff
changeset
|
276 |
|
| 0 | 277 |
{
|
|
555
eec6c0294435
(svn r955) Replace uint16 for orders with struct Order
tron
parents:
541
diff
changeset
|
278 |
Order b = v->current_order; |
|
eec6c0294435
(svn r955) Replace uint16 for orders with struct Order
tron
parents:
541
diff
changeset
|
279 |
v->current_order.type = OT_LEAVESTATION; |
|
eec6c0294435
(svn r955) Replace uint16 for orders with struct Order
tron
parents:
541
diff
changeset
|
280 |
v->current_order.flags = 0; |
| 2639 | 281 |
if (!(b.flags & OF_NON_STOP)) return; |
| 0 | 282 |
} |
283 |
} |
|
284 |
||
285 |
v->cur_order_index++; |
|
|
1024
9b06b01490a4
(svn r1525) -Codechange: rewrote the _order_array, now it can be made dynamic.
truelight
parents:
1020
diff
changeset
|
286 |
InvalidateVehicleOrder(v); |
| 0 | 287 |
} |
288 |
||
289 |
static void UpdateShipDeltaXY(Vehicle *v, int dir) |
|
290 |
{
|
|
291 |
#define MKIT(d,c,b,a) ((a&0xFF)<<24) | ((b&0xFF)<<16) | ((c&0xFF)<<8) | ((d&0xFF)<<0) |
|
292 |
static const uint32 _delta_xy_table[8] = {
|
|
293 |
MKIT( -3, -3, 6, 6), |
|
294 |
MKIT(-16, -3, 32, 6), |
|
295 |
MKIT( -3, -3, 6, 6), |
|
296 |
MKIT( -3,-16, 6, 32), |
|
297 |
MKIT( -3, -3, 6, 6), |
|
298 |
MKIT(-16, -3, 32, 6), |
|
299 |
MKIT( -3, -3, 6, 6), |
|
300 |
MKIT( -3,-16, 6, 32), |
|
301 |
}; |
|
302 |
#undef MKIT |
|
303 |
uint32 x = _delta_xy_table[dir]; |
|
|
2150
010d923a81a9
(svn r2660) Get rid of some more shifting/anding/casting
tron
parents:
2049
diff
changeset
|
304 |
v->x_offs = GB(x, 0, 8); |
|
010d923a81a9
(svn r2660) Get rid of some more shifting/anding/casting
tron
parents:
2049
diff
changeset
|
305 |
v->y_offs = GB(x, 8, 8); |
|
010d923a81a9
(svn r2660) Get rid of some more shifting/anding/casting
tron
parents:
2049
diff
changeset
|
306 |
v->sprite_width = GB(x, 16, 8); |
|
010d923a81a9
(svn r2660) Get rid of some more shifting/anding/casting
tron
parents:
2049
diff
changeset
|
307 |
v->sprite_height = GB(x, 24, 8); |
| 0 | 308 |
} |
309 |
||
310 |
static void RecalcShipStuff(Vehicle *v) |
|
311 |
{
|
|
312 |
UpdateShipDeltaXY(v, v->direction); |
|
313 |
v->cur_image = GetShipImage(v, v->direction); |
|
314 |
MarkShipDirty(v); |
|
315 |
InvalidateWindow(WC_VEHICLE_DEPOT, v->tile); |
|
316 |
} |
|
317 |
||
|
909
81bc9ef93f50
(svn r1396) Introduce TileIndexDiffC - the compile time version of TileIndexDiff
tron
parents:
900
diff
changeset
|
318 |
static const TileIndexDiffC _ship_leave_depot_offs[] = {
|
|
81bc9ef93f50
(svn r1396) Introduce TileIndexDiffC - the compile time version of TileIndexDiff
tron
parents:
900
diff
changeset
|
319 |
{-1, 0},
|
|
81bc9ef93f50
(svn r1396) Introduce TileIndexDiffC - the compile time version of TileIndexDiff
tron
parents:
900
diff
changeset
|
320 |
{ 0, -1}
|
| 0 | 321 |
}; |
322 |
||
323 |
static void CheckShipLeaveDepot(Vehicle *v) |
|
324 |
{
|
|
|
1977
4392ae3d8e31
(svn r2483) Replace almost 500 "uint tile" (and variants) with "TileIndex tile"
tron
parents:
1942
diff
changeset
|
325 |
TileIndex tile; |
| 0 | 326 |
int d; |
327 |
uint m; |
|
328 |
||
| 2639 | 329 |
if (v->u.ship.state != 0x80) return; |
| 0 | 330 |
|
331 |
tile = v->tile; |
|
|
2049
ad0d49c916d4
(svn r2558) Change the internal map format from 7 arrays to one array of structs, this doesn't change the saved format for now. It's a stepping stone for further changes.
tron
parents:
2008
diff
changeset
|
332 |
d = (_m[tile].m5&2) ? 1 : 0; |
| 0 | 333 |
|
334 |
// Check first side |
|
|
909
81bc9ef93f50
(svn r1396) Introduce TileIndexDiffC - the compile time version of TileIndexDiff
tron
parents:
900
diff
changeset
|
335 |
if (_ship_sometracks[d] & GetTileShipTrackStatus(TILE_ADD(tile, ToTileIndexDiff(_ship_leave_depot_offs[d])))) {
|
| 0 | 336 |
m = (d==0) ? 0x101 : 0x207; |
337 |
// Check second side |
|
|
909
81bc9ef93f50
(svn r1396) Introduce TileIndexDiffC - the compile time version of TileIndexDiff
tron
parents:
900
diff
changeset
|
338 |
} else if (_ship_sometracks[d+2] & GetTileShipTrackStatus(TILE_ADD(tile, -2 * ToTileIndexDiff(_ship_leave_depot_offs[d])))) {
|
| 0 | 339 |
m = (d==0) ? 0x105 : 0x203; |
340 |
} else {
|
|
341 |
return; |
|
342 |
} |
|
| 2635 | 343 |
v->direction = GB(m, 0, 8); |
344 |
v->u.ship.state = GB(m, 8, 8); |
|
| 0 | 345 |
v->vehstatus &= ~VS_HIDDEN; |
346 |
||
347 |
v->cur_speed = 0; |
|
348 |
RecalcShipStuff(v); |
|
349 |
||
350 |
PlayShipSound(v); |
|
|
578
86e352980acd
(svn r998) now vehicles are serviced both when entering and when leaving depots to prevent that vehicles might need service when leaving after a long stay (ln--)
bjarni
parents:
555
diff
changeset
|
351 |
VehicleServiceInDepot(v); |
|
1055
3aae1d6f12aa
(svn r1556) -Fix: Vehicle list updates should now really work
Celestar
parents:
1053
diff
changeset
|
352 |
InvalidateWindowClasses(WC_SHIPS_LIST); |
| 0 | 353 |
} |
354 |
||
355 |
static bool ShipAccelerate(Vehicle *v) |
|
356 |
{
|
|
357 |
uint spd; |
|
358 |
byte t; |
|
359 |
||
360 |
spd = min(v->cur_speed + 1, v->max_speed); |
|
361 |
||
362 |
//updates statusbar only if speed have changed to save CPU time |
|
363 |
if (spd != v->cur_speed) {
|
|
|
193
0a7025304867
(svn r194) -Codechange: stripping trailing-spaces. Please keep this that way!
truelight
parents:
164
diff
changeset
|
364 |
v->cur_speed = spd; |
| 0 | 365 |
if (_patches.vehicle_speed) |
|
755
823358e83abf
(svn r1211) -Feature: Introduce sticky windows to all vehicle windows...Just make sure you do not sticky more than 23 at a time. Also a lot of places in the code invalidated the 'status bar' of the vehicle, referring to it as widget 4. This is now widget 5 and has been #definitized
darkvater
parents:
679
diff
changeset
|
366 |
InvalidateWindowWidget(WC_VEHICLE_VIEW, v->index, STATUS_BAR); |
| 0 | 367 |
} |
368 |
||
369 |
// Decrease somewhat when turning |
|
| 2639 | 370 |
if (!(v->direction & 1)) spd = spd * 3 / 4; |
| 0 | 371 |
|
| 2639 | 372 |
if (spd == 0) return false; |
373 |
if ((byte)++spd == 0) return true; |
|
| 0 | 374 |
|
375 |
v->progress = (t = v->progress) - (byte)spd; |
|
376 |
||
377 |
return (t < v->progress); |
|
378 |
} |
|
379 |
||
| 2817 | 380 |
static int32 EstimateShipCost(EngineID engine_type) |
|
1793
8ac8a8c9ec0f
(svn r2297) - CodeChange: server-check the next batch of commands.
Darkvater
parents:
1790
diff
changeset
|
381 |
{
|
|
8ac8a8c9ec0f
(svn r2297) - CodeChange: server-check the next batch of commands.
Darkvater
parents:
1790
diff
changeset
|
382 |
return ShipVehInfo(engine_type)->base_cost * (_price.ship_base>>3)>>5; |
|
8ac8a8c9ec0f
(svn r2297) - CodeChange: server-check the next batch of commands.
Darkvater
parents:
1790
diff
changeset
|
383 |
} |
| 0 | 384 |
|
385 |
static void ShipEnterDepot(Vehicle *v) |
|
386 |
{
|
|
387 |
v->u.ship.state = 0x80; |
|
388 |
v->vehstatus |= VS_HIDDEN; |
|
389 |
v->cur_speed = 0; |
|
390 |
RecalcShipStuff(v); |
|
|
193
0a7025304867
(svn r194) -Codechange: stripping trailing-spaces. Please keep this that way!
truelight
parents:
164
diff
changeset
|
391 |
|
|
578
86e352980acd
(svn r998) now vehicles are serviced both when entering and when leaving depots to prevent that vehicles might need service when leaving after a long stay (ln--)
bjarni
parents:
555
diff
changeset
|
392 |
VehicleServiceInDepot(v); |
|
86e352980acd
(svn r998) now vehicles are serviced both when entering and when leaving depots to prevent that vehicles might need service when leaving after a long stay (ln--)
bjarni
parents:
555
diff
changeset
|
393 |
|
| 0 | 394 |
InvalidateWindow(WC_VEHICLE_DETAILS, v->index); |
395 |
||
|
445
0e3fa3da3899
(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
|
396 |
TriggerVehicle(v, VEHICLE_TRIGGER_DEPOT); |
|
0e3fa3da3899
(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
|
397 |
|
|
555
eec6c0294435
(svn r955) Replace uint16 for orders with struct Order
tron
parents:
541
diff
changeset
|
398 |
if (v->current_order.type == OT_GOTO_DEPOT) {
|
|
eec6c0294435
(svn r955) Replace uint16 for orders with struct Order
tron
parents:
541
diff
changeset
|
399 |
Order t; |
|
eec6c0294435
(svn r955) Replace uint16 for orders with struct Order
tron
parents:
541
diff
changeset
|
400 |
|
| 0 | 401 |
InvalidateWindow(WC_VEHICLE_VIEW, v->index); |
|
193
0a7025304867
(svn r194) -Codechange: stripping trailing-spaces. Please keep this that way!
truelight
parents:
164
diff
changeset
|
402 |
|
|
555
eec6c0294435
(svn r955) Replace uint16 for orders with struct Order
tron
parents:
541
diff
changeset
|
403 |
t = v->current_order; |
|
eec6c0294435
(svn r955) Replace uint16 for orders with struct Order
tron
parents:
541
diff
changeset
|
404 |
v->current_order.type = OT_DUMMY; |
|
eec6c0294435
(svn r955) Replace uint16 for orders with struct Order
tron
parents:
541
diff
changeset
|
405 |
v->current_order.flags = 0; |
| 0 | 406 |
|
|
1530
caa16c506a22
(svn r2034) -Codechange: Replaced the rather meaningless LOAD and UNLOAD flags for depots by something more meaningful
celestar
parents:
1520
diff
changeset
|
407 |
if (HASBIT(t.flags, OFB_PART_OF_ORDERS)) {
|
|
555
eec6c0294435
(svn r955) Replace uint16 for orders with struct Order
tron
parents:
541
diff
changeset
|
408 |
v->cur_order_index++; |
|
1530
caa16c506a22
(svn r2034) -Codechange: Replaced the rather meaningless LOAD and UNLOAD flags for depots by something more meaningful
celestar
parents:
1520
diff
changeset
|
409 |
} else if (HASBIT(t.flags, OFB_HALT_IN_DEPOT)) {
|
| 0 | 410 |
v->vehstatus |= VS_STOPPED; |
411 |
if (v->owner == _local_player) {
|
|
|
534
17ab2f22ff74
(svn r901) Small step in the process to clean up the DPARAM mess:
tron
parents:
507
diff
changeset
|
412 |
SetDParam(0, v->unitnumber); |
| 0 | 413 |
AddNewsItem( |
414 |
STR_981C_SHIP_IS_WAITING_IN_DEPOT, |
|
415 |
NEWS_FLAGS(NM_SMALL, NF_VIEWPORT|NF_VEHICLE, NT_ADVICE, 0), |
|
416 |
v->index, |
|
417 |
0); |
|
418 |
} |
|
419 |
} |
|
420 |
} |
|
|
1055
3aae1d6f12aa
(svn r1556) -Fix: Vehicle list updates should now really work
Celestar
parents:
1053
diff
changeset
|
421 |
InvalidateWindowClasses(WC_SHIPS_LIST); |
| 0 | 422 |
} |
423 |
||
| 2630 | 424 |
static void ShipArrivesAt(const Vehicle* v, Station* st) |
| 0 | 425 |
{
|
426 |
/* Check if station was ever visited before */ |
|
427 |
if (!(st->had_vehicle_of_type & HVOT_SHIP)) {
|
|
428 |
uint32 flags; |
|
| 2639 | 429 |
|
| 0 | 430 |
st->had_vehicle_of_type |= HVOT_SHIP; |
| 2639 | 431 |
|
|
534
17ab2f22ff74
(svn r901) Small step in the process to clean up the DPARAM mess:
tron
parents:
507
diff
changeset
|
432 |
SetDParam(0, st->index); |
| 0 | 433 |
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); |
434 |
AddNewsItem( |
|
435 |
STR_9833_CITIZENS_CELEBRATE_FIRST, |
|
436 |
flags, |
|
437 |
v->index, |
|
438 |
0); |
|
439 |
} |
|
440 |
} |
|
441 |
||
442 |
typedef struct {
|
|
|
1977
4392ae3d8e31
(svn r2483) Replace almost 500 "uint tile" (and variants) with "TileIndex tile"
tron
parents:
1942
diff
changeset
|
443 |
TileIndex skiptile; |
|
4392ae3d8e31
(svn r2483) Replace almost 500 "uint tile" (and variants) with "TileIndex tile"
tron
parents:
1942
diff
changeset
|
444 |
TileIndex dest_coords; |
| 0 | 445 |
uint best_bird_dist; |
446 |
uint best_length; |
|
447 |
} PathFindShip; |
|
448 |
||
|
1977
4392ae3d8e31
(svn r2483) Replace almost 500 "uint tile" (and variants) with "TileIndex tile"
tron
parents:
1942
diff
changeset
|
449 |
static bool ShipTrackFollower(TileIndex tile, PathFindShip *pfs, int track, uint length, byte *state) |
| 0 | 450 |
{
|
451 |
// Found dest? |
|
452 |
if (tile == pfs->dest_coords) {
|
|
453 |
pfs->best_bird_dist = 0; |
|
|
193
0a7025304867
(svn r194) -Codechange: stripping trailing-spaces. Please keep this that way!
truelight
parents:
164
diff
changeset
|
454 |
|
| 0 | 455 |
pfs->best_length = minu(pfs->best_length, length); |
456 |
return true; |
|
457 |
} |
|
458 |
||
459 |
// Skip this tile in the calculation |
|
460 |
if (tile != pfs->skiptile) {
|
|
|
1245
768d9bc95aaa
(svn r1749) Move the functions which calculate distances to map.[ch] and give the more meaningful names
tron
parents:
1237
diff
changeset
|
461 |
pfs->best_bird_dist = minu(pfs->best_bird_dist, DistanceMaxPlusManhattan(pfs->dest_coords, tile)); |
| 0 | 462 |
} |
|
193
0a7025304867
(svn r194) -Codechange: stripping trailing-spaces. Please keep this that way!
truelight
parents:
164
diff
changeset
|
463 |
|
| 0 | 464 |
return false; |
465 |
} |
|
466 |
||
467 |
static const byte _ship_search_directions[6][4] = {
|
|
468 |
{ 0, 9, 2, 9 },
|
|
469 |
{ 9, 1, 9, 3 },
|
|
470 |
{ 9, 0, 3, 9 },
|
|
471 |
{ 1, 9, 9, 2 },
|
|
472 |
{ 3, 2, 9, 9 },
|
|
473 |
{ 9, 9, 1, 0 },
|
|
474 |
}; |
|
475 |
||
476 |
static const byte _pick_shiptrack_table[6] = {1, 3, 2, 2, 0, 0};
|
|
477 |
||
|
1977
4392ae3d8e31
(svn r2483) Replace almost 500 "uint tile" (and variants) with "TileIndex tile"
tron
parents:
1942
diff
changeset
|
478 |
static uint FindShipTrack(Vehicle *v, TileIndex tile, int dir, uint bits, TileIndex skiptile, int *track) |
| 0 | 479 |
{
|
480 |
PathFindShip pfs; |
|
481 |
int i, best_track; |
|
482 |
uint best_bird_dist = 0; |
|
483 |
uint best_length = 0; |
|
484 |
uint r; |
|
485 |
byte ship_dir = v->direction & 3; |
|
486 |
||
487 |
pfs.dest_coords = v->dest_tile; |
|
488 |
pfs.skiptile = skiptile; |
|
489 |
||
490 |
best_track = -1; |
|
491 |
||
492 |
do {
|
|
493 |
i = FIND_FIRST_BIT(bits); |
|
494 |
bits = KILL_FIRST_BIT(bits); |
|
|
193
0a7025304867
(svn r194) -Codechange: stripping trailing-spaces. Please keep this that way!
truelight
parents:
164
diff
changeset
|
495 |
|
| 0 | 496 |
pfs.best_bird_dist = (uint)-1; |
497 |
pfs.best_length = (uint)-1; |
|
498 |
||
|
159
139cf78bfb28
(svn r160) -Codechange: made GetTileTrackStatus more readable (blathijs)
truelight
parents:
156
diff
changeset
|
499 |
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
|
500 |
|
| 0 | 501 |
if (best_track >= 0) {
|
502 |
if (pfs.best_bird_dist != 0) {
|
|
503 |
/* neither reached the destination, pick the one with the smallest bird dist */ |
|
504 |
if (pfs.best_bird_dist > best_bird_dist) goto bad; |
|
505 |
if (pfs.best_bird_dist < best_bird_dist) goto good; |
|
506 |
} else {
|
|
507 |
if (pfs.best_length > best_length) goto bad; |
|
508 |
if (pfs.best_length < best_length) goto good; |
|
509 |
} |
|
|
193
0a7025304867
(svn r194) -Codechange: stripping trailing-spaces. Please keep this that way!
truelight
parents:
164
diff
changeset
|
510 |
|
|
0a7025304867
(svn r194) -Codechange: stripping trailing-spaces. Please keep this that way!
truelight
parents:
164
diff
changeset
|
511 |
/* if we reach this position, there's two paths of equal value so far. |
| 0 | 512 |
* pick one randomly. */ |
|
2150
010d923a81a9
(svn r2660) Get rid of some more shifting/anding/casting
tron
parents:
2049
diff
changeset
|
513 |
r = GB(Random(), 0, 8); |
| 0 | 514 |
if (_pick_shiptrack_table[i] == ship_dir) r += 80; |
515 |
if (_pick_shiptrack_table[best_track] == ship_dir) r -= 80; |
|
516 |
if (r <= 127) goto bad; |
|
517 |
} |
|
518 |
good:; |
|
519 |
best_track = i; |
|
520 |
best_bird_dist = pfs.best_bird_dist; |
|
521 |
best_length = pfs.best_length; |
|
522 |
bad:; |
|
523 |
||
524 |
} while (bits != 0); |
|
525 |
||
526 |
*track = best_track; |
|
527 |
return best_bird_dist; |
|
528 |
} |
|
529 |
||
| 1247 | 530 |
/* returns the track to choose on the next tile, or -1 when it's better to |
531 |
* reverse. The tile given is the tile we are about to enter, enterdir is the |
|
532 |
* direction in which we are entering the tile */ |
|
|
1977
4392ae3d8e31
(svn r2483) Replace almost 500 "uint tile" (and variants) with "TileIndex tile"
tron
parents:
1942
diff
changeset
|
533 |
static int ChooseShipTrack(Vehicle *v, TileIndex tile, int enterdir, uint tracks) |
| 0 | 534 |
{
|
| 1247 | 535 |
assert(enterdir>=0 && enterdir<=3); |
| 0 | 536 |
|
| 1247 | 537 |
if (_patches.new_pathfinding_all) {
|
538 |
NPFFindStationOrTileData fstd; |
|
539 |
NPFFoundTargetData ftd; |
|
|
1977
4392ae3d8e31
(svn r2483) Replace almost 500 "uint tile" (and variants) with "TileIndex tile"
tron
parents:
1942
diff
changeset
|
540 |
TileIndex src_tile = TILE_ADD(tile, TileOffsByDir(ReverseDiagdir(enterdir))); |
|
1752
cdbfb2f23e72
(svn r2256) - Fix: Trains cannot find a depot when they are in a tunnel. (glx)
matthijs
parents:
1751
diff
changeset
|
541 |
byte trackdir = GetVehicleTrackdir(v); |
|
cdbfb2f23e72
(svn r2256) - Fix: Trains cannot find a depot when they are in a tunnel. (glx)
matthijs
parents:
1751
diff
changeset
|
542 |
assert (trackdir != 0xFF); /* Check that we are not in a depot */ |
| 1247 | 543 |
|
544 |
NPFFillWithOrderData(&fstd, v); |
|
545 |
||
|
2916
8f1aa489701f
(svn r3472) - [PBS] Remove from trunk. Anyone interested can still find it in branch/pbs. This reverts revisions r3158, r3140, r3075, r2977, r2674, r2625, r2621, r2529, r2528, r2525, r2524, r2519, r2517, r2516, r2507, r2499. (in conjunction with Tron)
Darkvater
parents:
2854
diff
changeset
|
546 |
ftd = NPFRouteToStationOrTile(src_tile, trackdir, &fstd, TRANSPORT_WATER, v->owner, INVALID_RAILTYPE); |
| 1247 | 547 |
|
| 2639 | 548 |
if (ftd.best_trackdir != 0xff) {
|
|
1698
bf364c664a60
(svn r2202) - Fix: [NPF] When a vehicle could not reach its target, it would choose a random direction. It will now try to get as close as possible.
matthijs
parents:
1530
diff
changeset
|
549 |
/* If ftd.best_bird_dist is 0, we found our target and ftd.best_trackdir contains |
|
bf364c664a60
(svn r2202) - Fix: [NPF] When a vehicle could not reach its target, it would choose a random direction. It will now try to get as close as possible.
matthijs
parents:
1530
diff
changeset
|
550 |
the direction we need to take to get there, if ftd.best_bird_dist is not 0, |
|
bf364c664a60
(svn r2202) - Fix: [NPF] When a vehicle could not reach its target, it would choose a random direction. It will now try to get as close as possible.
matthijs
parents:
1530
diff
changeset
|
551 |
we did not find our target, but ftd.best_trackdir contains the direction leading |
|
bf364c664a60
(svn r2202) - Fix: [NPF] When a vehicle could not reach its target, it would choose a random direction. It will now try to get as close as possible.
matthijs
parents:
1530
diff
changeset
|
552 |
to the tile closest to our target. */ |
| 1247 | 553 |
return ftd.best_trackdir & 7; /* TODO: Wrapper function? */ |
| 2639 | 554 |
} else {
|
|
1698
bf364c664a60
(svn r2202) - Fix: [NPF] When a vehicle could not reach its target, it would choose a random direction. It will now try to get as close as possible.
matthijs
parents:
1530
diff
changeset
|
555 |
return -1; /* Already at target, reverse? */ |
| 2639 | 556 |
} |
| 1247 | 557 |
} else {
|
558 |
uint b; |
|
559 |
uint tot_dist, dist; |
|
560 |
int track; |
|
|
1977
4392ae3d8e31
(svn r2483) Replace almost 500 "uint tile" (and variants) with "TileIndex tile"
tron
parents:
1942
diff
changeset
|
561 |
TileIndex tile2; |
| 1247 | 562 |
|
563 |
tile2 = TILE_ADD(tile, -TileOffsByDir(enterdir)); |
|
564 |
tot_dist = (uint)-1; |
|
565 |
||
566 |
/* Let's find out how far it would be if we would reverse first */ |
|
|
1942
634961366cdc
(svn r2448) General cleanup of rail related code, more to follow.
matthijs
parents:
1926
diff
changeset
|
567 |
b = GetTileShipTrackStatus(tile2) & _ship_sometracks[ReverseDiagdir(enterdir)] & v->u.ship.state; |
| 1247 | 568 |
if (b != 0) {
|
|
1942
634961366cdc
(svn r2448) General cleanup of rail related code, more to follow.
matthijs
parents:
1926
diff
changeset
|
569 |
dist = FindShipTrack(v, tile2, ReverseDiagdir(enterdir), b, tile, &track); |
| 1247 | 570 |
if (dist != (uint)-1) |
571 |
tot_dist = dist + 1; |
|
572 |
} |
|
573 |
/* And if we would not reverse? */ |
|
574 |
dist = FindShipTrack(v, tile, enterdir, tracks, 0, &track); |
|
575 |
if (dist > tot_dist) |
|
576 |
/* We could better reverse */ |
|
577 |
return -1; |
|
578 |
return track; |
|
| 0 | 579 |
} |
580 |
} |
|
581 |
||
582 |
static const byte _new_vehicle_direction_table[11] = {
|
|
583 |
0, 7, 6, 0, |
|
584 |
1, 0, 5, 0, |
|
585 |
2, 3, 4, |
|
586 |
}; |
|
587 |
||
|
1977
4392ae3d8e31
(svn r2483) Replace almost 500 "uint tile" (and variants) with "TileIndex tile"
tron
parents:
1942
diff
changeset
|
588 |
static int ShipGetNewDirectionFromTiles(TileIndex new_tile, TileIndex old_tile) |
| 0 | 589 |
{
|
|
926
bd4312619522
(svn r1414) Move TileIndex, TILE_MASK and GET_TILE_[XY] to map.h and turn the latter into inline functions names Tile[XY]
tron
parents:
919
diff
changeset
|
590 |
uint offs = (TileY(new_tile) - TileY(old_tile) + 1) * 4 + |
|
bd4312619522
(svn r1414) Move TileIndex, TILE_MASK and GET_TILE_[XY] to map.h and turn the latter into inline functions names Tile[XY]
tron
parents:
919
diff
changeset
|
591 |
TileX(new_tile) - TileX(old_tile) + 1; |
| 0 | 592 |
assert(offs < 11 && offs != 3 && offs != 7); |
593 |
return _new_vehicle_direction_table[offs]; |
|
594 |
} |
|
595 |
||
596 |
static int ShipGetNewDirection(Vehicle *v, int x, int y) |
|
597 |
{
|
|
598 |
uint offs = (y - v->y_pos + 1) * 4 + (x - v->x_pos + 1); |
|
599 |
assert(offs < 11 && offs != 3 && offs != 7); |
|
600 |
return _new_vehicle_direction_table[offs]; |
|
601 |
} |
|
602 |
||
|
1977
4392ae3d8e31
(svn r2483) Replace almost 500 "uint tile" (and variants) with "TileIndex tile"
tron
parents:
1942
diff
changeset
|
603 |
static int GetAvailShipTracks(TileIndex tile, int dir) |
| 0 | 604 |
{
|
|
159
139cf78bfb28
(svn r160) -Codechange: made GetTileTrackStatus more readable (blathijs)
truelight
parents:
156
diff
changeset
|
605 |
uint32 r = GetTileTrackStatus(tile, TRANSPORT_WATER); |
| 0 | 606 |
return (byte) ((r | r >> 8)) & _ship_sometracks[dir]; |
607 |
} |
|
608 |
||
609 |
static const byte _ship_subcoord[4][6][3] = {
|
|
610 |
{
|
|
611 |
{15, 8, 1},
|
|
612 |
{ 0, 0, 0},
|
|
613 |
{ 0, 0, 0},
|
|
614 |
{15, 8, 2},
|
|
615 |
{15, 7, 0},
|
|
616 |
{ 0, 0, 0},
|
|
617 |
}, |
|
618 |
{
|
|
619 |
{ 0, 0, 0},
|
|
620 |
{ 8, 0, 3},
|
|
621 |
{ 7, 0, 2},
|
|
622 |
{ 0, 0, 0},
|
|
623 |
{ 8, 0, 4},
|
|
624 |
{ 0, 0, 0},
|
|
625 |
}, |
|
626 |
{
|
|
627 |
{ 0, 8, 5},
|
|
628 |
{ 0, 0, 0},
|
|
629 |
{ 0, 7, 6},
|
|
630 |
{ 0, 0, 0},
|
|
631 |
{ 0, 0, 0},
|
|
632 |
{ 0, 8, 4},
|
|
633 |
}, |
|
634 |
{
|
|
635 |
{ 0, 0, 0},
|
|
636 |
{ 8,15, 7},
|
|
637 |
{ 0, 0, 0},
|
|
638 |
{ 8,15, 6},
|
|
639 |
{ 0, 0, 0},
|
|
640 |
{ 7,15, 0},
|
|
641 |
} |
|
642 |
}; |
|
643 |
||
644 |
static void ShipController(Vehicle *v) |
|
645 |
{
|
|
646 |
GetNewVehiclePosResult gp; |
|
647 |
uint32 r; |
|
648 |
const byte *b; |
|
649 |
int dir,track,tracks; |
|
650 |
||
651 |
v->tick_counter++; |
|
652 |
||
653 |
if (v->breakdown_ctr != 0) {
|
|
654 |
if (v->breakdown_ctr <= 2) {
|
|
655 |
HandleBrokenShip(v); |
|
656 |
return; |
|
657 |
} |
|
658 |
v->breakdown_ctr--; |
|
659 |
} |
|
660 |
||
| 2639 | 661 |
if (v->vehstatus & VS_STOPPED) return; |
| 0 | 662 |
|
663 |
ProcessShipOrder(v); |
|
664 |
HandleShipLoading(v); |
|
665 |
||
| 2639 | 666 |
if (v->current_order.type == OT_LOADING) return; |
| 0 | 667 |
|
668 |
CheckShipLeaveDepot(v); |
|
669 |
||
| 2639 | 670 |
if (!ShipAccelerate(v)) return; |
| 0 | 671 |
|
672 |
BeginVehicleMove(v); |
|
673 |
||
674 |
if (GetNewVehiclePos(v, &gp)) {
|
|
675 |
// staying in tile |
|
676 |
if (v->u.ship.state == 0x80) {
|
|
677 |
gp.x = v->x_pos; |
|
678 |
gp.y = v->y_pos; |
|
679 |
} else {
|
|
680 |
/* isnot inside depot */ |
|
681 |
r = VehicleEnterTile(v, gp.new_tile, gp.x, gp.y); |
|
682 |
if (r & 0x8) goto reverse_direction; |
|
683 |
||
|
1751
954dd2900ac9
(svn r2255) - Fix: [ 9680363 ] [NPF] Broken buoy handling for ships
matthijs
parents:
1698
diff
changeset
|
684 |
/* A leave station order only needs one tick to get processed, so we can |
|
954dd2900ac9
(svn r2255) - Fix: [ 9680363 ] [NPF] Broken buoy handling for ships
matthijs
parents:
1698
diff
changeset
|
685 |
* always skip ahead. */ |
|
555
eec6c0294435
(svn r955) Replace uint16 for orders with struct Order
tron
parents:
541
diff
changeset
|
686 |
if (v->current_order.type == OT_LEAVESTATION) {
|
|
eec6c0294435
(svn r955) Replace uint16 for orders with struct Order
tron
parents:
541
diff
changeset
|
687 |
v->current_order.type = OT_NOTHING; |
|
eec6c0294435
(svn r955) Replace uint16 for orders with struct Order
tron
parents:
541
diff
changeset
|
688 |
v->current_order.flags = 0; |
|
755
823358e83abf
(svn r1211) -Feature: Introduce sticky windows to all vehicle windows...Just make sure you do not sticky more than 23 at a time. Also a lot of places in the code invalidated the 'status bar' of the vehicle, referring to it as widget 4. This is now widget 5 and has been #definitized
darkvater
parents:
679
diff
changeset
|
689 |
InvalidateWindowWidget(WC_VEHICLE_VIEW, v->index, STATUS_BAR); |
|
1751
954dd2900ac9
(svn r2255) - Fix: [ 9680363 ] [NPF] Broken buoy handling for ships
matthijs
parents:
1698
diff
changeset
|
690 |
} else if (v->dest_tile != 0) {
|
|
954dd2900ac9
(svn r2255) - Fix: [ 9680363 ] [NPF] Broken buoy handling for ships
matthijs
parents:
1698
diff
changeset
|
691 |
/* We have a target, let's see if we reached it... */ |
|
954dd2900ac9
(svn r2255) - Fix: [ 9680363 ] [NPF] Broken buoy handling for ships
matthijs
parents:
1698
diff
changeset
|
692 |
if (v->current_order.type == OT_GOTO_STATION && |
|
954dd2900ac9
(svn r2255) - Fix: [ 9680363 ] [NPF] Broken buoy handling for ships
matthijs
parents:
1698
diff
changeset
|
693 |
IsBuoyTile(v->dest_tile) && |
|
954dd2900ac9
(svn r2255) - Fix: [ 9680363 ] [NPF] Broken buoy handling for ships
matthijs
parents:
1698
diff
changeset
|
694 |
DistanceManhattan(v->dest_tile, gp.new_tile) <= 3) {
|
|
954dd2900ac9
(svn r2255) - Fix: [ 9680363 ] [NPF] Broken buoy handling for ships
matthijs
parents:
1698
diff
changeset
|
695 |
/* We got within 3 tiles of our target buoy, so let's skip to our |
|
954dd2900ac9
(svn r2255) - Fix: [ 9680363 ] [NPF] Broken buoy handling for ships
matthijs
parents:
1698
diff
changeset
|
696 |
* next order */ |
|
954dd2900ac9
(svn r2255) - Fix: [ 9680363 ] [NPF] Broken buoy handling for ships
matthijs
parents:
1698
diff
changeset
|
697 |
v->cur_order_index++; |
|
954dd2900ac9
(svn r2255) - Fix: [ 9680363 ] [NPF] Broken buoy handling for ships
matthijs
parents:
1698
diff
changeset
|
698 |
v->current_order.type = OT_DUMMY; |
|
954dd2900ac9
(svn r2255) - Fix: [ 9680363 ] [NPF] Broken buoy handling for ships
matthijs
parents:
1698
diff
changeset
|
699 |
InvalidateVehicleOrder(v); |
|
954dd2900ac9
(svn r2255) - Fix: [ 9680363 ] [NPF] Broken buoy handling for ships
matthijs
parents:
1698
diff
changeset
|
700 |
} else {
|
|
954dd2900ac9
(svn r2255) - Fix: [ 9680363 ] [NPF] Broken buoy handling for ships
matthijs
parents:
1698
diff
changeset
|
701 |
/* Non-buoy orders really need to reach the tile */ |
|
954dd2900ac9
(svn r2255) - Fix: [ 9680363 ] [NPF] Broken buoy handling for ships
matthijs
parents:
1698
diff
changeset
|
702 |
if (v->dest_tile == gp.new_tile) {
|
|
954dd2900ac9
(svn r2255) - Fix: [ 9680363 ] [NPF] Broken buoy handling for ships
matthijs
parents:
1698
diff
changeset
|
703 |
if (v->current_order.type == OT_GOTO_DEPOT) {
|
|
954dd2900ac9
(svn r2255) - Fix: [ 9680363 ] [NPF] Broken buoy handling for ships
matthijs
parents:
1698
diff
changeset
|
704 |
if ((gp.x&0xF)==8 && (gp.y&0xF)==8) {
|
|
954dd2900ac9
(svn r2255) - Fix: [ 9680363 ] [NPF] Broken buoy handling for ships
matthijs
parents:
1698
diff
changeset
|
705 |
ShipEnterDepot(v); |
|
954dd2900ac9
(svn r2255) - Fix: [ 9680363 ] [NPF] Broken buoy handling for ships
matthijs
parents:
1698
diff
changeset
|
706 |
return; |
|
954dd2900ac9
(svn r2255) - Fix: [ 9680363 ] [NPF] Broken buoy handling for ships
matthijs
parents:
1698
diff
changeset
|
707 |
} |
|
954dd2900ac9
(svn r2255) - Fix: [ 9680363 ] [NPF] Broken buoy handling for ships
matthijs
parents:
1698
diff
changeset
|
708 |
} else if (v->current_order.type == OT_GOTO_STATION) {
|
|
954dd2900ac9
(svn r2255) - Fix: [ 9680363 ] [NPF] Broken buoy handling for ships
matthijs
parents:
1698
diff
changeset
|
709 |
Station *st; |
|
954dd2900ac9
(svn r2255) - Fix: [ 9680363 ] [NPF] Broken buoy handling for ships
matthijs
parents:
1698
diff
changeset
|
710 |
|
|
954dd2900ac9
(svn r2255) - Fix: [ 9680363 ] [NPF] Broken buoy handling for ships
matthijs
parents:
1698
diff
changeset
|
711 |
v->last_station_visited = v->current_order.station; |
|
954dd2900ac9
(svn r2255) - Fix: [ 9680363 ] [NPF] Broken buoy handling for ships
matthijs
parents:
1698
diff
changeset
|
712 |
|
|
954dd2900ac9
(svn r2255) - Fix: [ 9680363 ] [NPF] Broken buoy handling for ships
matthijs
parents:
1698
diff
changeset
|
713 |
/* Process station in the orderlist. */ |
|
954dd2900ac9
(svn r2255) - Fix: [ 9680363 ] [NPF] Broken buoy handling for ships
matthijs
parents:
1698
diff
changeset
|
714 |
st = GetStation(v->current_order.station); |
|
954dd2900ac9
(svn r2255) - Fix: [ 9680363 ] [NPF] Broken buoy handling for ships
matthijs
parents:
1698
diff
changeset
|
715 |
if (st->facilities & FACIL_DOCK) { /* ugly, ugly workaround for problem with ships able to drop off cargo at wrong stations */
|
|
954dd2900ac9
(svn r2255) - Fix: [ 9680363 ] [NPF] Broken buoy handling for ships
matthijs
parents:
1698
diff
changeset
|
716 |
v->current_order.type = OT_LOADING; |
|
954dd2900ac9
(svn r2255) - Fix: [ 9680363 ] [NPF] Broken buoy handling for ships
matthijs
parents:
1698
diff
changeset
|
717 |
v->current_order.flags &= OF_FULL_LOAD | OF_UNLOAD; |
|
954dd2900ac9
(svn r2255) - Fix: [ 9680363 ] [NPF] Broken buoy handling for ships
matthijs
parents:
1698
diff
changeset
|
718 |
v->current_order.flags |= OF_NON_STOP; |
|
954dd2900ac9
(svn r2255) - Fix: [ 9680363 ] [NPF] Broken buoy handling for ships
matthijs
parents:
1698
diff
changeset
|
719 |
ShipArrivesAt(v, st); |
|
954dd2900ac9
(svn r2255) - Fix: [ 9680363 ] [NPF] Broken buoy handling for ships
matthijs
parents:
1698
diff
changeset
|
720 |
|
|
954dd2900ac9
(svn r2255) - Fix: [ 9680363 ] [NPF] Broken buoy handling for ships
matthijs
parents:
1698
diff
changeset
|
721 |
SET_EXPENSES_TYPE(EXPENSES_SHIP_INC); |
|
954dd2900ac9
(svn r2255) - Fix: [ 9680363 ] [NPF] Broken buoy handling for ships
matthijs
parents:
1698
diff
changeset
|
722 |
if (LoadUnloadVehicle(v)) {
|
|
954dd2900ac9
(svn r2255) - Fix: [ 9680363 ] [NPF] Broken buoy handling for ships
matthijs
parents:
1698
diff
changeset
|
723 |
InvalidateWindow(WC_SHIPS_LIST, v->owner); |
|
954dd2900ac9
(svn r2255) - Fix: [ 9680363 ] [NPF] Broken buoy handling for ships
matthijs
parents:
1698
diff
changeset
|
724 |
MarkShipDirty(v); |
|
954dd2900ac9
(svn r2255) - Fix: [ 9680363 ] [NPF] Broken buoy handling for ships
matthijs
parents:
1698
diff
changeset
|
725 |
} |
|
954dd2900ac9
(svn r2255) - Fix: [ 9680363 ] [NPF] Broken buoy handling for ships
matthijs
parents:
1698
diff
changeset
|
726 |
InvalidateWindowWidget(WC_VEHICLE_VIEW, v->index, STATUS_BAR); |
|
954dd2900ac9
(svn r2255) - Fix: [ 9680363 ] [NPF] Broken buoy handling for ships
matthijs
parents:
1698
diff
changeset
|
727 |
} else { /* leave stations without docks right aways */
|
|
954dd2900ac9
(svn r2255) - Fix: [ 9680363 ] [NPF] Broken buoy handling for ships
matthijs
parents:
1698
diff
changeset
|
728 |
v->current_order.type = OT_LEAVESTATION; |
|
954dd2900ac9
(svn r2255) - Fix: [ 9680363 ] [NPF] Broken buoy handling for ships
matthijs
parents:
1698
diff
changeset
|
729 |
v->current_order.flags = 0; |
|
954dd2900ac9
(svn r2255) - Fix: [ 9680363 ] [NPF] Broken buoy handling for ships
matthijs
parents:
1698
diff
changeset
|
730 |
v->cur_order_index++; |
|
954dd2900ac9
(svn r2255) - Fix: [ 9680363 ] [NPF] Broken buoy handling for ships
matthijs
parents:
1698
diff
changeset
|
731 |
InvalidateVehicleOrder(v); |
|
954dd2900ac9
(svn r2255) - Fix: [ 9680363 ] [NPF] Broken buoy handling for ships
matthijs
parents:
1698
diff
changeset
|
732 |
} |
|
954dd2900ac9
(svn r2255) - Fix: [ 9680363 ] [NPF] Broken buoy handling for ships
matthijs
parents:
1698
diff
changeset
|
733 |
} |
|
954dd2900ac9
(svn r2255) - Fix: [ 9680363 ] [NPF] Broken buoy handling for ships
matthijs
parents:
1698
diff
changeset
|
734 |
} |
|
954dd2900ac9
(svn r2255) - Fix: [ 9680363 ] [NPF] Broken buoy handling for ships
matthijs
parents:
1698
diff
changeset
|
735 |
} |
| 0 | 736 |
} |
737 |
} |
|
738 |
} else {
|
|
739 |
// new tile |
|
|
1401
56d372a75b74
(svn r1905) - Fix: [ 1118810 ] openttd: ship_cmd.c:642 ... Assertion failed. Mapwrap fixed in ship_cmd.c (was implicitely ok before biggermaps).
Darkvater
parents:
1330
diff
changeset
|
740 |
if (TileX(gp.new_tile) >= MapMaxX() || TileY(gp.new_tile) >= MapMaxY()) |
|
926
bd4312619522
(svn r1414) Move TileIndex, TILE_MASK and GET_TILE_[XY] to map.h and turn the latter into inline functions names Tile[XY]
tron
parents:
919
diff
changeset
|
741 |
goto reverse_direction; |
| 0 | 742 |
|
743 |
dir = ShipGetNewDirectionFromTiles(gp.new_tile, gp.old_tile); |
|
744 |
assert(dir == 1 || dir == 3 || dir == 5 || dir == 7); |
|
745 |
dir>>=1; |
|
746 |
tracks = GetAvailShipTracks(gp.new_tile, dir); |
|
747 |
if (tracks == 0) |
|
748 |
goto reverse_direction; |
|
749 |
||
750 |
// Choose a direction, and continue if we find one |
|
751 |
track = ChooseShipTrack(v, gp.new_tile, dir, tracks); |
|
752 |
if (track < 0) |
|
753 |
goto reverse_direction; |
|
754 |
||
755 |
b = _ship_subcoord[dir][track]; |
|
|
193
0a7025304867
(svn r194) -Codechange: stripping trailing-spaces. Please keep this that way!
truelight
parents:
164
diff
changeset
|
756 |
|
| 0 | 757 |
gp.x = (gp.x&~0xF) | b[0]; |
758 |
gp.y = (gp.y&~0xF) | b[1]; |
|
759 |
||
760 |
/* Call the landscape function and tell it that the vehicle entered the tile */ |
|
761 |
r = VehicleEnterTile(v, gp.new_tile, gp.x, gp.y); |
|
762 |
if (r&0x8) goto reverse_direction; |
|
763 |
||
764 |
if (!(r&0x4)) {
|
|
765 |
v->tile = gp.new_tile; |
|
766 |
v->u.ship.state = 1 << track; |
|
767 |
} |
|
768 |
||
769 |
v->direction = b[2]; |
|
770 |
} |
|
771 |
||
772 |
/* update image of ship, as well as delta XY */ |
|
773 |
dir = ShipGetNewDirection(v, gp.x, gp.y); |
|
774 |
v->x_pos = gp.x; |
|
775 |
v->y_pos = gp.y; |
|
776 |
v->z_pos = GetSlopeZ(gp.x, gp.y); |
|
777 |
||
778 |
getout: |
|
779 |
UpdateShipDeltaXY(v, dir); |
|
780 |
v->cur_image = GetShipImage(v, dir); |
|
781 |
VehiclePositionChanged(v); |
|
782 |
EndVehicleMove(v); |
|
783 |
return; |
|
784 |
||
785 |
reverse_direction: |
|
786 |
dir = v->direction ^ 4; |
|
787 |
v->direction = dir; |
|
788 |
goto getout; |
|
789 |
} |
|
790 |
||
791 |
static void AgeShipCargo(Vehicle *v) |
|
792 |
{
|
|
| 2639 | 793 |
if (_age_cargo_skip_counter != 0) return; |
794 |
if (v->cargo_days != 255) v->cargo_days++; |
|
| 0 | 795 |
} |
796 |
||
797 |
void Ship_Tick(Vehicle *v) |
|
798 |
{
|
|
799 |
AgeShipCargo(v); |
|
800 |
ShipController(v); |
|
801 |
} |
|
802 |
||
803 |
||
|
1093
e8d26c7dc42f
(svn r1594) Convert all undefined parameter lists to (void) and add the appropriate warning flags in the Makefile
tron
parents:
1055
diff
changeset
|
804 |
void ShipsYearlyLoop(void) |
| 0 | 805 |
{
|
806 |
Vehicle *v; |
|
807 |
||
808 |
FOR_ALL_VEHICLES(v) {
|
|
809 |
if (v->type == VEH_Ship) {
|
|
810 |
v->profit_last_year = v->profit_this_year; |
|
811 |
v->profit_this_year = 0; |
|
812 |
InvalidateWindow(WC_VEHICLE_DETAILS, v->index); |
|
813 |
} |
|
814 |
} |
|
815 |
} |
|
816 |
||
|
1793
8ac8a8c9ec0f
(svn r2297) - CodeChange: server-check the next batch of commands.
Darkvater
parents:
1790
diff
changeset
|
817 |
/** Build a ship. |
|
8ac8a8c9ec0f
(svn r2297) - CodeChange: server-check the next batch of commands.
Darkvater
parents:
1790
diff
changeset
|
818 |
* @param x,y tile coordinates of depot where ship is built |
|
8ac8a8c9ec0f
(svn r2297) - CodeChange: server-check the next batch of commands.
Darkvater
parents:
1790
diff
changeset
|
819 |
* @param p1 ship type being built (engine) |
|
8ac8a8c9ec0f
(svn r2297) - CodeChange: server-check the next batch of commands.
Darkvater
parents:
1790
diff
changeset
|
820 |
* @param p2 unused |
|
8ac8a8c9ec0f
(svn r2297) - CodeChange: server-check the next batch of commands.
Darkvater
parents:
1790
diff
changeset
|
821 |
*/ |
| 0 | 822 |
int32 CmdBuildShip(int x, int y, uint32 flags, uint32 p1, uint32 p2) |
823 |
{
|
|
824 |
int32 value; |
|
825 |
Vehicle *v; |
|
|
1282
e7a73ee62d2f
(svn r1786) -Fix: unitnumber is increased to 16bit, so now you can have up to 5000
truelight
parents:
1266
diff
changeset
|
826 |
UnitID unit_num; |
|
1980
9ea0c89fbb58
(svn r2486) Turn TILE_FROM_XY into an inline function and rename it to TileVirtXY
tron
parents:
1977
diff
changeset
|
827 |
TileIndex tile = TileVirtXY(x, y); |
| 0 | 828 |
Engine *e; |
|
193
0a7025304867
(svn r194) -Codechange: stripping trailing-spaces. Please keep this that way!
truelight
parents:
164
diff
changeset
|
829 |
|
|
2854
6b85a5f4b65f
(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
|
830 |
if (!IsEngineBuildable(p1, VEH_Ship)) return_cmd_error(STR_ENGINE_NOT_BUILDABLE); |
|
1196
115f46e3807d
(svn r1700) - Fix: Hacked clients can no longer be used to build vehicles that are not available yet (Hackykid)
bjarni
parents:
1151
diff
changeset
|
831 |
|
| 0 | 832 |
SET_EXPENSES_TYPE(EXPENSES_NEW_VEHICLES); |
833 |
||
834 |
value = EstimateShipCost(p1); |
|
|
1793
8ac8a8c9ec0f
(svn r2297) - CodeChange: server-check the next batch of commands.
Darkvater
parents:
1790
diff
changeset
|
835 |
if (flags & DC_QUERY_COST) return value; |
| 0 | 836 |
|
|
1443
d9c101f7634b
(svn r1947) As in r1946, permit DC_QUERY_COST even on non-depot tiles - so that it works for the ai_new. It is de iure not a bug yet but let's be safe against future annoying headaches. Signed-Off-By: TrueLight
pasky
parents:
1401
diff
changeset
|
837 |
/* The ai_new queries the vehicle cost before building the route, |
|
d9c101f7634b
(svn r1947) As in r1946, permit DC_QUERY_COST even on non-depot tiles - so that it works for the ai_new. It is de iure not a bug yet but let's be safe against future annoying headaches. Signed-Off-By: TrueLight
pasky
parents:
1401
diff
changeset
|
838 |
* so we must check against cheaters no sooner than now. --pasky */ |
|
d9c101f7634b
(svn r1947) As in r1946, permit DC_QUERY_COST even on non-depot tiles - so that it works for the ai_new. It is de iure not a bug yet but let's be safe against future annoying headaches. Signed-Off-By: TrueLight
pasky
parents:
1401
diff
changeset
|
839 |
if (!IsTileDepotType(tile, TRANSPORT_WATER)) return CMD_ERROR; |
|
1901
fb05044cf5c3
(svn r2407) Use {Get,Is}TileOwner to get/check the owner of a tile and fix some bogus reads of _map_owner
tron
parents:
1891
diff
changeset
|
840 |
if (!IsTileOwner(tile, _current_player)) return CMD_ERROR; |
|
1443
d9c101f7634b
(svn r1947) As in r1946, permit DC_QUERY_COST even on non-depot tiles - so that it works for the ai_new. It is de iure not a bug yet but let's be safe against future annoying headaches. Signed-Off-By: TrueLight
pasky
parents:
1401
diff
changeset
|
841 |
|
| 0 | 842 |
v = AllocateVehicle(); |
|
1024
9b06b01490a4
(svn r1525) -Codechange: rewrote the _order_array, now it can be made dynamic.
truelight
parents:
1020
diff
changeset
|
843 |
if (v == NULL || IsOrderPoolFull() || |
| 0 | 844 |
(unit_num = GetFreeUnitNumber(VEH_Ship)) > _patches.max_ships) |
845 |
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
|
846 |
|
| 0 | 847 |
if (flags & DC_EXEC) {
|
|
538
5dd99f3b7eca
(svn r920) Replace vehicle info macros with inline functions and add asserts to check limits
tron
parents:
534
diff
changeset
|
848 |
const ShipVehicleInfo *svi = ShipVehInfo(p1); |
|
5dd99f3b7eca
(svn r920) Replace vehicle info macros with inline functions and add asserts to check limits
tron
parents:
534
diff
changeset
|
849 |
|
| 0 | 850 |
v->unitnumber = unit_num; |
851 |
||
852 |
v->owner = _current_player; |
|
853 |
v->tile = tile; |
|
|
926
bd4312619522
(svn r1414) Move TileIndex, TILE_MASK and GET_TILE_[XY] to map.h and turn the latter into inline functions names Tile[XY]
tron
parents:
919
diff
changeset
|
854 |
x = TileX(tile) * 16 + 8; |
|
bd4312619522
(svn r1414) Move TileIndex, TILE_MASK and GET_TILE_[XY] to map.h and turn the latter into inline functions names Tile[XY]
tron
parents:
919
diff
changeset
|
855 |
y = TileY(tile) * 16 + 8; |
| 0 | 856 |
v->x_pos = x; |
857 |
v->y_pos = y; |
|
858 |
v->z_pos = GetSlopeZ(x,y); |
|
859 |
||
860 |
v->z_height = 6; |
|
861 |
v->sprite_width = 6; |
|
862 |
v->sprite_height = 6; |
|
863 |
v->x_offs = -3; |
|
864 |
v->y_offs = -3; |
|
865 |
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
|
866 |
|
|
538
5dd99f3b7eca
(svn r920) Replace vehicle info macros with inline functions and add asserts to check limits
tron
parents:
534
diff
changeset
|
867 |
v->spritenum = svi->image_index; |
|
5dd99f3b7eca
(svn r920) Replace vehicle info macros with inline functions and add asserts to check limits
tron
parents:
534
diff
changeset
|
868 |
v->cargo_type = svi->cargo_type; |
|
5dd99f3b7eca
(svn r920) Replace vehicle info macros with inline functions and add asserts to check limits
tron
parents:
534
diff
changeset
|
869 |
v->cargo_cap = svi->capacity; |
| 0 | 870 |
v->value = value; |
|
193
0a7025304867
(svn r194) -Codechange: stripping trailing-spaces. Please keep this that way!
truelight
parents:
164
diff
changeset
|
871 |
|
|
1266
9dc5638fe8cc
(svn r1770) -Fix: Hopefully last pieces of code that are containing a station-id
truelight
parents:
1247
diff
changeset
|
872 |
v->last_station_visited = INVALID_STATION; |
|
538
5dd99f3b7eca
(svn r920) Replace vehicle info macros with inline functions and add asserts to check limits
tron
parents:
534
diff
changeset
|
873 |
v->max_speed = svi->max_speed; |
|
2477
d454d5152386
(svn r3003) Change int, uint, uin16 and byte to EngineID where appropriate, plus some related changes (mostly casts)
tron
parents:
2464
diff
changeset
|
874 |
v->engine_type = p1; |
| 0 | 875 |
|
|
1926
68d60188a22f
(svn r2432) Use GetEngine() instead of DEREF_ENGINE() or even _engines[]
tron
parents:
1901
diff
changeset
|
876 |
e = GetEngine(p1); |
| 0 | 877 |
v->reliability = e->reliability; |
878 |
v->reliability_spd_dec = e->reliability_spd_dec; |
|
879 |
v->max_age = e->lifelength * 366; |
|
880 |
_new_ship_id = v->index; |
|
| 2564 | 881 |
_new_vehicle_id = v->index; |
| 0 | 882 |
|
883 |
v->string_id = STR_SV_SHIP_NAME; |
|
884 |
v->u.ship.state = 0x80; |
|
885 |
||
886 |
v->service_interval = _patches.servint_ships; |
|
887 |
v->date_of_last_service = _date; |
|
888 |
v->build_year = _cur_year; |
|
889 |
v->cur_image = 0x0E5E; |
|
890 |
v->type = VEH_Ship; |
|
|
2804
b932fe148d36
(svn r3352) - NewGRF: Move initialization of vehicle random_bits to DC_EXEC blocks to allow use of Random() instead of InteractiveRandom(), which will alleviate some possible network desyncs.
peter1138
parents:
2791
diff
changeset
|
891 |
v->random_bits = VehicleRandomBits(); |
| 0 | 892 |
|
893 |
VehiclePositionChanged(v); |
|
894 |
||
895 |
InvalidateWindow(WC_VEHICLE_DEPOT, v->tile); |
|
| 588 | 896 |
RebuildVehicleLists(); |
| 0 | 897 |
InvalidateWindow(WC_COMPANY, v->owner); |
|
2618
7546b838230b
(svn r3156) -Fix: removed some cases where autoreplace windows were redrawn when nothing was changed
bjarni
parents:
2574
diff
changeset
|
898 |
if (IsLocalPlayer()) |
|
7546b838230b
(svn r3156) -Fix: removed some cases where autoreplace windows were redrawn when nothing was changed
bjarni
parents:
2574
diff
changeset
|
899 |
InvalidateWindow(WC_REPLACE_VEHICLE, VEH_Ship); // updates the replace Ship window |
| 0 | 900 |
} |
|
193
0a7025304867
(svn r194) -Codechange: stripping trailing-spaces. Please keep this that way!
truelight
parents:
164
diff
changeset
|
901 |
|
| 0 | 902 |
return value; |
903 |
} |
|
904 |
||
|
1793
8ac8a8c9ec0f
(svn r2297) - CodeChange: server-check the next batch of commands.
Darkvater
parents:
1790
diff
changeset
|
905 |
/** Sell a ship. |
|
8ac8a8c9ec0f
(svn r2297) - CodeChange: server-check the next batch of commands.
Darkvater
parents:
1790
diff
changeset
|
906 |
* @param x,y unused |
|
8ac8a8c9ec0f
(svn r2297) - CodeChange: server-check the next batch of commands.
Darkvater
parents:
1790
diff
changeset
|
907 |
* @param p1 vehicle ID to be sold |
|
8ac8a8c9ec0f
(svn r2297) - CodeChange: server-check the next batch of commands.
Darkvater
parents:
1790
diff
changeset
|
908 |
* @param p2 unused |
|
8ac8a8c9ec0f
(svn r2297) - CodeChange: server-check the next batch of commands.
Darkvater
parents:
1790
diff
changeset
|
909 |
*/ |
| 0 | 910 |
int32 CmdSellShip(int x, int y, uint32 flags, uint32 p1, uint32 p2) |
911 |
{
|
|
912 |
Vehicle *v; |
|
913 |
||
|
1237
0a1ce05c3d45
(svn r1741) - Fix: added IsVehicleIndex() so it's possible to protect GetVehicle() from reading an invalid vehicle index
bjarni
parents:
1235
diff
changeset
|
914 |
if (!IsVehicleIndex(p1)) return CMD_ERROR; |
|
193
0a7025304867
(svn r194) -Codechange: stripping trailing-spaces. Please keep this that way!
truelight
parents:
164
diff
changeset
|
915 |
|
|
919
b0d6c7642f99
(svn r1407) -Codechange: changed a lot around _stations, _vehicles, _towns and _industries
truelight
parents:
915
diff
changeset
|
916 |
v = GetVehicle(p1); |
| 0 | 917 |
|
|
1793
8ac8a8c9ec0f
(svn r2297) - CodeChange: server-check the next batch of commands.
Darkvater
parents:
1790
diff
changeset
|
918 |
if (v->type != VEH_Ship || !CheckOwnership(v->owner)) return CMD_ERROR; |
| 0 | 919 |
|
|
1237
0a1ce05c3d45
(svn r1741) - Fix: added IsVehicleIndex() so it's possible to protect GetVehicle() from reading an invalid vehicle index
bjarni
parents:
1235
diff
changeset
|
920 |
SET_EXPENSES_TYPE(EXPENSES_NEW_VEHICLES); |
|
0a1ce05c3d45
(svn r1741) - Fix: added IsVehicleIndex() so it's possible to protect GetVehicle() from reading an invalid vehicle index
bjarni
parents:
1235
diff
changeset
|
921 |
|
|
1330
8a67d04016ce
(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
|
922 |
if (!IsTileDepotType(v->tile, TRANSPORT_WATER) || v->u.road.state != 0x80 || !(v->vehstatus&VS_STOPPED)) |
| 0 | 923 |
return_cmd_error(STR_980B_SHIP_MUST_BE_STOPPED_IN); |
|
193
0a7025304867
(svn r194) -Codechange: stripping trailing-spaces. Please keep this that way!
truelight
parents:
164
diff
changeset
|
924 |
|
| 0 | 925 |
if (flags & DC_EXEC) {
|
926 |
InvalidateWindow(WC_VEHICLE_DEPOT, v->tile); |
|
| 588 | 927 |
RebuildVehicleLists(); |
| 0 | 928 |
InvalidateWindow(WC_COMPANY, v->owner); |
929 |
DeleteWindowById(WC_VEHICLE_VIEW, v->index); |
|
930 |
DeleteVehicle(v); |
|
|
2618
7546b838230b
(svn r3156) -Fix: removed some cases where autoreplace windows were redrawn when nothing was changed
bjarni
parents:
2574
diff
changeset
|
931 |
if (IsLocalPlayer()) |
|
7546b838230b
(svn r3156) -Fix: removed some cases where autoreplace windows were redrawn when nothing was changed
bjarni
parents:
2574
diff
changeset
|
932 |
InvalidateWindow(WC_REPLACE_VEHICLE, VEH_Ship); // updates the replace Ship window |
| 0 | 933 |
} |
|
193
0a7025304867
(svn r194) -Codechange: stripping trailing-spaces. Please keep this that way!
truelight
parents:
164
diff
changeset
|
934 |
|
| 0 | 935 |
return -(int32)v->value; |
936 |
} |
|
937 |
||
|
1793
8ac8a8c9ec0f
(svn r2297) - CodeChange: server-check the next batch of commands.
Darkvater
parents:
1790
diff
changeset
|
938 |
/** Start/Stop a ship. |
|
8ac8a8c9ec0f
(svn r2297) - CodeChange: server-check the next batch of commands.
Darkvater
parents:
1790
diff
changeset
|
939 |
* @param x,y unused |
|
8ac8a8c9ec0f
(svn r2297) - CodeChange: server-check the next batch of commands.
Darkvater
parents:
1790
diff
changeset
|
940 |
* @param p1 ship ID to start/stop |
|
8ac8a8c9ec0f
(svn r2297) - CodeChange: server-check the next batch of commands.
Darkvater
parents:
1790
diff
changeset
|
941 |
* @param p2 unused |
|
8ac8a8c9ec0f
(svn r2297) - CodeChange: server-check the next batch of commands.
Darkvater
parents:
1790
diff
changeset
|
942 |
*/ |
| 0 | 943 |
int32 CmdStartStopShip(int x, int y, uint32 flags, uint32 p1, uint32 p2) |
944 |
{
|
|
945 |
Vehicle *v; |
|
946 |
||
|
1237
0a1ce05c3d45
(svn r1741) - Fix: added IsVehicleIndex() so it's possible to protect GetVehicle() from reading an invalid vehicle index
bjarni
parents:
1235
diff
changeset
|
947 |
if (!IsVehicleIndex(p1)) return CMD_ERROR; |
|
0a1ce05c3d45
(svn r1741) - Fix: added IsVehicleIndex() so it's possible to protect GetVehicle() from reading an invalid vehicle index
bjarni
parents:
1235
diff
changeset
|
948 |
|
|
919
b0d6c7642f99
(svn r1407) -Codechange: changed a lot around _stations, _vehicles, _towns and _industries
truelight
parents:
915
diff
changeset
|
949 |
v = GetVehicle(p1); |
| 0 | 950 |
|
|
1793
8ac8a8c9ec0f
(svn r2297) - CodeChange: server-check the next batch of commands.
Darkvater
parents:
1790
diff
changeset
|
951 |
if (v->type != VEH_Ship || !CheckOwnership(v->owner)) return CMD_ERROR; |
| 0 | 952 |
|
953 |
if (flags & DC_EXEC) {
|
|
954 |
v->vehstatus ^= VS_STOPPED; |
|
|
755
823358e83abf
(svn r1211) -Feature: Introduce sticky windows to all vehicle windows...Just make sure you do not sticky more than 23 at a time. Also a lot of places in the code invalidated the 'status bar' of the vehicle, referring to it as widget 4. This is now widget 5 and has been #definitized
darkvater
parents:
679
diff
changeset
|
955 |
InvalidateWindowWidget(WC_VEHICLE_VIEW, v->index, STATUS_BAR); |
| 0 | 956 |
InvalidateWindow(WC_VEHICLE_DEPOT, v->tile); |
|
1793
8ac8a8c9ec0f
(svn r2297) - CodeChange: server-check the next batch of commands.
Darkvater
parents:
1790
diff
changeset
|
957 |
InvalidateWindowClasses(WC_SHIPS_LIST); |
| 0 | 958 |
} |
959 |
||
960 |
return 0; |
|
961 |
} |
|
962 |
||
|
1793
8ac8a8c9ec0f
(svn r2297) - CodeChange: server-check the next batch of commands.
Darkvater
parents:
1790
diff
changeset
|
963 |
/** Send a ship to the depot. |
|
8ac8a8c9ec0f
(svn r2297) - CodeChange: server-check the next batch of commands.
Darkvater
parents:
1790
diff
changeset
|
964 |
* @param x,y unused |
|
8ac8a8c9ec0f
(svn r2297) - CodeChange: server-check the next batch of commands.
Darkvater
parents:
1790
diff
changeset
|
965 |
* @param p1 vehicle ID to send to the depot |
|
8ac8a8c9ec0f
(svn r2297) - CodeChange: server-check the next batch of commands.
Darkvater
parents:
1790
diff
changeset
|
966 |
* @param p2 unused |
|
8ac8a8c9ec0f
(svn r2297) - CodeChange: server-check the next batch of commands.
Darkvater
parents:
1790
diff
changeset
|
967 |
*/ |
| 0 | 968 |
int32 CmdSendShipToDepot(int x, int y, uint32 flags, uint32 p1, uint32 p2) |
969 |
{
|
|
970 |
Vehicle *v; |
|
|
1793
8ac8a8c9ec0f
(svn r2297) - CodeChange: server-check the next batch of commands.
Darkvater
parents:
1790
diff
changeset
|
971 |
const Depot *dep; |
| 0 | 972 |
|
|
1237
0a1ce05c3d45
(svn r1741) - Fix: added IsVehicleIndex() so it's possible to protect GetVehicle() from reading an invalid vehicle index
bjarni
parents:
1235
diff
changeset
|
973 |
if (!IsVehicleIndex(p1)) return CMD_ERROR; |
|
0a1ce05c3d45
(svn r1741) - Fix: added IsVehicleIndex() so it's possible to protect GetVehicle() from reading an invalid vehicle index
bjarni
parents:
1235
diff
changeset
|
974 |
|
|
919
b0d6c7642f99
(svn r1407) -Codechange: changed a lot around _stations, _vehicles, _towns and _industries
truelight
parents:
915
diff
changeset
|
975 |
v = GetVehicle(p1); |
| 0 | 976 |
|
|
1793
8ac8a8c9ec0f
(svn r2297) - CodeChange: server-check the next batch of commands.
Darkvater
parents:
1790
diff
changeset
|
977 |
if (v->type != VEH_Ship || !CheckOwnership(v->owner)) return CMD_ERROR; |
| 0 | 978 |
|
|
1793
8ac8a8c9ec0f
(svn r2297) - CodeChange: server-check the next batch of commands.
Darkvater
parents:
1790
diff
changeset
|
979 |
if (v->vehstatus & VS_CRASHED) return CMD_ERROR; |
|
1757
b179d50241dc
(svn r2261) - Fix: When crashed vehicles try to find a depot for servicing, openttd asserts.
matthijs
parents:
1752
diff
changeset
|
980 |
|
|
1793
8ac8a8c9ec0f
(svn r2297) - CodeChange: server-check the next batch of commands.
Darkvater
parents:
1790
diff
changeset
|
981 |
/* If the current orders are already goto-depot */ |
|
555
eec6c0294435
(svn r955) Replace uint16 for orders with struct Order
tron
parents:
541
diff
changeset
|
982 |
if (v->current_order.type == OT_GOTO_DEPOT) {
|
| 0 | 983 |
if (flags & DC_EXEC) {
|
|
1793
8ac8a8c9ec0f
(svn r2297) - CodeChange: server-check the next batch of commands.
Darkvater
parents:
1790
diff
changeset
|
984 |
/* If the orders to 'goto depot' are in the orders list (forced servicing), |
|
8ac8a8c9ec0f
(svn r2297) - CodeChange: server-check the next batch of commands.
Darkvater
parents:
1790
diff
changeset
|
985 |
* then skip to the next order; effectively cancelling this forced service */ |
|
1530
caa16c506a22
(svn r2034) -Codechange: Replaced the rather meaningless LOAD and UNLOAD flags for depots by something more meaningful
celestar
parents:
1520
diff
changeset
|
986 |
if (HASBIT(v->current_order.flags, OFB_PART_OF_ORDERS)) |
|
caa16c506a22
(svn r2034) -Codechange: Replaced the rather meaningless LOAD and UNLOAD flags for depots by something more meaningful
celestar
parents:
1520
diff
changeset
|
987 |
v->cur_order_index++; |
|
caa16c506a22
(svn r2034) -Codechange: Replaced the rather meaningless LOAD and UNLOAD flags for depots by something more meaningful
celestar
parents:
1520
diff
changeset
|
988 |
|
|
555
eec6c0294435
(svn r955) Replace uint16 for orders with struct Order
tron
parents:
541
diff
changeset
|
989 |
v->current_order.type = OT_DUMMY; |
|
eec6c0294435
(svn r955) Replace uint16 for orders with struct Order
tron
parents:
541
diff
changeset
|
990 |
v->current_order.flags = 0; |
|
755
823358e83abf
(svn r1211) -Feature: Introduce sticky windows to all vehicle windows...Just make sure you do not sticky more than 23 at a time. Also a lot of places in the code invalidated the 'status bar' of the vehicle, referring to it as widget 4. This is now widget 5 and has been #definitized
darkvater
parents:
679
diff
changeset
|
991 |
InvalidateWindowWidget(WC_VEHICLE_VIEW, v->index, STATUS_BAR); |
| 0 | 992 |
} |
|
1793
8ac8a8c9ec0f
(svn r2297) - CodeChange: server-check the next batch of commands.
Darkvater
parents:
1790
diff
changeset
|
993 |
return 0; |
|
8ac8a8c9ec0f
(svn r2297) - CodeChange: server-check the next batch of commands.
Darkvater
parents:
1790
diff
changeset
|
994 |
} |
| 0 | 995 |
|
|
1793
8ac8a8c9ec0f
(svn r2297) - CodeChange: server-check the next batch of commands.
Darkvater
parents:
1790
diff
changeset
|
996 |
dep = FindClosestShipDepot(v); |
|
8ac8a8c9ec0f
(svn r2297) - CodeChange: server-check the next batch of commands.
Darkvater
parents:
1790
diff
changeset
|
997 |
if (dep == NULL) |
|
8ac8a8c9ec0f
(svn r2297) - CodeChange: server-check the next batch of commands.
Darkvater
parents:
1790
diff
changeset
|
998 |
return_cmd_error(STR_981A_UNABLE_TO_FIND_LOCAL_DEPOT); |
|
8ac8a8c9ec0f
(svn r2297) - CodeChange: server-check the next batch of commands.
Darkvater
parents:
1790
diff
changeset
|
999 |
|
|
8ac8a8c9ec0f
(svn r2297) - CodeChange: server-check the next batch of commands.
Darkvater
parents:
1790
diff
changeset
|
1000 |
if (flags & DC_EXEC) {
|
|
8ac8a8c9ec0f
(svn r2297) - CodeChange: server-check the next batch of commands.
Darkvater
parents:
1790
diff
changeset
|
1001 |
v->dest_tile = dep->xy; |
|
8ac8a8c9ec0f
(svn r2297) - CodeChange: server-check the next batch of commands.
Darkvater
parents:
1790
diff
changeset
|
1002 |
v->current_order.type = OT_GOTO_DEPOT; |
|
8ac8a8c9ec0f
(svn r2297) - CodeChange: server-check the next batch of commands.
Darkvater
parents:
1790
diff
changeset
|
1003 |
v->current_order.flags = OF_NON_STOP | OF_HALT_IN_DEPOT; |
|
8ac8a8c9ec0f
(svn r2297) - CodeChange: server-check the next batch of commands.
Darkvater
parents:
1790
diff
changeset
|
1004 |
v->current_order.station = dep->index; |
|
8ac8a8c9ec0f
(svn r2297) - CodeChange: server-check the next batch of commands.
Darkvater
parents:
1790
diff
changeset
|
1005 |
InvalidateWindowWidget(WC_VEHICLE_VIEW, v->index, STATUS_BAR); |
| 0 | 1006 |
} |
1007 |
||
1008 |
return 0; |
|
1009 |
} |
|
1010 |
||
1011 |
||
|
1802
448f187042d3
(svn r2306) - CodeChange: Check the last commands; refits. This needed an extensive rewrite and global/local-cargo ID juggling and bitmasking. However with this done it looks better as well and is compatible with newgrf handling. Big thanks to HackyKid for doing most of the work. This also closes patch "[ 1199277 ] Command checks"
Darkvater
parents:
1793
diff
changeset
|
1012 |
/** Refits a ship to the specified cargo type. |
|
448f187042d3
(svn r2306) - CodeChange: Check the last commands; refits. This needed an extensive rewrite and global/local-cargo ID juggling and bitmasking. However with this done it looks better as well and is compatible with newgrf handling. Big thanks to HackyKid for doing most of the work. This also closes patch "[ 1199277 ] Command checks"
Darkvater
parents:
1793
diff
changeset
|
1013 |
* @param x,y unused |
|
448f187042d3
(svn r2306) - CodeChange: Check the last commands; refits. This needed an extensive rewrite and global/local-cargo ID juggling and bitmasking. However with this done it looks better as well and is compatible with newgrf handling. Big thanks to HackyKid for doing most of the work. This also closes patch "[ 1199277 ] Command checks"
Darkvater
parents:
1793
diff
changeset
|
1014 |
* @param p1 vehicle ID of the ship to refit |
|
448f187042d3
(svn r2306) - CodeChange: Check the last commands; refits. This needed an extensive rewrite and global/local-cargo ID juggling and bitmasking. However with this done it looks better as well and is compatible with newgrf handling. Big thanks to HackyKid for doing most of the work. This also closes patch "[ 1199277 ] Command checks"
Darkvater
parents:
1793
diff
changeset
|
1015 |
* @param p2 various bitstuffed elements |
|
448f187042d3
(svn r2306) - CodeChange: Check the last commands; refits. This needed an extensive rewrite and global/local-cargo ID juggling and bitmasking. However with this done it looks better as well and is compatible with newgrf handling. Big thanks to HackyKid for doing most of the work. This also closes patch "[ 1199277 ] Command checks"
Darkvater
parents:
1793
diff
changeset
|
1016 |
* - p2 = (bit 0-7) - the new cargo type to refit to (p2 & 0xFF) |
|
448f187042d3
(svn r2306) - CodeChange: Check the last commands; refits. This needed an extensive rewrite and global/local-cargo ID juggling and bitmasking. However with this done it looks better as well and is compatible with newgrf handling. Big thanks to HackyKid for doing most of the work. This also closes patch "[ 1199277 ] Command checks"
Darkvater
parents:
1793
diff
changeset
|
1017 |
*/ |
| 0 | 1018 |
int32 CmdRefitShip(int x, int y, uint32 flags, uint32 p1, uint32 p2) |
1019 |
{
|
|
1020 |
Vehicle *v; |
|
1021 |
int32 cost; |
|
|
1802
448f187042d3
(svn r2306) - CodeChange: Check the last commands; refits. This needed an extensive rewrite and global/local-cargo ID juggling and bitmasking. However with this done it looks better as well and is compatible with newgrf handling. Big thanks to HackyKid for doing most of the work. This also closes patch "[ 1199277 ] Command checks"
Darkvater
parents:
1793
diff
changeset
|
1022 |
CargoID new_cid = p2 & 0xFF; //gets the cargo number |
|
1237
0a1ce05c3d45
(svn r1741) - Fix: added IsVehicleIndex() so it's possible to protect GetVehicle() from reading an invalid vehicle index
bjarni
parents:
1235
diff
changeset
|
1023 |
|
|
0a1ce05c3d45
(svn r1741) - Fix: added IsVehicleIndex() so it's possible to protect GetVehicle() from reading an invalid vehicle index
bjarni
parents:
1235
diff
changeset
|
1024 |
if (!IsVehicleIndex(p1)) return CMD_ERROR; |
|
193
0a7025304867
(svn r194) -Codechange: stripping trailing-spaces. Please keep this that way!
truelight
parents:
164
diff
changeset
|
1025 |
|
|
919
b0d6c7642f99
(svn r1407) -Codechange: changed a lot around _stations, _vehicles, _towns and _industries
truelight
parents:
915
diff
changeset
|
1026 |
v = GetVehicle(p1); |
|
1237
0a1ce05c3d45
(svn r1741) - Fix: added IsVehicleIndex() so it's possible to protect GetVehicle() from reading an invalid vehicle index
bjarni
parents:
1235
diff
changeset
|
1027 |
|
|
1802
448f187042d3
(svn r2306) - CodeChange: Check the last commands; refits. This needed an extensive rewrite and global/local-cargo ID juggling and bitmasking. However with this done it looks better as well and is compatible with newgrf handling. Big thanks to HackyKid for doing most of the work. This also closes patch "[ 1199277 ] Command checks"
Darkvater
parents:
1793
diff
changeset
|
1028 |
if (v->type != VEH_Ship || !CheckOwnership(v->owner)) return CMD_ERROR; |
|
2567
735280bafe7a
(svn r3104) -Codechange: [refit] removed now obsolite code that the old autoreplace needed
bjarni
parents:
2564
diff
changeset
|
1029 |
|
|
735280bafe7a
(svn r3104) -Codechange: [refit] removed now obsolite code that the old autoreplace needed
bjarni
parents:
2564
diff
changeset
|
1030 |
if (!IsTileDepotType(v->tile, TRANSPORT_WATER) || !(v->vehstatus&VS_STOPPED) || v->u.ship.state != 0x80) |
|
1802
448f187042d3
(svn r2306) - CodeChange: Check the last commands; refits. This needed an extensive rewrite and global/local-cargo ID juggling and bitmasking. However with this done it looks better as well and is compatible with newgrf handling. Big thanks to HackyKid for doing most of the work. This also closes patch "[ 1199277 ] Command checks"
Darkvater
parents:
1793
diff
changeset
|
1031 |
return_cmd_error(STR_980B_SHIP_MUST_BE_STOPPED_IN); |
|
2567
735280bafe7a
(svn r3104) -Codechange: [refit] removed now obsolite code that the old autoreplace needed
bjarni
parents:
2564
diff
changeset
|
1032 |
|
| 0 | 1033 |
|
|
1802
448f187042d3
(svn r2306) - CodeChange: Check the last commands; refits. This needed an extensive rewrite and global/local-cargo ID juggling and bitmasking. However with this done it looks better as well and is compatible with newgrf handling. Big thanks to HackyKid for doing most of the work. This also closes patch "[ 1199277 ] Command checks"
Darkvater
parents:
1793
diff
changeset
|
1034 |
/* Check cargo */ |
|
448f187042d3
(svn r2306) - CodeChange: Check the last commands; refits. This needed an extensive rewrite and global/local-cargo ID juggling and bitmasking. However with this done it looks better as well and is compatible with newgrf handling. Big thanks to HackyKid for doing most of the work. This also closes patch "[ 1199277 ] Command checks"
Darkvater
parents:
1793
diff
changeset
|
1035 |
if (!ShipVehInfo(v->engine_type)->refittable) return CMD_ERROR; |
|
2704
dc9ae68dfd74
(svn r3248) - Codechange: Change interface of CanRefitTo() to supply the engine type directly instead of getting it from a vehicle. This allows the function to be used before vehicles are involved.
peter1138
parents:
2662
diff
changeset
|
1036 |
if (new_cid > NUM_CARGO || !CanRefitTo(v->engine_type, new_cid)) return CMD_ERROR; |
| 915 | 1037 |
|
|
1237
0a1ce05c3d45
(svn r1741) - Fix: added IsVehicleIndex() so it's possible to protect GetVehicle() from reading an invalid vehicle index
bjarni
parents:
1235
diff
changeset
|
1038 |
SET_EXPENSES_TYPE(EXPENSES_SHIP_RUN); |
|
0a1ce05c3d45
(svn r1741) - Fix: added IsVehicleIndex() so it's possible to protect GetVehicle() from reading an invalid vehicle index
bjarni
parents:
1235
diff
changeset
|
1039 |
|
| 0 | 1040 |
cost = 0; |
|
1802
448f187042d3
(svn r2306) - CodeChange: Check the last commands; refits. This needed an extensive rewrite and global/local-cargo ID juggling and bitmasking. However with this done it looks better as well and is compatible with newgrf handling. Big thanks to HackyKid for doing most of the work. This also closes patch "[ 1199277 ] Command checks"
Darkvater
parents:
1793
diff
changeset
|
1041 |
if (IS_HUMAN_PLAYER(v->owner) && new_cid != v->cargo_type) {
|
| 0 | 1042 |
cost = _price.ship_base >> 7; |
1043 |
} |
|
1044 |
||
1045 |
if (flags & DC_EXEC) {
|
|
|
2568
b1fc2c980415
(svn r3105) readded 2 line that should not have been removed in last commit(3104). Now cargo are removed when refitting (like it should)
bjarni
parents:
2567
diff
changeset
|
1046 |
v->cargo_count = 0; |
|
1802
448f187042d3
(svn r2306) - CodeChange: Check the last commands; refits. This needed an extensive rewrite and global/local-cargo ID juggling and bitmasking. However with this done it looks better as well and is compatible with newgrf handling. Big thanks to HackyKid for doing most of the work. This also closes patch "[ 1199277 ] Command checks"
Darkvater
parents:
1793
diff
changeset
|
1047 |
v->cargo_type = new_cid; |
| 0 | 1048 |
InvalidateWindow(WC_VEHICLE_DETAILS, v->index); |
1049 |
} |
|
1050 |
||
1051 |
return cost; |
|
1052 |
||
1053 |
} |