author | smatz |
Tue, 11 Dec 2007 22:50:13 +0000 | |
changeset 8062 | eb133d21f363 |
parent 8058 | 5d32eaa21927 |
child 8072 | 7b188d7b8199 |
permissions | -rw-r--r-- |
2186 | 1 |
/* $Id$ */ |
2 |
||
6422
6679df1c05ba
(svn r9558) -Documentation: doxygen and comment changes: 'T' now. Almost done
belugas
parents:
6407
diff
changeset
|
3 |
/** @file train_cmd.cpp */ |
6679df1c05ba
(svn r9558) -Documentation: doxygen and comment changes: 'T' now. Almost done
belugas
parents:
6407
diff
changeset
|
4 |
|
0 | 5 |
#include "stdafx.h" |
1891
862800791170
(svn r2397) - CodeChange: rename all "ttd" files to "openttd" files.
Darkvater
parents:
1883
diff
changeset
|
6 |
#include "openttd.h" |
3234
a2791a480b71
(svn r3907) Replace many bridge related direct map accesses with calls to shiny new functions and mark some strange constructs with XXX
tron
parents:
3191
diff
changeset
|
7 |
#include "bridge_map.h" |
1922
bda6f85eefaa
(svn r2428) - Feature: [newgrf] Implement shorter train vehicles (Therax), and the callback that goes with it.
hackykid
parents:
1921
diff
changeset
|
8 |
#include "debug.h" |
2163
b17b313113a0
(svn r2673) Include functions.h directly, not globally via openttd.h
tron
parents:
2150
diff
changeset
|
9 |
#include "functions.h" |
6453
226bcddeba32
(svn r9609) -Codechange: Move some function prototypes out of functions.h and into landscape.h, and add a few where they didn't exist.
maedhros
parents:
6422
diff
changeset
|
10 |
#include "landscape.h" |
2561
233dafd7cf6c
(svn r3098) static, const, uint -> TileIndex, indentation, bracing, unused return values, ... mostly related to the clone vehicle GUI
tron
parents:
2552
diff
changeset
|
11 |
#include "gui.h" |
3315
c9d989783c55
(svn r4079) Add GetSation{Index,ByTile}() to get the station index resp. the station from a tile
tron
parents:
3269
diff
changeset
|
12 |
#include "station_map.h" |
507
04b5403aaf6b
(svn r815) Include strings.h only in the files which need it.
tron
parents:
495
diff
changeset
|
13 |
#include "table/strings.h" |
7266
b16e67e992b4
(svn r10587) -Codechange: move the string/dparam related stuff from variables.h to strings.h
rubidium
parents:
7215
diff
changeset
|
14 |
#include "strings.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
|
15 |
#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:
1208
diff
changeset
|
16 |
#include "tile.h" |
3154 | 17 |
#include "tunnel_map.h" |
0 | 18 |
#include "vehicle.h" |
6980
c7c4f3bf5901
(svn r10236) -Feature: Introduce a form of timetabling for vehicles.
maedhros
parents:
6966
diff
changeset
|
19 |
#include "timetable.h" |
6772
8672ba1bebc9
(svn r10008) -Codechange: Move a couple of functions related to articulated vehicles to a file of their own.
maedhros
parents:
6771
diff
changeset
|
20 |
#include "articulated_vehicles.h" |
0 | 21 |
#include "command.h" |
22 |
#include "pathfind.h" |
|
1247 | 23 |
#include "npf.h" |
0 | 24 |
#include "station.h" |
25 |
#include "table/train_cmd.h" |
|
26 |
#include "news.h" |
|
27 |
#include "engine.h" |
|
28 |
#include "player.h" |
|
337
cbe0c766c947
(svn r513) Merge revisions 402, 416, 417, 478, 479, 511, 512 from map to trunk
tron
parents:
308
diff
changeset
|
29 |
#include "sound.h" |
1313
f1013ec3d318
(svn r1817) -Codechange: Moved depot-functions to depot.c
truelight
parents:
1282
diff
changeset
|
30 |
#include "depot.h" |
1542
62a03537ad0b
(svn r2046) -Codechange: moved all waypoint code to waypoint.c/waypoint.h
truelight
parents:
1531
diff
changeset
|
31 |
#include "waypoint.h" |
1752
d65cd19f7117
(svn r2256) - Fix: Trains cannot find a depot when they are in a tunnel. (glx)
matthijs
parents:
1698
diff
changeset
|
32 |
#include "vehicle_gui.h" |
2676
59b65b4fb480
(svn r3218) -Feature: Multiheaded train engines will now stay in the same train
bjarni
parents:
2666
diff
changeset
|
33 |
#include "train.h" |
5385
3868f2e6db9b
(svn r7573) -Merged the bridge branch. Allows to build bridges of arbitrary rail/road combinations (including signals)
celestar
parents:
5380
diff
changeset
|
34 |
#include "bridge.h" |
2982
eb7f50dcb249
(svn r3557) - NewGRF: move callback enums to a new file as more than just engines will use them
peter1138
parents:
2970
diff
changeset
|
35 |
#include "newgrf_callbacks.h" |
2962
f0a49b646c48
(svn r3524) - Split newgrf features from engine.[ch] into newgrf_engine.[ch], and add the new files to project files.
peter1138
parents:
2952
diff
changeset
|
36 |
#include "newgrf_engine.h" |
4656
9c1d8c4d3e60
(svn r6532) - Feature: Add support for NewGRF sound effects. Currently sound priority isn't supported.
peter1138
parents:
4648
diff
changeset
|
37 |
#include "newgrf_sound.h" |
3727
3a3ebb0bde7e
(svn r4703) - NewGRF: add support for callback 0x1D, "can wagon be attached". This can be used to disallow freight wagons to be placed in passenger trains, along with other uses.
peter1138
parents:
3657
diff
changeset
|
38 |
#include "newgrf_text.h" |
3256
3ada27c81b7f
(svn r3944) -Feature: it's now possible to turn a single unit in a train
bjarni
parents:
3242
diff
changeset
|
39 |
#include "direction.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
|
40 |
#include "yapf/yapf.h" |
4261
28670f743746
(svn r5887) -Cleanup: move date related functions, defines and variables to date.[ch]
rubidium
parents:
4252
diff
changeset
|
41 |
#include "date.h" |
6091
c8827d9ae04a
(svn r8826) -Codechange: Replace _cargoc's separate arrays with a regular struct array (with accessor) and implement new initialization method using cargo labels.
peter1138
parents:
5998
diff
changeset
|
42 |
#include "cargotype.h" |
6643
f81bee57bc09
(svn r9874) -Feature: advanced vehicle lists a.k.a. group interface. Now you can make groups of vehicles and perform all kinds of tasks on that given group. Original code by nycom and graphics by skidd13.
rubidium
parents:
6608
diff
changeset
|
43 |
#include "group.h" |
7802
246a94599679
(svn r11352) -Codechange: cache callback 2D result (vehicle color mapping) instead calling it every time the vehicle is drawn
glx
parents:
7783
diff
changeset
|
44 |
#include "table/sprites.h" |
0 | 45 |
|
742
c71e6120b789
(svn r1198) -Fix: [ 1087701 ] It is no longer possible to crash trains of other
truelight
parents:
737
diff
changeset
|
46 |
static bool TrainCheckIfLineEnds(Vehicle *v); |
5252
d4b78248de25
(svn r7378) -Fix (r2428): Don't update vehicle images when turning a train around.
peter1138
parents:
5215
diff
changeset
|
47 |
static void TrainController(Vehicle *v, bool update_image); |
0 | 48 |
|
4344
7e123fec5b0b
(svn r6045) -Cleanup: align all table-like structures using spaces, i.e. whitespace fixes only except for a few comments to make them uniform for the whole enum/struct.
rubidium
parents:
4329
diff
changeset
|
49 |
static const byte _vehicle_initial_x_fract[4] = {10, 8, 4, 8}; |
7e123fec5b0b
(svn r6045) -Cleanup: align all table-like structures using spaces, i.e. whitespace fixes only except for a few comments to make them uniform for the whole enum/struct.
rubidium
parents:
4329
diff
changeset
|
50 |
static const byte _vehicle_initial_y_fract[4] = { 8, 4, 8, 10}; |
5993
956d341d930e
(svn r8701) -Codechange: replace magic numbers with enums for u.rail.track.
rubidium
parents:
5992
diff
changeset
|
51 |
static const TrackBits _state_dir_table[4] = { TRACK_BIT_RIGHT, TRACK_BIT_LOWER, TRACK_BIT_LEFT, TRACK_BIT_UPPER }; |
0 | 52 |
|
5163
459b243f8413
(svn r7269) -Feature: Add freight trains patch option. This option is a multiplier for the weight of cargo on freight trains, to simulate longer heavier trains. The default value of 1 behaves as before.
peter1138
parents:
5162
diff
changeset
|
53 |
|
459b243f8413
(svn r7269) -Feature: Add freight trains patch option. This option is a multiplier for the weight of cargo on freight trains, to simulate longer heavier trains. The default value of 1 behaves as before.
peter1138
parents:
5162
diff
changeset
|
54 |
/** Return the cargo weight multiplier to use for a rail vehicle |
5316
27fa85736f8a
(svn r7473) -Fix (r7269): Pass a cargo type to determine the freight weight
peter1138
parents:
5303
diff
changeset
|
55 |
* @param cargo Cargo type to get multiplier for |
5163
459b243f8413
(svn r7269) -Feature: Add freight trains patch option. This option is a multiplier for the weight of cargo on freight trains, to simulate longer heavier trains. The default value of 1 behaves as before.
peter1138
parents:
5162
diff
changeset
|
56 |
* @return Cargo weight multiplier |
459b243f8413
(svn r7269) -Feature: Add freight trains patch option. This option is a multiplier for the weight of cargo on freight trains, to simulate longer heavier trains. The default value of 1 behaves as before.
peter1138
parents:
5162
diff
changeset
|
57 |
*/ |
5316
27fa85736f8a
(svn r7473) -Fix (r7269): Pass a cargo type to determine the freight weight
peter1138
parents:
5303
diff
changeset
|
58 |
byte FreightWagonMult(CargoID cargo) |
5163
459b243f8413
(svn r7269) -Feature: Add freight trains patch option. This option is a multiplier for the weight of cargo on freight trains, to simulate longer heavier trains. The default value of 1 behaves as before.
peter1138
parents:
5162
diff
changeset
|
59 |
{ |
6114
f15b4f5533b2
(svn r8850) -Codechange: Use the cargo type's is_freight flag instead of checking the cargo type to determine if the cargo type is freight cargo type cargo type.
peter1138
parents:
6091
diff
changeset
|
60 |
if (!GetCargo(cargo)->is_freight) return 1; |
5163
459b243f8413
(svn r7269) -Feature: Add freight trains patch option. This option is a multiplier for the weight of cargo on freight trains, to simulate longer heavier trains. The default value of 1 behaves as before.
peter1138
parents:
5162
diff
changeset
|
61 |
return _patches.freight_trains; |
459b243f8413
(svn r7269) -Feature: Add freight trains patch option. This option is a multiplier for the weight of cargo on freight trains, to simulate longer heavier trains. The default value of 1 behaves as before.
peter1138
parents:
5162
diff
changeset
|
62 |
} |
459b243f8413
(svn r7269) -Feature: Add freight trains patch option. This option is a multiplier for the weight of cargo on freight trains, to simulate longer heavier trains. The default value of 1 behaves as before.
peter1138
parents:
5162
diff
changeset
|
63 |
|
459b243f8413
(svn r7269) -Feature: Add freight trains patch option. This option is a multiplier for the weight of cargo on freight trains, to simulate longer heavier trains. The default value of 1 behaves as before.
peter1138
parents:
5162
diff
changeset
|
64 |
|
1905
c53f8d71f9b6
(svn r2411) - Codechange: Have trains cache stuff like consist power/weight/max speed instead of recalculating it each time.
hackykid
parents:
1901
diff
changeset
|
65 |
/** |
5400
bba42ad3223b
(svn r7592) -Feature: Add support for tractive effort to 'realistic' acceleration.
peter1138
parents:
5385
diff
changeset
|
66 |
* Recalculates the cached total power of a train. Should be called when the consist is changed |
bba42ad3223b
(svn r7592) -Feature: Add support for tractive effort to 'realistic' acceleration.
peter1138
parents:
5385
diff
changeset
|
67 |
* @param v First vehicle of the consist. |
bba42ad3223b
(svn r7592) -Feature: Add support for tractive effort to 'realistic' acceleration.
peter1138
parents:
5385
diff
changeset
|
68 |
*/ |
bba42ad3223b
(svn r7592) -Feature: Add support for tractive effort to 'realistic' acceleration.
peter1138
parents:
5385
diff
changeset
|
69 |
void TrainPowerChanged(Vehicle* v) |
bba42ad3223b
(svn r7592) -Feature: Add support for tractive effort to 'realistic' acceleration.
peter1138
parents:
5385
diff
changeset
|
70 |
{ |
6490
fe4443fba5e3
(svn r9671) -Codechange: Implement NewGRF callback 36, which allows changing of various properties which were previously static. Vehicle max speed and train power/te/running costs are adjustable.
peter1138
parents:
6484
diff
changeset
|
71 |
uint32 total_power = 0; |
5400
bba42ad3223b
(svn r7592) -Feature: Add support for tractive effort to 'realistic' acceleration.
peter1138
parents:
5385
diff
changeset
|
72 |
uint32 max_te = 0; |
bba42ad3223b
(svn r7592) -Feature: Add support for tractive effort to 'realistic' acceleration.
peter1138
parents:
5385
diff
changeset
|
73 |
|
7492
35acee076719
(svn r11003) -Codechange: replace Vehicle->next to Vehicle->Next() and Vehicle->SetNext() so we can trap instances that change a next pointer and (in the future) update the first/previous pointers based on that.
rubidium
parents:
7488
diff
changeset
|
74 |
for (const Vehicle *u = v; u != NULL; u = u->Next()) { |
5400
bba42ad3223b
(svn r7592) -Feature: Add support for tractive effort to 'realistic' acceleration.
peter1138
parents:
5385
diff
changeset
|
75 |
/* Power is not added for articulated parts */ |
bba42ad3223b
(svn r7592) -Feature: Add support for tractive effort to 'realistic' acceleration.
peter1138
parents:
5385
diff
changeset
|
76 |
if (IsArticulatedPart(u)) continue; |
bba42ad3223b
(svn r7592) -Feature: Add support for tractive effort to 'realistic' acceleration.
peter1138
parents:
5385
diff
changeset
|
77 |
|
6172
e6d7a5b3d63f
(svn r8935) -Codechange: unification of track type between road and rail tiles, unification of ground type between normal rail tiles and depots/waypoints and removing the need for RailTileSubType.
rubidium
parents:
6155
diff
changeset
|
78 |
RailType railtype = GetRailType(u->tile); |
5769 | 79 |
bool engine_has_power = HasPowerOnRail(u->u.rail.railtype, railtype); |
80 |
bool wagon_has_power = HasPowerOnRail(v->u.rail.railtype, railtype); |
|
81 |
||
82 |
const RailVehicleInfo *rvi_u = RailVehInfo(u->engine_type); |
|
5400
bba42ad3223b
(svn r7592) -Feature: Add support for tractive effort to 'realistic' acceleration.
peter1138
parents:
5385
diff
changeset
|
83 |
|
6490
fe4443fba5e3
(svn r9671) -Codechange: Implement NewGRF callback 36, which allows changing of various properties which were previously static. Vehicle max speed and train power/te/running costs are adjustable.
peter1138
parents:
6484
diff
changeset
|
84 |
if (engine_has_power) { |
fe4443fba5e3
(svn r9671) -Codechange: Implement NewGRF callback 36, which allows changing of various properties which were previously static. Vehicle max speed and train power/te/running costs are adjustable.
peter1138
parents:
6484
diff
changeset
|
85 |
uint16 power = GetVehicleProperty(u, 0x0B, rvi_u->power); |
fe4443fba5e3
(svn r9671) -Codechange: Implement NewGRF callback 36, which allows changing of various properties which were previously static. Vehicle max speed and train power/te/running costs are adjustable.
peter1138
parents:
6484
diff
changeset
|
86 |
if (power != 0) { |
fe4443fba5e3
(svn r9671) -Codechange: Implement NewGRF callback 36, which allows changing of various properties which were previously static. Vehicle max speed and train power/te/running costs are adjustable.
peter1138
parents:
6484
diff
changeset
|
87 |
total_power += power; |
fe4443fba5e3
(svn r9671) -Codechange: Implement NewGRF callback 36, which allows changing of various properties which were previously static. Vehicle max speed and train power/te/running costs are adjustable.
peter1138
parents:
6484
diff
changeset
|
88 |
/* Tractive effort in (tonnes * 1000 * 10 =) N */ |
fe4443fba5e3
(svn r9671) -Codechange: Implement NewGRF callback 36, which allows changing of various properties which were previously static. Vehicle max speed and train power/te/running costs are adjustable.
peter1138
parents:
6484
diff
changeset
|
89 |
max_te += (u->u.rail.cached_veh_weight * 10000 * GetVehicleProperty(u, 0x1F, rvi_u->tractive_effort)) / 256; |
fe4443fba5e3
(svn r9671) -Codechange: Implement NewGRF callback 36, which allows changing of various properties which were previously static. Vehicle max speed and train power/te/running costs are adjustable.
peter1138
parents:
6484
diff
changeset
|
90 |
} |
5400
bba42ad3223b
(svn r7592) -Feature: Add support for tractive effort to 'realistic' acceleration.
peter1138
parents:
5385
diff
changeset
|
91 |
} |
bba42ad3223b
(svn r7592) -Feature: Add support for tractive effort to 'realistic' acceleration.
peter1138
parents:
5385
diff
changeset
|
92 |
|
7928
63e18de69e50
(svn r11481) -Codechange: Rename the HASBIT function to fit with the naming style
skidd13
parents:
7923
diff
changeset
|
93 |
if (HasBit(u->u.rail.flags, VRF_POWEREDWAGON) && (wagon_has_power)) { |
6490
fe4443fba5e3
(svn r9671) -Codechange: Implement NewGRF callback 36, which allows changing of various properties which were previously static. Vehicle max speed and train power/te/running costs are adjustable.
peter1138
parents:
6484
diff
changeset
|
94 |
total_power += RailVehInfo(u->u.rail.first_engine)->pow_wag_power; |
5400
bba42ad3223b
(svn r7592) -Feature: Add support for tractive effort to 'realistic' acceleration.
peter1138
parents:
5385
diff
changeset
|
95 |
} |
bba42ad3223b
(svn r7592) -Feature: Add support for tractive effort to 'realistic' acceleration.
peter1138
parents:
5385
diff
changeset
|
96 |
} |
bba42ad3223b
(svn r7592) -Feature: Add support for tractive effort to 'realistic' acceleration.
peter1138
parents:
5385
diff
changeset
|
97 |
|
6490
fe4443fba5e3
(svn r9671) -Codechange: Implement NewGRF callback 36, which allows changing of various properties which were previously static. Vehicle max speed and train power/te/running costs are adjustable.
peter1138
parents:
6484
diff
changeset
|
98 |
if (v->u.rail.cached_power != total_power || v->u.rail.cached_max_te != max_te) { |
7539
5f41050498bd
(svn r11059) -Fix [FS#1182]: inconsistency between Rail<->ElRail conversions of different kinds of rail containing tiles (normal rail, stations, depots, etc). Patch by SmatZ.
rubidium
parents:
7529
diff
changeset
|
99 |
/* If it has no power (no catenary), stop the train */ |
5f41050498bd
(svn r11059) -Fix [FS#1182]: inconsistency between Rail<->ElRail conversions of different kinds of rail containing tiles (normal rail, stations, depots, etc). Patch by SmatZ.
rubidium
parents:
7529
diff
changeset
|
100 |
if (total_power == 0) v->vehstatus |= VS_STOPPED; |
5f41050498bd
(svn r11059) -Fix [FS#1182]: inconsistency between Rail<->ElRail conversions of different kinds of rail containing tiles (normal rail, stations, depots, etc). Patch by SmatZ.
rubidium
parents:
7529
diff
changeset
|
101 |
|
6490
fe4443fba5e3
(svn r9671) -Codechange: Implement NewGRF callback 36, which allows changing of various properties which were previously static. Vehicle max speed and train power/te/running costs are adjustable.
peter1138
parents:
6484
diff
changeset
|
102 |
v->u.rail.cached_power = total_power; |
5400
bba42ad3223b
(svn r7592) -Feature: Add support for tractive effort to 'realistic' acceleration.
peter1138
parents:
5385
diff
changeset
|
103 |
v->u.rail.cached_max_te = max_te; |
bba42ad3223b
(svn r7592) -Feature: Add support for tractive effort to 'realistic' acceleration.
peter1138
parents:
5385
diff
changeset
|
104 |
InvalidateWindow(WC_VEHICLE_DETAILS, v->index); |
bba42ad3223b
(svn r7592) -Feature: Add support for tractive effort to 'realistic' acceleration.
peter1138
parents:
5385
diff
changeset
|
105 |
InvalidateWindowWidget(WC_VEHICLE_VIEW, v->index, STATUS_BAR); |
bba42ad3223b
(svn r7592) -Feature: Add support for tractive effort to 'realistic' acceleration.
peter1138
parents:
5385
diff
changeset
|
106 |
} |
bba42ad3223b
(svn r7592) -Feature: Add support for tractive effort to 'realistic' acceleration.
peter1138
parents:
5385
diff
changeset
|
107 |
} |
bba42ad3223b
(svn r7592) -Feature: Add support for tractive effort to 'realistic' acceleration.
peter1138
parents:
5385
diff
changeset
|
108 |
|
bba42ad3223b
(svn r7592) -Feature: Add support for tractive effort to 'realistic' acceleration.
peter1138
parents:
5385
diff
changeset
|
109 |
|
bba42ad3223b
(svn r7592) -Feature: Add support for tractive effort to 'realistic' acceleration.
peter1138
parents:
5385
diff
changeset
|
110 |
/** |
1905
c53f8d71f9b6
(svn r2411) - Codechange: Have trains cache stuff like consist power/weight/max speed instead of recalculating it each time.
hackykid
parents:
1901
diff
changeset
|
111 |
* Recalculates the cached weight of a train and its vehicles. Should be called each time the cargo on |
c53f8d71f9b6
(svn r2411) - Codechange: Have trains cache stuff like consist power/weight/max speed instead of recalculating it each time.
hackykid
parents:
1901
diff
changeset
|
112 |
* the consist changes. |
c53f8d71f9b6
(svn r2411) - Codechange: Have trains cache stuff like consist power/weight/max speed instead of recalculating it each time.
hackykid
parents:
1901
diff
changeset
|
113 |
* @param v First vehicle of the consist. |
c53f8d71f9b6
(svn r2411) - Codechange: Have trains cache stuff like consist power/weight/max speed instead of recalculating it each time.
hackykid
parents:
1901
diff
changeset
|
114 |
*/ |
2752 | 115 |
static void TrainCargoChanged(Vehicle* v) |
2639 | 116 |
{ |
5162
f8da34a35a59
(svn r7268) -Codechange: change rail vehicle cached weight from 16 to 32 bit values to avoid possible overflows.
peter1138
parents:
5116
diff
changeset
|
117 |
uint32 weight = 0; |
1905
c53f8d71f9b6
(svn r2411) - Codechange: Have trains cache stuff like consist power/weight/max speed instead of recalculating it each time.
hackykid
parents:
1901
diff
changeset
|
118 |
|
7492
35acee076719
(svn r11003) -Codechange: replace Vehicle->next to Vehicle->Next() and Vehicle->SetNext() so we can trap instances that change a next pointer and (in the future) update the first/previous pointers based on that.
rubidium
parents:
7488
diff
changeset
|
119 |
for (Vehicle *u = v; u != NULL; u = u->Next()) { |
7010
6f0d9f03180d
(svn r10266) -Codechange: keep track of the origin, time of travel and accumulated feeder share (transfers) of individual pieces of cargo. This means that cargo isn't thrown on a big pile when it's put in a station or unloaded at a station, however the GUI does not reflect these changes yet so you will not actually see it.
rubidium
parents:
7002
diff
changeset
|
120 |
uint32 vweight = GetCargo(u->cargo_type)->weight * u->cargo.Count() * FreightWagonMult(u->cargo_type) / 16; |
2602
1a6561c9a408
(svn r3139) -NewGRF, Feature: support for articulated rail vehicles. This is used, for example, by coal tenders.
peter1138
parents:
2599
diff
changeset
|
121 |
|
6422
6679df1c05ba
(svn r9558) -Documentation: doxygen and comment changes: 'T' now. Almost done
belugas
parents:
6407
diff
changeset
|
122 |
/* Vehicle weight is not added for articulated parts. */ |
2676
59b65b4fb480
(svn r3218) -Feature: Multiheaded train engines will now stay in the same train
bjarni
parents:
2666
diff
changeset
|
123 |
if (!IsArticulatedPart(u)) { |
6422
6679df1c05ba
(svn r9558) -Documentation: doxygen and comment changes: 'T' now. Almost done
belugas
parents:
6407
diff
changeset
|
124 |
/* vehicle weight is the sum of the weight of the vehicle and the weight of its cargo */ |
6572
f1f1a685a479
(svn r9780) -Codechange: [NewGRF] Add support for variable vehicle weight for trains (callback 36, property 16)
peter1138
parents:
6565
diff
changeset
|
125 |
vweight += GetVehicleProperty(u, 0x16, RailVehInfo(u->engine_type)->weight); |
2602
1a6561c9a408
(svn r3139) -NewGRF, Feature: support for articulated rail vehicles. This is used, for example, by coal tenders.
peter1138
parents:
2599
diff
changeset
|
126 |
|
6422
6679df1c05ba
(svn r9558) -Documentation: doxygen and comment changes: 'T' now. Almost done
belugas
parents:
6407
diff
changeset
|
127 |
/* powered wagons have extra weight added */ |
7928
63e18de69e50
(svn r11481) -Codechange: Rename the HASBIT function to fit with the naming style
skidd13
parents:
7923
diff
changeset
|
128 |
if (HasBit(u->u.rail.flags, VRF_POWEREDWAGON)) |
4017
62f8877d1085
(svn r5240) - NewGRF: when there is more than one engine in a consist, base livery overrides and powered wagon weight/power on the last engine before the wagon.
peter1138
parents:
3988
diff
changeset
|
129 |
vweight += RailVehInfo(u->u.rail.first_engine)->pow_wag_weight; |
2602
1a6561c9a408
(svn r3139) -NewGRF, Feature: support for articulated rail vehicles. This is used, for example, by coal tenders.
peter1138
parents:
2599
diff
changeset
|
130 |
} |
1905
c53f8d71f9b6
(svn r2411) - Codechange: Have trains cache stuff like consist power/weight/max speed instead of recalculating it each time.
hackykid
parents:
1901
diff
changeset
|
131 |
|
6422
6679df1c05ba
(svn r9558) -Documentation: doxygen and comment changes: 'T' now. Almost done
belugas
parents:
6407
diff
changeset
|
132 |
/* consist weight is the sum of the weight of all vehicles in the consist */ |
1905
c53f8d71f9b6
(svn r2411) - Codechange: Have trains cache stuff like consist power/weight/max speed instead of recalculating it each time.
hackykid
parents:
1901
diff
changeset
|
133 |
weight += vweight; |
c53f8d71f9b6
(svn r2411) - Codechange: Have trains cache stuff like consist power/weight/max speed instead of recalculating it each time.
hackykid
parents:
1901
diff
changeset
|
134 |
|
6422
6679df1c05ba
(svn r9558) -Documentation: doxygen and comment changes: 'T' now. Almost done
belugas
parents:
6407
diff
changeset
|
135 |
/* store vehicle weight in cache */ |
1905
c53f8d71f9b6
(svn r2411) - Codechange: Have trains cache stuff like consist power/weight/max speed instead of recalculating it each time.
hackykid
parents:
1901
diff
changeset
|
136 |
u->u.rail.cached_veh_weight = vweight; |
6150 | 137 |
} |
1905
c53f8d71f9b6
(svn r2411) - Codechange: Have trains cache stuff like consist power/weight/max speed instead of recalculating it each time.
hackykid
parents:
1901
diff
changeset
|
138 |
|
6422
6679df1c05ba
(svn r9558) -Documentation: doxygen and comment changes: 'T' now. Almost done
belugas
parents:
6407
diff
changeset
|
139 |
/* store consist weight in cache */ |
1905
c53f8d71f9b6
(svn r2411) - Codechange: Have trains cache stuff like consist power/weight/max speed instead of recalculating it each time.
hackykid
parents:
1901
diff
changeset
|
140 |
v->u.rail.cached_weight = weight; |
5400
bba42ad3223b
(svn r7592) -Feature: Add support for tractive effort to 'realistic' acceleration.
peter1138
parents:
5385
diff
changeset
|
141 |
|
bba42ad3223b
(svn r7592) -Feature: Add support for tractive effort to 'realistic' acceleration.
peter1138
parents:
5385
diff
changeset
|
142 |
/* Now update train power (tractive effort is dependent on weight) */ |
bba42ad3223b
(svn r7592) -Feature: Add support for tractive effort to 'realistic' acceleration.
peter1138
parents:
5385
diff
changeset
|
143 |
TrainPowerChanged(v); |
1905
c53f8d71f9b6
(svn r2411) - Codechange: Have trains cache stuff like consist power/weight/max speed instead of recalculating it each time.
hackykid
parents:
1901
diff
changeset
|
144 |
} |
c53f8d71f9b6
(svn r2411) - Codechange: Have trains cache stuff like consist power/weight/max speed instead of recalculating it each time.
hackykid
parents:
1901
diff
changeset
|
145 |
|
3355
e414a0b104a6
(svn r4150) -Feature: Merged elrails into trunk. Thanks to Tron for lots of code and proofreading, thanks to peter1138 for another lot of code and ideas.
celestar
parents:
3341
diff
changeset
|
146 |
|
e414a0b104a6
(svn r4150) -Feature: Merged elrails into trunk. Thanks to Tron for lots of code and proofreading, thanks to peter1138 for another lot of code and ideas.
celestar
parents:
3341
diff
changeset
|
147 |
/** |
1917
03e113481a62
(svn r2423) - CodeChange: Include first_engine in the train cache, instead of calculating it all over the place.
hackykid
parents:
1909
diff
changeset
|
148 |
* Recalculates the cached stuff of a train. Should be called each time a vehicle is added |
03e113481a62
(svn r2423) - CodeChange: Include first_engine in the train cache, instead of calculating it all over the place.
hackykid
parents:
1909
diff
changeset
|
149 |
* to/removed from the chain, and when the game is loaded. |
03e113481a62
(svn r2423) - CodeChange: Include first_engine in the train cache, instead of calculating it all over the place.
hackykid
parents:
1909
diff
changeset
|
150 |
* Note: this needs to be called too for 'wagon chains' (in the depot, without an engine) |
03e113481a62
(svn r2423) - CodeChange: Include first_engine in the train cache, instead of calculating it all over the place.
hackykid
parents:
1909
diff
changeset
|
151 |
* @param v First vehicle of the chain. |
1905
c53f8d71f9b6
(svn r2411) - Codechange: Have trains cache stuff like consist power/weight/max speed instead of recalculating it each time.
hackykid
parents:
1901
diff
changeset
|
152 |
*/ |
2639 | 153 |
void TrainConsistChanged(Vehicle* v) |
154 |
{ |
|
1905
c53f8d71f9b6
(svn r2411) - Codechange: Have trains cache stuff like consist power/weight/max speed instead of recalculating it each time.
hackykid
parents:
1901
diff
changeset
|
155 |
uint16 max_speed = 0xFFFF; |
1917
03e113481a62
(svn r2423) - CodeChange: Include first_engine in the train cache, instead of calculating it all over the place.
hackykid
parents:
1909
diff
changeset
|
156 |
|
6259
471b91a4b1d8
(svn r9068) -Codechange: capitalize the VEH_Train etc. enums to match the coding style (and rest of the code).
rubidium
parents:
6248
diff
changeset
|
157 |
assert(v->type == VEH_TRAIN); |
2676
59b65b4fb480
(svn r3218) -Feature: Multiheaded train engines will now stay in the same train
bjarni
parents:
2666
diff
changeset
|
158 |
assert(IsFrontEngine(v) || IsFreeWagon(v)); |
1917
03e113481a62
(svn r2423) - CodeChange: Include first_engine in the train cache, instead of calculating it all over the place.
hackykid
parents:
1909
diff
changeset
|
159 |
|
6150 | 160 |
const RailVehicleInfo *rvi_v = RailVehInfo(v->engine_type); |
161 |
EngineID first_engine = IsFrontEngine(v) ? v->engine_type : INVALID_ENGINE; |
|
2587
31647a23da0b
(svn r3124) Alter train loading/unloading time to use the actual length of the train instead of the number of wagons. The actual length is cached in the first vehicle of the train.
peter1138
parents:
2574
diff
changeset
|
162 |
v->u.rail.cached_total_length = 0; |
3355
e414a0b104a6
(svn r4150) -Feature: Merged elrails into trunk. Thanks to Tron for lots of code and proofreading, thanks to peter1138 for another lot of code and ideas.
celestar
parents:
3341
diff
changeset
|
163 |
v->u.rail.compatible_railtypes = 0; |
1905
c53f8d71f9b6
(svn r2411) - Codechange: Have trains cache stuff like consist power/weight/max speed instead of recalculating it each time.
hackykid
parents:
1901
diff
changeset
|
164 |
|
7492
35acee076719
(svn r11003) -Codechange: replace Vehicle->next to Vehicle->Next() and Vehicle->SetNext() so we can trap instances that change a next pointer and (in the future) update the first/previous pointers based on that.
rubidium
parents:
7488
diff
changeset
|
165 |
for (Vehicle *u = v; u != NULL; u = u->Next()) { |
1908
2fa391fed79a
(svn r2414) - Feature: [newgrf] Implement powered wagons, and the callback that goes with it.
hackykid
parents:
1905
diff
changeset
|
166 |
const RailVehicleInfo *rvi_u = RailVehInfo(u->engine_type); |
2fa391fed79a
(svn r2414) - Feature: [newgrf] Implement powered wagons, and the callback that goes with it.
hackykid
parents:
1905
diff
changeset
|
167 |
|
7497
40e457c0a8ac
(svn r11011) -Fix [FS#1129]: GetFirstVehicleInChain did change the game state while being marked const.
rubidium
parents:
7493
diff
changeset
|
168 |
/* Check the v->first cache. */ |
40e457c0a8ac
(svn r11011) -Fix [FS#1129]: GetFirstVehicleInChain did change the game state while being marked const.
rubidium
parents:
7493
diff
changeset
|
169 |
assert(u->First() == v); |
2993
5fa94545a407
(svn r3570) - Explicitly update v->first in TrainConsistChanged() if necessary, as this is far faster than brute forcing it later.
peter1138
parents:
2989
diff
changeset
|
170 |
|
6422
6679df1c05ba
(svn r9558) -Documentation: doxygen and comment changes: 'T' now. Almost done
belugas
parents:
6407
diff
changeset
|
171 |
/* update the 'first engine' */ |
6150 | 172 |
u->u.rail.first_engine = v == u ? INVALID_ENGINE : first_engine; |
5823 | 173 |
u->u.rail.railtype = rvi_u->railtype; |
1917
03e113481a62
(svn r2423) - CodeChange: Include first_engine in the train cache, instead of calculating it all over the place.
hackykid
parents:
1909
diff
changeset
|
174 |
|
4017
62f8877d1085
(svn r5240) - NewGRF: when there is more than one engine in a consist, base livery overrides and powered wagon weight/power on the last engine before the wagon.
peter1138
parents:
3988
diff
changeset
|
175 |
if (IsTrainEngine(u)) first_engine = u->engine_type; |
62f8877d1085
(svn r5240) - NewGRF: when there is more than one engine in a consist, base livery overrides and powered wagon weight/power on the last engine before the wagon.
peter1138
parents:
3988
diff
changeset
|
176 |
|
6603
076b05312635
(svn r9818) -Codechange: Cache wagon override sprite set whenever consist is changed, instead of 'recalculating' it every time it is used or just tested.
peter1138
parents:
6594
diff
changeset
|
177 |
/* Cache wagon override sprite group. NULL is returned if there is none */ |
076b05312635
(svn r9818) -Codechange: Cache wagon override sprite set whenever consist is changed, instead of 'recalculating' it every time it is used or just tested.
peter1138
parents:
6594
diff
changeset
|
178 |
u->u.rail.cached_override = GetWagonOverrideSpriteSet(u->engine_type, u->cargo_type, u->u.rail.first_engine); |
076b05312635
(svn r9818) -Codechange: Cache wagon override sprite set whenever consist is changed, instead of 'recalculating' it every time it is used or just tested.
peter1138
parents:
6594
diff
changeset
|
179 |
|
7802
246a94599679
(svn r11352) -Codechange: cache callback 2D result (vehicle color mapping) instead calling it every time the vehicle is drawn
glx
parents:
7783
diff
changeset
|
180 |
/* Reset color map */ |
246a94599679
(svn r11352) -Codechange: cache callback 2D result (vehicle color mapping) instead calling it every time the vehicle is drawn
glx
parents:
7783
diff
changeset
|
181 |
u->colormap = PAL_NONE; |
246a94599679
(svn r11352) -Codechange: cache callback 2D result (vehicle color mapping) instead calling it every time the vehicle is drawn
glx
parents:
7783
diff
changeset
|
182 |
|
2595
1c5db200577c
(svn r3132) -NewGRF: support positioning of rail vehicle visual effects.
peter1138
parents:
2587
diff
changeset
|
183 |
if (rvi_u->visual_effect != 0) { |
1c5db200577c
(svn r3132) -NewGRF: support positioning of rail vehicle visual effects.
peter1138
parents:
2587
diff
changeset
|
184 |
u->u.rail.cached_vis_effect = rvi_u->visual_effect; |
1c5db200577c
(svn r3132) -NewGRF: support positioning of rail vehicle visual effects.
peter1138
parents:
2587
diff
changeset
|
185 |
} else { |
2676
59b65b4fb480
(svn r3218) -Feature: Multiheaded train engines will now stay in the same train
bjarni
parents:
2666
diff
changeset
|
186 |
if (IsTrainWagon(u) || IsArticulatedPart(u)) { |
6422
6679df1c05ba
(svn r9558) -Documentation: doxygen and comment changes: 'T' now. Almost done
belugas
parents:
6407
diff
changeset
|
187 |
/* Wagons and articulated parts have no effect by default */ |
2595
1c5db200577c
(svn r3132) -NewGRF: support positioning of rail vehicle visual effects.
peter1138
parents:
2587
diff
changeset
|
188 |
u->u.rail.cached_vis_effect = 0x40; |
1c5db200577c
(svn r3132) -NewGRF: support positioning of rail vehicle visual effects.
peter1138
parents:
2587
diff
changeset
|
189 |
} else if (rvi_u->engclass == 0) { |
6422
6679df1c05ba
(svn r9558) -Documentation: doxygen and comment changes: 'T' now. Almost done
belugas
parents:
6407
diff
changeset
|
190 |
/* Steam is offset by -4 units */ |
2595
1c5db200577c
(svn r3132) -NewGRF: support positioning of rail vehicle visual effects.
peter1138
parents:
2587
diff
changeset
|
191 |
u->u.rail.cached_vis_effect = 4; |
1c5db200577c
(svn r3132) -NewGRF: support positioning of rail vehicle visual effects.
peter1138
parents:
2587
diff
changeset
|
192 |
} else { |
6422
6679df1c05ba
(svn r9558) -Documentation: doxygen and comment changes: 'T' now. Almost done
belugas
parents:
6407
diff
changeset
|
193 |
/* Diesel fumes and sparks come from the centre */ |
2595
1c5db200577c
(svn r3132) -NewGRF: support positioning of rail vehicle visual effects.
peter1138
parents:
2587
diff
changeset
|
194 |
u->u.rail.cached_vis_effect = 8; |
1c5db200577c
(svn r3132) -NewGRF: support positioning of rail vehicle visual effects.
peter1138
parents:
2587
diff
changeset
|
195 |
} |
1c5db200577c
(svn r3132) -NewGRF: support positioning of rail vehicle visual effects.
peter1138
parents:
2587
diff
changeset
|
196 |
} |
1c5db200577c
(svn r3132) -NewGRF: support positioning of rail vehicle visual effects.
peter1138
parents:
2587
diff
changeset
|
197 |
|
2676
59b65b4fb480
(svn r3218) -Feature: Multiheaded train engines will now stay in the same train
bjarni
parents:
2666
diff
changeset
|
198 |
if (!IsArticulatedPart(u)) { |
3926
ea737ba47ba0
(svn r5061) - NewGRF: always use visual effect callback if it is defined, not just for powered wagons.
peter1138
parents:
3900
diff
changeset
|
199 |
/* Check powered wagon / visual effect callback */ |
7928
63e18de69e50
(svn r11481) -Codechange: Rename the HASBIT function to fit with the naming style
skidd13
parents:
7923
diff
changeset
|
200 |
if (HasBit(EngInfo(u->engine_type)->callbackmask, CBM_TRAIN_WAGON_POWER)) { |
3926
ea737ba47ba0
(svn r5061) - NewGRF: always use visual effect callback if it is defined, not just for powered wagons.
peter1138
parents:
3900
diff
changeset
|
201 |
uint16 callback = GetVehicleCallback(CBID_TRAIN_WAGON_POWER, 0, 0, u->engine_type, u); |
ea737ba47ba0
(svn r5061) - NewGRF: always use visual effect callback if it is defined, not just for powered wagons.
peter1138
parents:
3900
diff
changeset
|
202 |
|
ea737ba47ba0
(svn r5061) - NewGRF: always use visual effect callback if it is defined, not just for powered wagons.
peter1138
parents:
3900
diff
changeset
|
203 |
if (callback != CALLBACK_FAILED) u->u.rail.cached_vis_effect = callback; |
ea737ba47ba0
(svn r5061) - NewGRF: always use visual effect callback if it is defined, not just for powered wagons.
peter1138
parents:
3900
diff
changeset
|
204 |
} |
ea737ba47ba0
(svn r5061) - NewGRF: always use visual effect callback if it is defined, not just for powered wagons.
peter1138
parents:
3900
diff
changeset
|
205 |
|
5868
94430141c189
(svn r8455) -Codechange: Give a more meaningful name (railveh_type)to member flags of RailVehInfo, as well as changing the code to reflect the fact that it was not a flag but rather a one value only variable. Doing so, some evaluations have been simplified.
belugas
parents:
5858
diff
changeset
|
206 |
if (rvi_v->pow_wag_power != 0 && rvi_u->railveh_type == RAILVEH_WAGON && |
7928
63e18de69e50
(svn r11481) -Codechange: Rename the HASBIT function to fit with the naming style
skidd13
parents:
7923
diff
changeset
|
207 |
UsesWagonOverride(u) && !HasBit(u->u.rail.cached_vis_effect, 7)) { |
5868
94430141c189
(svn r8455) -Codechange: Give a more meaningful name (railveh_type)to member flags of RailVehInfo, as well as changing the code to reflect the fact that it was not a flag but rather a one value only variable. Doing so, some evaluations have been simplified.
belugas
parents:
5858
diff
changeset
|
208 |
/* wagon is powered */ |
7931
b0a46cd92225
(svn r11484) -Codechange: Remove the doubled function SetBitT and rename the remaining to fit with the naming style
skidd13
parents:
7929
diff
changeset
|
209 |
SetBit(u->u.rail.flags, VRF_POWEREDWAGON); // cache 'powered' status |
6150 | 210 |
} else { |
7929
6c9b25842b0f
(svn r11482) -Codechange: Remove the doubled function ClrBitT and rename the remaining to fit with the naming style
skidd13
parents:
7928
diff
changeset
|
211 |
ClrBit(u->u.rail.flags, VRF_POWEREDWAGON); |
2595
1c5db200577c
(svn r3132) -NewGRF: support positioning of rail vehicle visual effects.
peter1138
parents:
2587
diff
changeset
|
212 |
} |
1c5db200577c
(svn r3132) -NewGRF: support positioning of rail vehicle visual effects.
peter1138
parents:
2587
diff
changeset
|
213 |
|
3355
e414a0b104a6
(svn r4150) -Feature: Merged elrails into trunk. Thanks to Tron for lots of code and proofreading, thanks to peter1138 for another lot of code and ideas.
celestar
parents:
3341
diff
changeset
|
214 |
/* Do not count powered wagons for the compatible railtypes, as wagons always |
e414a0b104a6
(svn r4150) -Feature: Merged elrails into trunk. Thanks to Tron for lots of code and proofreading, thanks to peter1138 for another lot of code and ideas.
celestar
parents:
3341
diff
changeset
|
215 |
have railtype normal */ |
e414a0b104a6
(svn r4150) -Feature: Merged elrails into trunk. Thanks to Tron for lots of code and proofreading, thanks to peter1138 for another lot of code and ideas.
celestar
parents:
3341
diff
changeset
|
216 |
if (rvi_u->power > 0) { |
e414a0b104a6
(svn r4150) -Feature: Merged elrails into trunk. Thanks to Tron for lots of code and proofreading, thanks to peter1138 for another lot of code and ideas.
celestar
parents:
3341
diff
changeset
|
217 |
v->u.rail.compatible_railtypes |= GetRailTypeInfo(u->u.rail.railtype)->powered_railtypes; |
e414a0b104a6
(svn r4150) -Feature: Merged elrails into trunk. Thanks to Tron for lots of code and proofreading, thanks to peter1138 for another lot of code and ideas.
celestar
parents:
3341
diff
changeset
|
218 |
} |
e414a0b104a6
(svn r4150) -Feature: Merged elrails into trunk. Thanks to Tron for lots of code and proofreading, thanks to peter1138 for another lot of code and ideas.
celestar
parents:
3341
diff
changeset
|
219 |
|
5116
3c0c3da214ca
(svn r7195) -Feature: [FS#297, optional elrails] New patches/vehicles option 'disable electrified railways'.
KUDr
parents:
4996
diff
changeset
|
220 |
/* Some electric engines can be allowed to run on normal rail. It happens to all |
3c0c3da214ca
(svn r7195) -Feature: [FS#297, optional elrails] New patches/vehicles option 'disable electrified railways'.
KUDr
parents:
4996
diff
changeset
|
221 |
* existing electric engines when elrails are disabled and then re-enabled */ |
7928
63e18de69e50
(svn r11481) -Codechange: Rename the HASBIT function to fit with the naming style
skidd13
parents:
7923
diff
changeset
|
222 |
if (HasBit(u->u.rail.flags, VRF_EL_ENGINE_ALLOWED_NORMAL_RAIL)) { |
5116
3c0c3da214ca
(svn r7195) -Feature: [FS#297, optional elrails] New patches/vehicles option 'disable electrified railways'.
KUDr
parents:
4996
diff
changeset
|
223 |
u->u.rail.railtype = RAILTYPE_RAIL; |
3c0c3da214ca
(svn r7195) -Feature: [FS#297, optional elrails] New patches/vehicles option 'disable electrified railways'.
KUDr
parents:
4996
diff
changeset
|
224 |
u->u.rail.compatible_railtypes |= (1 << RAILTYPE_RAIL); |
3c0c3da214ca
(svn r7195) -Feature: [FS#297, optional elrails] New patches/vehicles option 'disable electrified railways'.
KUDr
parents:
4996
diff
changeset
|
225 |
} |
3c0c3da214ca
(svn r7195) -Feature: [FS#297, optional elrails] New patches/vehicles option 'disable electrified railways'.
KUDr
parents:
4996
diff
changeset
|
226 |
|
6422
6679df1c05ba
(svn r9558) -Documentation: doxygen and comment changes: 'T' now. Almost done
belugas
parents:
6407
diff
changeset
|
227 |
/* max speed is the minimum of the speed limits of all vehicles in the consist */ |
6490
fe4443fba5e3
(svn r9671) -Codechange: Implement NewGRF callback 36, which allows changing of various properties which were previously static. Vehicle max speed and train power/te/running costs are adjustable.
peter1138
parents:
6484
diff
changeset
|
228 |
if ((rvi_u->railveh_type != RAILVEH_WAGON || _patches.wagon_speed_limits) && !UsesWagonOverride(u)) { |
fe4443fba5e3
(svn r9671) -Codechange: Implement NewGRF callback 36, which allows changing of various properties which were previously static. Vehicle max speed and train power/te/running costs are adjustable.
peter1138
parents:
6484
diff
changeset
|
229 |
uint16 speed = GetVehicleProperty(u, 0x09, rvi_u->max_speed); |
fe4443fba5e3
(svn r9671) -Codechange: Implement NewGRF callback 36, which allows changing of various properties which were previously static. Vehicle max speed and train power/te/running costs are adjustable.
peter1138
parents:
6484
diff
changeset
|
230 |
if (speed != 0) max_speed = min(speed, max_speed); |
fe4443fba5e3
(svn r9671) -Codechange: Implement NewGRF callback 36, which allows changing of various properties which were previously static. Vehicle max speed and train power/te/running costs are adjustable.
peter1138
parents:
6484
diff
changeset
|
231 |
} |
1908
2fa391fed79a
(svn r2414) - Feature: [newgrf] Implement powered wagons, and the callback that goes with it.
hackykid
parents:
1905
diff
changeset
|
232 |
} |
2fa391fed79a
(svn r2414) - Feature: [newgrf] Implement powered wagons, and the callback that goes with it.
hackykid
parents:
1905
diff
changeset
|
233 |
|
6644
327f66bc01c6
(svn r9875) -Fix (r9828): Only set carriage capacity if the wagon has not been refitted.
peter1138
parents:
6643
diff
changeset
|
234 |
if (u->cargo_type == rvi_u->cargo_type && u->cargo_subtype == 0) { |
327f66bc01c6
(svn r9875) -Fix (r9828): Only set carriage capacity if the wagon has not been refitted.
peter1138
parents:
6643
diff
changeset
|
235 |
/* Set cargo capacity if we've not been refitted */ |
327f66bc01c6
(svn r9875) -Fix (r9828): Only set carriage capacity if the wagon has not been refitted.
peter1138
parents:
6643
diff
changeset
|
236 |
u->cargo_cap = GetVehicleProperty(u, 0x14, rvi_u->capacity); |
327f66bc01c6
(svn r9875) -Fix (r9828): Only set carriage capacity if the wagon has not been refitted.
peter1138
parents:
6643
diff
changeset
|
237 |
} |
6608
dc0b009642a4
(svn r9828) -Codechange: [NewGRF] Add support for changing cargo capacity with callback 36. This is set on construction for ships and roadvehicles, and whenever carriages are attached for trains.
peter1138
parents:
6603
diff
changeset
|
238 |
|
7881
7838dbc8bbab
(svn r11431) -Codechange: [NewGRF] Add support for changing rail vehicle user-defined bit mask (prop 25) via callback 36
glx
parents:
7833
diff
changeset
|
239 |
u->u.rail.user_def_data = GetVehicleProperty(u, 0x25, rvi_u->user_def_data); |
7838dbc8bbab
(svn r11431) -Codechange: [NewGRF] Add support for changing rail vehicle user-defined bit mask (prop 25) via callback 36
glx
parents:
7833
diff
changeset
|
240 |
|
6422
6679df1c05ba
(svn r9558) -Documentation: doxygen and comment changes: 'T' now. Almost done
belugas
parents:
6407
diff
changeset
|
241 |
/* check the vehicle length (callback) */ |
6150 | 242 |
uint16 veh_len = CALLBACK_FAILED; |
7928
63e18de69e50
(svn r11481) -Codechange: Rename the HASBIT function to fit with the naming style
skidd13
parents:
7923
diff
changeset
|
243 |
if (HasBit(EngInfo(u->engine_type)->callbackmask, CBM_VEHICLE_LENGTH)) { |
7215
7f90af37655d
(svn r10493) -Codechange: update some callback ID enums to reflect their changed usage, add a few and update the comments.
rubidium
parents:
7196
diff
changeset
|
244 |
veh_len = GetVehicleCallback(CBID_VEHICLE_LENGTH, 0, 0, u->engine_type, u); |
3956
92362ba224b7
(svn r5105) - NewGRF: Move callbackmask from *VehicleInfo to EngineInfo. This simplifies code that works with more than one vehicle type.
peter1138
parents:
3955
diff
changeset
|
245 |
} |
92362ba224b7
(svn r5105) - NewGRF: Move callbackmask from *VehicleInfo to EngineInfo. This simplifies code that works with more than one vehicle type.
peter1138
parents:
3955
diff
changeset
|
246 |
if (veh_len == CALLBACK_FAILED) veh_len = rvi_u->shorten_factor; |
7922
a7e266f966d9
(svn r11475) -Codechange: rename clamp and clampu to Clamp and ClampU to fit with the coding style
skidd13
parents:
7881
diff
changeset
|
247 |
veh_len = Clamp(veh_len, 0, u->Next() == NULL ? 7 : 5); // the clamp on vehicles not the last in chain is stricter, as too short wagons can break the 'follow next vehicle' code |
1922
bda6f85eefaa
(svn r2428) - Feature: [newgrf] Implement shorter train vehicles (Therax), and the callback that goes with it.
hackykid
parents:
1921
diff
changeset
|
248 |
u->u.rail.cached_veh_length = 8 - veh_len; |
2587
31647a23da0b
(svn r3124) Alter train loading/unloading time to use the actual length of the train instead of the number of wagons. The actual length is cached in the first vehicle of the train.
peter1138
parents:
2574
diff
changeset
|
249 |
v->u.rail.cached_total_length += u->u.rail.cached_veh_length; |
6150 | 250 |
} |
1905
c53f8d71f9b6
(svn r2411) - Codechange: Have trains cache stuff like consist power/weight/max speed instead of recalculating it each time.
hackykid
parents:
1901
diff
changeset
|
251 |
|
6422
6679df1c05ba
(svn r9558) -Documentation: doxygen and comment changes: 'T' now. Almost done
belugas
parents:
6407
diff
changeset
|
252 |
/* store consist weight/max speed in cache */ |
1905
c53f8d71f9b6
(svn r2411) - Codechange: Have trains cache stuff like consist power/weight/max speed instead of recalculating it each time.
hackykid
parents:
1901
diff
changeset
|
253 |
v->u.rail.cached_max_speed = max_speed; |
3355
e414a0b104a6
(svn r4150) -Feature: Merged elrails into trunk. Thanks to Tron for lots of code and proofreading, thanks to peter1138 for another lot of code and ideas.
celestar
parents:
3341
diff
changeset
|
254 |
|
6422
6679df1c05ba
(svn r9558) -Documentation: doxygen and comment changes: 'T' now. Almost done
belugas
parents:
6407
diff
changeset
|
255 |
/* recalculate cached weights and power too (we do this *after* the rest, so it is known which wagons are powered and need extra weight added) */ |
1908
2fa391fed79a
(svn r2414) - Feature: [newgrf] Implement powered wagons, and the callback that goes with it.
hackykid
parents:
1905
diff
changeset
|
256 |
TrainCargoChanged(v); |
1905
c53f8d71f9b6
(svn r2411) - Codechange: Have trains cache stuff like consist power/weight/max speed instead of recalculating it each time.
hackykid
parents:
1901
diff
changeset
|
257 |
} |
1247 | 258 |
|
259 |
/* These two arrays are used for realistic acceleration. XXX: How should they |
|
260 |
* be interpreted? */ |
|
1179
ce0a75460808
(svn r1681) -Feature: New realistic acceleration.
celestar
parents:
1174
diff
changeset
|
261 |
static const byte _curve_neighbours45[8][2] = { |
ce0a75460808
(svn r1681) -Feature: New realistic acceleration.
celestar
parents:
1174
diff
changeset
|
262 |
{7, 1}, |
ce0a75460808
(svn r1681) -Feature: New realistic acceleration.
celestar
parents:
1174
diff
changeset
|
263 |
{0, 2}, |
ce0a75460808
(svn r1681) -Feature: New realistic acceleration.
celestar
parents:
1174
diff
changeset
|
264 |
{1, 3}, |
ce0a75460808
(svn r1681) -Feature: New realistic acceleration.
celestar
parents:
1174
diff
changeset
|
265 |
{2, 4}, |
ce0a75460808
(svn r1681) -Feature: New realistic acceleration.
celestar
parents:
1174
diff
changeset
|
266 |
{3, 5}, |
ce0a75460808
(svn r1681) -Feature: New realistic acceleration.
celestar
parents:
1174
diff
changeset
|
267 |
{4, 6}, |
ce0a75460808
(svn r1681) -Feature: New realistic acceleration.
celestar
parents:
1174
diff
changeset
|
268 |
{5, 7}, |
ce0a75460808
(svn r1681) -Feature: New realistic acceleration.
celestar
parents:
1174
diff
changeset
|
269 |
{6, 0}, |
ce0a75460808
(svn r1681) -Feature: New realistic acceleration.
celestar
parents:
1174
diff
changeset
|
270 |
}; |
ce0a75460808
(svn r1681) -Feature: New realistic acceleration.
celestar
parents:
1174
diff
changeset
|
271 |
|
ce0a75460808
(svn r1681) -Feature: New realistic acceleration.
celestar
parents:
1174
diff
changeset
|
272 |
static const byte _curve_neighbours90[8][2] = { |
ce0a75460808
(svn r1681) -Feature: New realistic acceleration.
celestar
parents:
1174
diff
changeset
|
273 |
{6, 2}, |
ce0a75460808
(svn r1681) -Feature: New realistic acceleration.
celestar
parents:
1174
diff
changeset
|
274 |
{7, 3}, |
ce0a75460808
(svn r1681) -Feature: New realistic acceleration.
celestar
parents:
1174
diff
changeset
|
275 |
{0, 4}, |
ce0a75460808
(svn r1681) -Feature: New realistic acceleration.
celestar
parents:
1174
diff
changeset
|
276 |
{1, 5}, |
ce0a75460808
(svn r1681) -Feature: New realistic acceleration.
celestar
parents:
1174
diff
changeset
|
277 |
{2, 6}, |
ce0a75460808
(svn r1681) -Feature: New realistic acceleration.
celestar
parents:
1174
diff
changeset
|
278 |
{3, 7}, |
ce0a75460808
(svn r1681) -Feature: New realistic acceleration.
celestar
parents:
1174
diff
changeset
|
279 |
{4, 0}, |
ce0a75460808
(svn r1681) -Feature: New realistic acceleration.
celestar
parents:
1174
diff
changeset
|
280 |
{5, 1}, |
ce0a75460808
(svn r1681) -Feature: New realistic acceleration.
celestar
parents:
1174
diff
changeset
|
281 |
}; |
ce0a75460808
(svn r1681) -Feature: New realistic acceleration.
celestar
parents:
1174
diff
changeset
|
282 |
|
ce0a75460808
(svn r1681) -Feature: New realistic acceleration.
celestar
parents:
1174
diff
changeset
|
283 |
enum AccelType { |
ce0a75460808
(svn r1681) -Feature: New realistic acceleration.
celestar
parents:
1174
diff
changeset
|
284 |
AM_ACCEL, |
ce0a75460808
(svn r1681) -Feature: New realistic acceleration.
celestar
parents:
1174
diff
changeset
|
285 |
AM_BRAKE |
ce0a75460808
(svn r1681) -Feature: New realistic acceleration.
celestar
parents:
1174
diff
changeset
|
286 |
}; |
ce0a75460808
(svn r1681) -Feature: New realistic acceleration.
celestar
parents:
1174
diff
changeset
|
287 |
|
2630 | 288 |
static bool TrainShouldStop(const Vehicle* v, TileIndex tile) |
1236
928560eaf613
(svn r1740) -Fix: [ 1112342 ] Realistic acceleration works properly with TTDPatch non-stop handling behaviour
celestar
parents:
1235
diff
changeset
|
289 |
{ |
2630 | 290 |
const Order* o = &v->current_order; |
3315
c9d989783c55
(svn r4079) Add GetSation{Index,ByTile}() to get the station index resp. the station from a tile
tron
parents:
3269
diff
changeset
|
291 |
StationID sid = GetStationIndex(tile); |
2630 | 292 |
|
6259
471b91a4b1d8
(svn r9068) -Codechange: capitalize the VEH_Train etc. enums to match the coding style (and rest of the code).
rubidium
parents:
6248
diff
changeset
|
293 |
assert(v->type == VEH_TRAIN); |
6422
6679df1c05ba
(svn r9558) -Documentation: doxygen and comment changes: 'T' now. Almost done
belugas
parents:
6407
diff
changeset
|
294 |
/* When does a train drive through a station |
6679df1c05ba
(svn r9558) -Documentation: doxygen and comment changes: 'T' now. Almost done
belugas
parents:
6407
diff
changeset
|
295 |
* first we deal with the "new nonstop handling" */ |
4527
fa30d19685c2
(svn r6353) -Codechange: Make DestinationID a typedef of uin16, which is as large as any type of destinataion (StationID, DepotID, WaypointID) it can hold
tron
parents:
4526
diff
changeset
|
296 |
if (_patches.new_nonstop && o->flags & OF_NON_STOP && sid == o->dest) { |
1236
928560eaf613
(svn r1740) -Fix: [ 1112342 ] Realistic acceleration works properly with TTDPatch non-stop handling behaviour
celestar
parents:
1235
diff
changeset
|
297 |
return false; |
3315
c9d989783c55
(svn r4079) Add GetSation{Index,ByTile}() to get the station index resp. the station from a tile
tron
parents:
3269
diff
changeset
|
298 |
} |
c9d989783c55
(svn r4079) Add GetSation{Index,ByTile}() to get the station index resp. the station from a tile
tron
parents:
3269
diff
changeset
|
299 |
|
c9d989783c55
(svn r4079) Add GetSation{Index,ByTile}() to get the station index resp. the station from a tile
tron
parents:
3269
diff
changeset
|
300 |
if (v->last_station_visited == sid) return false; |
c9d989783c55
(svn r4079) Add GetSation{Index,ByTile}() to get the station index resp. the station from a tile
tron
parents:
3269
diff
changeset
|
301 |
|
4527
fa30d19685c2
(svn r6353) -Codechange: Make DestinationID a typedef of uin16, which is as large as any type of destinataion (StationID, DepotID, WaypointID) it can hold
tron
parents:
4526
diff
changeset
|
302 |
if (sid != o->dest && (o->flags & OF_NON_STOP || _patches.new_nonstop)) { |
1236
928560eaf613
(svn r1740) -Fix: [ 1112342 ] Realistic acceleration works properly with TTDPatch non-stop handling behaviour
celestar
parents:
1235
diff
changeset
|
303 |
return false; |
3315
c9d989783c55
(svn r4079) Add GetSation{Index,ByTile}() to get the station index resp. the station from a tile
tron
parents:
3269
diff
changeset
|
304 |
} |
1236
928560eaf613
(svn r1740) -Fix: [ 1112342 ] Realistic acceleration works properly with TTDPatch non-stop handling behaviour
celestar
parents:
1235
diff
changeset
|
305 |
|
928560eaf613
(svn r1740) -Fix: [ 1112342 ] Realistic acceleration works properly with TTDPatch non-stop handling behaviour
celestar
parents:
1235
diff
changeset
|
306 |
return true; |
928560eaf613
(svn r1740) -Fix: [ 1112342 ] Realistic acceleration works properly with TTDPatch non-stop handling behaviour
celestar
parents:
1235
diff
changeset
|
307 |
} |
928560eaf613
(svn r1740) -Fix: [ 1112342 ] Realistic acceleration works properly with TTDPatch non-stop handling behaviour
celestar
parents:
1235
diff
changeset
|
308 |
|
6422
6679df1c05ba
(svn r9558) -Documentation: doxygen and comment changes: 'T' now. Almost done
belugas
parents:
6407
diff
changeset
|
309 |
/** new acceleration*/ |
1179
ce0a75460808
(svn r1681) -Feature: New realistic acceleration.
celestar
parents:
1174
diff
changeset
|
310 |
static int GetTrainAcceleration(Vehicle *v, bool mode) |
ce0a75460808
(svn r1681) -Feature: New realistic acceleration.
celestar
parents:
1174
diff
changeset
|
311 |
{ |
ce0a75460808
(svn r1681) -Feature: New realistic acceleration.
celestar
parents:
1174
diff
changeset
|
312 |
int max_speed = 2000; |
7561
5c350b238c0e
(svn r11086) -Fix/Revert (r11053, r10984): "fixing" r11053 made the acceleration code use the wrong speed, which can be fixed by reverting a small piece of r10984.
rubidium
parents:
7551
diff
changeset
|
313 |
int speed = v->cur_speed * 10 / 16; // km-ish/h -> mp/h |
6150 | 314 |
int curvecount[2] = {0, 0}; |
315 |
||
6422
6679df1c05ba
(svn r9558) -Documentation: doxygen and comment changes: 'T' now. Almost done
belugas
parents:
6407
diff
changeset
|
316 |
/*first find the curve speed limit */ |
6150 | 317 |
int numcurve = 0; |
318 |
int sum = 0; |
|
1179
ce0a75460808
(svn r1681) -Feature: New realistic acceleration.
celestar
parents:
1174
diff
changeset
|
319 |
int pos = 0; |
ce0a75460808
(svn r1681) -Feature: New realistic acceleration.
celestar
parents:
1174
diff
changeset
|
320 |
int lastpos = -1; |
7492
35acee076719
(svn r11003) -Codechange: replace Vehicle->next to Vehicle->Next() and Vehicle->SetNext() so we can trap instances that change a next pointer and (in the future) update the first/previous pointers based on that.
rubidium
parents:
7488
diff
changeset
|
321 |
for (const Vehicle *u = v; u->Next() != NULL; u = u->Next(), pos++) { |
3157
3f35e2d9c8e3
(svn r3783) Replace further ints and magic numbers by Direction, DiagDirection and friends
tron
parents:
3154
diff
changeset
|
322 |
Direction dir = u->direction; |
7492
35acee076719
(svn r11003) -Codechange: replace Vehicle->next to Vehicle->Next() and Vehicle->SetNext() so we can trap instances that change a next pointer and (in the future) update the first/previous pointers based on that.
rubidium
parents:
7488
diff
changeset
|
323 |
Direction ndir = u->Next()->direction; |
1531 | 324 |
int i; |
1179
ce0a75460808
(svn r1681) -Feature: New realistic acceleration.
celestar
parents:
1174
diff
changeset
|
325 |
|
ce0a75460808
(svn r1681) -Feature: New realistic acceleration.
celestar
parents:
1174
diff
changeset
|
326 |
for (i = 0; i < 2; i++) { |
ce0a75460808
(svn r1681) -Feature: New realistic acceleration.
celestar
parents:
1174
diff
changeset
|
327 |
if ( _curve_neighbours45[dir][i] == ndir) { |
ce0a75460808
(svn r1681) -Feature: New realistic acceleration.
celestar
parents:
1174
diff
changeset
|
328 |
curvecount[i]++; |
ce0a75460808
(svn r1681) -Feature: New realistic acceleration.
celestar
parents:
1174
diff
changeset
|
329 |
if (lastpos != -1) { |
1531 | 330 |
numcurve++; |
331 |
sum += pos - lastpos; |
|
1179
ce0a75460808
(svn r1681) -Feature: New realistic acceleration.
celestar
parents:
1174
diff
changeset
|
332 |
if (pos - lastpos == 1) { |
ce0a75460808
(svn r1681) -Feature: New realistic acceleration.
celestar
parents:
1174
diff
changeset
|
333 |
max_speed = 88; |
ce0a75460808
(svn r1681) -Feature: New realistic acceleration.
celestar
parents:
1174
diff
changeset
|
334 |
} |
ce0a75460808
(svn r1681) -Feature: New realistic acceleration.
celestar
parents:
1174
diff
changeset
|
335 |
} |
ce0a75460808
(svn r1681) -Feature: New realistic acceleration.
celestar
parents:
1174
diff
changeset
|
336 |
lastpos = pos; |
ce0a75460808
(svn r1681) -Feature: New realistic acceleration.
celestar
parents:
1174
diff
changeset
|
337 |
} |
ce0a75460808
(svn r1681) -Feature: New realistic acceleration.
celestar
parents:
1174
diff
changeset
|
338 |
} |
ce0a75460808
(svn r1681) -Feature: New realistic acceleration.
celestar
parents:
1174
diff
changeset
|
339 |
|
6422
6679df1c05ba
(svn r9558) -Documentation: doxygen and comment changes: 'T' now. Almost done
belugas
parents:
6407
diff
changeset
|
340 |
/*if we have a 90 degree turn, fix the speed limit to 60 */ |
1472
a2abe3b9d7a7
(svn r1976) Cleanups - mostly indentation and fiddling with loops
tron
parents:
1461
diff
changeset
|
341 |
if (_curve_neighbours90[dir][0] == ndir || |
a2abe3b9d7a7
(svn r1976) Cleanups - mostly indentation and fiddling with loops
tron
parents:
1461
diff
changeset
|
342 |
_curve_neighbours90[dir][1] == ndir) { |
1179
ce0a75460808
(svn r1681) -Feature: New realistic acceleration.
celestar
parents:
1174
diff
changeset
|
343 |
max_speed = 61; |
ce0a75460808
(svn r1681) -Feature: New realistic acceleration.
celestar
parents:
1174
diff
changeset
|
344 |
} |
ce0a75460808
(svn r1681) -Feature: New realistic acceleration.
celestar
parents:
1174
diff
changeset
|
345 |
} |
ce0a75460808
(svn r1681) -Feature: New realistic acceleration.
celestar
parents:
1174
diff
changeset
|
346 |
|
1472
a2abe3b9d7a7
(svn r1976) Cleanups - mostly indentation and fiddling with loops
tron
parents:
1461
diff
changeset
|
347 |
if (numcurve > 0) sum /= numcurve; |
a2abe3b9d7a7
(svn r1976) Cleanups - mostly indentation and fiddling with loops
tron
parents:
1461
diff
changeset
|
348 |
|
a2abe3b9d7a7
(svn r1976) Cleanups - mostly indentation and fiddling with loops
tron
parents:
1461
diff
changeset
|
349 |
if ((curvecount[0] != 0 || curvecount[1] != 0) && max_speed > 88) { |
1179
ce0a75460808
(svn r1681) -Feature: New realistic acceleration.
celestar
parents:
1174
diff
changeset
|
350 |
int total = curvecount[0] + curvecount[1]; |
1472
a2abe3b9d7a7
(svn r1976) Cleanups - mostly indentation and fiddling with loops
tron
parents:
1461
diff
changeset
|
351 |
|
1179
ce0a75460808
(svn r1681) -Feature: New realistic acceleration.
celestar
parents:
1174
diff
changeset
|
352 |
if (curvecount[0] == 1 && curvecount[1] == 1) { |
ce0a75460808
(svn r1681) -Feature: New realistic acceleration.
celestar
parents:
1174
diff
changeset
|
353 |
max_speed = 0xFFFF; |
ce0a75460808
(svn r1681) -Feature: New realistic acceleration.
celestar
parents:
1174
diff
changeset
|
354 |
} else if (total > 1) { |
7922
a7e266f966d9
(svn r11475) -Codechange: rename clamp and clampu to Clamp and ClampU to fit with the coding style
skidd13
parents:
7881
diff
changeset
|
355 |
max_speed = 232 - (13 - Clamp(sum, 1, 12)) * (13 - Clamp(sum, 1, 12)); |
1179
ce0a75460808
(svn r1681) -Feature: New realistic acceleration.
celestar
parents:
1174
diff
changeset
|
356 |
} |
ce0a75460808
(svn r1681) -Feature: New realistic acceleration.
celestar
parents:
1174
diff
changeset
|
357 |
} |
ce0a75460808
(svn r1681) -Feature: New realistic acceleration.
celestar
parents:
1174
diff
changeset
|
358 |
|
ce0a75460808
(svn r1681) -Feature: New realistic acceleration.
celestar
parents:
1174
diff
changeset
|
359 |
max_speed += (max_speed / 2) * v->u.rail.railtype; |
ce0a75460808
(svn r1681) -Feature: New realistic acceleration.
celestar
parents:
1174
diff
changeset
|
360 |
|
2676
59b65b4fb480
(svn r3218) -Feature: Multiheaded train engines will now stay in the same train
bjarni
parents:
2666
diff
changeset
|
361 |
if (IsTileType(v->tile, MP_STATION) && IsFrontEngine(v)) { |
1236
928560eaf613
(svn r1740) -Fix: [ 1112342 ] Realistic acceleration works properly with TTDPatch non-stop handling behaviour
celestar
parents:
1235
diff
changeset
|
362 |
if (TrainShouldStop(v, v->tile)) { |
5998
2bfbade143ac
(svn r8709) -Fix/Codechange: Rename the function GetStationPlatforms into GetPlatformLength because that is what it really does. Overload it because there is already a GetPlatformLength (one gives the length of the whole platform, the other gives the remaining length in a given direction). Turned both functions into methods of Station. While messing around with it, fix a problem where loading times for overhanging trains are miscomputed.
celestar
parents:
5994
diff
changeset
|
363 |
int station_length = GetStationByTile(v->tile)->GetPlatformLength(v->tile, DirToDiagDir(v->direction)); |
1179
ce0a75460808
(svn r1681) -Feature: New realistic acceleration.
celestar
parents:
1174
diff
changeset
|
364 |
int delta_v; |
ce0a75460808
(svn r1681) -Feature: New realistic acceleration.
celestar
parents:
1174
diff
changeset
|
365 |
|
ce0a75460808
(svn r1681) -Feature: New realistic acceleration.
celestar
parents:
1174
diff
changeset
|
366 |
max_speed = 120; |
ce0a75460808
(svn r1681) -Feature: New realistic acceleration.
celestar
parents:
1174
diff
changeset
|
367 |
|
ce0a75460808
(svn r1681) -Feature: New realistic acceleration.
celestar
parents:
1174
diff
changeset
|
368 |
delta_v = v->cur_speed / (station_length + 1); |
ce0a75460808
(svn r1681) -Feature: New realistic acceleration.
celestar
parents:
1174
diff
changeset
|
369 |
if (v->max_speed > (v->cur_speed - delta_v)) |
ce0a75460808
(svn r1681) -Feature: New realistic acceleration.
celestar
parents:
1174
diff
changeset
|
370 |
max_speed = v->cur_speed - (delta_v / 10); |
ce0a75460808
(svn r1681) -Feature: New realistic acceleration.
celestar
parents:
1174
diff
changeset
|
371 |
|
ce0a75460808
(svn r1681) -Feature: New realistic acceleration.
celestar
parents:
1174
diff
changeset
|
372 |
max_speed = max(max_speed, 25 * station_length); |
ce0a75460808
(svn r1681) -Feature: New realistic acceleration.
celestar
parents:
1174
diff
changeset
|
373 |
} |
ce0a75460808
(svn r1681) -Feature: New realistic acceleration.
celestar
parents:
1174
diff
changeset
|
374 |
} |
ce0a75460808
(svn r1681) -Feature: New realistic acceleration.
celestar
parents:
1174
diff
changeset
|
375 |
|
6150 | 376 |
int mass = v->u.rail.cached_weight; |
377 |
int power = v->u.rail.cached_power * 746; |
|
1905
c53f8d71f9b6
(svn r2411) - Codechange: Have trains cache stuff like consist power/weight/max speed instead of recalculating it each time.
hackykid
parents:
1901
diff
changeset
|
378 |
max_speed = min(max_speed, v->u.rail.cached_max_speed); |
c53f8d71f9b6
(svn r2411) - Codechange: Have trains cache stuff like consist power/weight/max speed instead of recalculating it each time.
hackykid
parents:
1901
diff
changeset
|
379 |
|
6150 | 380 |
int num = 0; //number of vehicles, change this into the number of axles later |
381 |
int incl = 0; |
|
382 |
int drag_coeff = 20; //[1e-4] |
|
7492
35acee076719
(svn r11003) -Codechange: replace Vehicle->next to Vehicle->Next() and Vehicle->SetNext() so we can trap instances that change a next pointer and (in the future) update the first/previous pointers based on that.
rubidium
parents:
7488
diff
changeset
|
383 |
for (const Vehicle *u = v; u != NULL; u = u->Next()) { |
1179
ce0a75460808
(svn r1681) -Feature: New realistic acceleration.
celestar
parents:
1174
diff
changeset
|
384 |
num++; |
ce0a75460808
(svn r1681) -Feature: New realistic acceleration.
celestar
parents:
1174
diff
changeset
|
385 |
drag_coeff += 3; |
ce0a75460808
(svn r1681) -Feature: New realistic acceleration.
celestar
parents:
1174
diff
changeset
|
386 |
|
5993
956d341d930e
(svn r8701) -Codechange: replace magic numbers with enums for u.rail.track.
rubidium
parents:
5992
diff
changeset
|
387 |
if (u->u.rail.track == TRACK_BIT_DEPOT) max_speed = min(max_speed, 61); |
1179
ce0a75460808
(svn r1681) -Feature: New realistic acceleration.
celestar
parents:
1174
diff
changeset
|
388 |
|
7928
63e18de69e50
(svn r11481) -Codechange: Rename the HASBIT function to fit with the naming style
skidd13
parents:
7923
diff
changeset
|
389 |
if (HasBit(u->u.rail.flags, VRF_GOINGUP)) { |
4434
a08cb4b5c179
(svn r6204) -Cleanup: replace non-indentation with spaces; like '}<TAB>else {' -> '} else {', tabs between code and comment, etc.
rubidium
parents:
4432
diff
changeset
|
390 |
incl += u->u.rail.cached_veh_weight * 60; //3% slope, quite a bit actually |
7928
63e18de69e50
(svn r11481) -Codechange: Rename the HASBIT function to fit with the naming style
skidd13
parents:
7923
diff
changeset
|
391 |
} else if (HasBit(u->u.rail.flags, VRF_GOINGDOWN)) { |
1905
c53f8d71f9b6
(svn r2411) - Codechange: Have trains cache stuff like consist power/weight/max speed instead of recalculating it each time.
hackykid
parents:
1901
diff
changeset
|
392 |
incl -= u->u.rail.cached_veh_weight * 60; |
1179
ce0a75460808
(svn r1681) -Feature: New realistic acceleration.
celestar
parents:
1174
diff
changeset
|
393 |
} |
ce0a75460808
(svn r1681) -Feature: New realistic acceleration.
celestar
parents:
1174
diff
changeset
|
394 |
} |
ce0a75460808
(svn r1681) -Feature: New realistic acceleration.
celestar
parents:
1174
diff
changeset
|
395 |
|
ce0a75460808
(svn r1681) -Feature: New realistic acceleration.
celestar
parents:
1174
diff
changeset
|
396 |
v->max_speed = max_speed; |
ce0a75460808
(svn r1681) -Feature: New realistic acceleration.
celestar
parents:
1174
diff
changeset
|
397 |
|
6150 | 398 |
const int area = 120; |
399 |
const int friction = 35; //[1e-3] |
|
400 |
int resistance; |
|
2519
beb11a5ac48c
(svn r3048) Replace 0/1/2 by RAILTYPE_RAIL/MONO/MAGLEV where appropriate
tron
parents:
2510
diff
changeset
|
401 |
if (v->u.rail.railtype != RAILTYPE_MAGLEV) { |
1179
ce0a75460808
(svn r1681) -Feature: New realistic acceleration.
celestar
parents:
1174
diff
changeset
|
402 |
resistance = 13 * mass / 10; |
ce0a75460808
(svn r1681) -Feature: New realistic acceleration.
celestar
parents:
1174
diff
changeset
|
403 |
resistance += 60 * num; |
ce0a75460808
(svn r1681) -Feature: New realistic acceleration.
celestar
parents:
1174
diff
changeset
|
404 |
resistance += friction * mass * speed / 1000; |
ce0a75460808
(svn r1681) -Feature: New realistic acceleration.
celestar
parents:
1174
diff
changeset
|
405 |
resistance += (area * drag_coeff * speed * speed) / 10000; |
3017
a75caf4efa2d
(svn r3597) Miscellaneous (I like that word) changes: Fix some indentation, add consts, reduce indentation level by short-circuit logic, convert if cascades to switch, whitespace, bracing, plus some minor stuff
tron
parents:
3008
diff
changeset
|
406 |
} else { |
1179
ce0a75460808
(svn r1681) -Feature: New realistic acceleration.
celestar
parents:
1174
diff
changeset
|
407 |
resistance = (area * (drag_coeff / 2) * speed * speed) / 10000; |
3017
a75caf4efa2d
(svn r3597) Miscellaneous (I like that word) changes: Fix some indentation, add consts, reduce indentation level by short-circuit logic, convert if cascades to switch, whitespace, bracing, plus some minor stuff
tron
parents:
3008
diff
changeset
|
408 |
} |
1179
ce0a75460808
(svn r1681) -Feature: New realistic acceleration.
celestar
parents:
1174
diff
changeset
|
409 |
resistance += incl; |
ce0a75460808
(svn r1681) -Feature: New realistic acceleration.
celestar
parents:
1174
diff
changeset
|
410 |
resistance *= 4; //[N] |
ce0a75460808
(svn r1681) -Feature: New realistic acceleration.
celestar
parents:
1174
diff
changeset
|
411 |
|
5277
b60d0b6807d1
(svn r7421) -Fix (r2475): Changed "kick off" acceleration resulted in only a small amount of power being applied whilst moving off and then double the power at 1 mph. This resulted in a perceived delay before trains moved. Fix this by applying the full power of the engine (or the kick off, whichever is greater). Essay over.
peter1138
parents:
5259
diff
changeset
|
412 |
/* Due to the mph to m/s conversion below, at speeds below 3 mph the force is |
b60d0b6807d1
(svn r7421) -Fix (r2475): Changed "kick off" acceleration resulted in only a small amount of power being applied whilst moving off and then double the power at 1 mph. This resulted in a perceived delay before trains moved. Fix this by applying the full power of the engine (or the kick off, whichever is greater). Essay over.
peter1138
parents:
5259
diff
changeset
|
413 |
* actually double the train's power */ |
6150 | 414 |
const int max_te = v->u.rail.cached_max_te; // [N] |
415 |
int force; |
|
5277
b60d0b6807d1
(svn r7421) -Fix (r2475): Changed "kick off" acceleration resulted in only a small amount of power being applied whilst moving off and then double the power at 1 mph. This resulted in a perceived delay before trains moved. Fix this by applying the full power of the engine (or the kick off, whichever is greater). Essay over.
peter1138
parents:
5259
diff
changeset
|
416 |
if (speed > 2) { |
1179
ce0a75460808
(svn r1681) -Feature: New realistic acceleration.
celestar
parents:
1174
diff
changeset
|
417 |
switch (v->u.rail.railtype) { |
2519
beb11a5ac48c
(svn r3048) Replace 0/1/2 by RAILTYPE_RAIL/MONO/MAGLEV where appropriate
tron
parents:
2510
diff
changeset
|
418 |
case RAILTYPE_RAIL: |
3355
e414a0b104a6
(svn r4150) -Feature: Merged elrails into trunk. Thanks to Tron for lots of code and proofreading, thanks to peter1138 for another lot of code and ideas.
celestar
parents:
3341
diff
changeset
|
419 |
case RAILTYPE_ELECTRIC: |
2519
beb11a5ac48c
(svn r3048) Replace 0/1/2 by RAILTYPE_RAIL/MONO/MAGLEV where appropriate
tron
parents:
2510
diff
changeset
|
420 |
case RAILTYPE_MONO: |
1179
ce0a75460808
(svn r1681) -Feature: New realistic acceleration.
celestar
parents:
1174
diff
changeset
|
421 |
force = power / speed; //[N] |
ce0a75460808
(svn r1681) -Feature: New realistic acceleration.
celestar
parents:
1174
diff
changeset
|
422 |
force *= 22; |
ce0a75460808
(svn r1681) -Feature: New realistic acceleration.
celestar
parents:
1174
diff
changeset
|
423 |
force /= 10; |
5400
bba42ad3223b
(svn r7592) -Feature: Add support for tractive effort to 'realistic' acceleration.
peter1138
parents:
5385
diff
changeset
|
424 |
if (mode == AM_ACCEL && force > max_te) force = max_te; |
1472
a2abe3b9d7a7
(svn r1976) Cleanups - mostly indentation and fiddling with loops
tron
parents:
1461
diff
changeset
|
425 |
break; |
a2abe3b9d7a7
(svn r1976) Cleanups - mostly indentation and fiddling with loops
tron
parents:
1461
diff
changeset
|
426 |
|
6150 | 427 |
default: NOT_REACHED(); |
2519
beb11a5ac48c
(svn r3048) Replace 0/1/2 by RAILTYPE_RAIL/MONO/MAGLEV where appropriate
tron
parents:
2510
diff
changeset
|
428 |
case RAILTYPE_MAGLEV: |
1179
ce0a75460808
(svn r1681) -Feature: New realistic acceleration.
celestar
parents:
1174
diff
changeset
|
429 |
force = power / 25; |
1472
a2abe3b9d7a7
(svn r1976) Cleanups - mostly indentation and fiddling with loops
tron
parents:
1461
diff
changeset
|
430 |
break; |
1179
ce0a75460808
(svn r1681) -Feature: New realistic acceleration.
celestar
parents:
1174
diff
changeset
|
431 |
} |
1472
a2abe3b9d7a7
(svn r1976) Cleanups - mostly indentation and fiddling with loops
tron
parents:
1461
diff
changeset
|
432 |
} else { |
6422
6679df1c05ba
(svn r9558) -Documentation: doxygen and comment changes: 'T' now. Almost done
belugas
parents:
6407
diff
changeset
|
433 |
/* "kickoff" acceleration */ |
5400
bba42ad3223b
(svn r7592) -Feature: Add support for tractive effort to 'realistic' acceleration.
peter1138
parents:
5385
diff
changeset
|
434 |
force = (mode == AM_ACCEL && v->u.rail.railtype != RAILTYPE_MAGLEV) ? min(max_te, power) : power; |
bba42ad3223b
(svn r7592) -Feature: Add support for tractive effort to 'realistic' acceleration.
peter1138
parents:
5385
diff
changeset
|
435 |
force = max(force, (mass * 8) + resistance); |
1472
a2abe3b9d7a7
(svn r1976) Cleanups - mostly indentation and fiddling with loops
tron
parents:
1461
diff
changeset
|
436 |
} |
1179
ce0a75460808
(svn r1681) -Feature: New realistic acceleration.
celestar
parents:
1174
diff
changeset
|
437 |
|
ce0a75460808
(svn r1681) -Feature: New realistic acceleration.
celestar
parents:
1174
diff
changeset
|
438 |
if (force <= 0) force = 10000; |
ce0a75460808
(svn r1681) -Feature: New realistic acceleration.
celestar
parents:
1174
diff
changeset
|
439 |
|
2519
beb11a5ac48c
(svn r3048) Replace 0/1/2 by RAILTYPE_RAIL/MONO/MAGLEV where appropriate
tron
parents:
2510
diff
changeset
|
440 |
if (v->u.rail.railtype != RAILTYPE_MAGLEV) force = min(force, mass * 10 * 200); |
1179
ce0a75460808
(svn r1681) -Feature: New realistic acceleration.
celestar
parents:
1174
diff
changeset
|
441 |
|
ce0a75460808
(svn r1681) -Feature: New realistic acceleration.
celestar
parents:
1174
diff
changeset
|
442 |
if (mode == AM_ACCEL) { |
1684
3b2df64cc706
(svn r2188) Revert r2185, because trains always accerlated (Requested by Celestar)
tron
parents:
1683
diff
changeset
|
443 |
return (force - resistance) / (mass * 4); |
1179
ce0a75460808
(svn r1681) -Feature: New realistic acceleration.
celestar
parents:
1174
diff
changeset
|
444 |
} else { |
5279
295d8b87b394
(svn r7425) -Fix (r1681): With realistic acceleration, guarantee a minimum braking
peter1138
parents:
5277
diff
changeset
|
445 |
return min((-force - resistance) / (mass * 4), -10000 / (mass * 4)); |
1179
ce0a75460808
(svn r1681) -Feature: New realistic acceleration.
celestar
parents:
1174
diff
changeset
|
446 |
} |
ce0a75460808
(svn r1681) -Feature: New realistic acceleration.
celestar
parents:
1174
diff
changeset
|
447 |
} |
ce0a75460808
(svn r1681) -Feature: New realistic acceleration.
celestar
parents:
1174
diff
changeset
|
448 |
|
2817 | 449 |
static void UpdateTrainAcceleration(Vehicle* v) |
0 | 450 |
{ |
2676
59b65b4fb480
(svn r3218) -Feature: Multiheaded train engines will now stay in the same train
bjarni
parents:
2666
diff
changeset
|
451 |
assert(IsFrontEngine(v)); |
0 | 452 |
|
1905
c53f8d71f9b6
(svn r2411) - Codechange: Have trains cache stuff like consist power/weight/max speed instead of recalculating it each time.
hackykid
parents:
1901
diff
changeset
|
453 |
v->max_speed = v->u.rail.cached_max_speed; |
0 | 454 |
|
6150 | 455 |
uint power = v->u.rail.cached_power; |
456 |
uint weight = v->u.rail.cached_weight; |
|
0 | 457 |
assert(weight != 0); |
7922
a7e266f966d9
(svn r11475) -Codechange: rename clamp and clampu to Clamp and ClampU to fit with the coding style
skidd13
parents:
7881
diff
changeset
|
458 |
v->acceleration = Clamp(power / weight * 4, 1, 255); |
0 | 459 |
} |
460 |
||
7134
5b2d47128d05
(svn r10408) -Codechange: make GetImage a class method of Vehicle instead of Get(Aircraft|RoadVeh|Ship|Train)Image.
rubidium
parents:
7109
diff
changeset
|
461 |
int Train::GetImage(Direction direction) const |
0 | 462 |
{ |
7134
5b2d47128d05
(svn r10408) -Codechange: make GetImage a class method of Vehicle instead of Get(Aircraft|RoadVeh|Ship|Train)Image.
rubidium
parents:
7109
diff
changeset
|
463 |
int img = this->spritenum; |
0 | 464 |
int base; |
465 |
||
7928
63e18de69e50
(svn r11481) -Codechange: Rename the HASBIT function to fit with the naming style
skidd13
parents:
7923
diff
changeset
|
466 |
if (HasBit(this->u.rail.flags, VRF_REVERSE_DIRECTION)) direction = ReverseDir(direction); |
3256
3ada27c81b7f
(svn r3944) -Feature: it's now possible to turn a single unit in a train
bjarni
parents:
3242
diff
changeset
|
467 |
|
0 | 468 |
if (is_custom_sprite(img)) { |
7134
5b2d47128d05
(svn r10408) -Codechange: make GetImage a class method of Vehicle instead of Get(Aircraft|RoadVeh|Ship|Train)Image.
rubidium
parents:
7109
diff
changeset
|
469 |
base = GetCustomVehicleSprite(this, (Direction)(direction + 4 * IS_CUSTOM_SECONDHEAD_SPRITE(img))); |
1472
a2abe3b9d7a7
(svn r1976) Cleanups - mostly indentation and fiddling with loops
tron
parents:
1461
diff
changeset
|
470 |
if (base != 0) return base; |
7134
5b2d47128d05
(svn r10408) -Codechange: make GetImage a class method of Vehicle instead of Get(Aircraft|RoadVeh|Ship|Train)Image.
rubidium
parents:
7109
diff
changeset
|
471 |
img = orig_rail_vehicle_info[this->engine_type].image_index; |
0 | 472 |
} |
193
0a7025304867
(svn r194) -Codechange: stripping trailing-spaces. Please keep this that way!
truelight
parents:
166
diff
changeset
|
473 |
|
0 | 474 |
base = _engine_sprite_base[img] + ((direction + _engine_sprite_add[img]) & _engine_sprite_and[img]); |
475 |
||
7134
5b2d47128d05
(svn r10408) -Codechange: make GetImage a class method of Vehicle instead of Get(Aircraft|RoadVeh|Ship|Train)Image.
rubidium
parents:
7109
diff
changeset
|
476 |
if (this->cargo.Count() >= this->cargo_cap / 2U) base += _wagon_full_adder[img]; |
0 | 477 |
return base; |
478 |
} |
|
479 |
||
5668
36b39f4a9032
(svn r8128) -Codechange: Split sprite and palette remap into separate 32 bit values.
peter1138
parents:
5651
diff
changeset
|
480 |
void DrawTrainEngine(int x, int y, EngineID engine, SpriteID pal) |
0 | 481 |
{ |
540
2987d7976ea2
(svn r924) Use RailVehInfo() instead of &_rail_vehicle_info[]
tron
parents:
534
diff
changeset
|
482 |
const RailVehicleInfo *rvi = RailVehInfo(engine); |
193
0a7025304867
(svn r194) -Codechange: stripping trailing-spaces. Please keep this that way!
truelight
parents:
166
diff
changeset
|
483 |
|
0 | 484 |
int img = rvi->image_index; |
5668
36b39f4a9032
(svn r8128) -Codechange: Split sprite and palette remap into separate 32 bit values.
peter1138
parents:
5651
diff
changeset
|
485 |
SpriteID image = 0; |
0 | 486 |
|
487 |
if (is_custom_sprite(img)) { |
|
3186
4317b5b295c4
(svn r3832) Replace some magic numbers by (Diag)Direction enums
tron
parents:
3185
diff
changeset
|
488 |
image = GetCustomVehicleIcon(engine, DIR_W); |
2570
f86c326fda65
(svn r3107) -NewGRF: Move train y-position offset adjustment to remove code duplication, and make it apply only to vehicles with a custom image.
peter1138
parents:
2564
diff
changeset
|
489 |
if (image == 0) { |
f86c326fda65
(svn r3107) -NewGRF: Move train y-position offset adjustment to remove code duplication, and make it apply only to vehicles with a custom image.
peter1138
parents:
2564
diff
changeset
|
490 |
img = orig_rail_vehicle_info[engine].image_index; |
f86c326fda65
(svn r3107) -NewGRF: Move train y-position offset adjustment to remove code duplication, and make it apply only to vehicles with a custom image.
peter1138
parents:
2564
diff
changeset
|
491 |
} else { |
f86c326fda65
(svn r3107) -NewGRF: Move train y-position offset adjustment to remove code duplication, and make it apply only to vehicles with a custom image.
peter1138
parents:
2564
diff
changeset
|
492 |
y += _traininfo_vehicle_pitch; |
f86c326fda65
(svn r3107) -NewGRF: Move train y-position offset adjustment to remove code duplication, and make it apply only to vehicles with a custom image.
peter1138
parents:
2564
diff
changeset
|
493 |
} |
0 | 494 |
} |
1472
a2abe3b9d7a7
(svn r1976) Cleanups - mostly indentation and fiddling with loops
tron
parents:
1461
diff
changeset
|
495 |
if (image == 0) { |
0 | 496 |
image = (6 & _engine_sprite_and[img]) + _engine_sprite_base[img]; |
497 |
} |
|
498 |
||
5868
94430141c189
(svn r8455) -Codechange: Give a more meaningful name (railveh_type)to member flags of RailVehInfo, as well as changing the code to reflect the fact that it was not a flag but rather a one value only variable. Doing so, some evaluations have been simplified.
belugas
parents:
5858
diff
changeset
|
499 |
if (rvi->railveh_type == RAILVEH_MULTIHEAD) { |
5668
36b39f4a9032
(svn r8128) -Codechange: Split sprite and palette remap into separate 32 bit values.
peter1138
parents:
5651
diff
changeset
|
500 |
DrawSprite(image, pal, x - 14, y); |
0 | 501 |
x += 15; |
502 |
image = 0; |
|
503 |
if (is_custom_sprite(img)) { |
|
5587
167d9a91ef02
(svn r8038) -Merge: the cpp branch. Effort of KUDr, Celestar, glx, Smoovius, stillunknown and pv2b.
rubidium
parents:
5584
diff
changeset
|
504 |
image = GetCustomVehicleIcon(engine, DIR_E); |
2464
e3054f0f0627
(svn r2990) Remove _engine_original_sprites and replace all uses with references to our (new) original engine/vehicle tables.
peter1138
parents:
2463
diff
changeset
|
505 |
if (image == 0) img = orig_rail_vehicle_info[engine].image_index; |
0 | 506 |
} |
1472
a2abe3b9d7a7
(svn r1976) Cleanups - mostly indentation and fiddling with loops
tron
parents:
1461
diff
changeset
|
507 |
if (image == 0) { |
a2abe3b9d7a7
(svn r1976) Cleanups - mostly indentation and fiddling with loops
tron
parents:
1461
diff
changeset
|
508 |
image = |
a2abe3b9d7a7
(svn r1976) Cleanups - mostly indentation and fiddling with loops
tron
parents:
1461
diff
changeset
|
509 |
((6 + _engine_sprite_add[img + 1]) & _engine_sprite_and[img + 1]) + |
a2abe3b9d7a7
(svn r1976) Cleanups - mostly indentation and fiddling with loops
tron
parents:
1461
diff
changeset
|
510 |
_engine_sprite_base[img + 1]; |
0 | 511 |
} |
512 |
} |
|
5668
36b39f4a9032
(svn r8128) -Codechange: Split sprite and palette remap into separate 32 bit values.
peter1138
parents:
5651
diff
changeset
|
513 |
DrawSprite(image, pal, x, y); |
0 | 514 |
} |
515 |
||
6943
1914f26aee04
(svn r10197) -Codechange: replace int32 with CommandCost where appropriate.
rubidium
parents:
6924
diff
changeset
|
516 |
static CommandCost CmdBuildRailWagon(EngineID engine, TileIndex tile, uint32 flags) |
0 | 517 |
{ |
889
64d2f7d5f02b
(svn r1375) -Fix: [1050990] Buying trains sometimes accounted for incorrectly. Was the result of the cost getting reset in a recursive call of docommand. That is fixed. In addition all cost-commands are typed explicitely. Please do not forget to do so or your costs will be credited to construction if you are unlucky.
darkvater
parents:
882
diff
changeset
|
518 |
SET_EXPENSES_TYPE(EXPENSES_NEW_VEHICLES); |
64d2f7d5f02b
(svn r1375) -Fix: [1050990] Buying trains sometimes accounted for incorrectly. Was the result of the cost getting reset in a recursive call of docommand. That is fixed. In addition all cost-commands are typed explicitely. Please do not forget to do so or your costs will be credited to construction if you are unlucky.
darkvater
parents:
882
diff
changeset
|
519 |
|
6150 | 520 |
const RailVehicleInfo *rvi = RailVehInfo(engine); |
6950
14ecb0acdfb4
(svn r10205) -Codechange: refactor returning of cost, so it can be more easily modified.
rubidium
parents:
6943
diff
changeset
|
521 |
CommandCost value((GetEngineProperty(engine, 0x17, rvi->base_cost) * _price.build_railwagon) >> 8); |
6150 | 522 |
|
7595
9d645518f001
(svn r11122) -Fix [FS#1234]: crash when building a NewGRF vehicle when the articulated build vehicle callback returneed a different value for the purchase window than the normal build. Thanks for Dalestan and _minime_ for pointers to possible causes.
rubidium
parents:
7593
diff
changeset
|
523 |
uint num_vehicles = 1 + CountArticulatedParts(engine, false); |
2602
1a6561c9a408
(svn r3139) -NewGRF, Feature: support for articulated rail vehicles. This is used, for example, by coal tenders.
peter1138
parents:
2599
diff
changeset
|
524 |
|
0 | 525 |
if (!(flags & DC_QUERY_COST)) { |
7595
9d645518f001
(svn r11122) -Fix [FS#1234]: crash when building a NewGRF vehicle when the articulated build vehicle callback returneed a different value for the purchase window than the normal build. Thanks for Dalestan and _minime_ for pointers to possible causes.
rubidium
parents:
7593
diff
changeset
|
526 |
/* Allow for the wagon and the articulated parts, plus one to "terminate" the list. */ |
9d645518f001
(svn r11122) -Fix [FS#1234]: crash when building a NewGRF vehicle when the articulated build vehicle callback returneed a different value for the purchase window than the normal build. Thanks for Dalestan and _minime_ for pointers to possible causes.
rubidium
parents:
7593
diff
changeset
|
527 |
Vehicle **vl = (Vehicle**)alloca(sizeof(*vl) * (num_vehicles + 1)); |
9d645518f001
(svn r11122) -Fix [FS#1234]: crash when building a NewGRF vehicle when the articulated build vehicle callback returneed a different value for the purchase window than the normal build. Thanks for Dalestan and _minime_ for pointers to possible causes.
rubidium
parents:
7593
diff
changeset
|
528 |
memset(vl, 0, sizeof(*vl) * (num_vehicles + 1)); |
4831
ffc748f7e3e6
(svn r6755) - Fix: Pass the newly created vehicle when checking for articulated engines. As this could result in more parts being added than previously counted, we check to see if we need to allocate more vehicles as we add parts.
peter1138
parents:
4806
diff
changeset
|
529 |
|
7398
b933416cf32b
(svn r10770) -Codechange: use the pool item class as super class for the vehicle struct.
rubidium
parents:
7371
diff
changeset
|
530 |
if (!Vehicle::AllocateList(vl, num_vehicles)) |
2602
1a6561c9a408
(svn r3139) -NewGRF, Feature: support for articulated rail vehicles. This is used, for example, by coal tenders.
peter1138
parents:
2599
diff
changeset
|
531 |
return_cmd_error(STR_00E1_TOO_MANY_VEHICLES_IN_GAME); |
0 | 532 |
|
533 |
if (flags & DC_EXEC) { |
|
6150 | 534 |
Vehicle *v = vl[0]; |
2639 | 535 |
v->spritenum = rvi->image_index; |
0 | 536 |
|
6150 | 537 |
Vehicle *u = NULL; |
538 |
||
539 |
Vehicle *w; |
|
919
544f374ee392
(svn r1407) -Codechange: changed a lot around _stations, _vehicles, _towns and _industries
truelight
parents:
915
diff
changeset
|
540 |
FOR_ALL_VEHICLES(w) { |
6259
471b91a4b1d8
(svn r9068) -Codechange: capitalize the VEH_Train etc. enums to match the coding style (and rest of the code).
rubidium
parents:
6248
diff
changeset
|
541 |
if (w->type == VEH_TRAIN && w->tile == tile && |
7696
ecb9955c0a4a
(svn r11230) -Fix [FS#1228]: one could construct trains out of crashed wagons and engines. Based on a patch by SmatZ.
rubidium
parents:
7695
diff
changeset
|
542 |
IsFreeWagon(w) && w->engine_type == engine && |
ecb9955c0a4a
(svn r11230) -Fix [FS#1228]: one could construct trains out of crashed wagons and engines. Based on a patch by SmatZ.
rubidium
parents:
7695
diff
changeset
|
543 |
!HASBITS(w->vehstatus, VS_CRASHED)) { /// do not connect new wagon with crashed/flooded consists |
919
544f374ee392
(svn r1407) -Codechange: changed a lot around _stations, _vehicles, _towns and _industries
truelight
parents:
915
diff
changeset
|
544 |
u = GetLastVehicleInChain(w); |
0 | 545 |
break; |
546 |
} |
|
547 |
} |
|
548 |
||
7782
e2999b5fcfad
(svn r11332) -Fix: vehicles getting a value of 0 on construction.
rubidium
parents:
7696
diff
changeset
|
549 |
v = new (v) Train(); |
0 | 550 |
v->engine_type = engine; |
551 |
||
6150 | 552 |
DiagDirection dir = GetRailDepotDirection(tile); |
2150
f710b959b1c4
(svn r2660) Get rid of some more shifting/anding/casting
tron
parents:
2140
diff
changeset
|
553 |
|
3153
e83501906eae
(svn r3776) Replace many ints and magic numbers by Direction, DiagDirection and friends
tron
parents:
3140
diff
changeset
|
554 |
v->direction = DiagDirToDir(dir); |
1986
fcc849a38ae6
(svn r2492) Remove some pointless casts and fix some nearby indentation
tron
parents:
1980
diff
changeset
|
555 |
v->tile = tile; |
193
0a7025304867
(svn r194) -Codechange: stripping trailing-spaces. Please keep this that way!
truelight
parents:
166
diff
changeset
|
556 |
|
6150 | 557 |
int x = TileX(tile) * TILE_SIZE | _vehicle_initial_x_fract[dir]; |
558 |
int y = TileY(tile) * TILE_SIZE | _vehicle_initial_y_fract[dir]; |
|
0 | 559 |
|
560 |
v->x_pos = x; |
|
561 |
v->y_pos = y; |
|
6150 | 562 |
v->z_pos = GetSlopeZ(x, y); |
0 | 563 |
v->owner = _current_player; |
5993
956d341d930e
(svn r8701) -Codechange: replace magic numbers with enums for u.rail.track.
rubidium
parents:
5992
diff
changeset
|
564 |
v->u.rail.track = TRACK_BIT_DEPOT; |
0 | 565 |
v->vehstatus = VS_HIDDEN | VS_DEFPAL; |
566 |
||
2676
59b65b4fb480
(svn r3218) -Feature: Multiheaded train engines will now stay in the same train
bjarni
parents:
2666
diff
changeset
|
567 |
v->subtype = 0; |
59b65b4fb480
(svn r3218) -Feature: Multiheaded train engines will now stay in the same train
bjarni
parents:
2666
diff
changeset
|
568 |
SetTrainWagon(v); |
6771
b58be16fb268
(svn r10007) -Codechange: Add some asserts to IsFrontEngine and friends to ensure that only trains use them.
maedhros
parents:
6752
diff
changeset
|
569 |
|
0 | 570 |
if (u != NULL) { |
7493
07944c9e005f
(svn r11004) -Codechange: some reworks of the saveload mechanism to be able to save and load private and protected variables in the vehicle struct.
rubidium
parents:
7492
diff
changeset
|
571 |
u->SetNext(v); |
2676
59b65b4fb480
(svn r3218) -Feature: Multiheaded train engines will now stay in the same train
bjarni
parents:
2666
diff
changeset
|
572 |
} else { |
59b65b4fb480
(svn r3218) -Feature: Multiheaded train engines will now stay in the same train
bjarni
parents:
2666
diff
changeset
|
573 |
SetFreeWagon(v); |
4739
e626ef1b522e
(svn r6651) -Coding feature: added the windowevent WE_INVALIDATE_DATA
bjarni
parents:
4737
diff
changeset
|
574 |
InvalidateWindowData(WC_VEHICLE_DEPOT, v->tile); |
0 | 575 |
} |
576 |
||
577 |
v->cargo_type = rvi->cargo_type; |
|
3870
d9ebc4ea750a
(svn r4910) - NewGRF: add and initialize cargo subtype for vehicle visual variations
peter1138
parents:
3836
diff
changeset
|
578 |
v->cargo_subtype = 0; |
0 | 579 |
v->cargo_cap = rvi->capacity; |
6950
14ecb0acdfb4
(svn r10205) -Codechange: refactor returning of cost, so it can be more easily modified.
rubidium
parents:
6943
diff
changeset
|
580 |
v->value = value.GetCost(); |
0 | 581 |
// v->day_counter = 0; |
582 |
||
5823 | 583 |
v->u.rail.railtype = rvi->railtype; |
193
0a7025304867
(svn r194) -Codechange: stripping trailing-spaces. Please keep this that way!
truelight
parents:
166
diff
changeset
|
584 |
|
4329
0e6e689f66e7
(svn r6002) -Cleanup: remove the now redundant BASE_YEAR constant.
rubidium
parents:
4293
diff
changeset
|
585 |
v->build_year = _cur_year; |
0 | 586 |
v->cur_image = 0xAC2; |
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:
2758
diff
changeset
|
587 |
v->random_bits = VehicleRandomBits(); |
193
0a7025304867
(svn r194) -Codechange: stripping trailing-spaces. Please keep this that way!
truelight
parents:
166
diff
changeset
|
588 |
|
6643
f81bee57bc09
(svn r9874) -Feature: advanced vehicle lists a.k.a. group interface. Now you can make groups of vehicles and perform all kinds of tasks on that given group. Original code by nycom and graphics by skidd13.
rubidium
parents:
6608
diff
changeset
|
589 |
v->group_id = DEFAULT_GROUP; |
f81bee57bc09
(svn r9874) -Feature: advanced vehicle lists a.k.a. group interface. Now you can make groups of vehicles and perform all kinds of tasks on that given group. Original code by nycom and graphics by skidd13.
rubidium
parents:
6608
diff
changeset
|
590 |
|
6857
60130753e595
(svn r10097) -Feature: Add support for articulated road vehicles, or callbacks 11 and 17 for
maedhros
parents:
6789
diff
changeset
|
591 |
AddArticulatedParts(vl, VEH_TRAIN); |
2602
1a6561c9a408
(svn r3139) -NewGRF, Feature: support for articulated rail vehicles. This is used, for example, by coal tenders.
peter1138
parents:
2599
diff
changeset
|
592 |
|
2564 | 593 |
_new_vehicle_id = v->index; |
0 | 594 |
|
595 |
VehiclePositionChanged(v); |
|
7497
40e457c0a8ac
(svn r11011) -Fix [FS#1129]: GetFirstVehicleInChain did change the game state while being marked const.
rubidium
parents:
7493
diff
changeset
|
596 |
TrainConsistChanged(v->First()); |
40e457c0a8ac
(svn r11011) -Fix [FS#1129]: GetFirstVehicleInChain did change the game state while being marked const.
rubidium
parents:
7493
diff
changeset
|
597 |
UpdateTrainGroupID(v->First()); |
0 | 598 |
|
599 |
InvalidateWindow(WC_VEHICLE_DEPOT, v->tile); |
|
2970
3b9380f10074
(svn r3535) -Feature: [autoreplace] allow autoreplacing of train wagons
bjarni
parents:
2962
diff
changeset
|
600 |
if (IsLocalPlayer()) { |
7425
d9bc116f2f54
(svn r10823) -Fix r8610 [FS#1097]: the autoreplace window vehicle count didn't always update correctly) (Matthias)
bjarni
parents:
7398
diff
changeset
|
601 |
InvalidateAutoreplaceWindow(v->engine_type, v->group_id); // updates the replace Train window |
2970
3b9380f10074
(svn r3535) -Feature: [autoreplace] allow autoreplacing of train wagons
bjarni
parents:
2962
diff
changeset
|
602 |
} |
5944
6d059cc8662b
(svn r8610) -Codechange/Feature: rewrote the list handling in the autoreplace window
bjarni
parents:
5922
diff
changeset
|
603 |
GetPlayer(_current_player)->num_engines[engine]++; |
0 | 604 |
} |
605 |
} |
|
606 |
||
6950
14ecb0acdfb4
(svn r10205) -Codechange: refactor returning of cost, so it can be more easily modified.
rubidium
parents:
6943
diff
changeset
|
607 |
return CommandCost(value); |
0 | 608 |
} |
609 |
||
6422
6679df1c05ba
(svn r9558) -Documentation: doxygen and comment changes: 'T' now. Almost done
belugas
parents:
6407
diff
changeset
|
610 |
/** Move all free vehicles in the depot to the train */ |
2630 | 611 |
static void NormalizeTrainVehInDepot(const Vehicle* u) |
0 | 612 |
{ |
2630 | 613 |
const Vehicle* v; |
1472
a2abe3b9d7a7
(svn r1976) Cleanups - mostly indentation and fiddling with loops
tron
parents:
1461
diff
changeset
|
614 |
|
0 | 615 |
FOR_ALL_VEHICLES(v) { |
6259
471b91a4b1d8
(svn r9068) -Codechange: capitalize the VEH_Train etc. enums to match the coding style (and rest of the code).
rubidium
parents:
6248
diff
changeset
|
616 |
if (v->type == VEH_TRAIN && IsFreeWagon(v) && |
0 | 617 |
v->tile == u->tile && |
5993
956d341d930e
(svn r8701) -Codechange: replace magic numbers with enums for u.rail.track.
rubidium
parents:
5992
diff
changeset
|
618 |
v->u.rail.track == TRACK_BIT_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:
3487
diff
changeset
|
619 |
if (CmdFailed(DoCommand(0, v->index | (u->index << 16), 1, DC_EXEC, |
2676
59b65b4fb480
(svn r3218) -Feature: Multiheaded train engines will now stay in the same train
bjarni
parents:
2666
diff
changeset
|
620 |
CMD_MOVE_RAIL_VEHICLE))) |
0 | 621 |
break; |
622 |
} |
|
623 |
} |
|
624 |
} |
|
625 |
||
6943
1914f26aee04
(svn r10197) -Codechange: replace int32 with CommandCost where appropriate.
rubidium
parents:
6924
diff
changeset
|
626 |
static CommandCost EstimateTrainCost(EngineID engine, const RailVehicleInfo* rvi) |
0 | 627 |
{ |
6950
14ecb0acdfb4
(svn r10205) -Codechange: refactor returning of cost, so it can be more easily modified.
rubidium
parents:
6943
diff
changeset
|
628 |
return CommandCost(GetEngineProperty(engine, 0x17, rvi->base_cost) * (_price.build_railvehicle >> 3) >> 5); |
0 | 629 |
} |
630 |
||
2817 | 631 |
static void AddRearEngineToMultiheadedTrain(Vehicle* v, Vehicle* u, bool building) |
1060
ae9a2238bd80
(svn r1561) Fix: autoreplacing a singleheaded engine into a dualheaded engine now adds the the rear engine
bjarni
parents:
1057
diff
changeset
|
632 |
{ |
7497
40e457c0a8ac
(svn r11011) -Fix [FS#1129]: GetFirstVehicleInChain did change the game state while being marked const.
rubidium
parents:
7493
diff
changeset
|
633 |
u = new (u) Train(); |
1060
ae9a2238bd80
(svn r1561) Fix: autoreplacing a singleheaded engine into a dualheaded engine now adds the the rear engine
bjarni
parents:
1057
diff
changeset
|
634 |
u->direction = v->direction; |
ae9a2238bd80
(svn r1561) Fix: autoreplacing a singleheaded engine into a dualheaded engine now adds the the rear engine
bjarni
parents:
1057
diff
changeset
|
635 |
u->owner = v->owner; |
ae9a2238bd80
(svn r1561) Fix: autoreplacing a singleheaded engine into a dualheaded engine now adds the the rear engine
bjarni
parents:
1057
diff
changeset
|
636 |
u->tile = v->tile; |
ae9a2238bd80
(svn r1561) Fix: autoreplacing a singleheaded engine into a dualheaded engine now adds the the rear engine
bjarni
parents:
1057
diff
changeset
|
637 |
u->x_pos = v->x_pos; |
ae9a2238bd80
(svn r1561) Fix: autoreplacing a singleheaded engine into a dualheaded engine now adds the the rear engine
bjarni
parents:
1057
diff
changeset
|
638 |
u->y_pos = v->y_pos; |
ae9a2238bd80
(svn r1561) Fix: autoreplacing a singleheaded engine into a dualheaded engine now adds the the rear engine
bjarni
parents:
1057
diff
changeset
|
639 |
u->z_pos = v->z_pos; |
5993
956d341d930e
(svn r8701) -Codechange: replace magic numbers with enums for u.rail.track.
rubidium
parents:
5992
diff
changeset
|
640 |
u->u.rail.track = TRACK_BIT_DEPOT; |
1060
ae9a2238bd80
(svn r1561) Fix: autoreplacing a singleheaded engine into a dualheaded engine now adds the the rear engine
bjarni
parents:
1057
diff
changeset
|
641 |
u->vehstatus = v->vehstatus & ~VS_STOPPED; |
2676
59b65b4fb480
(svn r3218) -Feature: Multiheaded train engines will now stay in the same train
bjarni
parents:
2666
diff
changeset
|
642 |
u->subtype = 0; |
59b65b4fb480
(svn r3218) -Feature: Multiheaded train engines will now stay in the same train
bjarni
parents:
2666
diff
changeset
|
643 |
SetMultiheaded(u); |
1060
ae9a2238bd80
(svn r1561) Fix: autoreplacing a singleheaded engine into a dualheaded engine now adds the the rear engine
bjarni
parents:
1057
diff
changeset
|
644 |
u->spritenum = v->spritenum + 1; |
ae9a2238bd80
(svn r1561) Fix: autoreplacing a singleheaded engine into a dualheaded engine now adds the the rear engine
bjarni
parents:
1057
diff
changeset
|
645 |
u->cargo_type = v->cargo_type; |
3870
d9ebc4ea750a
(svn r4910) - NewGRF: add and initialize cargo subtype for vehicle visual variations
peter1138
parents:
3836
diff
changeset
|
646 |
u->cargo_subtype = v->cargo_subtype; |
1060
ae9a2238bd80
(svn r1561) Fix: autoreplacing a singleheaded engine into a dualheaded engine now adds the the rear engine
bjarni
parents:
1057
diff
changeset
|
647 |
u->cargo_cap = v->cargo_cap; |
ae9a2238bd80
(svn r1561) Fix: autoreplacing a singleheaded engine into a dualheaded engine now adds the the rear engine
bjarni
parents:
1057
diff
changeset
|
648 |
u->u.rail.railtype = v->u.rail.railtype; |
7493
07944c9e005f
(svn r11004) -Codechange: some reworks of the saveload mechanism to be able to save and load private and protected variables in the vehicle struct.
rubidium
parents:
7492
diff
changeset
|
649 |
if (building) v->SetNext(u); |
1060
ae9a2238bd80
(svn r1561) Fix: autoreplacing a singleheaded engine into a dualheaded engine now adds the the rear engine
bjarni
parents:
1057
diff
changeset
|
650 |
u->engine_type = v->engine_type; |
ae9a2238bd80
(svn r1561) Fix: autoreplacing a singleheaded engine into a dualheaded engine now adds the the rear engine
bjarni
parents:
1057
diff
changeset
|
651 |
u->build_year = v->build_year; |
1472
a2abe3b9d7a7
(svn r1976) Cleanups - mostly indentation and fiddling with loops
tron
parents:
1461
diff
changeset
|
652 |
if (building) v->value >>= 1; |
a2abe3b9d7a7
(svn r1976) Cleanups - mostly indentation and fiddling with loops
tron
parents:
1461
diff
changeset
|
653 |
u->value = v->value; |
1060
ae9a2238bd80
(svn r1561) Fix: autoreplacing a singleheaded engine into a dualheaded engine now adds the the rear engine
bjarni
parents:
1057
diff
changeset
|
654 |
u->cur_image = 0xAC2; |
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:
2758
diff
changeset
|
655 |
u->random_bits = VehicleRandomBits(); |
1060
ae9a2238bd80
(svn r1561) Fix: autoreplacing a singleheaded engine into a dualheaded engine now adds the the rear engine
bjarni
parents:
1057
diff
changeset
|
656 |
VehiclePositionChanged(u); |
ae9a2238bd80
(svn r1561) Fix: autoreplacing a singleheaded engine into a dualheaded engine now adds the the rear engine
bjarni
parents:
1057
diff
changeset
|
657 |
} |
ae9a2238bd80
(svn r1561) Fix: autoreplacing a singleheaded engine into a dualheaded engine now adds the the rear engine
bjarni
parents:
1057
diff
changeset
|
658 |
|
1784
d0698aac0c2e
(svn r2288) - CodeChange: protected the next batch of commands (41 so far, out of 115).
Darkvater
parents:
1779
diff
changeset
|
659 |
/** Build a railroad vehicle. |
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:
3487
diff
changeset
|
660 |
* @param tile tile of the depot where rail-vehicle is built |
6422
6679df1c05ba
(svn r9558) -Documentation: doxygen and comment changes: 'T' now. Almost done
belugas
parents:
6407
diff
changeset
|
661 |
* @param flags type of operation |
1784
d0698aac0c2e
(svn r2288) - CodeChange: protected the next batch of commands (41 so far, out of 115).
Darkvater
parents:
1779
diff
changeset
|
662 |
* @param p1 engine type id |
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:
3815
diff
changeset
|
663 |
* @param p2 bit 0 when set, the train will get number 0, otherwise it will get a free number |
28ee8b8c2522
(svn r4826) -Fix: [autoreplace] fixed possible problem when autoreplacing and was number of vehicles (of a type, not total) was reached
bjarni
parents:
3815
diff
changeset
|
664 |
* bit 1 prevents any free cars from being added to the train |
0 | 665 |
*/ |
6943
1914f26aee04
(svn r10197) -Codechange: replace int32 with CommandCost where appropriate.
rubidium
parents:
6924
diff
changeset
|
666 |
CommandCost CmdBuildRailVehicle(TileIndex tile, uint32 flags, uint32 p1, uint32 p2) |
0 | 667 |
{ |
1784
d0698aac0c2e
(svn r2288) - CodeChange: protected the next batch of commands (41 so far, out of 115).
Darkvater
parents:
1779
diff
changeset
|
668 |
/* Check if the engine-type is valid (for the player) */ |
6407
757a3cec2422
(svn r9543) -Fix [FS#691]: Split up STR_ENGINE_NOT_BUILDABLE into four strings so it can be
maedhros
parents:
6357
diff
changeset
|
669 |
if (!IsEngineBuildable(p1, VEH_TRAIN, _current_player)) return_cmd_error(STR_RAIL_VEHICLE_NOT_AVAILABLE); |
1196
67f7f3017d99
(svn r1700) - Fix: Hacked clients can no longer be used to build vehicles that are not available yet (Hackykid)
bjarni
parents:
1192
diff
changeset
|
670 |
|
1784
d0698aac0c2e
(svn r2288) - CodeChange: protected the next batch of commands (41 so far, out of 115).
Darkvater
parents:
1779
diff
changeset
|
671 |
/* Check if the train is actually being built in a depot belonging |
d0698aac0c2e
(svn r2288) - CodeChange: protected the next batch of commands (41 so far, out of 115).
Darkvater
parents:
1779
diff
changeset
|
672 |
* to the player. Doesn't matter if only the cost is queried */ |
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:
1438
diff
changeset
|
673 |
if (!(flags & DC_QUERY_COST)) { |
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:
1438
diff
changeset
|
674 |
if (!IsTileDepotType(tile, TRANSPORT_RAIL)) 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:
1895
diff
changeset
|
675 |
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:
1438
diff
changeset
|
676 |
} |
1221
ce638de43f3a
(svn r1725) - Fix: now trains can only be built in depots and you have to own the depot too (hacked client protection)
bjarni
parents:
1214
diff
changeset
|
677 |
|
0 | 678 |
SET_EXPENSES_TYPE(EXPENSES_NEW_VEHICLES); |
679 |
||
6150 | 680 |
const RailVehicleInfo *rvi = RailVehInfo(p1); |
2244 | 681 |
|
682 |
/* Check if depot and new engine uses the same kind of tracks */ |
|
3411
72993ac027ea
(svn r4226) -Fix: [elrails] it's no longer possible to build electric engines in non-electric depots
bjarni
parents:
3390
diff
changeset
|
683 |
/* We need to see if the engine got power on the tile to avoid eletric engines in non-electric depots */ |
5823 | 684 |
if (!HasPowerOnRail(rvi->railtype, GetRailType(tile))) return CMD_ERROR; |
193
0a7025304867
(svn r194) -Codechange: stripping trailing-spaces. Please keep this that way!
truelight
parents:
166
diff
changeset
|
685 |
|
5868
94430141c189
(svn r8455) -Codechange: Give a more meaningful name (railveh_type)to member flags of RailVehInfo, as well as changing the code to reflect the fact that it was not a flag but rather a one value only variable. Doing so, some evaluations have been simplified.
belugas
parents:
5858
diff
changeset
|
686 |
if (rvi->railveh_type == RAILVEH_WAGON) return CmdBuildRailWagon(p1, tile, flags); |
0 | 687 |
|
6943
1914f26aee04
(svn r10197) -Codechange: replace int32 with CommandCost where appropriate.
rubidium
parents:
6924
diff
changeset
|
688 |
CommandCost value = EstimateTrainCost(p1, rvi); |
6150 | 689 |
|
690 |
uint num_vehicles = |
|
691 |
(rvi->railveh_type == RAILVEH_MULTIHEAD ? 2 : 1) + |
|
7595
9d645518f001
(svn r11122) -Fix [FS#1234]: crash when building a NewGRF vehicle when the articulated build vehicle callback returneed a different value for the purchase window than the normal build. Thanks for Dalestan and _minime_ for pointers to possible causes.
rubidium
parents:
7593
diff
changeset
|
692 |
CountArticulatedParts(p1, false); |
0 | 693 |
|
694 |
if (!(flags & DC_QUERY_COST)) { |
|
7595
9d645518f001
(svn r11122) -Fix [FS#1234]: crash when building a NewGRF vehicle when the articulated build vehicle callback returneed a different value for the purchase window than the normal build. Thanks for Dalestan and _minime_ for pointers to possible causes.
rubidium
parents:
7593
diff
changeset
|
695 |
/* Allow for the dual-heads and the articulated parts, plus one to "terminate" the list. */ |
9d645518f001
(svn r11122) -Fix [FS#1234]: crash when building a NewGRF vehicle when the articulated build vehicle callback returneed a different value for the purchase window than the normal build. Thanks for Dalestan and _minime_ for pointers to possible causes.
rubidium
parents:
7593
diff
changeset
|
696 |
Vehicle **vl = (Vehicle**)alloca(sizeof(*vl) * (num_vehicles + 1)); |
9d645518f001
(svn r11122) -Fix [FS#1234]: crash when building a NewGRF vehicle when the articulated build vehicle callback returneed a different value for the purchase window than the normal build. Thanks for Dalestan and _minime_ for pointers to possible causes.
rubidium
parents:
7593
diff
changeset
|
697 |
memset(vl, 0, sizeof(*vl) * (num_vehicles + 1)); |
4831
ffc748f7e3e6
(svn r6755) - Fix: Pass the newly created vehicle when checking for articulated engines. As this could result in more parts being added than previously counted, we check to see if we need to allocate more vehicles as we add parts.
peter1138
parents:
4806
diff
changeset
|
698 |
|
7398
b933416cf32b
(svn r10770) -Codechange: use the pool item class as super class for the vehicle struct.
rubidium
parents:
7371
diff
changeset
|
699 |
if (!Vehicle::AllocateList(vl, num_vehicles)) |
0 | 700 |
return_cmd_error(STR_00E1_TOO_MANY_VEHICLES_IN_GAME); |
701 |
||
6150 | 702 |
Vehicle *v = vl[0]; |
703 |
||
7928
63e18de69e50
(svn r11481) -Codechange: Rename the HASBIT function to fit with the naming style
skidd13
parents:
7923
diff
changeset
|
704 |
UnitID unit_num = HasBit(p2, 0) ? 0 : GetFreeUnitNumber(VEH_TRAIN); |
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:
3815
diff
changeset
|
705 |
if (unit_num > _patches.max_trains) |
28ee8b8c2522
(svn r4826) -Fix: [autoreplace] fixed possible problem when autoreplacing and was number of vehicles (of a type, not total) was reached
bjarni
parents:
3815
diff
changeset
|
706 |
return_cmd_error(STR_00E1_TOO_MANY_VEHICLES_IN_GAME); |
28ee8b8c2522
(svn r4826) -Fix: [autoreplace] fixed possible problem when autoreplacing and was number of vehicles (of a type, not total) was reached
bjarni
parents:
3815
diff
changeset
|
707 |
|
0 | 708 |
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:
3487
diff
changeset
|
709 |
DiagDirection dir = GetRailDepotDirection(tile); |
35d747bb5e82
(svn r4342) Change the first two parameters of commands - virtual pixel coordinates of the tile to operate on - to a TileIndex
tron
parents:
3487
diff
changeset
|
710 |
int x = TileX(tile) * TILE_SIZE + _vehicle_initial_x_fract[dir]; |
35d747bb5e82
(svn r4342) Change the first two parameters of commands - virtual pixel coordinates of the tile to operate on - to a TileIndex
tron
parents:
3487
diff
changeset
|
711 |
int y = TileY(tile) * TILE_SIZE + _vehicle_initial_y_fract[dir]; |
2150
f710b959b1c4
(svn r2660) Get rid of some more shifting/anding/casting
tron
parents:
2140
diff
changeset
|
712 |
|
7783
b6c199abdd23
(svn r11333) -Fix: Train engines still had a value of 0.
maedhros
parents:
7782
diff
changeset
|
713 |
v = new (v) Train(); |
0 | 714 |
v->unitnumber = unit_num; |
3153
e83501906eae
(svn r3776) Replace many ints and magic numbers by Direction, DiagDirection and friends
tron
parents:
3140
diff
changeset
|
715 |
v->direction = DiagDirToDir(dir); |
1986
fcc849a38ae6
(svn r2492) Remove some pointless casts and fix some nearby indentation
tron
parents:
1980
diff
changeset
|
716 |
v->tile = tile; |
0 | 717 |
v->owner = _current_player; |
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:
3487
diff
changeset
|
718 |
v->x_pos = 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:
3487
diff
changeset
|
719 |
v->y_pos = y; |
6150 | 720 |
v->z_pos = GetSlopeZ(x, y); |
5993
956d341d930e
(svn r8701) -Codechange: replace magic numbers with enums for u.rail.track.
rubidium
parents:
5992
diff
changeset
|
721 |
v->u.rail.track = TRACK_BIT_DEPOT; |
0 | 722 |
v->vehstatus = VS_HIDDEN | VS_STOPPED | VS_DEFPAL; |
723 |
v->spritenum = rvi->image_index; |
|
724 |
v->cargo_type = rvi->cargo_type; |
|
3870
d9ebc4ea750a
(svn r4910) - NewGRF: add and initialize cargo subtype for vehicle visual variations
peter1138
parents:
3836
diff
changeset
|
725 |
v->cargo_subtype = 0; |
0 | 726 |
v->cargo_cap = rvi->capacity; |
727 |
v->max_speed = rvi->max_speed; |
|
6950
14ecb0acdfb4
(svn r10205) -Codechange: refactor returning of cost, so it can be more easily modified.
rubidium
parents:
6943
diff
changeset
|
728 |
v->value = value.GetCost(); |
1266
eccd576e322f
(svn r1770) -Fix: Hopefully last pieces of code that are containing a station-id
truelight
parents:
1247
diff
changeset
|
729 |
v->last_station_visited = INVALID_STATION; |
0 | 730 |
v->dest_tile = 0; |
193
0a7025304867
(svn r194) -Codechange: stripping trailing-spaces. Please keep this that way!
truelight
parents:
166
diff
changeset
|
731 |
|
2477
225b2916fe2a
(svn r3003) Change int, uint, uin16 and byte to EngineID where appropriate, plus some related changes (mostly casts)
tron
parents:
2475
diff
changeset
|
732 |
v->engine_type = p1; |
0 | 733 |
|
5823 | 734 |
const Engine *e = GetEngine(p1); |
0 | 735 |
v->reliability = e->reliability; |
736 |
v->reliability_spd_dec = e->reliability_spd_dec; |
|
737 |
v->max_age = e->lifelength * 366; |
|
193
0a7025304867
(svn r194) -Codechange: stripping trailing-spaces. Please keep this that way!
truelight
parents:
166
diff
changeset
|
738 |
|
0 | 739 |
v->string_id = STR_SV_TRAIN_NAME; |
5823 | 740 |
v->u.rail.railtype = rvi->railtype; |
2564 | 741 |
_new_vehicle_id = v->index; |
193
0a7025304867
(svn r194) -Codechange: stripping trailing-spaces. Please keep this that way!
truelight
parents:
166
diff
changeset
|
742 |
|
0 | 743 |
v->service_interval = _patches.servint_trains; |
744 |
v->date_of_last_service = _date; |
|
4329
0e6e689f66e7
(svn r6002) -Cleanup: remove the now redundant BASE_YEAR constant.
rubidium
parents:
4293
diff
changeset
|
745 |
v->build_year = _cur_year; |
0 | 746 |
v->cur_image = 0xAC2; |
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:
2758
diff
changeset
|
747 |
v->random_bits = VehicleRandomBits(); |
0 | 748 |
|
6176
153f0f24dc1b
(svn r8946) -Feature: [NewGRF] Add support for vehicle variables 0xFE and 0xFF bit 10,
maedhros
parents:
6175
diff
changeset
|
749 |
v->vehicle_flags = 0; |
7931
b0a46cd92225
(svn r11484) -Codechange: Remove the doubled function SetBitT and rename the remaining to fit with the naming style
skidd13
parents:
7929
diff
changeset
|
750 |
if (e->flags & ENGINE_EXCLUSIVE_PREVIEW) SetBit(v->vehicle_flags, VF_BUILT_AS_PROTOTYPE); |
6176
153f0f24dc1b
(svn r8946) -Feature: [NewGRF] Add support for vehicle variables 0xFE and 0xFF bit 10,
maedhros
parents:
6175
diff
changeset
|
751 |
|
6643
f81bee57bc09
(svn r9874) -Feature: advanced vehicle lists a.k.a. group interface. Now you can make groups of vehicles and perform all kinds of tasks on that given group. Original code by nycom and graphics by skidd13.
rubidium
parents:
6608
diff
changeset
|
752 |
v->group_id = DEFAULT_GROUP; |
f81bee57bc09
(svn r9874) -Feature: advanced vehicle lists a.k.a. group interface. Now you can make groups of vehicles and perform all kinds of tasks on that given group. Original code by nycom and graphics by skidd13.
rubidium
parents:
6608
diff
changeset
|
753 |
|
2676
59b65b4fb480
(svn r3218) -Feature: Multiheaded train engines will now stay in the same train
bjarni
parents:
2666
diff
changeset
|
754 |
v->subtype = 0; |
59b65b4fb480
(svn r3218) -Feature: Multiheaded train engines will now stay in the same train
bjarni
parents:
2666
diff
changeset
|
755 |
SetFrontEngine(v); |
59b65b4fb480
(svn r3218) -Feature: Multiheaded train engines will now stay in the same train
bjarni
parents:
2666
diff
changeset
|
756 |
SetTrainEngine(v); |
59b65b4fb480
(svn r3218) -Feature: Multiheaded train engines will now stay in the same train
bjarni
parents:
2666
diff
changeset
|
757 |
|
0 | 758 |
VehiclePositionChanged(v); |
759 |
||
5868
94430141c189
(svn r8455) -Codechange: Give a more meaningful name (railveh_type)to member flags of RailVehInfo, as well as changing the code to reflect the fact that it was not a flag but rather a one value only variable. Doing so, some evaluations have been simplified.
belugas
parents:
5858
diff
changeset
|
760 |
if (rvi->railveh_type == RAILVEH_MULTIHEAD) { |
2676
59b65b4fb480
(svn r3218) -Feature: Multiheaded train engines will now stay in the same train
bjarni
parents:
2666
diff
changeset
|
761 |
SetMultiheaded(v); |
2602
1a6561c9a408
(svn r3139) -NewGRF, Feature: support for articulated rail vehicles. This is used, for example, by coal tenders.
peter1138
parents:
2599
diff
changeset
|
762 |
AddRearEngineToMultiheadedTrain(vl[0], vl[1], true); |
2676
59b65b4fb480
(svn r3218) -Feature: Multiheaded train engines will now stay in the same train
bjarni
parents:
2666
diff
changeset
|
763 |
/* Now we need to link the front and rear engines together |
59b65b4fb480
(svn r3218) -Feature: Multiheaded train engines will now stay in the same train
bjarni
parents:
2666
diff
changeset
|
764 |
* other_multiheaded_part is the pointer that links to the other half of the engine |
59b65b4fb480
(svn r3218) -Feature: Multiheaded train engines will now stay in the same train
bjarni
parents:
2666
diff
changeset
|
765 |
* vl[0] is the front and vl[1] is the rear |
59b65b4fb480
(svn r3218) -Feature: Multiheaded train engines will now stay in the same train
bjarni
parents:
2666
diff
changeset
|
766 |
*/ |
59b65b4fb480
(svn r3218) -Feature: Multiheaded train engines will now stay in the same train
bjarni
parents:
2666
diff
changeset
|
767 |
vl[0]->u.rail.other_multiheaded_part = vl[1]; |
59b65b4fb480
(svn r3218) -Feature: Multiheaded train engines will now stay in the same train
bjarni
parents:
2666
diff
changeset
|
768 |
vl[1]->u.rail.other_multiheaded_part = vl[0]; |
2602
1a6561c9a408
(svn r3139) -NewGRF, Feature: support for articulated rail vehicles. This is used, for example, by coal tenders.
peter1138
parents:
2599
diff
changeset
|
769 |
} else { |
6857
60130753e595
(svn r10097) -Feature: Add support for articulated road vehicles, or callbacks 11 and 17 for
maedhros
parents:
6789
diff
changeset
|
770 |
AddArticulatedParts(vl, VEH_TRAIN); |
2244 | 771 |
} |
0 | 772 |
|
1905
c53f8d71f9b6
(svn r2411) - Codechange: Have trains cache stuff like consist power/weight/max speed instead of recalculating it each time.
hackykid
parents:
1901
diff
changeset
|
773 |
TrainConsistChanged(v); |
0 | 774 |
UpdateTrainAcceleration(v); |
6643
f81bee57bc09
(svn r9874) -Feature: advanced vehicle lists a.k.a. group interface. Now you can make groups of vehicles and perform all kinds of tasks on that given group. Original code by nycom and graphics by skidd13.
rubidium
parents:
6608
diff
changeset
|
775 |
UpdateTrainGroupID(v); |
2244 | 776 |
|
7928
63e18de69e50
(svn r11481) -Codechange: Rename the HASBIT function to fit with the naming style
skidd13
parents:
7923
diff
changeset
|
777 |
if (!HasBit(p2, 1)) { // check if the cars should be added to the new vehicle |
2244 | 778 |
NormalizeTrainVehInDepot(v); |
779 |
} |
|
0 | 780 |
|
4739
e626ef1b522e
(svn r6651) -Coding feature: added the windowevent WE_INVALIDATE_DATA
bjarni
parents:
4737
diff
changeset
|
781 |
InvalidateWindowData(WC_VEHICLE_DEPOT, v->tile); |
588 | 782 |
RebuildVehicleLists(); |
0 | 783 |
InvalidateWindow(WC_COMPANY, v->owner); |
5944
6d059cc8662b
(svn r8610) -Codechange/Feature: rewrote the list handling in the autoreplace window
bjarni
parents:
5922
diff
changeset
|
784 |
if (IsLocalPlayer()) |
7425
d9bc116f2f54
(svn r10823) -Fix r8610 [FS#1097]: the autoreplace window vehicle count didn't always update correctly) (Matthias)
bjarni
parents:
7398
diff
changeset
|
785 |
InvalidateAutoreplaceWindow(v->engine_type, v->group_id); // updates the replace Train window |
5944
6d059cc8662b
(svn r8610) -Codechange/Feature: rewrote the list handling in the autoreplace window
bjarni
parents:
5922
diff
changeset
|
786 |
|
6d059cc8662b
(svn r8610) -Codechange/Feature: rewrote the list handling in the autoreplace window
bjarni
parents:
5922
diff
changeset
|
787 |
GetPlayer(_current_player)->num_engines[p1]++; |
0 | 788 |
} |
789 |
} |
|
1128
ca7f860db7ac
(svn r1629) added a counter to tell how many engines you have of each type to the autoreplace vehicle windows and made them show only the vehicles you actually have in the left list.
bjarni
parents:
1109
diff
changeset
|
790 |
|
193
0a7025304867
(svn r194) -Codechange: stripping trailing-spaces. Please keep this that way!
truelight
parents:
166
diff
changeset
|
791 |
return value; |
0 | 792 |
} |
793 |
||
794 |
||
1942
c5d5cf5b0263
(svn r2448) General cleanup of rail related code, more to follow.
matthijs
parents:
1935
diff
changeset
|
795 |
/* Check if all the wagons of the given train are in a depot, returns the |
3183
90c676e6a50d
(svn r3829) Reduce the use of _error_message by directly returning error codes instead of using this global variable
tron
parents:
3172
diff
changeset
|
796 |
* number of cars (including loco) then. If not it returns -1 */ |
4648
7bde2a5c36e8
(svn r6524) -Code cleanup r6515: cleaned up the command to start/stop all vehicles in a depot.
bjarni
parents:
4632
diff
changeset
|
797 |
int CheckTrainInDepot(const Vehicle *v, bool needs_to_be_stopped) |
0 | 798 |
{ |
799 |
TileIndex tile = v->tile; |
|
193
0a7025304867
(svn r194) -Codechange: stripping trailing-spaces. Please keep this that way!
truelight
parents:
166
diff
changeset
|
800 |
|
0 | 801 |
/* check if stopped in a depot */ |
3183
90c676e6a50d
(svn r3829) Reduce the use of _error_message by directly returning error codes instead of using this global variable
tron
parents:
3172
diff
changeset
|
802 |
if (!IsTileDepotType(tile, TRANSPORT_RAIL) || v->cur_speed != 0) return -1; |
0 | 803 |
|
6150 | 804 |
int count = 0; |
7492
35acee076719
(svn r11003) -Codechange: replace Vehicle->next to Vehicle->Next() and Vehicle->SetNext() so we can trap instances that change a next pointer and (in the future) update the first/previous pointers based on that.
rubidium
parents:
7488
diff
changeset
|
805 |
for (; v != NULL; v = v->Next()) { |
2844 | 806 |
/* This count is used by the depot code to determine the number of engines |
807 |
* in the consist. Exclude articulated parts so that autoreplacing to |
|
3986
1390892ea4f3
(svn r5176) fixing the typo, that should have been fixed in last commit
bjarni
parents:
3985
diff
changeset
|
808 |
* engines with more articulated parts than before works correctly. |
3985
5dc801277eea
(svn r5175) -Fix: [autoreplace] FS#186 autoreplaced trains can leave all wagons in depot
bjarni
parents:
3977
diff
changeset
|
809 |
* |
5dc801277eea
(svn r5175) -Fix: [autoreplace] FS#186 autoreplaced trains can leave all wagons in depot
bjarni
parents:
3977
diff
changeset
|
810 |
* Also skip counting rear ends of multiheaded engines */ |
7526
27c4fbf8aef0
(svn r11045) -Codechange: added a function to tell if a vehicle is the rear part of a dualheaded train engine
bjarni
parents:
7502
diff
changeset
|
811 |
if (!IsArticulatedPart(v) && !IsRearDualheaded(v)) count++; |
5993
956d341d930e
(svn r8701) -Codechange: replace magic numbers with enums for u.rail.track.
rubidium
parents:
5992
diff
changeset
|
812 |
if (v->u.rail.track != TRACK_BIT_DEPOT || v->tile != tile || |
4529
18bd5e7e35aa
(svn r6356) -Fix: FS#263 planes come out of hangar and drive back into hangar
bjarni
parents:
4527
diff
changeset
|
813 |
(IsFrontEngine(v) && needs_to_be_stopped && !(v->vehstatus & VS_STOPPED))) { |
1472
a2abe3b9d7a7
(svn r1976) Cleanups - mostly indentation and fiddling with loops
tron
parents:
1461
diff
changeset
|
814 |
return -1; |
a2abe3b9d7a7
(svn r1976) Cleanups - mostly indentation and fiddling with loops
tron
parents:
1461
diff
changeset
|
815 |
} |
a2abe3b9d7a7
(svn r1976) Cleanups - mostly indentation and fiddling with loops
tron
parents:
1461
diff
changeset
|
816 |
} |
0 | 817 |
|
818 |
return count; |
|
819 |
} |
|
820 |
||
4529
18bd5e7e35aa
(svn r6356) -Fix: FS#263 planes come out of hangar and drive back into hangar
bjarni
parents:
4527
diff
changeset
|
821 |
/* Used to check if the train is inside the depot and verifying that the VS_STOPPED flag is set */ |
5587
167d9a91ef02
(svn r8038) -Merge: the cpp branch. Effort of KUDr, Celestar, glx, Smoovius, stillunknown and pv2b.
rubidium
parents:
5584
diff
changeset
|
822 |
int CheckTrainStoppedInDepot(const Vehicle *v) |
4529
18bd5e7e35aa
(svn r6356) -Fix: FS#263 planes come out of hangar and drive back into hangar
bjarni
parents:
4527
diff
changeset
|
823 |
{ |
18bd5e7e35aa
(svn r6356) -Fix: FS#263 planes come out of hangar and drive back into hangar
bjarni
parents:
4527
diff
changeset
|
824 |
return CheckTrainInDepot(v, true); |
18bd5e7e35aa
(svn r6356) -Fix: FS#263 planes come out of hangar and drive back into hangar
bjarni
parents:
4527
diff
changeset
|
825 |
} |
18bd5e7e35aa
(svn r6356) -Fix: FS#263 planes come out of hangar and drive back into hangar
bjarni
parents:
4527
diff
changeset
|
826 |
|
18bd5e7e35aa
(svn r6356) -Fix: FS#263 planes come out of hangar and drive back into hangar
bjarni
parents:
4527
diff
changeset
|
827 |
/* Used to check if the train is inside the depot, but not checking the VS_STOPPED flag */ |
18bd5e7e35aa
(svn r6356) -Fix: FS#263 planes come out of hangar and drive back into hangar
bjarni
parents:
4527
diff
changeset
|
828 |
inline bool CheckTrainIsInsideDepot(const Vehicle *v) |
18bd5e7e35aa
(svn r6356) -Fix: FS#263 planes come out of hangar and drive back into hangar
bjarni
parents:
4527
diff
changeset
|
829 |
{ |
6150 | 830 |
return CheckTrainInDepot(v, false) > 0; |
4529
18bd5e7e35aa
(svn r6356) -Fix: FS#263 planes come out of hangar and drive back into hangar
bjarni
parents:
4527
diff
changeset
|
831 |
} |
18bd5e7e35aa
(svn r6356) -Fix: FS#263 planes come out of hangar and drive back into hangar
bjarni
parents:
4527
diff
changeset
|
832 |
|
2602
1a6561c9a408
(svn r3139) -NewGRF, Feature: support for articulated rail vehicles. This is used, for example, by coal tenders.
peter1138
parents:
2599
diff
changeset
|
833 |
/** |
1a6561c9a408
(svn r3139) -NewGRF, Feature: support for articulated rail vehicles. This is used, for example, by coal tenders.
peter1138
parents:
2599
diff
changeset
|
834 |
* Unlink a rail wagon from the consist. |
1a6561c9a408
(svn r3139) -NewGRF, Feature: support for articulated rail vehicles. This is used, for example, by coal tenders.
peter1138
parents:
2599
diff
changeset
|
835 |
* @param v Vehicle to remove. |
1a6561c9a408
(svn r3139) -NewGRF, Feature: support for articulated rail vehicles. This is used, for example, by coal tenders.
peter1138
parents:
2599
diff
changeset
|
836 |
* @param first The first vehicle of the consist. |
1a6561c9a408
(svn r3139) -NewGRF, Feature: support for articulated rail vehicles. This is used, for example, by coal tenders.
peter1138
parents:
2599
diff
changeset
|
837 |
* @return The first vehicle of the consist. |
1a6561c9a408
(svn r3139) -NewGRF, Feature: support for articulated rail vehicles. This is used, for example, by coal tenders.
peter1138
parents:
2599
diff
changeset
|
838 |
*/ |
0 | 839 |
static Vehicle *UnlinkWagon(Vehicle *v, Vehicle *first) |
840 |
{ |
|
6422
6679df1c05ba
(svn r9558) -Documentation: doxygen and comment changes: 'T' now. Almost done
belugas
parents:
6407
diff
changeset
|
841 |
/* unlinking the first vehicle of the chain? */ |
0 | 842 |
if (v == first) { |
2602
1a6561c9a408
(svn r3139) -NewGRF, Feature: support for articulated rail vehicles. This is used, for example, by coal tenders.
peter1138
parents:
2599
diff
changeset
|
843 |
v = GetNextVehicle(v); |
1472
a2abe3b9d7a7
(svn r1976) Cleanups - mostly indentation and fiddling with loops
tron
parents:
1461
diff
changeset
|
844 |
if (v == NULL) return NULL; |
1766
8cdb302ae946
(svn r2270) - Fix/Codechange: fix up selling rail vehicles. Try to be smart about it. When selling dual-headed trains, also sell the rear end; if the now-first wagon is an engine, make it a train. When selling the whole train, try to leave dual-headed setups intact
Darkvater
parents:
1758
diff
changeset
|
845 |
|
2676
59b65b4fb480
(svn r3218) -Feature: Multiheaded train engines will now stay in the same train
bjarni
parents:
2666
diff
changeset
|
846 |
if (IsTrainWagon(v)) SetFreeWagon(v); |
59b65b4fb480
(svn r3218) -Feature: Multiheaded train engines will now stay in the same train
bjarni
parents:
2666
diff
changeset
|
847 |
|
0 | 848 |
return v; |
849 |
} |
|
1766
8cdb302ae946
(svn r2270) - Fix/Codechange: fix up selling rail vehicles. Try to be smart about it. When selling dual-headed trains, also sell the rear end; if the now-first wagon is an engine, make it a train. When selling the whole train, try to leave dual-headed setups intact
Darkvater
parents:
1758
diff
changeset
|
850 |
|
6150 | 851 |
Vehicle *u; |
2602
1a6561c9a408
(svn r3139) -NewGRF, Feature: support for articulated rail vehicles. This is used, for example, by coal tenders.
peter1138
parents:
2599
diff
changeset
|
852 |
for (u = first; GetNextVehicle(u) != v; u = GetNextVehicle(u)) {} |
7493
07944c9e005f
(svn r11004) -Codechange: some reworks of the saveload mechanism to be able to save and load private and protected variables in the vehicle struct.
rubidium
parents:
7492
diff
changeset
|
853 |
GetLastEnginePart(u)->SetNext(GetNextVehicle(v)); |
1766
8cdb302ae946
(svn r2270) - Fix/Codechange: fix up selling rail vehicles. Try to be smart about it. When selling dual-headed trains, also sell the rear end; if the now-first wagon is an engine, make it a train. When selling the whole train, try to leave dual-headed setups intact
Darkvater
parents:
1758
diff
changeset
|
854 |
return first; |
0 | 855 |
} |
856 |
||
1472
a2abe3b9d7a7
(svn r1976) Cleanups - mostly indentation and fiddling with loops
tron
parents:
1461
diff
changeset
|
857 |
static Vehicle *FindGoodVehiclePos(const Vehicle *src) |
0 | 858 |
{ |
859 |
Vehicle *dst; |
|
2477
225b2916fe2a
(svn r3003) Change int, uint, uin16 and byte to EngineID where appropriate, plus some related changes (mostly casts)
tron
parents:
2475
diff
changeset
|
860 |
EngineID eng = src->engine_type; |
0 | 861 |
TileIndex tile = src->tile; |
862 |
||
863 |
FOR_ALL_VEHICLES(dst) { |
|
7696
ecb9955c0a4a
(svn r11230) -Fix [FS#1228]: one could construct trains out of crashed wagons and engines. Based on a patch by SmatZ.
rubidium
parents:
7695
diff
changeset
|
864 |
if (dst->type == VEH_TRAIN && IsFreeWagon(dst) && dst->tile == tile && !HASBITS(dst->vehstatus, VS_CRASHED)) { |
6422
6679df1c05ba
(svn r9558) -Documentation: doxygen and comment changes: 'T' now. Almost done
belugas
parents:
6407
diff
changeset
|
865 |
/* check so all vehicles in the line have the same engine. */ |
0 | 866 |
Vehicle *v = dst; |
1472
a2abe3b9d7a7
(svn r1976) Cleanups - mostly indentation and fiddling with loops
tron
parents:
1461
diff
changeset
|
867 |
|
0 | 868 |
while (v->engine_type == eng) { |
7492
35acee076719
(svn r11003) -Codechange: replace Vehicle->next to Vehicle->Next() and Vehicle->SetNext() so we can trap instances that change a next pointer and (in the future) update the first/previous pointers based on that.
rubidium
parents:
7488
diff
changeset
|
869 |
v = v->Next(); |
1472
a2abe3b9d7a7
(svn r1976) Cleanups - mostly indentation and fiddling with loops
tron
parents:
1461
diff
changeset
|
870 |
if (v == NULL) return dst; |
0 | 871 |
} |
872 |
} |
|
873 |
} |
|
874 |
||
875 |
return NULL; |
|
876 |
} |
|
877 |
||
2676
59b65b4fb480
(svn r3218) -Feature: Multiheaded train engines will now stay in the same train
bjarni
parents:
2666
diff
changeset
|
878 |
/* |
59b65b4fb480
(svn r3218) -Feature: Multiheaded train engines will now stay in the same train
bjarni
parents:
2666
diff
changeset
|
879 |
* add a vehicle v behind vehicle dest |
59b65b4fb480
(svn r3218) -Feature: Multiheaded train engines will now stay in the same train
bjarni
parents:
2666
diff
changeset
|
880 |
* use this function since it sets flags as needed |
59b65b4fb480
(svn r3218) -Feature: Multiheaded train engines will now stay in the same train
bjarni
parents:
2666
diff
changeset
|
881 |
*/ |
59b65b4fb480
(svn r3218) -Feature: Multiheaded train engines will now stay in the same train
bjarni
parents:
2666
diff
changeset
|
882 |
static void AddWagonToConsist(Vehicle *v, Vehicle *dest) |
59b65b4fb480
(svn r3218) -Feature: Multiheaded train engines will now stay in the same train
bjarni
parents:
2666
diff
changeset
|
883 |
{ |
7497
40e457c0a8ac
(svn r11011) -Fix [FS#1129]: GetFirstVehicleInChain did change the game state while being marked const.
rubidium
parents:
7493
diff
changeset
|
884 |
UnlinkWagon(v, v->First()); |
2676
59b65b4fb480
(svn r3218) -Feature: Multiheaded train engines will now stay in the same train
bjarni
parents:
2666
diff
changeset
|
885 |
if (dest == NULL) return; |
59b65b4fb480
(svn r3218) -Feature: Multiheaded train engines will now stay in the same train
bjarni
parents:
2666
diff
changeset
|
886 |
|
7497
40e457c0a8ac
(svn r11011) -Fix [FS#1129]: GetFirstVehicleInChain did change the game state while being marked const.
rubidium
parents:
7493
diff
changeset
|
887 |
Vehicle *next = dest->Next(); |
8007
f89f5691ce89
(svn r11567) -Fix [FS#1512] (r11011): break the chain before moving a vehicle after another in the same chain
glx
parents:
7967
diff
changeset
|
888 |
v->SetNext(NULL); |
7492
35acee076719
(svn r11003) -Codechange: replace Vehicle->next to Vehicle->Next() and Vehicle->SetNext() so we can trap instances that change a next pointer and (in the future) update the first/previous pointers based on that.
rubidium
parents:
7488
diff
changeset
|
889 |
dest->SetNext(v); |
7497
40e457c0a8ac
(svn r11011) -Fix [FS#1129]: GetFirstVehicleInChain did change the game state while being marked const.
rubidium
parents:
7493
diff
changeset
|
890 |
v->SetNext(next); |
2676
59b65b4fb480
(svn r3218) -Feature: Multiheaded train engines will now stay in the same train
bjarni
parents:
2666
diff
changeset
|
891 |
ClearFreeWagon(v); |
59b65b4fb480
(svn r3218) -Feature: Multiheaded train engines will now stay in the same train
bjarni
parents:
2666
diff
changeset
|
892 |
ClearFrontEngine(v); |
59b65b4fb480
(svn r3218) -Feature: Multiheaded train engines will now stay in the same train
bjarni
parents:
2666
diff
changeset
|
893 |
} |
59b65b4fb480
(svn r3218) -Feature: Multiheaded train engines will now stay in the same train
bjarni
parents:
2666
diff
changeset
|
894 |
|
59b65b4fb480
(svn r3218) -Feature: Multiheaded train engines will now stay in the same train
bjarni
parents:
2666
diff
changeset
|
895 |
/* |
59b65b4fb480
(svn r3218) -Feature: Multiheaded train engines will now stay in the same train
bjarni
parents:
2666
diff
changeset
|
896 |
* move around on the train so rear engines are placed correctly according to the other engines |
59b65b4fb480
(svn r3218) -Feature: Multiheaded train engines will now stay in the same train
bjarni
parents:
2666
diff
changeset
|
897 |
* always call with the front engine |
59b65b4fb480
(svn r3218) -Feature: Multiheaded train engines will now stay in the same train
bjarni
parents:
2666
diff
changeset
|
898 |
*/ |
59b65b4fb480
(svn r3218) -Feature: Multiheaded train engines will now stay in the same train
bjarni
parents:
2666
diff
changeset
|
899 |
static void NormaliseTrainConsist(Vehicle *v) |
59b65b4fb480
(svn r3218) -Feature: Multiheaded train engines will now stay in the same train
bjarni
parents:
2666
diff
changeset
|
900 |
{ |
59b65b4fb480
(svn r3218) -Feature: Multiheaded train engines will now stay in the same train
bjarni
parents:
2666
diff
changeset
|
901 |
if (IsFreeWagon(v)) return; |
59b65b4fb480
(svn r3218) -Feature: Multiheaded train engines will now stay in the same train
bjarni
parents:
2666
diff
changeset
|
902 |
|
59b65b4fb480
(svn r3218) -Feature: Multiheaded train engines will now stay in the same train
bjarni
parents:
2666
diff
changeset
|
903 |
assert(IsFrontEngine(v)); |
59b65b4fb480
(svn r3218) -Feature: Multiheaded train engines will now stay in the same train
bjarni
parents:
2666
diff
changeset
|
904 |
|
2952 | 905 |
for (; v != NULL; v = GetNextVehicle(v)) { |
2676
59b65b4fb480
(svn r3218) -Feature: Multiheaded train engines will now stay in the same train
bjarni
parents:
2666
diff
changeset
|
906 |
if (!IsMultiheaded(v) || !IsTrainEngine(v)) continue; |
59b65b4fb480
(svn r3218) -Feature: Multiheaded train engines will now stay in the same train
bjarni
parents:
2666
diff
changeset
|
907 |
|
59b65b4fb480
(svn r3218) -Feature: Multiheaded train engines will now stay in the same train
bjarni
parents:
2666
diff
changeset
|
908 |
/* make sure that there are no free cars before next engine */ |
6150 | 909 |
Vehicle *u; |
7492
35acee076719
(svn r11003) -Codechange: replace Vehicle->next to Vehicle->Next() and Vehicle->SetNext() so we can trap instances that change a next pointer and (in the future) update the first/previous pointers based on that.
rubidium
parents:
7488
diff
changeset
|
910 |
for (u = v; u->Next() != NULL && !IsTrainEngine(u->Next()); u = u->Next()) {} |
2676
59b65b4fb480
(svn r3218) -Feature: Multiheaded train engines will now stay in the same train
bjarni
parents:
2666
diff
changeset
|
911 |
|
59b65b4fb480
(svn r3218) -Feature: Multiheaded train engines will now stay in the same train
bjarni
parents:
2666
diff
changeset
|
912 |
if (u == v->u.rail.other_multiheaded_part) continue; |
59b65b4fb480
(svn r3218) -Feature: Multiheaded train engines will now stay in the same train
bjarni
parents:
2666
diff
changeset
|
913 |
AddWagonToConsist(v->u.rail.other_multiheaded_part, u); |
59b65b4fb480
(svn r3218) -Feature: Multiheaded train engines will now stay in the same train
bjarni
parents:
2666
diff
changeset
|
914 |
} |
59b65b4fb480
(svn r3218) -Feature: Multiheaded train engines will now stay in the same train
bjarni
parents:
2666
diff
changeset
|
915 |
} |
59b65b4fb480
(svn r3218) -Feature: Multiheaded train engines will now stay in the same train
bjarni
parents:
2666
diff
changeset
|
916 |
|
1784
d0698aac0c2e
(svn r2288) - CodeChange: protected the next batch of commands (41 so far, out of 115).
Darkvater
parents:
1779
diff
changeset
|
917 |
/** Move a rail vehicle around inside 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:
3487
diff
changeset
|
918 |
* @param tile unused |
6422
6679df1c05ba
(svn r9558) -Documentation: doxygen and comment changes: 'T' now. Almost done
belugas
parents:
6407
diff
changeset
|
919 |
* @param flags type of operation |
1784
d0698aac0c2e
(svn r2288) - CodeChange: protected the next batch of commands (41 so far, out of 115).
Darkvater
parents:
1779
diff
changeset
|
920 |
* @param p1 various bitstuffed elements |
2639 | 921 |
* - p1 (bit 0 - 15) source vehicle index |
922 |
* - p1 (bit 16 - 31) what wagon to put the source wagon AFTER, XXX - INVALID_VEHICLE to make a new line |
|
1784
d0698aac0c2e
(svn r2288) - CodeChange: protected the next batch of commands (41 so far, out of 115).
Darkvater
parents:
1779
diff
changeset
|
923 |
* @param p2 (bit 0) move all vehicles following the source vehicle |
0 | 924 |
*/ |
6943
1914f26aee04
(svn r10197) -Codechange: replace int32 with CommandCost where appropriate.
rubidium
parents:
6924
diff
changeset
|
925 |
CommandCost CmdMoveRailVehicle(TileIndex tile, uint32 flags, uint32 p1, uint32 p2) |
0 | 926 |
{ |
2484
0e45d70ae908
(svn r3010) Get rid of quite some dubious casts, either by using GB(), proper types or just removing them
tron
parents:
2482
diff
changeset
|
927 |
VehicleID s = GB(p1, 0, 16); |
0e45d70ae908
(svn r3010) Get rid of quite some dubious casts, either by using GB(), proper types or just removing them
tron
parents:
2482
diff
changeset
|
928 |
VehicleID d = GB(p1, 16, 16); |
0 | 929 |
|
4352
6703cd8d39e0
(svn r6053) -Codechange: renamed all IsXXXIndex to IsValidXXXID
truelight
parents:
4351
diff
changeset
|
930 |
if (!IsValidVehicleID(s)) return CMD_ERROR; |
2484
0e45d70ae908
(svn r3010) Get rid of quite some dubious casts, either by using GB(), proper types or just removing them
tron
parents:
2482
diff
changeset
|
931 |
|
6150 | 932 |
Vehicle *src = GetVehicle(s); |
1237
1c7a3f9c94b9
(svn r1741) - Fix: added IsVehicleIndex() so it's possible to protect GetVehicle() from reading an invalid vehicle index
bjarni
parents:
1236
diff
changeset
|
933 |
|
6259
471b91a4b1d8
(svn r9068) -Codechange: capitalize the VEH_Train etc. enums to match the coding style (and rest of the code).
rubidium
parents:
6248
diff
changeset
|
934 |
if (src->type != VEH_TRAIN || !CheckOwnership(src->owner)) return CMD_ERROR; |
0 | 935 |
|
7696
ecb9955c0a4a
(svn r11230) -Fix [FS#1228]: one could construct trains out of crashed wagons and engines. Based on a patch by SmatZ.
rubidium
parents:
7695
diff
changeset
|
936 |
/* Do not allow moving crashed vehicles inside the depot, it is likely to cause asserts later */ |
ecb9955c0a4a
(svn r11230) -Fix [FS#1228]: one could construct trains out of crashed wagons and engines. Based on a patch by SmatZ.
rubidium
parents:
7695
diff
changeset
|
937 |
if (HASBITS(src->vehstatus, VS_CRASHED)) return CMD_ERROR; |
ecb9955c0a4a
(svn r11230) -Fix [FS#1228]: one could construct trains out of crashed wagons and engines. Based on a patch by SmatZ.
rubidium
parents:
7695
diff
changeset
|
938 |
|
6422
6679df1c05ba
(svn r9558) -Documentation: doxygen and comment changes: 'T' now. Almost done
belugas
parents:
6407
diff
changeset
|
939 |
/* if nothing is selected as destination, try and find a matching vehicle to drag to. */ |
6150 | 940 |
Vehicle *dst; |
2484
0e45d70ae908
(svn r3010) Get rid of quite some dubious casts, either by using GB(), proper types or just removing them
tron
parents:
2482
diff
changeset
|
941 |
if (d == INVALID_VEHICLE) { |
4198
f8d95f4d9af1
(svn r5665) - Codechange: check pointers against NULL, coding style, tabulation; nothing serious.
Darkvater
parents:
4197
diff
changeset
|
942 |
dst = IsTrainEngine(src) ? NULL : FindGoodVehiclePos(src); |
0 | 943 |
} else { |
6136 | 944 |
if (!IsValidVehicleID(d)) return CMD_ERROR; |
2484
0e45d70ae908
(svn r3010) Get rid of quite some dubious casts, either by using GB(), proper types or just removing them
tron
parents:
2482
diff
changeset
|
945 |
dst = GetVehicle(d); |
6259
471b91a4b1d8
(svn r9068) -Codechange: capitalize the VEH_Train etc. enums to match the coding style (and rest of the code).
rubidium
parents:
6248
diff
changeset
|
946 |
if (dst->type != VEH_TRAIN || !CheckOwnership(dst->owner)) return CMD_ERROR; |
7696
ecb9955c0a4a
(svn r11230) -Fix [FS#1228]: one could construct trains out of crashed wagons and engines. Based on a patch by SmatZ.
rubidium
parents:
7695
diff
changeset
|
947 |
|
ecb9955c0a4a
(svn r11230) -Fix [FS#1228]: one could construct trains out of crashed wagons and engines. Based on a patch by SmatZ.
rubidium
parents:
7695
diff
changeset
|
948 |
/* Do not allow appending to crashed vehicles, too */ |
ecb9955c0a4a
(svn r11230) -Fix [FS#1228]: one could construct trains out of crashed wagons and engines. Based on a patch by SmatZ.
rubidium
parents:
7695
diff
changeset
|
949 |
if (HASBITS(dst->vehstatus, VS_CRASHED)) return CMD_ERROR; |
0 | 950 |
} |
951 |
||
6422
6679df1c05ba
(svn r9558) -Documentation: doxygen and comment changes: 'T' now. Almost done
belugas
parents:
6407
diff
changeset
|
952 |
/* if an articulated part is being handled, deal with its parent vehicle */ |
7497
40e457c0a8ac
(svn r11011) -Fix [FS#1129]: GetFirstVehicleInChain did change the game state while being marked const.
rubidium
parents:
7493
diff
changeset
|
953 |
while (IsArticulatedPart(src)) src = src->Previous(); |
2602
1a6561c9a408
(svn r3139) -NewGRF, Feature: support for articulated rail vehicles. This is used, for example, by coal tenders.
peter1138
parents:
2599
diff
changeset
|
954 |
if (dst != NULL) { |
7497
40e457c0a8ac
(svn r11011) -Fix [FS#1129]: GetFirstVehicleInChain did change the game state while being marked const.
rubidium
parents:
7493
diff
changeset
|
955 |
while (IsArticulatedPart(dst)) dst = dst->Previous(); |
2602
1a6561c9a408
(svn r3139) -NewGRF, Feature: support for articulated rail vehicles. This is used, for example, by coal tenders.
peter1138
parents:
2599
diff
changeset
|
956 |
} |
1a6561c9a408
(svn r3139) -NewGRF, Feature: support for articulated rail vehicles. This is used, for example, by coal tenders.
peter1138
parents:
2599
diff
changeset
|
957 |
|
6422
6679df1c05ba
(svn r9558) -Documentation: doxygen and comment changes: 'T' now. Almost done
belugas
parents:
6407
diff
changeset
|
958 |
/* don't move the same vehicle.. */ |
6950
14ecb0acdfb4
(svn r10205) -Codechange: refactor returning of cost, so it can be more easily modified.
rubidium
parents:
6943
diff
changeset
|
959 |
if (src == dst) return CommandCost(); |
193
0a7025304867
(svn r194) -Codechange: stripping trailing-spaces. Please keep this that way!
truelight
parents:
166
diff
changeset
|
960 |
|
0 | 961 |
/* locate the head of the two chains */ |
7497
40e457c0a8ac
(svn r11011) -Fix [FS#1129]: GetFirstVehicleInChain did change the game state while being marked const.
rubidium
parents:
7493
diff
changeset
|
962 |
Vehicle *src_head = src->First(); |
6150 | 963 |
Vehicle *dst_head; |
2602
1a6561c9a408
(svn r3139) -NewGRF, Feature: support for articulated rail vehicles. This is used, for example, by coal tenders.
peter1138
parents:
2599
diff
changeset
|
964 |
if (dst != NULL) { |
7497
40e457c0a8ac
(svn r11011) -Fix [FS#1129]: GetFirstVehicleInChain did change the game state while being marked const.
rubidium
parents:
7493
diff
changeset
|
965 |
dst_head = dst->First(); |
6136 | 966 |
if (dst_head->tile != src_head->tile) return CMD_ERROR; |
6422
6679df1c05ba
(svn r9558) -Documentation: doxygen and comment changes: 'T' now. Almost done
belugas
parents:
6407
diff
changeset
|
967 |
/* Now deal with articulated part of destination wagon */ |
2602
1a6561c9a408
(svn r3139) -NewGRF, Feature: support for articulated rail vehicles. This is used, for example, by coal tenders.
peter1138
parents:
2599
diff
changeset
|
968 |
dst = GetLastEnginePart(dst); |
6136 | 969 |
} else { |
970 |
dst_head = NULL; |
|
2602
1a6561c9a408
(svn r3139) -NewGRF, Feature: support for articulated rail vehicles. This is used, for example, by coal tenders.
peter1138
parents:
2599
diff
changeset
|
971 |
} |
193
0a7025304867
(svn r194) -Codechange: stripping trailing-spaces. Please keep this that way!
truelight
parents:
166
diff
changeset
|
972 |
|
7526
27c4fbf8aef0
(svn r11045) -Codechange: added a function to tell if a vehicle is the rear part of a dualheaded train engine
bjarni
parents:
7502
diff
changeset
|
973 |
if (IsRearDualheaded(src)) return_cmd_error(STR_REAR_ENGINE_FOLLOW_FRONT_ERROR); |
2676
59b65b4fb480
(svn r3218) -Feature: Multiheaded train engines will now stay in the same train
bjarni
parents:
2666
diff
changeset
|
974 |
|
6422
6679df1c05ba
(svn r9558) -Documentation: doxygen and comment changes: 'T' now. Almost done
belugas
parents:
6407
diff
changeset
|
975 |
/* when moving all wagons, we can't have the same src_head and dst_head */ |
7928
63e18de69e50
(svn r11481) -Codechange: Rename the HASBIT function to fit with the naming style
skidd13
parents:
7923
diff
changeset
|
976 |
if (HasBit(p2, 0) && src_head == dst_head) return CommandCost(); |
0 | 977 |
|
2883
90f7db6e078e
(svn r3431) - Fix crash when moving vehicles around in a train depot under certain conditions.
peter1138
parents:
2874
diff
changeset
|
978 |
{ |
90f7db6e078e
(svn r3431) - Fix crash when moving vehicles around in a train depot under certain conditions.
peter1138
parents:
2874
diff
changeset
|
979 |
int max_len = _patches.mammoth_trains ? 100 : 9; |
90f7db6e078e
(svn r3431) - Fix crash when moving vehicles around in a train depot under certain conditions.
peter1138
parents:
2874
diff
changeset
|
980 |
|
6422
6679df1c05ba
(svn r9558) -Documentation: doxygen and comment changes: 'T' now. Almost done
belugas
parents:
6407
diff
changeset
|
981 |
/* check if all vehicles in the source train are stopped inside a depot. */ |
6150 | 982 |
int src_len = CheckTrainStoppedInDepot(src_head); |
3183
90c676e6a50d
(svn r3829) Reduce the use of _error_message by directly returning error codes instead of using this global variable
tron
parents:
3172
diff
changeset
|
983 |
if (src_len < 0) return_cmd_error(STR_881A_TRAINS_CAN_ONLY_BE_ALTERED); |
2883
90f7db6e078e
(svn r3431) - Fix crash when moving vehicles around in a train depot under certain conditions.
peter1138
parents:
2874
diff
changeset
|
984 |
|
6422
6679df1c05ba
(svn r9558) -Documentation: doxygen and comment changes: 'T' now. Almost done
belugas
parents:
6407
diff
changeset
|
985 |
/* check the destination row if the source and destination aren't the same. */ |
2883
90f7db6e078e
(svn r3431) - Fix crash when moving vehicles around in a train depot under certain conditions.
peter1138
parents:
2874
diff
changeset
|
986 |
if (src_head != dst_head) { |
90f7db6e078e
(svn r3431) - Fix crash when moving vehicles around in a train depot under certain conditions.
peter1138
parents:
2874
diff
changeset
|
987 |
int dst_len = 0; |
90f7db6e078e
(svn r3431) - Fix crash when moving vehicles around in a train depot under certain conditions.
peter1138
parents:
2874
diff
changeset
|
988 |
|
90f7db6e078e
(svn r3431) - Fix crash when moving vehicles around in a train depot under certain conditions.
peter1138
parents:
2874
diff
changeset
|
989 |
if (dst_head != NULL) { |
6422
6679df1c05ba
(svn r9558) -Documentation: doxygen and comment changes: 'T' now. Almost done
belugas
parents:
6407
diff
changeset
|
990 |
/* check if all vehicles in the dest train are stopped. */ |
2883
90f7db6e078e
(svn r3431) - Fix crash when moving vehicles around in a train depot under certain conditions.
peter1138
parents:
2874
diff
changeset
|
991 |
dst_len = CheckTrainStoppedInDepot(dst_head); |
3183
90c676e6a50d
(svn r3829) Reduce the use of _error_message by directly returning error codes instead of using this global variable
tron
parents:
3172
diff
changeset
|
992 |
if (dst_len < 0) return_cmd_error(STR_881A_TRAINS_CAN_ONLY_BE_ALTERED); |
2883
90f7db6e078e
(svn r3431) - Fix crash when moving vehicles around in a train depot under certain conditions.
peter1138
parents:
2874
diff
changeset
|
993 |
} |
90f7db6e078e
(svn r3431) - Fix crash when moving vehicles around in a train depot under certain conditions.
peter1138
parents:
2874
diff
changeset
|
994 |
|
6422
6679df1c05ba
(svn r9558) -Documentation: doxygen and comment changes: 'T' now. Almost done
belugas
parents:
6407
diff
changeset
|
995 |
/* We are moving between rows, so only count the wagons from the source |
6679df1c05ba
(svn r9558) -Documentation: doxygen and comment changes: 'T' now. Almost done
belugas
parents:
6407
diff
changeset
|
996 |
* row that are being moved. */ |
7928
63e18de69e50
(svn r11481) -Codechange: Rename the HASBIT function to fit with the naming style
skidd13
parents:
7923
diff
changeset
|
997 |
if (HasBit(p2, 0)) { |
2883
90f7db6e078e
(svn r3431) - Fix crash when moving vehicles around in a train depot under certain conditions.
peter1138
parents:
2874
diff
changeset
|
998 |
const Vehicle *u; |
90f7db6e078e
(svn r3431) - Fix crash when moving vehicles around in a train depot under certain conditions.
peter1138
parents:
2874
diff
changeset
|
999 |
for (u = src_head; u != src && u != NULL; u = GetNextVehicle(u)) |
90f7db6e078e
(svn r3431) - Fix crash when moving vehicles around in a train depot under certain conditions.
peter1138
parents:
2874
diff
changeset
|
1000 |
src_len--; |
90f7db6e078e
(svn r3431) - Fix crash when moving vehicles around in a train depot under certain conditions.
peter1138
parents:
2874
diff
changeset
|
1001 |
} else { |
6422
6679df1c05ba
(svn r9558) -Documentation: doxygen and comment changes: 'T' now. Almost done
belugas
parents:
6407
diff
changeset
|
1002 |
/* If moving only one vehicle, just count that. */ |
2883
90f7db6e078e
(svn r3431) - Fix crash when moving vehicles around in a train depot under certain conditions.
peter1138
parents:
2874
diff
changeset
|
1003 |
src_len = 1; |
90f7db6e078e
(svn r3431) - Fix crash when moving vehicles around in a train depot under certain conditions.
peter1138
parents:
2874
diff
changeset
|
1004 |
} |
90f7db6e078e
(svn r3431) - Fix crash when moving vehicles around in a train depot under certain conditions.
peter1138
parents:
2874
diff
changeset
|
1005 |
|
90f7db6e078e
(svn r3431) - Fix crash when moving vehicles around in a train depot under certain conditions.
peter1138
parents:
2874
diff
changeset
|
1006 |
if (src_len + dst_len > max_len) { |
6422
6679df1c05ba
(svn r9558) -Documentation: doxygen and comment changes: 'T' now. Almost done
belugas
parents:
6407
diff
changeset
|
1007 |
/* Abort if we're adding too many wagons to a train. */ |
2883
90f7db6e078e
(svn r3431) - Fix crash when moving vehicles around in a train depot under certain conditions.
peter1138
parents:
2874
diff
changeset
|
1008 |
if (dst_head != NULL && IsFrontEngine(dst_head)) return_cmd_error(STR_8819_TRAIN_TOO_LONG); |
6422
6679df1c05ba
(svn r9558) -Documentation: doxygen and comment changes: 'T' now. Almost done
belugas
parents:
6407
diff
changeset
|
1009 |
/* Abort if we're making a train on a new row. */ |
2883
90f7db6e078e
(svn r3431) - Fix crash when moving vehicles around in a train depot under certain conditions.
peter1138
parents:
2874
diff
changeset
|
1010 |
if (dst_head == NULL && IsTrainEngine(src)) return_cmd_error(STR_8819_TRAIN_TOO_LONG); |
90f7db6e078e
(svn r3431) - Fix crash when moving vehicles around in a train depot under certain conditions.
peter1138
parents:
2874
diff
changeset
|
1011 |
} |
90f7db6e078e
(svn r3431) - Fix crash when moving vehicles around in a train depot under certain conditions.
peter1138
parents:
2874
diff
changeset
|
1012 |
} else { |
6422
6679df1c05ba
(svn r9558) -Documentation: doxygen and comment changes: 'T' now. Almost done
belugas
parents:
6407
diff
changeset
|
1013 |
/* Abort if we're creating a new train on an existing row. */ |
2883
90f7db6e078e
(svn r3431) - Fix crash when moving vehicles around in a train depot under certain conditions.
peter1138
parents:
2874
diff
changeset
|
1014 |
if (src_len > max_len && src == src_head && IsTrainEngine(GetNextVehicle(src_head))) |
90f7db6e078e
(svn r3431) - Fix crash when moving vehicles around in a train depot under certain conditions.
peter1138
parents:
2874
diff
changeset
|
1015 |
return_cmd_error(STR_8819_TRAIN_TOO_LONG); |
90f7db6e078e
(svn r3431) - Fix crash when moving vehicles around in a train depot under certain conditions.
peter1138
parents:
2874
diff
changeset
|
1016 |
} |
90f7db6e078e
(svn r3431) - Fix crash when moving vehicles around in a train depot under certain conditions.
peter1138
parents:
2874
diff
changeset
|
1017 |
} |
90f7db6e078e
(svn r3431) - Fix crash when moving vehicles around in a train depot under certain conditions.
peter1138
parents:
2874
diff
changeset
|
1018 |
|
6422
6679df1c05ba
(svn r9558) -Documentation: doxygen and comment changes: 'T' now. Almost done
belugas
parents:
6407
diff
changeset
|
1019 |
/* moving a loco to a new line?, then we need to assign a unitnumber. */ |
2676
59b65b4fb480
(svn r3218) -Feature: Multiheaded train engines will now stay in the same train
bjarni
parents:
2666
diff
changeset
|
1020 |
if (dst == NULL && !IsFrontEngine(src) && IsTrainEngine(src)) { |
6259
471b91a4b1d8
(svn r9068) -Codechange: capitalize the VEH_Train etc. enums to match the coding style (and rest of the code).
rubidium
parents:
6248
diff
changeset
|
1021 |
UnitID unit_num = GetFreeUnitNumber(VEH_TRAIN); |
0 | 1022 |
if (unit_num > _patches.max_trains) |
1023 |
return_cmd_error(STR_00E1_TOO_MANY_VEHICLES_IN_GAME); |
|
1024 |
||
3017
a75caf4efa2d
(svn r3597) Miscellaneous (I like that word) changes: Fix some indentation, add consts, reduce indentation level by short-circuit logic, convert if cascades to switch, whitespace, bracing, plus some minor stuff
tron
parents:
3008
diff
changeset
|
1025 |
if (flags & DC_EXEC) src->unitnumber = unit_num; |
0 | 1026 |
} |
1027 |
||
3727
3a3ebb0bde7e
(svn r4703) - NewGRF: add support for callback 0x1D, "can wagon be attached". This can be used to disallow freight wagons to be placed in passenger trains, along with other uses.
peter1138
parents:
3657
diff
changeset
|
1028 |
if (dst_head != NULL) { |
3a3ebb0bde7e
(svn r4703) - NewGRF: add support for callback 0x1D, "can wagon be attached". This can be used to disallow freight wagons to be placed in passenger trains, along with other uses.
peter1138
parents:
3657
diff
changeset
|
1029 |
/* Check NewGRF Callback 0x1D */ |
3a3ebb0bde7e
(svn r4703) - NewGRF: add support for callback 0x1D, "can wagon be attached". This can be used to disallow freight wagons to be placed in passenger trains, along with other uses.
peter1138
parents:
3657
diff
changeset
|
1030 |
uint16 callback = GetVehicleCallbackParent(CBID_TRAIN_ALLOW_WAGON_ATTACH, 0, 0, dst_head->engine_type, src, dst_head); |
3a3ebb0bde7e
(svn r4703) - NewGRF: add support for callback 0x1D, "can wagon be attached". This can be used to disallow freight wagons to be placed in passenger trains, along with other uses.
peter1138
parents:
3657
diff
changeset
|
1031 |
if (callback != CALLBACK_FAILED) { |
3729
db4040124d25
(svn r4706) - NewGRF: add the correct default error message for the wagon attach callback.
peter1138
parents:
3727
diff
changeset
|
1032 |
if (callback == 0xFD) return_cmd_error(STR_INCOMPATIBLE_RAIL_TYPES); |
3727
3a3ebb0bde7e
(svn r4703) - NewGRF: add support for callback 0x1D, "can wagon be attached". This can be used to disallow freight wagons to be placed in passenger trains, along with other uses.
peter1138
parents:
3657
diff
changeset
|
1033 |
if (callback < 0xFD) { |
3a3ebb0bde7e
(svn r4703) - NewGRF: add support for callback 0x1D, "can wagon be attached". This can be used to disallow freight wagons to be placed in passenger trains, along with other uses.
peter1138
parents:
3657
diff
changeset
|
1034 |
StringID error = GetGRFStringID(GetEngineGRFID(dst_head->engine_type), 0xD000 + callback); |
3a3ebb0bde7e
(svn r4703) - NewGRF: add support for callback 0x1D, "can wagon be attached". This can be used to disallow freight wagons to be placed in passenger trains, along with other uses.
peter1138
parents:
3657
diff
changeset
|
1035 |
return_cmd_error(error); |
3a3ebb0bde7e
(svn r4703) - NewGRF: add support for callback 0x1D, "can wagon be attached". This can be used to disallow freight wagons to be placed in passenger trains, along with other uses.
peter1138
parents:
3657
diff
changeset
|
1036 |
} |
3a3ebb0bde7e
(svn r4703) - NewGRF: add support for callback 0x1D, "can wagon be attached". This can be used to disallow freight wagons to be placed in passenger trains, along with other uses.
peter1138
parents:
3657
diff
changeset
|
1037 |
} |
3a3ebb0bde7e
(svn r4703) - NewGRF: add support for callback 0x1D, "can wagon be attached". This can be used to disallow freight wagons to be placed in passenger trains, along with other uses.
peter1138
parents:
3657
diff
changeset
|
1038 |
} |
0 | 1039 |
|
1040 |
/* do it? */ |
|
1041 |
if (flags & DC_EXEC) { |
|
6643
f81bee57bc09
(svn r9874) -Feature: advanced vehicle lists a.k.a. group interface. Now you can make groups of vehicles and perform all kinds of tasks on that given group. Original code by nycom and graphics by skidd13.
rubidium
parents:
6608
diff
changeset
|
1042 |
/* If we move the front Engine and if the second vehicle is not an engine |
f81bee57bc09
(svn r9874) -Feature: advanced vehicle lists a.k.a. group interface. Now you can make groups of vehicles and perform all kinds of tasks on that given group. Original code by nycom and graphics by skidd13.
rubidium
parents:
6608
diff
changeset
|
1043 |
add the whole vehicle to the DEFAULT_GROUP */ |
f81bee57bc09
(svn r9874) -Feature: advanced vehicle lists a.k.a. group interface. Now you can make groups of vehicles and perform all kinds of tasks on that given group. Original code by nycom and graphics by skidd13.
rubidium
parents:
6608
diff
changeset
|
1044 |
if (IsFrontEngine(src) && !IsDefaultGroupID(src->group_id)) { |
7529
ca42b9956322
(svn r11048) -Fix [FS#1206]: several cases where (re)moving eninges on a train would corrupt the vehicle counts for the groups.
rubidium
parents:
7526
diff
changeset
|
1045 |
Vehicle *v = GetNextVehicle(src); |
ca42b9956322
(svn r11048) -Fix [FS#1206]: several cases where (re)moving eninges on a train would corrupt the vehicle counts for the groups.
rubidium
parents:
7526
diff
changeset
|
1046 |
|
ca42b9956322
(svn r11048) -Fix [FS#1206]: several cases where (re)moving eninges on a train would corrupt the vehicle counts for the groups.
rubidium
parents:
7526
diff
changeset
|
1047 |
if (v != NULL && IsTrainEngine(v)) { |
ca42b9956322
(svn r11048) -Fix [FS#1206]: several cases where (re)moving eninges on a train would corrupt the vehicle counts for the groups.
rubidium
parents:
7526
diff
changeset
|
1048 |
v->group_id = src->group_id; |
ca42b9956322
(svn r11048) -Fix [FS#1206]: several cases where (re)moving eninges on a train would corrupt the vehicle counts for the groups.
rubidium
parents:
7526
diff
changeset
|
1049 |
src->group_id = DEFAULT_GROUP; |
6643
f81bee57bc09
(svn r9874) -Feature: advanced vehicle lists a.k.a. group interface. Now you can make groups of vehicles and perform all kinds of tasks on that given group. Original code by nycom and graphics by skidd13.
rubidium
parents:
6608
diff
changeset
|
1050 |
} |
f81bee57bc09
(svn r9874) -Feature: advanced vehicle lists a.k.a. group interface. Now you can make groups of vehicles and perform all kinds of tasks on that given group. Original code by nycom and graphics by skidd13.
rubidium
parents:
6608
diff
changeset
|
1051 |
} |
f81bee57bc09
(svn r9874) -Feature: advanced vehicle lists a.k.a. group interface. Now you can make groups of vehicles and perform all kinds of tasks on that given group. Original code by nycom and graphics by skidd13.
rubidium
parents:
6608
diff
changeset
|
1052 |
|
7928
63e18de69e50
(svn r11481) -Codechange: Rename the HASBIT function to fit with the naming style
skidd13
parents:
7923
diff
changeset
|
1053 |
if (HasBit(p2, 0)) { |
6422
6679df1c05ba
(svn r9558) -Documentation: doxygen and comment changes: 'T' now. Almost done
belugas
parents:
6407
diff
changeset
|
1054 |
/* unlink ALL wagons */ |
0 | 1055 |
if (src != src_head) { |
1056 |
Vehicle *v = src_head; |
|
2602
1a6561c9a408
(svn r3139) -NewGRF, Feature: support for articulated rail vehicles. This is used, for example, by coal tenders.
peter1138
parents:
2599
diff
changeset
|
1057 |
while (GetNextVehicle(v) != src) v = GetNextVehicle(v); |
7493
07944c9e005f
(svn r11004) -Codechange: some reworks of the saveload mechanism to be able to save and load private and protected variables in the vehicle struct.
rubidium
parents:
7492
diff
changeset
|
1058 |
GetLastEnginePart(v)->SetNext(NULL); |
1917
03e113481a62
(svn r2423) - CodeChange: Include first_engine in the train cache, instead of calculating it all over the place.
hackykid
parents:
1909
diff
changeset
|
1059 |
} else { |
4739
e626ef1b522e
(svn r6651) -Coding feature: added the windowevent WE_INVALIDATE_DATA
bjarni
parents:
4737
diff
changeset
|
1060 |
InvalidateWindowData(WC_VEHICLE_DEPOT, src_head->tile); // We removed a line |
1917
03e113481a62
(svn r2423) - CodeChange: Include first_engine in the train cache, instead of calculating it all over the place.
hackykid
parents:
1909
diff
changeset
|
1061 |
src_head = NULL; |
0 | 1062 |
} |
1063 |
} else { |
|
6422
6679df1c05ba
(svn r9558) -Documentation: doxygen and comment changes: 'T' now. Almost done
belugas
parents:
6407
diff
changeset
|
1064 |
/* if moving within the same chain, dont use dst_head as it may get invalidated */ |
4198
f8d95f4d9af1
(svn r5665) - Codechange: check pointers against NULL, coding style, tabulation; nothing serious.
Darkvater
parents:
4197
diff
changeset
|
1065 |
if (src_head == dst_head) dst_head = NULL; |
6422
6679df1c05ba
(svn r9558) -Documentation: doxygen and comment changes: 'T' now. Almost done
belugas
parents:
6407
diff
changeset
|
1066 |
/* unlink single wagon from linked list */ |
1917
03e113481a62
(svn r2423) - CodeChange: Include first_engine in the train cache, instead of calculating it all over the place.
hackykid
parents:
1909
diff
changeset
|
1067 |
src_head = UnlinkWagon(src, src_head); |
7493
07944c9e005f
(svn r11004) -Codechange: some reworks of the saveload mechanism to be able to save and load private and protected variables in the vehicle struct.
rubidium
parents:
7492
diff
changeset
|
1068 |
GetLastEnginePart(src)->SetNext(NULL); |
0 | 1069 |
} |
1070 |
||
1071 |
if (dst == NULL) { |
|
4739
e626ef1b522e
(svn r6651) -Coding feature: added the windowevent WE_INVALIDATE_DATA
bjarni
parents:
4737
diff
changeset
|
1072 |
/* We make a new line in the depot, so we know already that we invalidate the window data */ |
4806
2e9d9fc049b0
(svn r6728) -Fix r6651: solved issue where moving rail vehicles in a depot could read from a NULL pointer
bjarni
parents:
4739
diff
changeset
|
1073 |
InvalidateWindowData(WC_VEHICLE_DEPOT, src->tile); |
4739
e626ef1b522e
(svn r6651) -Coding feature: added the windowevent WE_INVALIDATE_DATA
bjarni
parents:
4737
diff
changeset
|
1074 |
|
6422
6679df1c05ba
(svn r9558) -Documentation: doxygen and comment changes: 'T' now. Almost done
belugas
parents:
6407
diff
changeset
|
1075 |
/* move the train to an empty line. for locomotives, we set the type to TS_Front. for wagons, 4. */ |
2676
59b65b4fb480
(svn r3218) -Feature: Multiheaded train engines will now stay in the same train
bjarni
parents:
2666
diff
changeset
|
1076 |
if (IsTrainEngine(src)) { |
59b65b4fb480
(svn r3218) -Feature: Multiheaded train engines will now stay in the same train
bjarni
parents:
2666
diff
changeset
|
1077 |
if (!IsFrontEngine(src)) { |
6422
6679df1c05ba
(svn r9558) -Documentation: doxygen and comment changes: 'T' now. Almost done
belugas
parents:
6407
diff
changeset
|
1078 |
/* setting the type to 0 also involves setting up the orders field. */ |
2676
59b65b4fb480
(svn r3218) -Feature: Multiheaded train engines will now stay in the same train
bjarni
parents:
2666
diff
changeset
|
1079 |
SetFrontEngine(src); |
1024
5e446b5b3ec5
(svn r1525) -Codechange: rewrote the _order_array, now it can be made dynamic.
truelight
parents:
954
diff
changeset
|
1080 |
assert(src->orders == NULL); |
0 | 1081 |
src->num_orders = 0; |
6643
f81bee57bc09
(svn r9874) -Feature: advanced vehicle lists a.k.a. group interface. Now you can make groups of vehicles and perform all kinds of tasks on that given group. Original code by nycom and graphics by skidd13.
rubidium
parents:
6608
diff
changeset
|
1082 |
|
f81bee57bc09
(svn r9874) -Feature: advanced vehicle lists a.k.a. group interface. Now you can make groups of vehicles and perform all kinds of tasks on that given group. Original code by nycom and graphics by skidd13.
rubidium
parents:
6608
diff
changeset
|
1083 |
// Decrease the engines number of the src engine_type |
f81bee57bc09
(svn r9874) -Feature: advanced vehicle lists a.k.a. group interface. Now you can make groups of vehicles and perform all kinds of tasks on that given group. Original code by nycom and graphics by skidd13.
rubidium
parents:
6608
diff
changeset
|
1084 |
if (!IsDefaultGroupID(src->group_id) && IsValidGroupID(src->group_id)) { |
f81bee57bc09
(svn r9874) -Feature: advanced vehicle lists a.k.a. group interface. Now you can make groups of vehicles and perform all kinds of tasks on that given group. Original code by nycom and graphics by skidd13.
rubidium
parents:
6608
diff
changeset
|
1085 |
GetGroup(src->group_id)->num_engines[src->engine_type]--; |
f81bee57bc09
(svn r9874) -Feature: advanced vehicle lists a.k.a. group interface. Now you can make groups of vehicles and perform all kinds of tasks on that given group. Original code by nycom and graphics by skidd13.
rubidium
parents:
6608
diff
changeset
|
1086 |
} |
f81bee57bc09
(svn r9874) -Feature: advanced vehicle lists a.k.a. group interface. Now you can make groups of vehicles and perform all kinds of tasks on that given group. Original code by nycom and graphics by skidd13.
rubidium
parents:
6608
diff
changeset
|
1087 |
|
f81bee57bc09
(svn r9874) -Feature: advanced vehicle lists a.k.a. group interface. Now you can make groups of vehicles and perform all kinds of tasks on that given group. Original code by nycom and graphics by skidd13.
rubidium
parents:
6608
diff
changeset
|
1088 |
// If we move an engine to a new line affect it to the DEFAULT_GROUP |
f81bee57bc09
(svn r9874) -Feature: advanced vehicle lists a.k.a. group interface. Now you can make groups of vehicles and perform all kinds of tasks on that given group. Original code by nycom and graphics by skidd13.
rubidium
parents:
6608
diff
changeset
|
1089 |
src->group_id = DEFAULT_GROUP; |
0 | 1090 |
} |
1091 |
} else { |
|
2676
59b65b4fb480
(svn r3218) -Feature: Multiheaded train engines will now stay in the same train
bjarni
parents:
2666
diff
changeset
|
1092 |
SetFreeWagon(src); |
0 | 1093 |
} |
1917
03e113481a62
(svn r2423) - CodeChange: Include first_engine in the train cache, instead of calculating it all over the place.
hackykid
parents:
1909
diff
changeset
|
1094 |
dst_head = src; |
0 | 1095 |
} else { |
2676
59b65b4fb480
(svn r3218) -Feature: Multiheaded train engines will now stay in the same train
bjarni
parents:
2666
diff
changeset
|
1096 |
if (IsFrontEngine(src)) { |
6422
6679df1c05ba
(svn r9558) -Documentation: doxygen and comment changes: 'T' now. Almost done
belugas
parents:
6407
diff
changeset
|
1097 |
/* the vehicle was previously a loco. need to free the order list and delete vehicle windows etc. */ |
0 | 1098 |
DeleteWindowById(WC_VEHICLE_VIEW, src->index); |
1024
5e446b5b3ec5
(svn r1525) -Codechange: rewrote the _order_array, now it can be made dynamic.
truelight
parents:
954
diff
changeset
|
1099 |
DeleteVehicleOrders(src); |
7529
ca42b9956322
(svn r11048) -Fix [FS#1206]: several cases where (re)moving eninges on a train would corrupt the vehicle counts for the groups.
rubidium
parents:
7526
diff
changeset
|
1100 |
RemoveVehicleFromGroup(src); |
0 | 1101 |
} |
193
0a7025304867
(svn r194) -Codechange: stripping trailing-spaces. Please keep this that way!
truelight
parents:
166
diff
changeset
|
1102 |
|
4739
e626ef1b522e
(svn r6651) -Coding feature: added the windowevent WE_INVALIDATE_DATA
bjarni
parents:
4737
diff
changeset
|
1103 |
if (IsFrontEngine(src) || IsFreeWagon(src)) { |
e626ef1b522e
(svn r6651) -Coding feature: added the windowevent WE_INVALIDATE_DATA
bjarni
parents:
4737
diff
changeset
|
1104 |
InvalidateWindowData(WC_VEHICLE_DEPOT, src->tile); |
e626ef1b522e
(svn r6651) -Coding feature: added the windowevent WE_INVALIDATE_DATA
bjarni
parents:
4737
diff
changeset
|
1105 |
ClearFrontEngine(src); |
e626ef1b522e
(svn r6651) -Coding feature: added the windowevent WE_INVALIDATE_DATA
bjarni
parents:
4737
diff
changeset
|
1106 |
ClearFreeWagon(src); |
e626ef1b522e
(svn r6651) -Coding feature: added the windowevent WE_INVALIDATE_DATA
bjarni
parents:
4737
diff
changeset
|
1107 |
src->unitnumber = 0; // doesn't occupy a unitnumber anymore. |
e626ef1b522e
(svn r6651) -Coding feature: added the windowevent WE_INVALIDATE_DATA
bjarni
parents:
4737
diff
changeset
|
1108 |
} |
0 | 1109 |
|
6422
6679df1c05ba
(svn r9558) -Documentation: doxygen and comment changes: 'T' now. Almost done
belugas
parents:
6407
diff
changeset
|
1110 |
/* link in the wagon(s) in the chain. */ |
0 | 1111 |
{ |
1472
a2abe3b9d7a7
(svn r1976) Cleanups - mostly indentation and fiddling with loops
tron
parents:
1461
diff
changeset
|
1112 |
Vehicle *v; |
a2abe3b9d7a7
(svn r1976) Cleanups - mostly indentation and fiddling with loops
tron
parents:
1461
diff
changeset
|
1113 |
|
2602
1a6561c9a408
(svn r3139) -NewGRF, Feature: support for articulated rail vehicles. This is used, for example, by coal tenders.
peter1138
parents:
2599
diff
changeset
|
1114 |
for (v = src; GetNextVehicle(v) != NULL; v = GetNextVehicle(v)); |
7492
35acee076719
(svn r11003) -Codechange: replace Vehicle->next to Vehicle->Next() and Vehicle->SetNext() so we can trap instances that change a next pointer and (in the future) update the first/previous pointers based on that.
rubidium
parents:
7488
diff
changeset
|
1115 |
GetLastEnginePart(v)->SetNext(dst->Next()); |
0 | 1116 |
} |
7492
35acee076719
(svn r11003) -Codechange: replace Vehicle->next to Vehicle->Next() and Vehicle->SetNext() so we can trap instances that change a next pointer and (in the future) update the first/previous pointers based on that.
rubidium
parents:
7488
diff
changeset
|
1117 |
dst->SetNext(src); |
0 | 1118 |
} |
7497
40e457c0a8ac
(svn r11011) -Fix [FS#1129]: GetFirstVehicleInChain did change the game state while being marked const.
rubidium
parents:
7493
diff
changeset
|
1119 |
|
2676
59b65b4fb480
(svn r3218) -Feature: Multiheaded train engines will now stay in the same train
bjarni
parents:
2666
diff
changeset
|
1120 |
if (src->u.rail.other_multiheaded_part != NULL) { |
59b65b4fb480
(svn r3218) -Feature: Multiheaded train engines will now stay in the same train
bjarni
parents:
2666
diff
changeset
|
1121 |
if (src->u.rail.other_multiheaded_part == src_head) { |
7492
35acee076719
(svn r11003) -Codechange: replace Vehicle->next to Vehicle->Next() and Vehicle->SetNext() so we can trap instances that change a next pointer and (in the future) update the first/previous pointers based on that.
rubidium
parents:
7488
diff
changeset
|
1122 |
src_head = src_head->Next(); |
2676
59b65b4fb480
(svn r3218) -Feature: Multiheaded train engines will now stay in the same train
bjarni
parents:
2666
diff
changeset
|
1123 |
} |
59b65b4fb480
(svn r3218) -Feature: Multiheaded train engines will now stay in the same train
bjarni
parents:
2666
diff
changeset
|
1124 |
AddWagonToConsist(src->u.rail.other_multiheaded_part, src); |
59b65b4fb480
(svn r3218) -Feature: Multiheaded train engines will now stay in the same train
bjarni
parents:
2666
diff
changeset
|
1125 |
} |
59b65b4fb480
(svn r3218) -Feature: Multiheaded train engines will now stay in the same train
bjarni
parents:
2666
diff
changeset
|
1126 |
|
2607
9915a4829de8
(svn r3144) -Fix: a new train is now made if the front unit is an engine and the former front engine is moved away (Meush)
bjarni
parents:
2602
diff
changeset
|
1127 |
/* If there is an engine behind first_engine we moved away, it should become new first_engine |
9915a4829de8
(svn r3144) -Fix: a new train is now made if the front unit is an engine and the former front engine is moved away (Meush)
bjarni
parents:
2602
diff
changeset
|
1128 |
* To do this, CmdMoveRailVehicle must be called once more |
2676
59b65b4fb480
(svn r3218) -Feature: Multiheaded train engines will now stay in the same train
bjarni
parents:
2666
diff
changeset
|
1129 |
* we can't loop forever here because next time we reach this line we will have a front engine */ |
59b65b4fb480
(svn r3218) -Feature: Multiheaded train engines will now stay in the same train
bjarni
parents:
2666
diff
changeset
|
1130 |
if (src_head != NULL && !IsFrontEngine(src_head) && IsTrainEngine(src_head)) { |
6643
f81bee57bc09
(svn r9874) -Feature: advanced vehicle lists a.k.a. group interface. Now you can make groups of vehicles and perform all kinds of tasks on that given group. Original code by nycom and graphics by skidd13.
rubidium
parents:
6608
diff
changeset
|
1131 |
/* As in CmdMoveRailVehicle src_head->group_id will be equal to DEFAULT_GROUP |
f81bee57bc09
(svn r9874) -Feature: advanced vehicle lists a.k.a. group interface. Now you can make groups of vehicles and perform all kinds of tasks on that given group. Original code by nycom and graphics by skidd13.
rubidium
parents:
6608
diff
changeset
|
1132 |
* we need to save the group and reaffect it to src_head */ |
f81bee57bc09
(svn r9874) -Feature: advanced vehicle lists a.k.a. group interface. Now you can make groups of vehicles and perform all kinds of tasks on that given group. Original code by nycom and graphics by skidd13.
rubidium
parents:
6608
diff
changeset
|
1133 |
const GroupID tmp_g = src_head->group_id; |
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:
3487
diff
changeset
|
1134 |
CmdMoveRailVehicle(0, flags, src_head->index | (INVALID_VEHICLE << 16), 1); |
6643
f81bee57bc09
(svn r9874) -Feature: advanced vehicle lists a.k.a. group interface. Now you can make groups of vehicles and perform all kinds of tasks on that given group. Original code by nycom and graphics by skidd13.
rubidium
parents:
6608
diff
changeset
|
1135 |
SetTrainGroupID(src_head, tmp_g); |
4434
a08cb4b5c179
(svn r6204) -Cleanup: replace non-indentation with spaces; like '}<TAB>else {' -> '} else {', tabs between code and comment, etc.
rubidium
parents:
4432
diff
changeset
|
1136 |
src_head = NULL; // don't do anything more to this train since the new call will do it |
2607
9915a4829de8
(svn r3144) -Fix: a new train is now made if the front unit is an engine and the former front engine is moved away (Meush)
bjarni
parents:
2602
diff
changeset
|
1137 |
} |
9915a4829de8
(svn r3144) -Fix: a new train is now made if the front unit is an engine and the former front engine is moved away (Meush)
bjarni
parents:
2602
diff
changeset
|
1138 |
|
4198
f8d95f4d9af1
(svn r5665) - Codechange: check pointers against NULL, coding style, tabulation; nothing serious.
Darkvater
parents:
4197
diff
changeset
|
1139 |
if (src_head != NULL) { |
2676
59b65b4fb480
(svn r3218) -Feature: Multiheaded train engines will now stay in the same train
bjarni
parents:
2666
diff
changeset
|
1140 |
NormaliseTrainConsist(src_head); |
1905
c53f8d71f9b6
(svn r2411) - Codechange: Have trains cache stuff like consist power/weight/max speed instead of recalculating it each time.
hackykid
parents:
1901
diff
changeset
|
1141 |
TrainConsistChanged(src_head); |
6643
f81bee57bc09
(svn r9874) -Feature: advanced vehicle lists a.k.a. group interface. Now you can make groups of vehicles and perform all kinds of tasks on that given group. Original code by nycom and graphics by skidd13.
rubidium
parents:
6608
diff
changeset
|
1142 |
UpdateTrainGroupID(src_head); |
2676
59b65b4fb480
(svn r3218) -Feature: Multiheaded train engines will now stay in the same train
bjarni
parents:
2666
diff
changeset
|
1143 |
if (IsFrontEngine(src_head)) { |
1917
03e113481a62
(svn r2423) - CodeChange: Include first_engine in the train cache, instead of calculating it all over the place.
hackykid
parents:
1909
diff
changeset
|
1144 |
UpdateTrainAcceleration(src_head); |
03e113481a62
(svn r2423) - CodeChange: Include first_engine in the train cache, instead of calculating it all over the place.
hackykid
parents:
1909
diff
changeset
|
1145 |
InvalidateWindow(WC_VEHICLE_DETAILS, src_head->index); |
03e113481a62
(svn r2423) - CodeChange: Include first_engine in the train cache, instead of calculating it all over the place.
hackykid
parents:
1909
diff
changeset
|
1146 |
/* Update the refit button and window */ |
03e113481a62
(svn r2423) - CodeChange: Include first_engine in the train cache, instead of calculating it all over the place.
hackykid
parents:
1909
diff
changeset
|
1147 |
InvalidateWindow(WC_VEHICLE_REFIT, src_head->index); |
03e113481a62
(svn r2423) - CodeChange: Include first_engine in the train cache, instead of calculating it all over the place.
hackykid
parents:
1909
diff
changeset
|
1148 |
InvalidateWindowWidget(WC_VEHICLE_VIEW, src_head->index, 12); |
03e113481a62
(svn r2423) - CodeChange: Include first_engine in the train cache, instead of calculating it all over the place.
hackykid
parents:
1909
diff
changeset
|
1149 |
} |
03e113481a62
(svn r2423) - CodeChange: Include first_engine in the train cache, instead of calculating it all over the place.
hackykid
parents:
1909
diff
changeset
|
1150 |
/* Update the depot window */ |
03e113481a62
(svn r2423) - CodeChange: Include first_engine in the train cache, instead of calculating it all over the place.
hackykid
parents:
1909
diff
changeset
|
1151 |
InvalidateWindow(WC_VEHICLE_DEPOT, src_head->tile); |
6150 | 1152 |
} |
0 | 1153 |
|
4198
f8d95f4d9af1
(svn r5665) - Codechange: check pointers against NULL, coding style, tabulation; nothing serious.
Darkvater
parents:
4197
diff
changeset
|
1154 |
if (dst_head != NULL) { |
2676
59b65b4fb480
(svn r3218) -Feature: Multiheaded train engines will now stay in the same train
bjarni
parents:
2666
diff
changeset
|
1155 |
NormaliseTrainConsist(dst_head); |
1917
03e113481a62
(svn r2423) - CodeChange: Include first_engine in the train cache, instead of calculating it all over the place.
hackykid
parents:
1909
diff
changeset
|
1156 |
TrainConsistChanged(dst_head); |
6643
f81bee57bc09
(svn r9874) -Feature: advanced vehicle lists a.k.a. group interface. Now you can make groups of vehicles and perform all kinds of tasks on that given group. Original code by nycom and graphics by skidd13.
rubidium
parents:
6608
diff
changeset
|
1157 |
UpdateTrainGroupID(dst_head); |
2676
59b65b4fb480
(svn r3218) -Feature: Multiheaded train engines will now stay in the same train
bjarni
parents:
2666
diff
changeset
|
1158 |
if (IsFrontEngine(dst_head)) { |
0 | 1159 |
UpdateTrainAcceleration(dst_head); |
1917
03e113481a62
(svn r2423) - CodeChange: Include first_engine in the train cache, instead of calculating it all over the place.
hackykid
parents:
1909
diff
changeset
|
1160 |
InvalidateWindow(WC_VEHICLE_DETAILS, dst_head->index); |
03e113481a62
(svn r2423) - CodeChange: Include first_engine in the train cache, instead of calculating it all over the place.
hackykid
parents:
1909
diff
changeset
|
1161 |
/* Update the refit button and window */ |
03e113481a62
(svn r2423) - CodeChange: Include first_engine in the train cache, instead of calculating it all over the place.
hackykid
parents:
1909
diff
changeset
|
1162 |
InvalidateWindowWidget(WC_VEHICLE_VIEW, dst_head->index, 12); |
03e113481a62
(svn r2423) - CodeChange: Include first_engine in the train cache, instead of calculating it all over the place.
hackykid
parents:
1909
diff
changeset
|
1163 |
InvalidateWindow(WC_VEHICLE_REFIT, dst_head->index); |
1905
c53f8d71f9b6
(svn r2411) - Codechange: Have trains cache stuff like consist power/weight/max speed instead of recalculating it each time.
hackykid
parents:
1901
diff
changeset
|
1164 |
} |
1917
03e113481a62
(svn r2423) - CodeChange: Include first_engine in the train cache, instead of calculating it all over the place.
hackykid
parents:
1909
diff
changeset
|
1165 |
/* Update the depot window */ |
03e113481a62
(svn r2423) - CodeChange: Include first_engine in the train cache, instead of calculating it all over the place.
hackykid
parents:
1909
diff
changeset
|
1166 |
InvalidateWindow(WC_VEHICLE_DEPOT, dst_head->tile); |
0 | 1167 |
} |
1168 |
||
737
05082439a150
(svn r1189) Fix vehicle list update glitch when moving waggons in depots
tron
parents:
715
diff
changeset
|
1169 |
RebuildVehicleLists(); |
0 | 1170 |
} |
1171 |
||
6950
14ecb0acdfb4
(svn r10205) -Codechange: refactor returning of cost, so it can be more easily modified.
rubidium
parents:
6943
diff
changeset
|
1172 |
return CommandCost(); |
0 | 1173 |
} |
1174 |
||
1784
d0698aac0c2e
(svn r2288) - CodeChange: protected the next batch of commands (41 so far, out of 115).
Darkvater
parents:
1779
diff
changeset
|
1175 |
/** Start/Stop a train. |
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:
3487
diff
changeset
|
1176 |
* @param tile unused |
6422
6679df1c05ba
(svn r9558) -Documentation: doxygen and comment changes: 'T' now. Almost done
belugas
parents:
6407
diff
changeset
|
1177 |
* @param flags type of operation |
1784
d0698aac0c2e
(svn r2288) - CodeChange: protected the next batch of commands (41 so far, out of 115).
Darkvater
parents:
1779
diff
changeset
|
1178 |
* @param p1 train to start/stop |
d0698aac0c2e
(svn r2288) - CodeChange: protected the next batch of commands (41 so far, out of 115).
Darkvater
parents:
1779
diff
changeset
|
1179 |
* @param p2 unused |
d0698aac0c2e
(svn r2288) - CodeChange: protected the next batch of commands (41 so far, out of 115).
Darkvater
parents:
1779
diff
changeset
|
1180 |
*/ |
6943
1914f26aee04
(svn r10197) -Codechange: replace int32 with CommandCost where appropriate.
rubidium
parents:
6924
diff
changeset
|
1181 |
CommandCost CmdStartStopTrain(TileIndex tile, uint32 flags, uint32 p1, uint32 p2) |
0 | 1182 |
{ |
4352
6703cd8d39e0
(svn r6053) -Codechange: renamed all IsXXXIndex to IsValidXXXID
truelight
parents:
4351
diff
changeset
|
1183 |
if (!IsValidVehicleID(p1)) return CMD_ERROR; |
1237
1c7a3f9c94b9
(svn r1741) - Fix: added IsVehicleIndex() so it's possible to protect GetVehicle() from reading an invalid vehicle index
bjarni
parents:
1236
diff
changeset
|
1184 |
|
6150 | 1185 |
Vehicle *v = GetVehicle(p1); |
0 | 1186 |
|
6259
471b91a4b1d8
(svn r9068) -Codechange: capitalize the VEH_Train etc. enums to match the coding style (and rest of the code).
rubidium
parents:
6248
diff
changeset
|
1187 |
if (v->type != VEH_TRAIN || !CheckOwnership(v->owner)) return CMD_ERROR; |
0 | 1188 |
|
4244
d40c73c55357
(svn r5822) - NewGRF: add support for callback 31, vehicle start/stop check. This allows a set to disallow a vehicle from being started, i.e. to not be able to leave the depot. This is almost a partner to callback 1D.
peter1138
parents:
4242
diff
changeset
|
1189 |
/* Check if this train can be started/stopped. The callback will fail or |
d40c73c55357
(svn r5822) - NewGRF: add support for callback 31, vehicle start/stop check. This allows a set to disallow a vehicle from being started, i.e. to not be able to leave the depot. This is almost a partner to callback 1D.
peter1138
parents:
4242
diff
changeset
|
1190 |
* return 0xFF if it can. */ |
6150 | 1191 |
uint16 callback = GetVehicleCallback(CBID_VEHICLE_START_STOP_CHECK, 0, 0, v->engine_type, v); |
4244
d40c73c55357
(svn r5822) - NewGRF: add support for callback 31, vehicle start/stop check. This allows a set to disallow a vehicle from being started, i.e. to not be able to leave the depot. This is almost a partner to callback 1D.
peter1138
parents:
4242
diff
changeset
|
1192 |
if (callback != CALLBACK_FAILED && callback != 0xFF) { |
d40c73c55357
(svn r5822) - NewGRF: add support for callback 31, vehicle start/stop check. This allows a set to disallow a vehicle from being started, i.e. to not be able to leave the depot. This is almost a partner to callback 1D.
peter1138
parents:
4242
diff
changeset
|
1193 |
StringID error = GetGRFStringID(GetEngineGRFID(v->engine_type), 0xD000 + callback); |
d40c73c55357
(svn r5822) - NewGRF: add support for callback 31, vehicle start/stop check. This allows a set to disallow a vehicle from being started, i.e. to not be able to leave the depot. This is almost a partner to callback 1D.
peter1138
parents:
4242
diff
changeset
|
1194 |
return_cmd_error(error); |
d40c73c55357
(svn r5822) - NewGRF: add support for callback 31, vehicle start/stop check. This allows a set to disallow a vehicle from being started, i.e. to not be able to leave the depot. This is almost a partner to callback 1D.
peter1138
parents:
4242
diff
changeset
|
1195 |
} |
d40c73c55357
(svn r5822) - NewGRF: add support for callback 31, vehicle start/stop check. This allows a set to disallow a vehicle from being started, i.e. to not be able to leave the depot. This is almost a partner to callback 1D.
peter1138
parents:
4242
diff
changeset
|
1196 |
|
4251
e8f69de723e1
(svn r5853) -Fix: [elrails] FS#178 Electric Trains can leave Conventional Depot
bjarni
parents:
4244
diff
changeset
|
1197 |
if (v->vehstatus & VS_STOPPED && v->u.rail.cached_power == 0) return_cmd_error(STR_TRAIN_START_NO_CATENARY); |
e8f69de723e1
(svn r5853) -Fix: [elrails] FS#178 Electric Trains can leave Conventional Depot
bjarni
parents:
4244
diff
changeset
|
1198 |
|
0 | 1199 |
if (flags & DC_EXEC) { |
5993
956d341d930e
(svn r8701) -Codechange: replace magic numbers with enums for u.rail.track.
rubidium
parents:
5992
diff
changeset
|
1200 |
if (v->vehstatus & VS_STOPPED && v->u.rail.track == TRACK_BIT_DEPOT) { |
3139
b17abef09e15
(svn r3757) -Feature: Delete news items about vehicles, when they get stale
tron
parents:
3022
diff
changeset
|
1201 |
DeleteVehicleNews(p1, STR_8814_TRAIN_IS_WAITING_IN_DEPOT); |
b17abef09e15
(svn r3757) -Feature: Delete news items about vehicles, when they get stale
tron
parents:
3022
diff
changeset
|
1202 |
} |
b17abef09e15
(svn r3757) -Feature: Delete news items about vehicles, when they get stale
tron
parents:
3022
diff
changeset
|
1203 |
|
0 | 1204 |
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:
744
diff
changeset
|
1205 |
InvalidateWindowWidget(WC_VEHICLE_VIEW, v->index, STATUS_BAR); |
0 | 1206 |
InvalidateWindow(WC_VEHICLE_DEPOT, v->tile); |
1207 |
} |
|
6950
14ecb0acdfb4
(svn r10205) -Codechange: refactor returning of cost, so it can be more easily modified.
rubidium
parents:
6943
diff
changeset
|
1208 |
return CommandCost(); |
0 | 1209 |
} |
1210 |
||
1784
d0698aac0c2e
(svn r2288) - CodeChange: protected the next batch of commands (41 so far, out of 115).
Darkvater
parents:
1779
diff
changeset
|
1211 |
/** Sell a (single) train wagon/engine. |
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:
3487
diff
changeset
|
1212 |
* @param tile unused |
6422
6679df1c05ba
(svn r9558) -Documentation: doxygen and comment changes: 'T' now. Almost done
belugas
parents:
6407
diff
changeset
|
1213 |
* @param flags type of operation |
1766
8cdb302ae946
(svn r2270) - Fix/Codechange: fix up selling rail vehicles. Try to be smart about it. When selling dual-headed trains, also sell the rear end; if the now-first wagon is an engine, make it a train. When selling the whole train, try to leave dual-headed setups intact
Darkvater
parents:
1758
diff
changeset
|
1214 |
* @param p1 the wagon/engine index |
8cdb302ae946
(svn r2270) - Fix/Codechange: fix up selling rail vehicles. Try to be smart about it. When selling dual-headed trains, also sell the rear end; if the now-first wagon is an engine, make it a train. When selling the whole train, try to leave dual-headed setups intact
Darkvater
parents:
1758
diff
changeset
|
1215 |
* @param p2 the selling mode |
1784
d0698aac0c2e
(svn r2288) - CodeChange: protected the next batch of commands (41 so far, out of 115).
Darkvater
parents:
1779
diff
changeset
|
1216 |
* - p2 = 0: only sell the single dragged wagon/engine (and any belonging rear-engines) |
d0698aac0c2e
(svn r2288) - CodeChange: protected the next batch of commands (41 so far, out of 115).
Darkvater
parents:
1779
diff
changeset
|
1217 |
* - p2 = 1: sell the vehicle and all vehicles following it in the chain |
d0698aac0c2e
(svn r2288) - CodeChange: protected the next batch of commands (41 so far, out of 115).
Darkvater
parents:
1779
diff
changeset
|
1218 |
if the wagon is dragged, don't delete the possibly belonging rear-engine to some front |
d0698aac0c2e
(svn r2288) - CodeChange: protected the next batch of commands (41 so far, out of 115).
Darkvater
parents:
1779
diff
changeset
|
1219 |
* - p2 = 2: when selling attached locos, rearrange all vehicles after it to separate lines; |
d0698aac0c2e
(svn r2288) - CodeChange: protected the next batch of commands (41 so far, out of 115).
Darkvater
parents:
1779
diff
changeset
|
1220 |
* all wagons of the same type will go on the same line. Used by the AI currently |
1766
8cdb302ae946
(svn r2270) - Fix/Codechange: fix up selling rail vehicles. Try to be smart about it. When selling dual-headed trains, also sell the rear end; if the now-first wagon is an engine, make it a train. When selling the whole train, try to leave dual-headed setups intact
Darkvater
parents:
1758
diff
changeset
|
1221 |
*/ |
6943
1914f26aee04
(svn r10197) -Codechange: replace int32 with CommandCost where appropriate.
rubidium
parents:
6924
diff
changeset
|
1222 |
CommandCost CmdSellRailWagon(TileIndex tile, uint32 flags, uint32 p1, uint32 p2) |
0 | 1223 |
{ |
6789
d32dd7c82158
(svn r10028) -Fix (r2270/r2951): When deleting the first engine of a train with multiple engines, only reopen the train window if the player had the original train window open. This fixes 'random' windows opening for multiple players of the same company.
peter1138
parents:
6788
diff
changeset
|
1224 |
/* Check if we deleted a vehicle window */ |
d32dd7c82158
(svn r10028) -Fix (r2270/r2951): When deleting the first engine of a train with multiple engines, only reopen the train window if the player had the original train window open. This fixes 'random' windows opening for multiple players of the same company.
peter1138
parents:
6788
diff
changeset
|
1225 |
Window *w = NULL; |
d32dd7c82158
(svn r10028) -Fix (r2270/r2951): When deleting the first engine of a train with multiple engines, only reopen the train window if the player had the original train window open. This fixes 'random' windows opening for multiple players of the same company.
peter1138
parents:
6788
diff
changeset
|
1226 |
|
4352
6703cd8d39e0
(svn r6053) -Codechange: renamed all IsXXXIndex to IsValidXXXID
truelight
parents:
4351
diff
changeset
|
1227 |
if (!IsValidVehicleID(p1) || p2 > 2) return CMD_ERROR; |
0 | 1228 |
|
6150 | 1229 |
Vehicle *v = GetVehicle(p1); |
0 | 1230 |
|
6259
471b91a4b1d8
(svn r9068) -Codechange: capitalize the VEH_Train etc. enums to match the coding style (and rest of the code).
rubidium
parents:
6248
diff
changeset
|
1231 |
if (v->type != VEH_TRAIN || !CheckOwnership(v->owner)) return CMD_ERROR; |
0 | 1232 |
|
7695
4b27fd86b318
(svn r11229) -Fix [FS#1307]: one could sell vehicles that were crashed in a depot, which would still yield money.
rubidium
parents:
7642
diff
changeset
|
1233 |
if (HASBITS(v->vehstatus, VS_CRASHED)) return_cmd_error(STR_CAN_T_SELL_DESTROYED_VEHICLE); |
4b27fd86b318
(svn r11229) -Fix [FS#1307]: one could sell vehicles that were crashed in a depot, which would still yield money.
rubidium
parents:
7642
diff
changeset
|
1234 |
|
1237
1c7a3f9c94b9
(svn r1741) - Fix: added IsVehicleIndex() so it's possible to protect GetVehicle() from reading an invalid vehicle index
bjarni
parents:
1236
diff
changeset
|
1235 |
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:
1236
diff
changeset
|
1236 |
|
7497
40e457c0a8ac
(svn r11011) -Fix [FS#1129]: GetFirstVehicleInChain did change the game state while being marked const.
rubidium
parents:
7493
diff
changeset
|
1237 |
while (IsArticulatedPart(v)) v = v->Previous(); |
40e457c0a8ac
(svn r11011) -Fix [FS#1129]: GetFirstVehicleInChain did change the game state while being marked const.
rubidium
parents:
7493
diff
changeset
|
1238 |
Vehicle *first = v->First(); |
193
0a7025304867
(svn r194) -Codechange: stripping trailing-spaces. Please keep this that way!
truelight
parents:
166
diff
changeset
|
1239 |
|
6422
6679df1c05ba
(svn r9558) -Documentation: doxygen and comment changes: 'T' now. Almost done
belugas
parents:
6407
diff
changeset
|
1240 |
/* make sure the vehicle is stopped in the depot */ |
3183
90c676e6a50d
(svn r3829) Reduce the use of _error_message by directly returning error codes instead of using this global variable
tron
parents:
3172
diff
changeset
|
1241 |
if (CheckTrainStoppedInDepot(first) < 0) { |
90c676e6a50d
(svn r3829) Reduce the use of _error_message by directly returning error codes instead of using this global variable
tron
parents:
3172
diff
changeset
|
1242 |
return_cmd_error(STR_881A_TRAINS_CAN_ONLY_BE_ALTERED); |
90c676e6a50d
(svn r3829) Reduce the use of _error_message by directly returning error codes instead of using this global variable
tron
parents:
3172
diff
changeset
|
1243 |
} |
0 | 1244 |
|
7526
27c4fbf8aef0
(svn r11045) -Codechange: added a function to tell if a vehicle is the rear part of a dualheaded train engine
bjarni
parents:
7502
diff
changeset
|
1245 |
if (IsRearDualheaded(v)) return_cmd_error(STR_REAR_ENGINE_FOLLOW_FRONT_ERROR); |
2676
59b65b4fb480
(svn r3218) -Feature: Multiheaded train engines will now stay in the same train
bjarni
parents:
2666
diff
changeset
|
1246 |
|
1842
fb9086b04740
(svn r2347) - Fix (regression): depot window did not get redrawn when a non-train-engine was sold.
Darkvater
parents:
1802
diff
changeset
|
1247 |
if (flags & DC_EXEC) { |
2676
59b65b4fb480
(svn r3218) -Feature: Multiheaded train engines will now stay in the same train
bjarni
parents:
2666
diff
changeset
|
1248 |
if (v == first && IsFrontEngine(first)) { |
6789
d32dd7c82158
(svn r10028) -Fix (r2270/r2951): When deleting the first engine of a train with multiple engines, only reopen the train window if the player had the original train window open. This fixes 'random' windows opening for multiple players of the same company.
peter1138
parents:
6788
diff
changeset
|
1249 |
w = FindWindowById(WC_VEHICLE_VIEW, first->index); |
d32dd7c82158
(svn r10028) -Fix (r2270/r2951): When deleting the first engine of a train with multiple engines, only reopen the train window if the player had the original train window open. This fixes 'random' windows opening for multiple players of the same company.
peter1138
parents:
6788
diff
changeset
|
1250 |
if (w != NULL) DeleteWindow(w); |
2618
9691753519ac
(svn r3156) -Fix: removed some cases where autoreplace windows were redrawn when nothing was changed
bjarni
parents:
2617
diff
changeset
|
1251 |
} |
0 | 1252 |
InvalidateWindow(WC_VEHICLE_DEPOT, first->tile); |
1779
25b3028dc97c
(svn r2283) - Fix (regression): [ 1197493 ] train_gui.c:1341: failed assertion ..., somehow RebuildVehicleList() got lost during the rewrite :P
Darkvater
parents:
1777
diff
changeset
|
1253 |
RebuildVehicleLists(); |
1766
8cdb302ae946
(svn r2270) - Fix/Codechange: fix up selling rail vehicles. Try to be smart about it. When selling dual-headed trains, also sell the rear end; if the now-first wagon is an engine, make it a train. When selling the whole train, try to leave dual-headed setups intact
Darkvater
parents:
1758
diff
changeset
|
1254 |
} |
8cdb302ae946
(svn r2270) - Fix/Codechange: fix up selling rail vehicles. Try to be smart about it. When selling dual-headed trains, also sell the rear end; if the now-first wagon is an engine, make it a train. When selling the whole train, try to leave dual-headed setups intact
Darkvater
parents:
1758
diff
changeset
|
1255 |
|
6950
14ecb0acdfb4
(svn r10205) -Codechange: refactor returning of cost, so it can be more easily modified.
rubidium
parents:
6943
diff
changeset
|
1256 |
CommandCost cost; |
1766
8cdb302ae946
(svn r2270) - Fix/Codechange: fix up selling rail vehicles. Try to be smart about it. When selling dual-headed trains, also sell the rear end; if the now-first wagon is an engine, make it a train. When selling the whole train, try to leave dual-headed setups intact
Darkvater
parents:
1758
diff
changeset
|
1257 |
switch (p2) { |
8cdb302ae946
(svn r2270) - Fix/Codechange: fix up selling rail vehicles. Try to be smart about it. When selling dual-headed trains, also sell the rear end; if the now-first wagon is an engine, make it a train. When selling the whole train, try to leave dual-headed setups intact
Darkvater
parents:
1758
diff
changeset
|
1258 |
case 0: case 2: { /* Delete given wagon */ |
8cdb302ae946
(svn r2270) - Fix/Codechange: fix up selling rail vehicles. Try to be smart about it. When selling dual-headed trains, also sell the rear end; if the now-first wagon is an engine, make it a train. When selling the whole train, try to leave dual-headed setups intact
Darkvater
parents:
1758
diff
changeset
|
1259 |
bool switch_engine = false; // update second wagon to engine? |
8cdb302ae946
(svn r2270) - Fix/Codechange: fix up selling rail vehicles. Try to be smart about it. When selling dual-headed trains, also sell the rear end; if the now-first wagon is an engine, make it a train. When selling the whole train, try to leave dual-headed setups intact
Darkvater
parents:
1758
diff
changeset
|
1260 |
byte ori_subtype = v->subtype; // backup subtype of deleted wagon in case DeleteVehicle() changes |
8cdb302ae946
(svn r2270) - Fix/Codechange: fix up selling rail vehicles. Try to be smart about it. When selling dual-headed trains, also sell the rear end; if the now-first wagon is an engine, make it a train. When selling the whole train, try to leave dual-headed setups intact
Darkvater
parents:
1758
diff
changeset
|
1261 |
|
8cdb302ae946
(svn r2270) - Fix/Codechange: fix up selling rail vehicles. Try to be smart about it. When selling dual-headed trains, also sell the rear end; if the now-first wagon is an engine, make it a train. When selling the whole train, try to leave dual-headed setups intact
Darkvater
parents:
1758
diff
changeset
|
1262 |
/* 1. Delete the engine, if it is dualheaded also delete the matching |
2676
59b65b4fb480
(svn r3218) -Feature: Multiheaded train engines will now stay in the same train
bjarni
parents:
2666
diff
changeset
|
1263 |
* rear engine of the loco (from the point of deletion onwards) */ |
59b65b4fb480
(svn r3218) -Feature: Multiheaded train engines will now stay in the same train
bjarni
parents:
2666
diff
changeset
|
1264 |
Vehicle *rear = (IsMultiheaded(v) && |
59b65b4fb480
(svn r3218) -Feature: Multiheaded train engines will now stay in the same train
bjarni
parents:
2666
diff
changeset
|
1265 |
IsTrainEngine(v)) ? v->u.rail.other_multiheaded_part : NULL; |
59b65b4fb480
(svn r3218) -Feature: Multiheaded train engines will now stay in the same train
bjarni
parents:
2666
diff
changeset
|
1266 |
|
1766
8cdb302ae946
(svn r2270) - Fix/Codechange: fix up selling rail vehicles. Try to be smart about it. When selling dual-headed trains, also sell the rear end; if the now-first wagon is an engine, make it a train. When selling the whole train, try to leave dual-headed setups intact
Darkvater
parents:
1758
diff
changeset
|
1267 |
if (rear != NULL) { |
6990
136a08baf0ed
(svn r10246) -Fix (r10297): some forgotten money conversions and truncation issues. Thanks to benc for providing the patch.
rubidium
parents:
6980
diff
changeset
|
1268 |
cost.AddCost(-rear->value); |
1766
8cdb302ae946
(svn r2270) - Fix/Codechange: fix up selling rail vehicles. Try to be smart about it. When selling dual-headed trains, also sell the rear end; if the now-first wagon is an engine, make it a train. When selling the whole train, try to leave dual-headed setups intact
Darkvater
parents:
1758
diff
changeset
|
1269 |
if (flags & DC_EXEC) { |
2676
59b65b4fb480
(svn r3218) -Feature: Multiheaded train engines will now stay in the same train
bjarni
parents:
2666
diff
changeset
|
1270 |
UnlinkWagon(rear, first); |
5256
9056fd4b30f4
(svn r7386) -Codechange r7385: moved deletion of the vehicle highlight from DeleteVehicle to the sell commands as they are not called as often
bjarni
parents:
5252
diff
changeset
|
1271 |
DeleteDepotHighlightOfVehicle(rear); |
7398
b933416cf32b
(svn r10770) -Codechange: use the pool item class as super class for the vehicle struct.
rubidium
parents:
7371
diff
changeset
|
1272 |
delete rear; |
0 | 1273 |
} |
1274 |
} |
|
1766
8cdb302ae946
(svn r2270) - Fix/Codechange: fix up selling rail vehicles. Try to be smart about it. When selling dual-headed trains, also sell the rear end; if the now-first wagon is an engine, make it a train. When selling the whole train, try to leave dual-headed setups intact
Darkvater
parents:
1758
diff
changeset
|
1275 |
|
8cdb302ae946
(svn r2270) - Fix/Codechange: fix up selling rail vehicles. Try to be smart about it. When selling dual-headed trains, also sell the rear end; if the now-first wagon is an engine, make it a train. When selling the whole train, try to leave dual-headed setups intact
Darkvater
parents:
1758
diff
changeset
|
1276 |
/* 2. We are selling the first engine, some special action might be required |
2676
59b65b4fb480
(svn r3218) -Feature: Multiheaded train engines will now stay in the same train
bjarni
parents:
2666
diff
changeset
|
1277 |
* here, so take attention */ |
1770
18491bba9211
(svn r2274) - Codechange: some comments, parentheses and EngineID typedef for engine_type
Darkvater
parents:
1766
diff
changeset
|
1278 |
if ((flags & DC_EXEC) && v == first) { |
6150 | 1279 |
Vehicle *new_f = GetNextVehicle(first); |
1766
8cdb302ae946
(svn r2270) - Fix/Codechange: fix up selling rail vehicles. Try to be smart about it. When selling dual-headed trains, also sell the rear end; if the now-first wagon is an engine, make it a train. When selling the whole train, try to leave dual-headed setups intact
Darkvater
parents:
1758
diff
changeset
|
1280 |
|
8cdb302ae946
(svn r2270) - Fix/Codechange: fix up selling rail vehicles. Try to be smart about it. When selling dual-headed trains, also sell the rear end; if the now-first wagon is an engine, make it a train. When selling the whole train, try to leave dual-headed setups intact
Darkvater
parents:
1758
diff
changeset
|
1281 |
/* 2.2 If there are wagons present after the deleted front engine, check |
6322
62c0c7a59e3c
(svn r9277) -Fix [FS#685]: shared orders got messed up when the 'first' trains got removed in the depot.
rubidium
parents:
6316
diff
changeset
|
1282 |
* if the second wagon (which will be first) is an engine. If it is one, |
62c0c7a59e3c
(svn r9277) -Fix [FS#685]: shared orders got messed up when the 'first' trains got removed in the depot.
rubidium
parents:
6316
diff
changeset
|
1283 |
* promote it as a new train, retaining the unitnumber, orders */ |
62c0c7a59e3c
(svn r9277) -Fix [FS#685]: shared orders got messed up when the 'first' trains got removed in the depot.
rubidium
parents:
6316
diff
changeset
|
1284 |
if (new_f != NULL && IsTrainEngine(new_f)) { |
62c0c7a59e3c
(svn r9277) -Fix [FS#685]: shared orders got messed up when the 'first' trains got removed in the depot.
rubidium
parents:
6316
diff
changeset
|
1285 |
switch_engine = true; |
62c0c7a59e3c
(svn r9277) -Fix [FS#685]: shared orders got messed up when the 'first' trains got removed in the depot.
rubidium
parents:
6316
diff
changeset
|
1286 |
/* Copy important data from the front engine */ |
62c0c7a59e3c
(svn r9277) -Fix [FS#685]: shared orders got messed up when the 'first' trains got removed in the depot.
rubidium
parents:
6316
diff
changeset
|
1287 |
new_f->unitnumber = first->unitnumber; |
62c0c7a59e3c
(svn r9277) -Fix [FS#685]: shared orders got messed up when the 'first' trains got removed in the depot.
rubidium
parents:
6316
diff
changeset
|
1288 |
new_f->current_order = first->current_order; |
62c0c7a59e3c
(svn r9277) -Fix [FS#685]: shared orders got messed up when the 'first' trains got removed in the depot.
rubidium
parents:
6316
diff
changeset
|
1289 |
new_f->cur_order_index = first->cur_order_index; |
62c0c7a59e3c
(svn r9277) -Fix [FS#685]: shared orders got messed up when the 'first' trains got removed in the depot.
rubidium
parents:
6316
diff
changeset
|
1290 |
new_f->orders = first->orders; |
62c0c7a59e3c
(svn r9277) -Fix [FS#685]: shared orders got messed up when the 'first' trains got removed in the depot.
rubidium
parents:
6316
diff
changeset
|
1291 |
new_f->num_orders = first->num_orders; |
7529
ca42b9956322
(svn r11048) -Fix [FS#1206]: several cases where (re)moving eninges on a train would corrupt the vehicle counts for the groups.
rubidium
parents:
7526
diff
changeset
|
1292 |
new_f->group_id = first->group_id; |
6322
62c0c7a59e3c
(svn r9277) -Fix [FS#685]: shared orders got messed up when the 'first' trains got removed in the depot.
rubidium
parents:
6316
diff
changeset
|
1293 |
|
62c0c7a59e3c
(svn r9277) -Fix [FS#685]: shared orders got messed up when the 'first' trains got removed in the depot.
rubidium
parents:
6316
diff
changeset
|
1294 |
if (first->prev_shared != NULL) { |
62c0c7a59e3c
(svn r9277) -Fix [FS#685]: shared orders got messed up when the 'first' trains got removed in the depot.
rubidium
parents:
6316
diff
changeset
|
1295 |
first->prev_shared->next_shared = new_f; |
62c0c7a59e3c
(svn r9277) -Fix [FS#685]: shared orders got messed up when the 'first' trains got removed in the depot.
rubidium
parents:
6316
diff
changeset
|
1296 |
new_f->prev_shared = first->prev_shared; |
1766
8cdb302ae946
(svn r2270) - Fix/Codechange: fix up selling rail vehicles. Try to be smart about it. When selling dual-headed trains, also sell the rear end; if the now-first wagon is an engine, make it a train. When selling the whole train, try to leave dual-headed setups intact
Darkvater
parents:
1758
diff
changeset
|
1297 |
} |
6322
62c0c7a59e3c
(svn r9277) -Fix [FS#685]: shared orders got messed up when the 'first' trains got removed in the depot.
rubidium
parents:
6316
diff
changeset
|
1298 |
|
62c0c7a59e3c
(svn r9277) -Fix [FS#685]: shared orders got messed up when the 'first' trains got removed in the depot.
rubidium
parents:
6316
diff
changeset
|
1299 |
if (first->next_shared != NULL) { |
62c0c7a59e3c
(svn r9277) -Fix [FS#685]: shared orders got messed up when the 'first' trains got removed in the depot.
rubidium
parents:
6316
diff
changeset
|
1300 |
first->next_shared->prev_shared = new_f; |
62c0c7a59e3c
(svn r9277) -Fix [FS#685]: shared orders got messed up when the 'first' trains got removed in the depot.
rubidium
parents:
6316
diff
changeset
|
1301 |
new_f->next_shared = first->next_shared; |
62c0c7a59e3c
(svn r9277) -Fix [FS#685]: shared orders got messed up when the 'first' trains got removed in the depot.
rubidium
parents:
6316
diff
changeset
|
1302 |
} |
62c0c7a59e3c
(svn r9277) -Fix [FS#685]: shared orders got messed up when the 'first' trains got removed in the depot.
rubidium
parents:
6316
diff
changeset
|
1303 |
|
62c0c7a59e3c
(svn r9277) -Fix [FS#685]: shared orders got messed up when the 'first' trains got removed in the depot.
rubidium
parents:
6316
diff
changeset
|
1304 |
/* |
62c0c7a59e3c
(svn r9277) -Fix [FS#685]: shared orders got messed up when the 'first' trains got removed in the depot.
rubidium
parents:
6316
diff
changeset
|
1305 |
* Remove all order information from the front train, to |
62c0c7a59e3c
(svn r9277) -Fix [FS#685]: shared orders got messed up when the 'first' trains got removed in the depot.
rubidium
parents:
6316
diff
changeset
|
1306 |
* prevent the order and the shared order list to be |
62c0c7a59e3c
(svn r9277) -Fix [FS#685]: shared orders got messed up when the 'first' trains got removed in the depot.
rubidium
parents:
6316
diff
changeset
|
1307 |
* destroyed by Destroy/DeleteVehicle. |
62c0c7a59e3c
(svn r9277) -Fix [FS#685]: shared orders got messed up when the 'first' trains got removed in the depot.
rubidium
parents:
6316
diff
changeset
|
1308 |
*/ |
62c0c7a59e3c
(svn r9277) -Fix [FS#685]: shared orders got messed up when the 'first' trains got removed in the depot.
rubidium
parents:
6316
diff
changeset
|
1309 |
first->orders = NULL; |
62c0c7a59e3c
(svn r9277) -Fix [FS#685]: shared orders got messed up when the 'first' trains got removed in the depot.
rubidium
parents:
6316
diff
changeset
|
1310 |
first->prev_shared = NULL; |
62c0c7a59e3c
(svn r9277) -Fix [FS#685]: shared orders got messed up when the 'first' trains got removed in the depot.
rubidium
parents:
6316
diff
changeset
|
1311 |
first->next_shared = NULL; |
7529
ca42b9956322
(svn r11048) -Fix [FS#1206]: several cases where (re)moving eninges on a train would corrupt the vehicle counts for the groups.
rubidium
parents:
7526
diff
changeset
|
1312 |
first->group_id = DEFAULT_GROUP; |
6322
62c0c7a59e3c
(svn r9277) -Fix [FS#685]: shared orders got messed up when the 'first' trains got removed in the depot.
rubidium
parents:
6316
diff
changeset
|
1313 |
|
6789
d32dd7c82158
(svn r10028) -Fix (r2270/r2951): When deleting the first engine of a train with multiple engines, only reopen the train window if the player had the original train window open. This fixes 'random' windows opening for multiple players of the same company.
peter1138
parents:
6788
diff
changeset
|
1314 |
/* If we deleted a window then open a new one for the 'new' train */ |
7486
bf6a94009823
(svn r10997) -Codechange: unify the vehicle view window. Patch by PhilSophus.
rubidium
parents:
7477
diff
changeset
|
1315 |
if (IsLocalPlayer() && w != NULL) ShowVehicleViewWindow(new_f); |
1766
8cdb302ae946
(svn r2270) - Fix/Codechange: fix up selling rail vehicles. Try to be smart about it. When selling dual-headed trains, also sell the rear end; if the now-first wagon is an engine, make it a train. When selling the whole train, try to leave dual-headed setups intact
Darkvater
parents:
1758
diff
changeset
|
1316 |
} |
8cdb302ae946
(svn r2270) - Fix/Codechange: fix up selling rail vehicles. Try to be smart about it. When selling dual-headed trains, also sell the rear end; if the now-first wagon is an engine, make it a train. When selling the whole train, try to leave dual-headed setups intact
Darkvater
parents:
1758
diff
changeset
|
1317 |
} |
8cdb302ae946
(svn r2270) - Fix/Codechange: fix up selling rail vehicles. Try to be smart about it. When selling dual-headed trains, also sell the rear end; if the now-first wagon is an engine, make it a train. When selling the whole train, try to leave dual-headed setups intact
Darkvater
parents:
1758
diff
changeset
|
1318 |
|
8cdb302ae946
(svn r2270) - Fix/Codechange: fix up selling rail vehicles. Try to be smart about it. When selling dual-headed trains, also sell the rear end; if the now-first wagon is an engine, make it a train. When selling the whole train, try to leave dual-headed setups intact
Darkvater
parents:
1758
diff
changeset
|
1319 |
/* 3. Delete the requested wagon */ |
6950
14ecb0acdfb4
(svn r10205) -Codechange: refactor returning of cost, so it can be more easily modified.
rubidium
parents:
6943
diff
changeset
|
1320 |
cost.AddCost(-v->value); |
1766
8cdb302ae946
(svn r2270) - Fix/Codechange: fix up selling rail vehicles. Try to be smart about it. When selling dual-headed trains, also sell the rear end; if the now-first wagon is an engine, make it a train. When selling the whole train, try to leave dual-headed setups intact
Darkvater
parents:
1758
diff
changeset
|
1321 |
if (flags & DC_EXEC) { |
8cdb302ae946
(svn r2270) - Fix/Codechange: fix up selling rail vehicles. Try to be smart about it. When selling dual-headed trains, also sell the rear end; if the now-first wagon is an engine, make it a train. When selling the whole train, try to leave dual-headed setups intact
Darkvater
parents:
1758
diff
changeset
|
1322 |
first = UnlinkWagon(v, first); |
5256
9056fd4b30f4
(svn r7386) -Codechange r7385: moved deletion of the vehicle highlight from DeleteVehicle to the sell commands as they are not called as often
bjarni
parents:
5252
diff
changeset
|
1323 |
DeleteDepotHighlightOfVehicle(v); |
7398
b933416cf32b
(svn r10770) -Codechange: use the pool item class as super class for the vehicle struct.
rubidium
parents:
7371
diff
changeset
|
1324 |
delete v; |
1766
8cdb302ae946
(svn r2270) - Fix/Codechange: fix up selling rail vehicles. Try to be smart about it. When selling dual-headed trains, also sell the rear end; if the now-first wagon is an engine, make it a train. When selling the whole train, try to leave dual-headed setups intact
Darkvater
parents:
1758
diff
changeset
|
1325 |
|
8cdb302ae946
(svn r2270) - Fix/Codechange: fix up selling rail vehicles. Try to be smart about it. When selling dual-headed trains, also sell the rear end; if the now-first wagon is an engine, make it a train. When selling the whole train, try to leave dual-headed setups intact
Darkvater
parents:
1758
diff
changeset
|
1326 |
/* 4 If the second wagon was an engine, update it to front_engine |
8cdb302ae946
(svn r2270) - Fix/Codechange: fix up selling rail vehicles. Try to be smart about it. When selling dual-headed trains, also sell the rear end; if the now-first wagon is an engine, make it a train. When selling the whole train, try to leave dual-headed setups intact
Darkvater
parents:
1758
diff
changeset
|
1327 |
* which UnlinkWagon() has changed to TS_Free_Car */ |
2676
59b65b4fb480
(svn r3218) -Feature: Multiheaded train engines will now stay in the same train
bjarni
parents:
2666
diff
changeset
|
1328 |
if (switch_engine) SetFrontEngine(first); |
1766
8cdb302ae946
(svn r2270) - Fix/Codechange: fix up selling rail vehicles. Try to be smart about it. When selling dual-headed trains, also sell the rear end; if the now-first wagon is an engine, make it a train. When selling the whole train, try to leave dual-headed setups intact
Darkvater
parents:
1758
diff
changeset
|
1329 |
|
8cdb302ae946
(svn r2270) - Fix/Codechange: fix up selling rail vehicles. Try to be smart about it. When selling dual-headed trains, also sell the rear end; if the now-first wagon is an engine, make it a train. When selling the whole train, try to leave dual-headed setups intact
Darkvater
parents:
1758
diff
changeset
|
1330 |
/* 5. If the train still exists, update its acceleration, window, etc. */ |
1917
03e113481a62
(svn r2423) - CodeChange: Include first_engine in the train cache, instead of calculating it all over the place.
hackykid
parents:
1909
diff
changeset
|
1331 |
if (first != NULL) { |
2676
59b65b4fb480
(svn r3218) -Feature: Multiheaded train engines will now stay in the same train
bjarni
parents:
2666
diff
changeset
|
1332 |
NormaliseTrainConsist(first); |
1905
c53f8d71f9b6
(svn r2411) - Codechange: Have trains cache stuff like consist power/weight/max speed instead of recalculating it each time.
hackykid
parents:
1901
diff
changeset
|
1333 |
TrainConsistChanged(first); |
6643
f81bee57bc09
(svn r9874) -Feature: advanced vehicle lists a.k.a. group interface. Now you can make groups of vehicles and perform all kinds of tasks on that given group. Original code by nycom and graphics by skidd13.
rubidium
parents:
6608
diff
changeset
|
1334 |
UpdateTrainGroupID(first); |
2676
59b65b4fb480
(svn r3218) -Feature: Multiheaded train engines will now stay in the same train
bjarni
parents:
2666
diff
changeset
|
1335 |
if (IsFrontEngine(first)) { |
1917
03e113481a62
(svn r2423) - CodeChange: Include first_engine in the train cache, instead of calculating it all over the place.
hackykid
parents:
1909
diff
changeset
|
1336 |
InvalidateWindow(WC_VEHICLE_DETAILS, first->index); |
03e113481a62
(svn r2423) - CodeChange: Include first_engine in the train cache, instead of calculating it all over the place.
hackykid
parents:
1909
diff
changeset
|
1337 |
InvalidateWindow(WC_VEHICLE_REFIT, first->index); |
03e113481a62
(svn r2423) - CodeChange: Include first_engine in the train cache, instead of calculating it all over the place.
hackykid
parents:
1909
diff
changeset
|
1338 |
UpdateTrainAcceleration(first); |
03e113481a62
(svn r2423) - CodeChange: Include first_engine in the train cache, instead of calculating it all over the place.
hackykid
parents:
1909
diff
changeset
|
1339 |
} |
1766
8cdb302ae946
(svn r2270) - Fix/Codechange: fix up selling rail vehicles. Try to be smart about it. When selling dual-headed trains, also sell the rear end; if the now-first wagon is an engine, make it a train. When selling the whole train, try to leave dual-headed setups intact
Darkvater
parents:
1758
diff
changeset
|
1340 |
} |
8cdb302ae946
(svn r2270) - Fix/Codechange: fix up selling rail vehicles. Try to be smart about it. When selling dual-headed trains, also sell the rear end; if the now-first wagon is an engine, make it a train. When selling the whole train, try to leave dual-headed setups intact
Darkvater
parents:
1758
diff
changeset
|
1341 |
|
8cdb302ae946
(svn r2270) - Fix/Codechange: fix up selling rail vehicles. Try to be smart about it. When selling dual-headed trains, also sell the rear end; if the now-first wagon is an engine, make it a train. When selling the whole train, try to leave dual-headed setups intact
Darkvater
parents:
1758
diff
changeset
|
1342 |
|
8cdb302ae946
(svn r2270) - Fix/Codechange: fix up selling rail vehicles. Try to be smart about it. When selling dual-headed trains, also sell the rear end; if the now-first wagon is an engine, make it a train. When selling the whole train, try to leave dual-headed setups intact
Darkvater
parents:
1758
diff
changeset
|
1343 |
/* (6.) Borked AI. If it sells an engine it expects all wagons lined |
2676
59b65b4fb480
(svn r3218) -Feature: Multiheaded train engines will now stay in the same train
bjarni
parents:
2666
diff
changeset
|
1344 |
* up on a new line to be added to the newly built loco. Replace it is. |
59b65b4fb480
(svn r3218) -Feature: Multiheaded train engines will now stay in the same train
bjarni
parents:
2666
diff
changeset
|
1345 |
* Totally braindead cause building a new engine adds all loco-less |
59b65b4fb480
(svn r3218) -Feature: Multiheaded train engines will now stay in the same train
bjarni
parents:
2666
diff
changeset
|
1346 |
* engines to its train anyways */ |
7928
63e18de69e50
(svn r11481) -Codechange: Rename the HASBIT function to fit with the naming style
skidd13
parents:
7923
diff
changeset
|
1347 |
if (p2 == 2 && HasBit(ori_subtype, Train_Front)) { |
6150 | 1348 |
Vehicle *tmp; |
1766
8cdb302ae946
(svn r2270) - Fix/Codechange: fix up selling rail vehicles. Try to be smart about it. When selling dual-headed trains, also sell the rear end; if the now-first wagon is an engine, make it a train. When selling the whole train, try to leave dual-headed setups intact
Darkvater
parents:
1758
diff
changeset
|
1349 |
for (v = first; v != NULL; v = tmp) { |
2602
1a6561c9a408
(svn r3139) -NewGRF, Feature: support for articulated rail vehicles. This is used, for example, by coal tenders.
peter1138
parents:
2599
diff
changeset
|
1350 |
tmp = GetNextVehicle(v); |
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:
3487
diff
changeset
|
1351 |
DoCommand(v->tile, v->index | INVALID_VEHICLE << 16, 0, DC_EXEC, CMD_MOVE_RAIL_VEHICLE); |
1766
8cdb302ae946
(svn r2270) - Fix/Codechange: fix up selling rail vehicles. Try to be smart about it. When selling dual-headed trains, also sell the rear end; if the now-first wagon is an engine, make it a train. When selling the whole train, try to leave dual-headed setups intact
Darkvater
parents:
1758
diff
changeset
|
1352 |
} |
8cdb302ae946
(svn r2270) - Fix/Codechange: fix up selling rail vehicles. Try to be smart about it. When selling dual-headed trains, also sell the rear end; if the now-first wagon is an engine, make it a train. When selling the whole train, try to leave dual-headed setups intact
Darkvater
parents:
1758
diff
changeset
|
1353 |
} |
8cdb302ae946
(svn r2270) - Fix/Codechange: fix up selling rail vehicles. Try to be smart about it. When selling dual-headed trains, also sell the rear end; if the now-first wagon is an engine, make it a train. When selling the whole train, try to leave dual-headed setups intact
Darkvater
parents:
1758
diff
changeset
|
1354 |
} |
8cdb302ae946
(svn r2270) - Fix/Codechange: fix up selling rail vehicles. Try to be smart about it. When selling dual-headed trains, also sell the rear end; if the now-first wagon is an engine, make it a train. When selling the whole train, try to leave dual-headed setups intact
Darkvater
parents:
1758
diff
changeset
|
1355 |
} break; |
8cdb302ae946
(svn r2270) - Fix/Codechange: fix up selling rail vehicles. Try to be smart about it. When selling dual-headed trains, also sell the rear end; if the now-first wagon is an engine, make it a train. When selling the whole train, try to leave dual-headed setups intact
Darkvater
parents:
1758
diff
changeset
|
1356 |
case 1: { /* Delete wagon and all wagons after it given certain criteria */ |
2676
59b65b4fb480
(svn r3218) -Feature: Multiheaded train engines will now stay in the same train
bjarni
parents:
2666
diff
changeset
|
1357 |
/* Start deleting every vehicle after the selected one |
59b65b4fb480
(svn r3218) -Feature: Multiheaded train engines will now stay in the same train
bjarni
parents:
2666
diff
changeset
|
1358 |
* If we encounter a matching rear-engine to a front-engine |
59b65b4fb480
(svn r3218) -Feature: Multiheaded train engines will now stay in the same train
bjarni
parents:
2666
diff
changeset
|
1359 |
* earlier in the chain (before deletion), leave it alone */ |
6150 | 1360 |
Vehicle *tmp; |
1766
8cdb302ae946
(svn r2270) - Fix/Codechange: fix up selling rail vehicles. Try to be smart about it. When selling dual-headed trains, also sell the rear end; if the now-first wagon is an engine, make it a train. When selling the whole train, try to leave dual-headed setups intact
Darkvater
parents:
1758
diff
changeset
|
1361 |
for (; v != NULL; v = tmp) { |
2602
1a6561c9a408
(svn r3139) -NewGRF, Feature: support for articulated rail vehicles. This is used, for example, by coal tenders.
peter1138
parents:
2599
diff
changeset
|
1362 |
tmp = GetNextVehicle(v); |
1766
8cdb302ae946
(svn r2270) - Fix/Codechange: fix up selling rail vehicles. Try to be smart about it. When selling dual-headed trains, also sell the rear end; if the now-first wagon is an engine, make it a train. When selling the whole train, try to leave dual-headed setups intact
Darkvater
parents:
1758
diff
changeset
|
1363 |
|
2676
59b65b4fb480
(svn r3218) -Feature: Multiheaded train engines will now stay in the same train
bjarni
parents:
2666
diff
changeset
|
1364 |
if (IsMultiheaded(v)) { |
59b65b4fb480
(svn r3218) -Feature: Multiheaded train engines will now stay in the same train
bjarni
parents:
2666
diff
changeset
|
1365 |
if (IsTrainEngine(v)) { |
59b65b4fb480
(svn r3218) -Feature: Multiheaded train engines will now stay in the same train
bjarni
parents:
2666
diff
changeset
|
1366 |
/* We got a front engine of a multiheaded set. Now we will sell the rear end too */ |
59b65b4fb480
(svn r3218) -Feature: Multiheaded train engines will now stay in the same train
bjarni
parents:
2666
diff
changeset
|
1367 |
Vehicle *rear = v->u.rail.other_multiheaded_part; |
59b65b4fb480
(svn r3218) -Feature: Multiheaded train engines will now stay in the same train
bjarni
parents:
2666
diff
changeset
|
1368 |
|
59b65b4fb480
(svn r3218) -Feature: Multiheaded train engines will now stay in the same train
bjarni
parents:
2666
diff
changeset
|
1369 |
if (rear != NULL) { |
6950
14ecb0acdfb4
(svn r10205) -Codechange: refactor returning of cost, so it can be more easily modified.
rubidium
parents:
6943
diff
changeset
|
1370 |
cost.AddCost(-rear->value); |
6785
b0ba7d1b9096
(svn r10023) -Fix (r3218): When selling trains, if there were no wagons between multiheaded
maedhros
parents:
6784
diff
changeset
|
1371 |
|
b0ba7d1b9096
(svn r10023) -Fix (r3218): When selling trains, if there were no wagons between multiheaded
maedhros
parents:
6784
diff
changeset
|
1372 |
/* If this is a multiheaded vehicle with nothing |
b0ba7d1b9096
(svn r10023) -Fix (r3218): When selling trains, if there were no wagons between multiheaded
maedhros
parents:
6784
diff
changeset
|
1373 |
* between the parts, tmp will be pointing to the |
b0ba7d1b9096
(svn r10023) -Fix (r3218): When selling trains, if there were no wagons between multiheaded
maedhros
parents:
6784
diff
changeset
|
1374 |
* rear part, which is unlinked from the train and |
b0ba7d1b9096
(svn r10023) -Fix (r3218): When selling trains, if there were no wagons between multiheaded
maedhros
parents:
6784
diff
changeset
|
1375 |
* deleted here. However, because tmp has already |
b0ba7d1b9096
(svn r10023) -Fix (r3218): When selling trains, if there were no wagons between multiheaded
maedhros
parents:
6784
diff
changeset
|
1376 |
* been set it needs to be updated now so that the |
b0ba7d1b9096
(svn r10023) -Fix (r3218): When selling trains, if there were no wagons between multiheaded
maedhros
parents:
6784
diff
changeset
|
1377 |
* loop never sees the rear part. */ |
b0ba7d1b9096
(svn r10023) -Fix (r3218): When selling trains, if there were no wagons between multiheaded
maedhros
parents:
6784
diff
changeset
|
1378 |
if (tmp == rear) tmp = GetNextVehicle(tmp); |
b0ba7d1b9096
(svn r10023) -Fix (r3218): When selling trains, if there were no wagons between multiheaded
maedhros
parents:
6784
diff
changeset
|
1379 |
|
2676
59b65b4fb480
(svn r3218) -Feature: Multiheaded train engines will now stay in the same train
bjarni
parents:
2666
diff
changeset
|
1380 |
if (flags & DC_EXEC) { |
59b65b4fb480
(svn r3218) -Feature: Multiheaded train engines will now stay in the same train
bjarni
parents:
2666
diff
changeset
|
1381 |
first = UnlinkWagon(rear, first); |
5256
9056fd4b30f4
(svn r7386) -Codechange r7385: moved deletion of the vehicle highlight from DeleteVehicle to the sell commands as they are not called as often
bjarni
parents:
5252
diff
changeset
|
1382 |
DeleteDepotHighlightOfVehicle(rear); |
7398
b933416cf32b
(svn r10770) -Codechange: use the pool item class as super class for the vehicle struct.
rubidium
parents:
7371
diff
changeset
|
1383 |
delete rear; |
2676
59b65b4fb480
(svn r3218) -Feature: Multiheaded train engines will now stay in the same train
bjarni
parents:
2666
diff
changeset
|
1384 |
} |
59b65b4fb480
(svn r3218) -Feature: Multiheaded train engines will now stay in the same train
bjarni
parents:
2666
diff
changeset
|
1385 |
} |
59b65b4fb480
(svn r3218) -Feature: Multiheaded train engines will now stay in the same train
bjarni
parents:
2666
diff
changeset
|
1386 |
} else if (v->u.rail.other_multiheaded_part != NULL) { |
59b65b4fb480
(svn r3218) -Feature: Multiheaded train engines will now stay in the same train
bjarni
parents:
2666
diff
changeset
|
1387 |
/* The front to this engine is earlier in this train. Do nothing */ |
2549 | 1388 |
continue; |
1389 |
} |
|
1766
8cdb302ae946
(svn r2270) - Fix/Codechange: fix up selling rail vehicles. Try to be smart about it. When selling dual-headed trains, also sell the rear end; if the now-first wagon is an engine, make it a train. When selling the whole train, try to leave dual-headed setups intact
Darkvater
parents:
1758
diff
changeset
|
1390 |
} |
8cdb302ae946
(svn r2270) - Fix/Codechange: fix up selling rail vehicles. Try to be smart about it. When selling dual-headed trains, also sell the rear end; if the now-first wagon is an engine, make it a train. When selling the whole train, try to leave dual-headed setups intact
Darkvater
parents:
1758
diff
changeset
|
1391 |
|
6950
14ecb0acdfb4
(svn r10205) -Codechange: refactor returning of cost, so it can be more easily modified.
rubidium
parents:
6943
diff
changeset
|
1392 |
cost.AddCost(-v->value); |
1766
8cdb302ae946
(svn r2270) - Fix/Codechange: fix up selling rail vehicles. Try to be smart about it. When selling dual-headed trains, also sell the rear end; if the now-first wagon is an engine, make it a train. When selling the whole train, try to leave dual-headed setups intact
Darkvater
parents:
1758
diff
changeset
|
1393 |
if (flags & DC_EXEC) { |
8cdb302ae946
(svn r2270) - Fix/Codechange: fix up selling rail vehicles. Try to be smart about it. When selling dual-headed trains, also sell the rear end; if the now-first wagon is an engine, make it a train. When selling the whole train, try to leave dual-headed setups intact
Darkvater
parents:
1758
diff
changeset
|
1394 |
first = UnlinkWagon(v, first); |
5256
9056fd4b30f4
(svn r7386) -Codechange r7385: moved deletion of the vehicle highlight from DeleteVehicle to the sell commands as they are not called as often
bjarni
parents:
5252
diff
changeset
|
1395 |
DeleteDepotHighlightOfVehicle(v); |
7398
b933416cf32b
(svn r10770) -Codechange: use the pool item class as super class for the vehicle struct.
rubidium
parents:
7371
diff
changeset
|
1396 |
delete v; |
1766
8cdb302ae946
(svn r2270) - Fix/Codechange: fix up selling rail vehicles. Try to be smart about it. When selling dual-headed trains, also sell the rear end; if the now-first wagon is an engine, make it a train. When selling the whole train, try to leave dual-headed setups intact
Darkvater
parents:
1758
diff
changeset
|
1397 |
} |
8cdb302ae946
(svn r2270) - Fix/Codechange: fix up selling rail vehicles. Try to be smart about it. When selling dual-headed trains, also sell the rear end; if the now-first wagon is an engine, make it a train. When selling the whole train, try to leave dual-headed setups intact
Darkvater
parents:
1758
diff
changeset
|
1398 |
} |
8cdb302ae946
(svn r2270) - Fix/Codechange: fix up selling rail vehicles. Try to be smart about it. When selling dual-headed trains, also sell the rear end; if the now-first wagon is an engine, make it a train. When selling the whole train, try to leave dual-headed setups intact
Darkvater
parents:
1758
diff
changeset
|
1399 |
|
1905
c53f8d71f9b6
(svn r2411) - Codechange: Have trains cache stuff like consist power/weight/max speed instead of recalculating it each time.
hackykid
parents:
1901
diff
changeset
|
1400 |
/* 3. If it is still a valid train after selling, update its acceleration and cached values */ |
3017
a75caf4efa2d
(svn r3597) Miscellaneous (I like that word) changes: Fix some indentation, add consts, reduce indentation level by short-circuit logic, convert if cascades to switch, whitespace, bracing, plus some minor stuff
tron
parents:
3008
diff
changeset
|
1401 |
if (flags & DC_EXEC && first != NULL) { |
2676
59b65b4fb480
(svn r3218) -Feature: Multiheaded train engines will now stay in the same train
bjarni
parents:
2666
diff
changeset
|
1402 |
NormaliseTrainConsist(first); |
1905
c53f8d71f9b6
(svn r2411) - Codechange: Have trains cache stuff like consist power/weight/max speed instead of recalculating it each time.
hackykid
parents:
1901
diff
changeset
|
1403 |
TrainConsistChanged(first); |
6643
f81bee57bc09
(svn r9874) -Feature: advanced vehicle lists a.k.a. group interface. Now you can make groups of vehicles and perform all kinds of tasks on that given group. Original code by nycom and graphics by skidd13.
rubidium
parents:
6608
diff
changeset
|
1404 |
UpdateTrainGroupID(first); |
3017
a75caf4efa2d
(svn r3597) Miscellaneous (I like that word) changes: Fix some indentation, add consts, reduce indentation level by short-circuit logic, convert if cascades to switch, whitespace, bracing, plus some minor stuff
tron
parents:
3008
diff
changeset
|
1405 |
if (IsFrontEngine(first)) UpdateTrainAcceleration(first); |
2676
59b65b4fb480
(svn r3218) -Feature: Multiheaded train engines will now stay in the same train
bjarni
parents:
2666
diff
changeset
|
1406 |
InvalidateWindow(WC_VEHICLE_DETAILS, first->index); |
59b65b4fb480
(svn r3218) -Feature: Multiheaded train engines will now stay in the same train
bjarni
parents:
2666
diff
changeset
|
1407 |
InvalidateWindow(WC_VEHICLE_REFIT, first->index); |
1905
c53f8d71f9b6
(svn r2411) - Codechange: Have trains cache stuff like consist power/weight/max speed instead of recalculating it each time.
hackykid
parents:
1901
diff
changeset
|
1408 |
} |
1766
8cdb302ae946
(svn r2270) - Fix/Codechange: fix up selling rail vehicles. Try to be smart about it. When selling dual-headed trains, also sell the rear end; if the now-first wagon is an engine, make it a train. When selling the whole train, try to leave dual-headed setups intact
Darkvater
parents:
1758
diff
changeset
|
1409 |
} break; |
0 | 1410 |
} |
1411 |
return cost; |
|
1412 |
} |
|
1413 |
||
6558
c88e142f896e
(svn r9760) -Codechange: remove the need for saving some vehicle variables.
rubidium
parents:
6554
diff
changeset
|
1414 |
void Train::UpdateDeltaXY(Direction direction) |
0 | 1415 |
{ |
6558
c88e142f896e
(svn r9760) -Codechange: remove the need for saving some vehicle variables.
rubidium
parents:
6554
diff
changeset
|
1416 |
#define MKIT(a, b, c, d) ((a & 0xFF) << 24) | ((b & 0xFF) << 16) | ((c & 0xFF) << 8) | ((d & 0xFF) << 0) |
0 | 1417 |
static const uint32 _delta_xy_table[8] = { |
1418 |
MKIT(3, 3, -1, -1), |
|
1419 |
MKIT(3, 7, -1, -3), |
|
1420 |
MKIT(3, 3, -1, -1), |
|
1421 |
MKIT(7, 3, -3, -1), |
|
1422 |
MKIT(3, 3, -1, -1), |
|
1423 |
MKIT(3, 7, -1, -3), |
|
1424 |
MKIT(3, 3, -1, -1), |
|
1425 |
MKIT(7, 3, -3, -1), |
|
1426 |
}; |
|
1427 |
#undef MKIT |
|
1428 |
||
1429 |
uint32 x = _delta_xy_table[direction]; |
|
6558
c88e142f896e
(svn r9760) -Codechange: remove the need for saving some vehicle variables.
rubidium
parents:
6554
diff
changeset
|
1430 |
this->x_offs = GB(x, 0, 8); |
c88e142f896e
(svn r9760) -Codechange: remove the need for saving some vehicle variables.
rubidium
parents:
6554
diff
changeset
|
1431 |
this->y_offs = GB(x, 8, 8); |
c88e142f896e
(svn r9760) -Codechange: remove the need for saving some vehicle variables.
rubidium
parents:
6554
diff
changeset
|
1432 |
this->sprite_width = GB(x, 16, 8); |
c88e142f896e
(svn r9760) -Codechange: remove the need for saving some vehicle variables.
rubidium
parents:
6554
diff
changeset
|
1433 |
this->sprite_height = GB(x, 24, 8); |
c88e142f896e
(svn r9760) -Codechange: remove the need for saving some vehicle variables.
rubidium
parents:
6554
diff
changeset
|
1434 |
this->z_height = 6; |
0 | 1435 |
} |
1436 |
||
1437 |
static void UpdateVarsAfterSwap(Vehicle *v) |
|
1438 |
{ |
|
6558
c88e142f896e
(svn r9760) -Codechange: remove the need for saving some vehicle variables.
rubidium
parents:
6554
diff
changeset
|
1439 |
v->UpdateDeltaXY(v->direction); |
7134
5b2d47128d05
(svn r10408) -Codechange: make GetImage a class method of Vehicle instead of Get(Aircraft|RoadVeh|Ship|Train)Image.
rubidium
parents:
7109
diff
changeset
|
1440 |
v->cur_image = v->GetImage(v->direction); |
0 | 1441 |
BeginVehicleMove(v); |
1442 |
VehiclePositionChanged(v); |
|
1443 |
EndVehicleMove(v); |
|
1444 |
} |
|
1445 |
||
2639 | 1446 |
static void SetLastSpeed(Vehicle* v, int spd) |
1447 |
{ |
|
0 | 1448 |
int old = v->u.rail.last_speed; |
1449 |
if (spd != old) { |
|
1450 |
v->u.rail.last_speed = spd; |
|
3017
a75caf4efa2d
(svn r3597) Miscellaneous (I like that word) changes: Fix some indentation, add consts, reduce indentation level by short-circuit logic, convert if cascades to switch, whitespace, bracing, plus some minor stuff
tron
parents:
3008
diff
changeset
|
1451 |
if (_patches.vehicle_speed || (old == 0) != (spd == 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:
744
diff
changeset
|
1452 |
InvalidateWindowWidget(WC_VEHICLE_VIEW, v->index, STATUS_BAR); |
0 | 1453 |
} |
1454 |
} |
|
1455 |
||
954
66c89362a778
(svn r1445) -Fix: reversing a train also reverses the UP and DOWN status for the
truelight
parents:
926
diff
changeset
|
1456 |
static void SwapTrainFlags(byte *swap_flag1, byte *swap_flag2) |
66c89362a778
(svn r1445) -Fix: reversing a train also reverses the UP and DOWN status for the
truelight
parents:
926
diff
changeset
|
1457 |
{ |
6150 | 1458 |
byte flag1 = *swap_flag1; |
1459 |
byte flag2 = *swap_flag2; |
|
954
66c89362a778
(svn r1445) -Fix: reversing a train also reverses the UP and DOWN status for the
truelight
parents:
926
diff
changeset
|
1460 |
|
66c89362a778
(svn r1445) -Fix: reversing a train also reverses the UP and DOWN status for the
truelight
parents:
926
diff
changeset
|
1461 |
/* Clear the flags */ |
7929
6c9b25842b0f
(svn r11482) -Codechange: Remove the doubled function ClrBitT and rename the remaining to fit with the naming style
skidd13
parents:
7928
diff
changeset
|
1462 |
ClrBit(*swap_flag1, VRF_GOINGUP); |
6c9b25842b0f
(svn r11482) -Codechange: Remove the doubled function ClrBitT and rename the remaining to fit with the naming style
skidd13
parents:
7928
diff
changeset
|
1463 |
ClrBit(*swap_flag1, VRF_GOINGDOWN); |
6c9b25842b0f
(svn r11482) -Codechange: Remove the doubled function ClrBitT and rename the remaining to fit with the naming style
skidd13
parents:
7928
diff
changeset
|
1464 |
ClrBit(*swap_flag2, VRF_GOINGUP); |
6c9b25842b0f
(svn r11482) -Codechange: Remove the doubled function ClrBitT and rename the remaining to fit with the naming style
skidd13
parents:
7928
diff
changeset
|
1465 |
ClrBit(*swap_flag2, VRF_GOINGDOWN); |
954
66c89362a778
(svn r1445) -Fix: reversing a train also reverses the UP and DOWN status for the
truelight
parents:
926
diff
changeset
|
1466 |
|
66c89362a778
(svn r1445) -Fix: reversing a train also reverses the UP and DOWN status for the
truelight
parents:
926
diff
changeset
|
1467 |
/* Reverse the rail-flags (if needed) */ |
7928
63e18de69e50
(svn r11481) -Codechange: Rename the HASBIT function to fit with the naming style
skidd13
parents:
7923
diff
changeset
|
1468 |
if (HasBit(flag1, VRF_GOINGUP)) { |
7931
b0a46cd92225
(svn r11484) -Codechange: Remove the doubled function SetBitT and rename the remaining to fit with the naming style
skidd13
parents:
7929
diff
changeset
|
1469 |
SetBit(*swap_flag2, VRF_GOINGDOWN); |
7928
63e18de69e50
(svn r11481) -Codechange: Rename the HASBIT function to fit with the naming style
skidd13
parents:
7923
diff
changeset
|
1470 |
} else if (HasBit(flag1, VRF_GOINGDOWN)) { |
7931
b0a46cd92225
(svn r11484) -Codechange: Remove the doubled function SetBitT and rename the remaining to fit with the naming style
skidd13
parents:
7929
diff
changeset
|
1471 |
SetBit(*swap_flag2, VRF_GOINGUP); |
954
66c89362a778
(svn r1445) -Fix: reversing a train also reverses the UP and DOWN status for the
truelight
parents:
926
diff
changeset
|
1472 |
} |
7928
63e18de69e50
(svn r11481) -Codechange: Rename the HASBIT function to fit with the naming style
skidd13
parents:
7923
diff
changeset
|
1473 |
if (HasBit(flag2, VRF_GOINGUP)) { |
7931
b0a46cd92225
(svn r11484) -Codechange: Remove the doubled function SetBitT and rename the remaining to fit with the naming style
skidd13
parents:
7929
diff
changeset
|
1474 |
SetBit(*swap_flag1, VRF_GOINGDOWN); |
7928
63e18de69e50
(svn r11481) -Codechange: Rename the HASBIT function to fit with the naming style
skidd13
parents:
7923
diff
changeset
|
1475 |
} else if (HasBit(flag2, VRF_GOINGDOWN)) { |
7931
b0a46cd92225
(svn r11484) -Codechange: Remove the doubled function SetBitT and rename the remaining to fit with the naming style
skidd13
parents:
7929
diff
changeset
|
1476 |
SetBit(*swap_flag1, VRF_GOINGUP); |
954
66c89362a778
(svn r1445) -Fix: reversing a train also reverses the UP and DOWN status for the
truelight
parents:
926
diff
changeset
|
1477 |
} |
66c89362a778
(svn r1445) -Fix: reversing a train also reverses the UP and DOWN status for the
truelight
parents:
926
diff
changeset
|
1478 |
} |
66c89362a778
(svn r1445) -Fix: reversing a train also reverses the UP and DOWN status for the
truelight
parents:
926
diff
changeset
|
1479 |
|
0 | 1480 |
static void ReverseTrainSwapVeh(Vehicle *v, int l, int r) |
1481 |
{ |
|
1482 |
Vehicle *a, *b; |
|
1483 |
||
1484 |
/* locate vehicles to swap */ |
|
7492
35acee076719
(svn r11003) -Codechange: replace Vehicle->next to Vehicle->Next() and Vehicle->SetNext() so we can trap instances that change a next pointer and (in the future) update the first/previous pointers based on that.
rubidium
parents:
7488
diff
changeset
|
1485 |
for (a = v; l != 0; l--) a = a->Next(); |
35acee076719
(svn r11003) -Codechange: replace Vehicle->next to Vehicle->Next() and Vehicle->SetNext() so we can trap instances that change a next pointer and (in the future) update the first/previous pointers based on that.
rubidium
parents:
7488
diff
changeset
|
1486 |
for (b = v; r != 0; r--) b = b->Next(); |
0 | 1487 |
|
1488 |
if (a != b) { |
|
1489 |
/* swap the hidden bits */ |
|
1490 |
{ |
|
1491 |
uint16 tmp = (a->vehstatus & ~VS_HIDDEN) | (b->vehstatus&VS_HIDDEN); |
|
1492 |
b->vehstatus = (b->vehstatus & ~VS_HIDDEN) | (a->vehstatus&VS_HIDDEN); |
|
1493 |
a->vehstatus = tmp; |
|
1494 |
} |
|
193
0a7025304867
(svn r194) -Codechange: stripping trailing-spaces. Please keep this that way!
truelight
parents:
166
diff
changeset
|
1495 |
|
5733 | 1496 |
Swap(a->u.rail.track, b->u.rail.track); |
1497 |
Swap(a->direction, b->direction); |
|
0 | 1498 |
|
1499 |
/* toggle direction */ |
|
5993
956d341d930e
(svn r8701) -Codechange: replace magic numbers with enums for u.rail.track.
rubidium
parents:
5992
diff
changeset
|
1500 |
if (a->u.rail.track != TRACK_BIT_DEPOT) a->direction = ReverseDir(a->direction); |
956d341d930e
(svn r8701) -Codechange: replace magic numbers with enums for u.rail.track.
rubidium
parents:
5992
diff
changeset
|
1501 |
if (b->u.rail.track != TRACK_BIT_DEPOT) b->direction = ReverseDir(b->direction); |
193
0a7025304867
(svn r194) -Codechange: stripping trailing-spaces. Please keep this that way!
truelight
parents:
166
diff
changeset
|
1502 |
|
5733 | 1503 |
Swap(a->x_pos, b->x_pos); |
1504 |
Swap(a->y_pos, b->y_pos); |
|
1505 |
Swap(a->tile, b->tile); |
|
1506 |
Swap(a->z_pos, b->z_pos); |
|
0 | 1507 |
|
954
66c89362a778
(svn r1445) -Fix: reversing a train also reverses the UP and DOWN status for the
truelight
parents:
926
diff
changeset
|
1508 |
SwapTrainFlags(&a->u.rail.flags, &b->u.rail.flags); |
66c89362a778
(svn r1445) -Fix: reversing a train also reverses the UP and DOWN status for the
truelight
parents:
926
diff
changeset
|
1509 |
|
0 | 1510 |
/* update other vars */ |
1511 |
UpdateVarsAfterSwap(a); |
|
1512 |
UpdateVarsAfterSwap(b); |
|
1554
79809a004e97
(svn r2058) -Fix: hopefully this fixes the reverse-train-in-depot-bugs (plural)
truelight
parents:
1552
diff
changeset
|
1513 |
|
5385
3868f2e6db9b
(svn r7573) -Merged the bridge branch. Allows to build bridges of arbitrary rail/road combinations (including signals)
celestar
parents:
5380
diff
changeset
|
1514 |
/* call the proper EnterTile function unless we are in a wormhole */ |
5993
956d341d930e
(svn r8701) -Codechange: replace magic numbers with enums for u.rail.track.
rubidium
parents:
5992
diff
changeset
|
1515 |
if (a->u.rail.track != TRACK_BIT_WORMHOLE) VehicleEnterTile(a, a->tile, a->x_pos, a->y_pos); |
956d341d930e
(svn r8701) -Codechange: replace magic numbers with enums for u.rail.track.
rubidium
parents:
5992
diff
changeset
|
1516 |
if (b->u.rail.track != TRACK_BIT_WORMHOLE) VehicleEnterTile(b, b->tile, b->x_pos, b->y_pos); |
0 | 1517 |
} else { |
5993
956d341d930e
(svn r8701) -Codechange: replace magic numbers with enums for u.rail.track.
rubidium
parents:
5992
diff
changeset
|
1518 |
if (a->u.rail.track != TRACK_BIT_DEPOT) a->direction = ReverseDir(a->direction); |
193
0a7025304867
(svn r194) -Codechange: stripping trailing-spaces. Please keep this that way!
truelight
parents:
166
diff
changeset
|
1519 |
UpdateVarsAfterSwap(a); |
1554
79809a004e97
(svn r2058) -Fix: hopefully this fixes the reverse-train-in-depot-bugs (plural)
truelight
parents:
1552
diff
changeset
|
1520 |
|
5993
956d341d930e
(svn r8701) -Codechange: replace magic numbers with enums for u.rail.track.
rubidium
parents:
5992
diff
changeset
|
1521 |
if (a->u.rail.track != TRACK_BIT_WORMHOLE) VehicleEnterTile(a, a->tile, a->x_pos, a->y_pos); |
0 | 1522 |
} |
3355
e414a0b104a6
(svn r4150) -Feature: Merged elrails into trunk. Thanks to Tron for lots of code and proofreading, thanks to peter1138 for another lot of code and ideas.
celestar
parents:
3341
diff
changeset
|
1523 |
|
e414a0b104a6
(svn r4150) -Feature: Merged elrails into trunk. Thanks to Tron for lots of code and proofreading, thanks to peter1138 for another lot of code and ideas.
celestar
parents:
3341
diff
changeset
|
1524 |
/* Update train's power incase tiles were different rail type */ |
e414a0b104a6
(svn r4150) -Feature: Merged elrails into trunk. Thanks to Tron for lots of code and proofreading, thanks to peter1138 for another lot of code and ideas.
celestar
parents:
3341
diff
changeset
|
1525 |
TrainPowerChanged(v); |
0 | 1526 |
} |
1527 |
||
744
ee33af65c436
(svn r1200) -Fix: Fixed bug pointed out by Tron: when a train is on the
truelight
parents:
743
diff
changeset
|
1528 |
/* Check if the vehicle is a train and is on the tile we are testing */ |
ee33af65c436
(svn r1200) -Fix: Fixed bug pointed out by Tron: when a train is on the
truelight
parents:
743
diff
changeset
|
1529 |
static void *TestTrainOnCrossing(Vehicle *v, void *data) |
ee33af65c436
(svn r1200) -Fix: Fixed bug pointed out by Tron: when a train is on the
truelight
parents:
743
diff
changeset
|
1530 |
{ |
6259
471b91a4b1d8
(svn r9068) -Codechange: capitalize the VEH_Train etc. enums to match the coding style (and rest of the code).
rubidium
parents:
6248
diff
changeset
|
1531 |
if (v->tile != *(const TileIndex*)data || v->type != VEH_TRAIN) return NULL; |
744
ee33af65c436
(svn r1200) -Fix: Fixed bug pointed out by Tron: when a train is on the
truelight
parents:
743
diff
changeset
|
1532 |
return v; |
ee33af65c436
(svn r1200) -Fix: Fixed bug pointed out by Tron: when a train is on the
truelight
parents:
743
diff
changeset
|
1533 |
} |
ee33af65c436
(svn r1200) -Fix: Fixed bug pointed out by Tron: when a train is on the
truelight
parents:
743
diff
changeset
|
1534 |
|
1103
530d0a75f91c
(svn r1604) Fix: [ 1105112 ] Destroyed train locks crossings
dominik
parents:
1095
diff
changeset
|
1535 |
static void DisableTrainCrossing(TileIndex tile) |
530d0a75f91c
(svn r1604) Fix: [ 1105112 ] Destroyed train locks crossings
dominik
parents:
1095
diff
changeset
|
1536 |
{ |
3560
b2fcf1898eec
(svn r4435) - Fix: an assertion triggered when trying to remove a bridge with the remove-tool (r4348 surfaced this). In CmdRemoveRoad tiletype was not checked for ownership. Intorudce IsLevelCrossingTile() which checks if a tile is a crossing without knowing the type. Suggested by peter1138 and Tron.
Darkvater
parents:
3546
diff
changeset
|
1537 |
if (IsLevelCrossingTile(tile) && |
2639 | 1538 |
VehicleFromPos(tile, &tile, TestTrainOnCrossing) == NULL && // empty? |
3322
41b4d25b126d
(svn r4088) -Codechange: Introduce {Unb,B}arCrossing and IsCrossingBarred to put and get the status of a level crossing
celestar
parents:
3315
diff
changeset
|
1539 |
IsCrossingBarred(tile)) { |
41b4d25b126d
(svn r4088) -Codechange: Introduce {Unb,B}arCrossing and IsCrossingBarred to put and get the status of a level crossing
celestar
parents:
3315
diff
changeset
|
1540 |
UnbarCrossing(tile); |
2639 | 1541 |
MarkTileDirtyByTile(tile); |
1103
530d0a75f91c
(svn r1604) Fix: [ 1105112 ] Destroyed train locks crossings
dominik
parents:
1095
diff
changeset
|
1542 |
} |
530d0a75f91c
(svn r1604) Fix: [ 1105112 ] Destroyed train locks crossings
dominik
parents:
1095
diff
changeset
|
1543 |
} |
530d0a75f91c
(svn r1604) Fix: [ 1105112 ] Destroyed train locks crossings
dominik
parents:
1095
diff
changeset
|
1544 |
|
1922
bda6f85eefaa
(svn r2428) - Feature: [newgrf] Implement shorter train vehicles (Therax), and the callback that goes with it.
hackykid
parents:
1921
diff
changeset
|
1545 |
/** |
bda6f85eefaa
(svn r2428) - Feature: [newgrf] Implement shorter train vehicles (Therax), and the callback that goes with it.
hackykid
parents:
1921
diff
changeset
|
1546 |
* Advances wagons for train reversing, needed for variable length wagons. |
bda6f85eefaa
(svn r2428) - Feature: [newgrf] Implement shorter train vehicles (Therax), and the callback that goes with it.
hackykid
parents:
1921
diff
changeset
|
1547 |
* Needs to be called once before the train is reversed, and once after it. |
bda6f85eefaa
(svn r2428) - Feature: [newgrf] Implement shorter train vehicles (Therax), and the callback that goes with it.
hackykid
parents:
1921
diff
changeset
|
1548 |
* @param v First vehicle in chain |
bda6f85eefaa
(svn r2428) - Feature: [newgrf] Implement shorter train vehicles (Therax), and the callback that goes with it.
hackykid
parents:
1921
diff
changeset
|
1549 |
* @param before Set to true for the call before reversing, false otherwise |
bda6f85eefaa
(svn r2428) - Feature: [newgrf] Implement shorter train vehicles (Therax), and the callback that goes with it.
hackykid
parents:
1921
diff
changeset
|
1550 |
*/ |
bda6f85eefaa
(svn r2428) - Feature: [newgrf] Implement shorter train vehicles (Therax), and the callback that goes with it.
hackykid
parents:
1921
diff
changeset
|
1551 |
static void AdvanceWagons(Vehicle *v, bool before) |
bda6f85eefaa
(svn r2428) - Feature: [newgrf] Implement shorter train vehicles (Therax), and the callback that goes with it.
hackykid
parents:
1921
diff
changeset
|
1552 |
{ |
6150 | 1553 |
Vehicle *base = v; |
7492
35acee076719
(svn r11003) -Codechange: replace Vehicle->next to Vehicle->Next() and Vehicle->SetNext() so we can trap instances that change a next pointer and (in the future) update the first/previous pointers based on that.
rubidium
parents:
7488
diff
changeset
|
1554 |
Vehicle *first = base->Next(); |
6150 | 1555 |
uint length = CountVehiclesInChain(v); |
1922
bda6f85eefaa
(svn r2428) - Feature: [newgrf] Implement shorter train vehicles (Therax), and the callback that goes with it.
hackykid
parents:
1921
diff
changeset
|
1556 |
|
bda6f85eefaa
(svn r2428) - Feature: [newgrf] Implement shorter train vehicles (Therax), and the callback that goes with it.
hackykid
parents:
1921
diff
changeset
|
1557 |
while (length > 2) { |
6422
6679df1c05ba
(svn r9558) -Documentation: doxygen and comment changes: 'T' now. Almost done
belugas
parents:
6407
diff
changeset
|
1558 |
/* find pairwise matching wagon |
6679df1c05ba
(svn r9558) -Documentation: doxygen and comment changes: 'T' now. Almost done
belugas
parents:
6407
diff
changeset
|
1559 |
* start<>end, start+1<>end-1, ... */ |
6150 | 1560 |
Vehicle *last = first; |
7492
35acee076719
(svn r11003) -Codechange: replace Vehicle->next to Vehicle->Next() and Vehicle->SetNext() so we can trap instances that change a next pointer and (in the future) update the first/previous pointers based on that.
rubidium
parents:
7488
diff
changeset
|
1561 |
for (uint i = length - 3; i > 0; i--) last = last->Next(); |
6150 | 1562 |
|
1563 |
int differential = last->u.rail.cached_veh_length - base->u.rail.cached_veh_length; |
|
2639 | 1564 |
if (before) differential *= -1; |
1922
bda6f85eefaa
(svn r2428) - Feature: [newgrf] Implement shorter train vehicles (Therax), and the callback that goes with it.
hackykid
parents:
1921
diff
changeset
|
1565 |
|
bda6f85eefaa
(svn r2428) - Feature: [newgrf] Implement shorter train vehicles (Therax), and the callback that goes with it.
hackykid
parents:
1921
diff
changeset
|
1566 |
if (differential > 0) { |
6422
6679df1c05ba
(svn r9558) -Documentation: doxygen and comment changes: 'T' now. Almost done
belugas
parents:
6407
diff
changeset
|
1567 |
/* disconnect last car to make sure only this subset moves */ |
7492
35acee076719
(svn r11003) -Codechange: replace Vehicle->next to Vehicle->Next() and Vehicle->SetNext() so we can trap instances that change a next pointer and (in the future) update the first/previous pointers based on that.
rubidium
parents:
7488
diff
changeset
|
1568 |
Vehicle *tempnext = last->Next(); |
35acee076719
(svn r11003) -Codechange: replace Vehicle->next to Vehicle->Next() and Vehicle->SetNext() so we can trap instances that change a next pointer and (in the future) update the first/previous pointers based on that.
rubidium
parents:
7488
diff
changeset
|
1569 |
last->SetNext(NULL); |
1922
bda6f85eefaa
(svn r2428) - Feature: [newgrf] Implement shorter train vehicles (Therax), and the callback that goes with it.
hackykid
parents:
1921
diff
changeset
|
1570 |
|
6150 | 1571 |
for (int i = 0; i < differential; i++) TrainController(first, false); |
1922
bda6f85eefaa
(svn r2428) - Feature: [newgrf] Implement shorter train vehicles (Therax), and the callback that goes with it.
hackykid
parents:
1921
diff
changeset
|
1572 |
|
7492
35acee076719
(svn r11003) -Codechange: replace Vehicle->next to Vehicle->Next() and Vehicle->SetNext() so we can trap instances that change a next pointer and (in the future) update the first/previous pointers based on that.
rubidium
parents:
7488
diff
changeset
|
1573 |
last->SetNext(tempnext); |
1922
bda6f85eefaa
(svn r2428) - Feature: [newgrf] Implement shorter train vehicles (Therax), and the callback that goes with it.
hackykid
parents:
1921
diff
changeset
|
1574 |
} |
bda6f85eefaa
(svn r2428) - Feature: [newgrf] Implement shorter train vehicles (Therax), and the callback that goes with it.
hackykid
parents:
1921
diff
changeset
|
1575 |
|
bda6f85eefaa
(svn r2428) - Feature: [newgrf] Implement shorter train vehicles (Therax), and the callback that goes with it.
hackykid
parents:
1921
diff
changeset
|
1576 |
base = first; |
7492
35acee076719
(svn r11003) -Codechange: replace Vehicle->next to Vehicle->Next() and Vehicle->SetNext() so we can trap instances that change a next pointer and (in the future) update the first/previous pointers based on that.
rubidium
parents:
7488
diff
changeset
|
1577 |
first = first->Next(); |
1922
bda6f85eefaa
(svn r2428) - Feature: [newgrf] Implement shorter train vehicles (Therax), and the callback that goes with it.
hackykid
parents:
1921
diff
changeset
|
1578 |
length -= 2; |
bda6f85eefaa
(svn r2428) - Feature: [newgrf] Implement shorter train vehicles (Therax), and the callback that goes with it.
hackykid
parents:
1921
diff
changeset
|
1579 |
} |
bda6f85eefaa
(svn r2428) - Feature: [newgrf] Implement shorter train vehicles (Therax), and the callback that goes with it.
hackykid
parents:
1921
diff
changeset
|
1580 |
} |
bda6f85eefaa
(svn r2428) - Feature: [newgrf] Implement shorter train vehicles (Therax), and the callback that goes with it.
hackykid
parents:
1921
diff
changeset
|
1581 |
|
2951 | 1582 |
|
0 | 1583 |
static void ReverseTrainDirection(Vehicle *v) |
1584 |
{ |
|
4739
e626ef1b522e
(svn r6651) -Coding feature: added the windowevent WE_INVALIDATE_DATA
bjarni
parents:
4737
diff
changeset
|
1585 |
if (IsTileDepotType(v->tile, TRANSPORT_RAIL)) { |
e626ef1b522e
(svn r6651) -Coding feature: added the windowevent WE_INVALIDATE_DATA
bjarni
parents:
4737
diff
changeset
|
1586 |
InvalidateWindowData(WC_VEHICLE_DEPOT, v->tile); |
e626ef1b522e
(svn r6651) -Coding feature: added the windowevent WE_INVALIDATE_DATA
bjarni
parents:
4737
diff
changeset
|
1587 |
} |
0 | 1588 |
|
743
da4d304b52d2
(svn r1199) -Fix: [ 958098 ] No longer road/rail crossing signals hang when a train
truelight
parents:
742
diff
changeset
|
1589 |
/* Check if we were approaching a rail/road-crossing */ |
da4d304b52d2
(svn r1199) -Fix: [ 958098 ] No longer road/rail crossing signals hang when a train
truelight
parents:
742
diff
changeset
|
1590 |
{ |
da4d304b52d2
(svn r1199) -Fix: [ 958098 ] No longer road/rail crossing signals hang when a train
truelight
parents:
742
diff
changeset
|
1591 |
TileIndex tile = v->tile; |
3163
14e1eba3591d
(svn r3789) Add an enum and function to handle DiagDirection changes
tron
parents:
3161
diff
changeset
|
1592 |
DiagDirection dir = DirToDiagDir(v->direction); |
14e1eba3591d
(svn r3789) Add an enum and function to handle DiagDirection changes
tron
parents:
3161
diff
changeset
|
1593 |
|
1459
19333d7f99b3
(svn r1963) - Add: [NPF] Penalty for a red signal that is the last signal on the path.
matthijs
parents:
1455
diff
changeset
|
1594 |
/* Determine the diagonal direction in which we will exit this tile */ |
3163
14e1eba3591d
(svn r3789) Add an enum and function to handle DiagDirection changes
tron
parents:
3161
diff
changeset
|
1595 |
if (!(v->direction & 1) && v->u.rail.track != _state_dir_table[dir]) { |
14e1eba3591d
(svn r3789) Add an enum and function to handle DiagDirection changes
tron
parents:
3161
diff
changeset
|
1596 |
dir = ChangeDiagDir(dir, DIAGDIRDIFF_90LEFT); |
743
da4d304b52d2
(svn r1199) -Fix: [ 958098 ] No longer road/rail crossing signals hang when a train
truelight
parents:
742
diff
changeset
|
1597 |
} |
da4d304b52d2
(svn r1199) -Fix: [ 958098 ] No longer road/rail crossing signals hang when a train
truelight
parents:
742
diff
changeset
|
1598 |
/* Calculate next tile */ |
4559
aa0c13e39840
(svn r6406) -Codechange: Rename TileOffsByDir to TileOffsByDiagDir because it accepts
Darkvater
parents:
4556
diff
changeset
|
1599 |
tile += TileOffsByDiagDir(dir); |
1103
530d0a75f91c
(svn r1604) Fix: [ 1105112 ] Destroyed train locks crossings
dominik
parents:
1095
diff
changeset
|
1600 |
|
530d0a75f91c
(svn r1604) Fix: [ 1105112 ] Destroyed train locks crossings
dominik
parents:
1095
diff
changeset
|
1601 |
/* Check if the train left a rail/road-crossing */ |
530d0a75f91c
(svn r1604) Fix: [ 1105112 ] Destroyed train locks crossings
dominik
parents:
1095
diff
changeset
|
1602 |
DisableTrainCrossing(tile); |
743
da4d304b52d2
(svn r1199) -Fix: [ 958098 ] No longer road/rail crossing signals hang when a train
truelight
parents:
742
diff
changeset
|
1603 |
} |
da4d304b52d2
(svn r1199) -Fix: [ 958098 ] No longer road/rail crossing signals hang when a train
truelight
parents:
742
diff
changeset
|
1604 |
|
6422
6679df1c05ba
(svn r9558) -Documentation: doxygen and comment changes: 'T' now. Almost done
belugas
parents:
6407
diff
changeset
|
1605 |
/* count number of vehicles */ |
6150 | 1606 |
int r = -1; |
1607 |
const Vehicle *u = v; |
|
7492
35acee076719
(svn r11003) -Codechange: replace Vehicle->next to Vehicle->Next() and Vehicle->SetNext() so we can trap instances that change a next pointer and (in the future) update the first/previous pointers based on that.
rubidium
parents:
7488
diff
changeset
|
1608 |
do r++; while ((u = u->Next()) != NULL); |
0 | 1609 |
|
1922
bda6f85eefaa
(svn r2428) - Feature: [newgrf] Implement shorter train vehicles (Therax), and the callback that goes with it.
hackykid
parents:
1921
diff
changeset
|
1610 |
AdvanceWagons(v, true); |
bda6f85eefaa
(svn r2428) - Feature: [newgrf] Implement shorter train vehicles (Therax), and the callback that goes with it.
hackykid
parents:
1921
diff
changeset
|
1611 |
|
0 | 1612 |
/* swap start<>end, start+1<>end-1, ... */ |
6150 | 1613 |
int l = 0; |
0 | 1614 |
do { |
1615 |
ReverseTrainSwapVeh(v, l++, r--); |
|
1616 |
} while (l <= r); |
|
1617 |
||
1922
bda6f85eefaa
(svn r2428) - Feature: [newgrf] Implement shorter train vehicles (Therax), and the callback that goes with it.
hackykid
parents:
1921
diff
changeset
|
1618 |
AdvanceWagons(v, false); |
bda6f85eefaa
(svn r2428) - Feature: [newgrf] Implement shorter train vehicles (Therax), and the callback that goes with it.
hackykid
parents:
1921
diff
changeset
|
1619 |
|
4739
e626ef1b522e
(svn r6651) -Coding feature: added the windowevent WE_INVALIDATE_DATA
bjarni
parents:
4737
diff
changeset
|
1620 |
if (IsTileDepotType(v->tile, TRANSPORT_RAIL)) { |
e626ef1b522e
(svn r6651) -Coding feature: added the windowevent WE_INVALIDATE_DATA
bjarni
parents:
4737
diff
changeset
|
1621 |
InvalidateWindowData(WC_VEHICLE_DEPOT, v->tile); |
e626ef1b522e
(svn r6651) -Coding feature: added the windowevent WE_INVALIDATE_DATA
bjarni
parents:
4737
diff
changeset
|
1622 |
} |
0 | 1623 |
|
7929
6c9b25842b0f
(svn r11482) -Codechange: Remove the doubled function ClrBitT and rename the remaining to fit with the naming style
skidd13
parents:
7928
diff
changeset
|
1624 |
ClrBit(v->u.rail.flags, VRF_REVERSING); |
0 | 1625 |
} |
1626 |
||
1784
d0698aac0c2e
(svn r2288) - CodeChange: protected the next batch of commands (41 so far, out of 115).
Darkvater
parents:
1779
diff
changeset
|
1627 |
/** Reverse train. |
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:
3487
diff
changeset
|
1628 |
* @param tile unused |
6422
6679df1c05ba
(svn r9558) -Documentation: doxygen and comment changes: 'T' now. Almost done
belugas
parents:
6407
diff
changeset
|
1629 |
* @param flags type of operation |
1784
d0698aac0c2e
(svn r2288) - CodeChange: protected the next batch of commands (41 so far, out of 115).
Darkvater
parents:
1779
diff
changeset
|
1630 |
* @param p1 train to reverse |
3256
3ada27c81b7f
(svn r3944) -Feature: it's now possible to turn a single unit in a train
bjarni
parents:
3242
diff
changeset
|
1631 |
* @param p2 if true, reverse a unit in a train (needs to be in a depot) |
1784
d0698aac0c2e
(svn r2288) - CodeChange: protected the next batch of commands (41 so far, out of 115).
Darkvater
parents:
1779
diff
changeset
|
1632 |
*/ |
6943
1914f26aee04
(svn r10197) -Codechange: replace int32 with CommandCost where appropriate.
rubidium
parents:
6924
diff
changeset
|
1633 |
CommandCost CmdReverseTrainDirection(TileIndex tile, uint32 flags, uint32 p1, uint32 p2) |
0 | 1634 |
{ |
4352
6703cd8d39e0
(svn r6053) -Codechange: renamed all IsXXXIndex to IsValidXXXID
truelight
parents:
4351
diff
changeset
|
1635 |
if (!IsValidVehicleID(p1)) return CMD_ERROR; |
1237
1c7a3f9c94b9
(svn r1741) - Fix: added IsVehicleIndex() so it's possible to protect GetVehicle() from reading an invalid vehicle index
bjarni
parents:
1236
diff
changeset
|
1636 |
|
6150 | 1637 |
Vehicle *v = GetVehicle(p1); |
0 | 1638 |
|
6259
471b91a4b1d8
(svn r9068) -Codechange: capitalize the VEH_Train etc. enums to match the coding style (and rest of the code).
rubidium
parents:
6248
diff
changeset
|
1639 |
if (v->type != VEH_TRAIN || !CheckOwnership(v->owner)) return CMD_ERROR; |
0 | 1640 |
|
3256
3ada27c81b7f
(svn r3944) -Feature: it's now possible to turn a single unit in a train
bjarni
parents:
3242
diff
changeset
|
1641 |
if (p2) { |
6422
6679df1c05ba
(svn r9558) -Documentation: doxygen and comment changes: 'T' now. Almost done
belugas
parents:
6407
diff
changeset
|
1642 |
/* turn a single unit around */ |
3256
3ada27c81b7f
(svn r3944) -Feature: it's now possible to turn a single unit in a train
bjarni
parents:
3242
diff
changeset
|
1643 |
|
7928
63e18de69e50
(svn r11481) -Codechange: Rename the HASBIT function to fit with the naming style
skidd13
parents:
7923
diff
changeset
|
1644 |
if (IsMultiheaded(v) || HasBit(EngInfo(v->engine_type)->callbackmask, CBM_VEHICLE_ARTIC_ENGINE)) { |
3256
3ada27c81b7f
(svn r3944) -Feature: it's now possible to turn a single unit in a train
bjarni
parents:
3242
diff
changeset
|
1645 |
return_cmd_error(STR_ONLY_TURN_SINGLE_UNIT); |
3ada27c81b7f
(svn r3944) -Feature: it's now possible to turn a single unit in a train
bjarni
parents:
3242
diff
changeset
|
1646 |
} |
3ada27c81b7f
(svn r3944) -Feature: it's now possible to turn a single unit in a train
bjarni
parents:
3242
diff
changeset
|
1647 |
|
7497
40e457c0a8ac
(svn r11011) -Fix [FS#1129]: GetFirstVehicleInChain did change the game state while being marked const.
rubidium
parents:
7493
diff
changeset
|
1648 |
Vehicle *front = v->First(); |
6422
6679df1c05ba
(svn r9558) -Documentation: doxygen and comment changes: 'T' now. Almost done
belugas
parents:
6407
diff
changeset
|
1649 |
/* make sure the vehicle is stopped in the depot */ |
3256
3ada27c81b7f
(svn r3944) -Feature: it's now possible to turn a single unit in a train
bjarni
parents:
3242
diff
changeset
|
1650 |
if (CheckTrainStoppedInDepot(front) < 0) { |
3ada27c81b7f
(svn r3944) -Feature: it's now possible to turn a single unit in a train
bjarni
parents:
3242
diff
changeset
|
1651 |
return_cmd_error(STR_881A_TRAINS_CAN_ONLY_BE_ALTERED); |
3ada27c81b7f
(svn r3944) -Feature: it's now possible to turn a single unit in a train
bjarni
parents:
3242
diff
changeset
|
1652 |
} |
3257
dbf829a8555b
(svn r3945) cleaned the layout in CmdReverseTrainDirection a bit (made a bit messy in last commit)
bjarni
parents:
3256
diff
changeset
|
1653 |
|
dbf829a8555b
(svn r3945) cleaned the layout in CmdReverseTrainDirection a bit (made a bit messy in last commit)
bjarni
parents:
3256
diff
changeset
|
1654 |
if (flags & DC_EXEC) { |
7932
6c3d71e8a129
(svn r11485) -Codechange: Remove the doubled function ToggleBitT and rename the remaining to fit with the naming style
skidd13
parents:
7931
diff
changeset
|
1655 |
ToggleBit(v->u.rail.flags, VRF_REVERSE_DIRECTION); |
4856
f1777f3659d8
(svn r6782) - Fix (r3947): Invalidate depot & vehicle windows when reversing a single engine with ctrl-click.
peter1138
parents:
4839
diff
changeset
|
1656 |
InvalidateWindow(WC_VEHICLE_DEPOT, v->tile); |
f1777f3659d8
(svn r6782) - Fix (r3947): Invalidate depot & vehicle windows when reversing a single engine with ctrl-click.
peter1138
parents:
4839
diff
changeset
|
1657 |
InvalidateWindow(WC_VEHICLE_DETAILS, v->index); |
3257
dbf829a8555b
(svn r3945) cleaned the layout in CmdReverseTrainDirection a bit (made a bit messy in last commit)
bjarni
parents:
3256
diff
changeset
|
1658 |
} |
dbf829a8555b
(svn r3945) cleaned the layout in CmdReverseTrainDirection a bit (made a bit messy in last commit)
bjarni
parents:
3256
diff
changeset
|
1659 |
} else { |
7476
f6eb56e8b8a7
(svn r10983) -Codechange: use vehstatus & VS_CRASHED instead of some other "methods" custom to each vehicle to determine whether the vehicle is crashed.
rubidium
parents:
7425
diff
changeset
|
1660 |
/* turn the whole train around */ |
f6eb56e8b8a7
(svn r10983) -Codechange: use vehstatus & VS_CRASHED instead of some other "methods" custom to each vehicle to determine whether the vehicle is crashed.
rubidium
parents:
7425
diff
changeset
|
1661 |
if (v->vehstatus & VS_CRASHED || v->breakdown_ctr != 0) return CMD_ERROR; |
3257
dbf829a8555b
(svn r3945) cleaned the layout in CmdReverseTrainDirection a bit (made a bit messy in last commit)
bjarni
parents:
3256
diff
changeset
|
1662 |
|
dbf829a8555b
(svn r3945) cleaned the layout in CmdReverseTrainDirection a bit (made a bit messy in last commit)
bjarni
parents:
3256
diff
changeset
|
1663 |
if (flags & DC_EXEC) { |
3256
3ada27c81b7f
(svn r3944) -Feature: it's now possible to turn a single unit in a train
bjarni
parents:
3242
diff
changeset
|
1664 |
if (_patches.realistic_acceleration && v->cur_speed != 0) { |
7932
6c3d71e8a129
(svn r11485) -Codechange: Remove the doubled function ToggleBitT and rename the remaining to fit with the naming style
skidd13
parents:
7931
diff
changeset
|
1665 |
ToggleBit(v->u.rail.flags, VRF_REVERSING); |
3256
3ada27c81b7f
(svn r3944) -Feature: it's now possible to turn a single unit in a train
bjarni
parents:
3242
diff
changeset
|
1666 |
} else { |
3ada27c81b7f
(svn r3944) -Feature: it's now possible to turn a single unit in a train
bjarni
parents:
3242
diff
changeset
|
1667 |
v->cur_speed = 0; |
3ada27c81b7f
(svn r3944) -Feature: it's now possible to turn a single unit in a train
bjarni
parents:
3242
diff
changeset
|
1668 |
SetLastSpeed(v, 0); |
3ada27c81b7f
(svn r3944) -Feature: it's now possible to turn a single unit in a train
bjarni
parents:
3242
diff
changeset
|
1669 |
ReverseTrainDirection(v); |
3ada27c81b7f
(svn r3944) -Feature: it's now possible to turn a single unit in a train
bjarni
parents:
3242
diff
changeset
|
1670 |
} |
0 | 1671 |
} |
1672 |
} |
|
6950
14ecb0acdfb4
(svn r10205) -Codechange: refactor returning of cost, so it can be more easily modified.
rubidium
parents:
6943
diff
changeset
|
1673 |
return CommandCost(); |
0 | 1674 |
} |
1675 |
||
1784
d0698aac0c2e
(svn r2288) - CodeChange: protected the next batch of commands (41 so far, out of 115).
Darkvater
parents:
1779
diff
changeset
|
1676 |
/** Force a train through a red signal |
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:
3487
diff
changeset
|
1677 |
* @param tile unused |
6422
6679df1c05ba
(svn r9558) -Documentation: doxygen and comment changes: 'T' now. Almost done
belugas
parents:
6407
diff
changeset
|
1678 |
* @param flags type of operation |
1784
d0698aac0c2e
(svn r2288) - CodeChange: protected the next batch of commands (41 so far, out of 115).
Darkvater
parents:
1779
diff
changeset
|
1679 |
* @param p1 train to ignore the red signal |
d0698aac0c2e
(svn r2288) - CodeChange: protected the next batch of commands (41 so far, out of 115).
Darkvater
parents:
1779
diff
changeset
|
1680 |
* @param p2 unused |
d0698aac0c2e
(svn r2288) - CodeChange: protected the next batch of commands (41 so far, out of 115).
Darkvater
parents:
1779
diff
changeset
|
1681 |
*/ |
6943
1914f26aee04
(svn r10197) -Codechange: replace int32 with CommandCost where appropriate.
rubidium
parents:
6924
diff
changeset
|
1682 |
CommandCost CmdForceTrainProceed(TileIndex tile, uint32 flags, uint32 p1, uint32 p2) |
0 | 1683 |
{ |
4352
6703cd8d39e0
(svn r6053) -Codechange: renamed all IsXXXIndex to IsValidXXXID
truelight
parents:
4351
diff
changeset
|
1684 |
if (!IsValidVehicleID(p1)) return CMD_ERROR; |
1237
1c7a3f9c94b9
(svn r1741) - Fix: added IsVehicleIndex() so it's possible to protect GetVehicle() from reading an invalid vehicle index
bjarni
parents:
1236
diff
changeset
|
1685 |
|
6150 | 1686 |
Vehicle *v = GetVehicle(p1); |
0 | 1687 |
|
6259
471b91a4b1d8
(svn r9068) -Codechange: capitalize the VEH_Train etc. enums to match the coding style (and rest of the code).
rubidium
parents:
6248
diff
changeset
|
1688 |
if (v->type != VEH_TRAIN || !CheckOwnership(v->owner)) return CMD_ERROR; |
0 | 1689 |
|
2639 | 1690 |
if (flags & DC_EXEC) v->u.rail.force_proceed = 0x50; |
193
0a7025304867
(svn r194) -Codechange: stripping trailing-spaces. Please keep this that way!
truelight
parents:
166
diff
changeset
|
1691 |
|
6950
14ecb0acdfb4
(svn r10205) -Codechange: refactor returning of cost, so it can be more easily modified.
rubidium
parents:
6943
diff
changeset
|
1692 |
return CommandCost(); |
0 | 1693 |
} |
1694 |
||
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:
1794
diff
changeset
|
1695 |
/** Refits a train 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:
3487
diff
changeset
|
1696 |
* @param tile unused |
6422
6679df1c05ba
(svn r9558) -Documentation: doxygen and comment changes: 'T' now. Almost done
belugas
parents:
6407
diff
changeset
|
1697 |
* @param flags type of operation |
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:
1794
diff
changeset
|
1698 |
* @param p1 vehicle ID of the train to refit |
3954
7b51d0046efb
(svn r5103) - Add cargo subtype parameter to refit commands (mart3p)
peter1138
parents:
3948
diff
changeset
|
1699 |
* param p2 various bitstuffed elements |
7b51d0046efb
(svn r5103) - Add cargo subtype parameter to refit commands (mart3p)
peter1138
parents:
3948
diff
changeset
|
1700 |
* - p2 = (bit 0-7) - the new cargo type to refit to |
7b51d0046efb
(svn r5103) - Add cargo subtype parameter to refit commands (mart3p)
peter1138
parents:
3948
diff
changeset
|
1701 |
* - p2 = (bit 8-15) - the new cargo subtype to refit to |
6546
4c6d90bde803
(svn r9742) -Fix (r9689) [FS#739]: Fix cloning with refit costs again, hopefully for good this time.
maedhros
parents:
6502
diff
changeset
|
1702 |
* - p2 = (bit 16) - refit only this vehicle |
4c6d90bde803
(svn r9742) -Fix (r9689) [FS#739]: Fix cloning with refit costs again, hopefully for good this time.
maedhros
parents:
6502
diff
changeset
|
1703 |
* @return cost of refit or error |
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:
1794
diff
changeset
|
1704 |
*/ |
6943
1914f26aee04
(svn r10197) -Codechange: replace int32 with CommandCost where appropriate.
rubidium
parents:
6924
diff
changeset
|
1705 |
CommandCost CmdRefitRailVehicle(TileIndex tile, uint32 flags, uint32 p1, uint32 p2) |
0 | 1706 |
{ |
2635 | 1707 |
CargoID new_cid = GB(p2, 0, 8); |
3954
7b51d0046efb
(svn r5103) - Add cargo subtype parameter to refit commands (mart3p)
peter1138
parents:
3948
diff
changeset
|
1708 |
byte new_subtype = GB(p2, 8, 8); |
7928
63e18de69e50
(svn r11481) -Codechange: Rename the HASBIT function to fit with the naming style
skidd13
parents:
7923
diff
changeset
|
1709 |
bool only_this = HasBit(p2, 16); |
842 | 1710 |
|
4352
6703cd8d39e0
(svn r6053) -Codechange: renamed all IsXXXIndex to IsValidXXXID
truelight
parents:
4351
diff
changeset
|
1711 |
if (!IsValidVehicleID(p1)) return CMD_ERROR; |
915 | 1712 |
|
6150 | 1713 |
Vehicle *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:
1236
diff
changeset
|
1714 |
|
6259
471b91a4b1d8
(svn r9068) -Codechange: capitalize the VEH_Train etc. enums to match the coding style (and rest of the code).
rubidium
parents:
6248
diff
changeset
|
1715 |
if (v->type != VEH_TRAIN || !CheckOwnership(v->owner)) return CMD_ERROR; |
2244 | 1716 |
if (CheckTrainStoppedInDepot(v) < 0) return_cmd_error(STR_TRAIN_MUST_BE_STOPPED); |
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:
1794
diff
changeset
|
1717 |
|
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:
1794
diff
changeset
|
1718 |
/* Check cargo */ |
6316
d2b70e10f106
(svn r9259) -Codechange: NUM_CARGO isn't a valid cargo type...
peter1138
parents:
6303
diff
changeset
|
1719 |
if (new_cid >= NUM_CARGO) return CMD_ERROR; |
0 | 1720 |
|
1237
1c7a3f9c94b9
(svn r1741) - Fix: added IsVehicleIndex() so it's possible to protect GetVehicle() from reading an invalid vehicle index
bjarni
parents:
1236
diff
changeset
|
1721 |
SET_EXPENSES_TYPE(EXPENSES_TRAIN_RUN); |
1c7a3f9c94b9
(svn r1741) - Fix: added IsVehicleIndex() so it's possible to protect GetVehicle() from reading an invalid vehicle index
bjarni
parents:
1236
diff
changeset
|
1722 |
|
6950
14ecb0acdfb4
(svn r10205) -Codechange: refactor returning of cost, so it can be more easily modified.
rubidium
parents:
6943
diff
changeset
|
1723 |
CommandCost cost; |
6150 | 1724 |
uint num = 0; |
915 | 1725 |
|
0 | 1726 |
do { |
491
6527219352cd
(svn r773) When refitting a train engine, refit also all the attached wagons which can be refitted (applicable to DBSetXL, as shown in http://pasky.or.cz/~pasky/dev/openttd/screenshots/wagrefit.png). This is how TTDPatch does it, pointed out by Bjarni.
pasky
parents:
445
diff
changeset
|
1727 |
/* XXX: We also refit all the attached wagons en-masse if they |
6527219352cd
(svn r773) When refitting a train engine, refit also all the attached wagons which can be refitted (applicable to DBSetXL, as shown in http://pasky.or.cz/~pasky/dev/openttd/screenshots/wagrefit.png). This is how TTDPatch does it, pointed out by Bjarni.
pasky
parents:
445
diff
changeset
|
1728 |
* can be refitted. This is how TTDPatch does it. TODO: Have |
6527219352cd
(svn r773) When refitting a train engine, refit also all the attached wagons which can be refitted (applicable to DBSetXL, as shown in http://pasky.or.cz/~pasky/dev/openttd/screenshots/wagrefit.png). This is how TTDPatch does it, pointed out by Bjarni.
pasky
parents:
445
diff
changeset
|
1729 |
* some nice [Refit] button near each wagon. --pasky */ |
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:
2677
diff
changeset
|
1730 |
if (!CanRefitTo(v->engine_type, new_cid)) continue; |
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:
1794
diff
changeset
|
1731 |
|
1859
870dcb6fd65b
(svn r2365) - Change: [refitting] Make refitting capacities for trains newgrf compatible. Train vehicles can now carry twice as much mail/goods as other cargo, and four times as much passengers.
hackykid
parents:
1842
diff
changeset
|
1732 |
if (v->cargo_cap != 0) { |
1895
0d499b71a782
(svn r2401) - Fix: [newgrf] Finish up callback mechanism, implement 'refit capacity' callback slightly more correct.
hackykid
parents:
1891
diff
changeset
|
1733 |
uint16 amount = CALLBACK_FAILED; |
0d499b71a782
(svn r2401) - Fix: [newgrf] Finish up callback mechanism, implement 'refit capacity' callback slightly more correct.
hackykid
parents:
1891
diff
changeset
|
1734 |
|
7928
63e18de69e50
(svn r11481) -Codechange: Rename the HASBIT function to fit with the naming style
skidd13
parents:
7923
diff
changeset
|
1735 |
if (HasBit(EngInfo(v->engine_type)->callbackmask, CBM_VEHICLE_REFIT_CAPACITY)) { |
3988
fcb1549e4d4c
(svn r5187) - NewGRF: temporarily change a vehicle's cargo subtype when calling the refit capacity callback.
peter1138
parents:
3986
diff
changeset
|
1736 |
/* Back up the vehicle's cargo type */ |
1895
0d499b71a782
(svn r2401) - Fix: [newgrf] Finish up callback mechanism, implement 'refit capacity' callback slightly more correct.
hackykid
parents:
1891
diff
changeset
|
1737 |
CargoID temp_cid = v->cargo_type; |
3988
fcb1549e4d4c
(svn r5187) - NewGRF: temporarily change a vehicle's cargo subtype when calling the refit capacity callback.
peter1138
parents:
3986
diff
changeset
|
1738 |
byte temp_subtype = v->cargo_subtype; |
1895
0d499b71a782
(svn r2401) - Fix: [newgrf] Finish up callback mechanism, implement 'refit capacity' callback slightly more correct.
hackykid
parents:
1891
diff
changeset
|
1739 |
v->cargo_type = new_cid; |
3988
fcb1549e4d4c
(svn r5187) - NewGRF: temporarily change a vehicle's cargo subtype when calling the refit capacity callback.
peter1138
parents:
3986
diff
changeset
|
1740 |
v->cargo_subtype = new_subtype; |
fcb1549e4d4c
(svn r5187) - NewGRF: temporarily change a vehicle's cargo subtype when calling the refit capacity callback.
peter1138
parents:
3986
diff
changeset
|
1741 |
/* Check the refit capacity callback */ |
3390
ae4b0872dc78
(svn r4198) - NewGRF: Rename GetCallBackResult() to GetVehicleCallback(), as other types will exist later, and use separate parameters instead of bitshifting.
peter1138
parents:
3355
diff
changeset
|
1742 |
amount = GetVehicleCallback(CBID_VEHICLE_REFIT_CAPACITY, 0, 0, v->engine_type, v); |
3988
fcb1549e4d4c
(svn r5187) - NewGRF: temporarily change a vehicle's cargo subtype when calling the refit capacity callback.
peter1138
parents:
3986
diff
changeset
|
1743 |
/* Restore the original cargo type */ |
1895
0d499b71a782
(svn r2401) - Fix: [newgrf] Finish up callback mechanism, implement 'refit capacity' callback slightly more correct.
hackykid
parents:
1891
diff
changeset
|
1744 |
v->cargo_type = temp_cid; |
3988
fcb1549e4d4c
(svn r5187) - NewGRF: temporarily change a vehicle's cargo subtype when calling the refit capacity callback.
peter1138
parents:
3986
diff
changeset
|
1745 |
v->cargo_subtype = temp_subtype; |
1895
0d499b71a782
(svn r2401) - Fix: [newgrf] Finish up callback mechanism, implement 'refit capacity' callback slightly more correct.
hackykid
parents:
1891
diff
changeset
|
1746 |
} |
0d499b71a782
(svn r2401) - Fix: [newgrf] Finish up callback mechanism, implement 'refit capacity' callback slightly more correct.
hackykid
parents:
1891
diff
changeset
|
1747 |
|
0d499b71a782
(svn r2401) - Fix: [newgrf] Finish up callback mechanism, implement 'refit capacity' callback slightly more correct.
hackykid
parents:
1891
diff
changeset
|
1748 |
if (amount == CALLBACK_FAILED) { // callback failed or not used, use default |
6150 | 1749 |
const RailVehicleInfo *rvi = RailVehInfo(v->engine_type); |
1883
ad68cd0a0a25
(svn r2389) - Feature: [newgrf] Implement the mechanism for handling newgrf callbacks.
hackykid
parents:
1882
diff
changeset
|
1750 |
CargoID old_cid = rvi->cargo_type; |
3017
a75caf4efa2d
(svn r3597) Miscellaneous (I like that word) changes: Fix some indentation, add consts, reduce indentation level by short-circuit logic, convert if cascades to switch, whitespace, bracing, plus some minor stuff
tron
parents:
3008
diff
changeset
|
1751 |
/* normally, the capacity depends on the cargo type, a rail vehicle can |
a75caf4efa2d
(svn r3597) Miscellaneous (I like that word) changes: Fix some indentation, add consts, reduce indentation level by short-circuit logic, convert if cascades to switch, whitespace, bracing, plus some minor stuff
tron
parents:
3008
diff
changeset
|
1752 |
* carry twice as much mail/goods as normal cargo, and four times as |
a75caf4efa2d
(svn r3597) Miscellaneous (I like that word) changes: Fix some indentation, add consts, reduce indentation level by short-circuit logic, convert if cascades to switch, whitespace, bracing, plus some minor stuff
tron
parents:
3008
diff
changeset
|
1753 |
* many passengers |
a75caf4efa2d
(svn r3597) Miscellaneous (I like that word) changes: Fix some indentation, add consts, reduce indentation level by short-circuit logic, convert if cascades to switch, whitespace, bracing, plus some minor stuff
tron
parents:
3008
diff
changeset
|
1754 |
*/ |
1883
ad68cd0a0a25
(svn r2389) - Feature: [newgrf] Implement the mechanism for handling newgrf callbacks.
hackykid
parents:
1882
diff
changeset
|
1755 |
amount = rvi->capacity; |
3017
a75caf4efa2d
(svn r3597) Miscellaneous (I like that word) changes: Fix some indentation, add consts, reduce indentation level by short-circuit logic, convert if cascades to switch, whitespace, bracing, plus some minor stuff
tron
parents:
3008
diff
changeset
|
1756 |
switch (old_cid) { |
a75caf4efa2d
(svn r3597) Miscellaneous (I like that word) changes: Fix some indentation, add consts, reduce indentation level by short-circuit logic, convert if cascades to switch, whitespace, bracing, plus some minor stuff
tron
parents:
3008
diff
changeset
|
1757 |
case CT_PASSENGERS: break; |
a75caf4efa2d
(svn r3597) Miscellaneous (I like that word) changes: Fix some indentation, add consts, reduce indentation level by short-circuit logic, convert if cascades to switch, whitespace, bracing, plus some minor stuff
tron
parents:
3008
diff
changeset
|
1758 |
case CT_MAIL: |
a75caf4efa2d
(svn r3597) Miscellaneous (I like that word) changes: Fix some indentation, add consts, reduce indentation level by short-circuit logic, convert if cascades to switch, whitespace, bracing, plus some minor stuff
tron
parents:
3008
diff
changeset
|
1759 |
case CT_GOODS: amount *= 2; break; |
a75caf4efa2d
(svn r3597) Miscellaneous (I like that word) changes: Fix some indentation, add consts, reduce indentation level by short-circuit logic, convert if cascades to switch, whitespace, bracing, plus some minor stuff
tron
parents:
3008
diff
changeset
|
1760 |
default: amount *= 4; break; |
a75caf4efa2d
(svn r3597) Miscellaneous (I like that word) changes: Fix some indentation, add consts, reduce indentation level by short-circuit logic, convert if cascades to switch, whitespace, bracing, plus some minor stuff
tron
parents:
3008
diff
changeset
|
1761 |
} |
a75caf4efa2d
(svn r3597) Miscellaneous (I like that word) changes: Fix some indentation, add consts, reduce indentation level by short-circuit logic, convert if cascades to switch, whitespace, bracing, plus some minor stuff
tron
parents:
3008
diff
changeset
|
1762 |
switch (new_cid) { |
a75caf4efa2d
(svn r3597) Miscellaneous (I like that word) changes: Fix some indentation, add consts, reduce indentation level by short-circuit logic, convert if cascades to switch, whitespace, bracing, plus some minor stuff
tron
parents:
3008
diff
changeset
|
1763 |
case CT_PASSENGERS: break; |
a75caf4efa2d
(svn r3597) Miscellaneous (I like that word) changes: Fix some indentation, add consts, reduce indentation level by short-circuit logic, convert if cascades to switch, whitespace, bracing, plus some minor stuff
tron
parents:
3008
diff
changeset
|
1764 |
case CT_MAIL: |
a75caf4efa2d
(svn r3597) Miscellaneous (I like that word) changes: Fix some indentation, add consts, reduce indentation level by short-circuit logic, convert if cascades to switch, whitespace, bracing, plus some minor stuff
tron
parents:
3008
diff
changeset
|
1765 |
case CT_GOODS: amount /= 2; break; |
a75caf4efa2d
(svn r3597) Miscellaneous (I like that word) changes: Fix some indentation, add consts, reduce indentation level by short-circuit logic, convert if cascades to switch, whitespace, bracing, plus some minor stuff
tron
parents:
3008
diff
changeset
|
1766 |
default: amount /= 4; break; |
a75caf4efa2d
(svn r3597) Miscellaneous (I like that word) changes: Fix some indentation, add consts, reduce indentation level by short-circuit logic, convert if cascades to switch, whitespace, bracing, plus some minor stuff
tron
parents:
3008
diff
changeset
|
1767 |
} |
6150 | 1768 |
} |
1883
ad68cd0a0a25
(svn r2389) - Feature: [newgrf] Implement the mechanism for handling newgrf callbacks.
hackykid
parents:
1882
diff
changeset
|
1769 |
|
ad68cd0a0a25
(svn r2389) - Feature: [newgrf] Implement the mechanism for handling newgrf callbacks.
hackykid
parents:
1882
diff
changeset
|
1770 |
if (amount != 0) { |
4242
5738cbc9b2bd
(svn r5819) - NewGRF: add support for refit costs specified in NewGRF. This may affect the default refit costs for the default rail vehicles.
peter1138
parents:
4198
diff
changeset
|
1771 |
if (new_cid != v->cargo_type) { |
6950
14ecb0acdfb4
(svn r10205) -Codechange: refactor returning of cost, so it can be more easily modified.
rubidium
parents:
6943
diff
changeset
|
1772 |
cost.AddCost(GetRefitCost(v->engine_type)); |
4242
5738cbc9b2bd
(svn r5819) - NewGRF: add support for refit costs specified in NewGRF. This may affect the default refit costs for the default rail vehicles.
peter1138
parents:
4198
diff
changeset
|
1773 |
} |
5738cbc9b2bd
(svn r5819) - NewGRF: add support for refit costs specified in NewGRF. This may affect the default refit costs for the default rail vehicles.
peter1138
parents:
4198
diff
changeset
|
1774 |
|
1883
ad68cd0a0a25
(svn r2389) - Feature: [newgrf] Implement the mechanism for handling newgrf callbacks.
hackykid
parents:
1882
diff
changeset
|
1775 |
num += amount; |
ad68cd0a0a25
(svn r2389) - Feature: [newgrf] Implement the mechanism for handling newgrf callbacks.
hackykid
parents:
1882
diff
changeset
|
1776 |
if (flags & DC_EXEC) { |
7010
6f0d9f03180d
(svn r10266) -Codechange: keep track of the origin, time of travel and accumulated feeder share (transfers) of individual pieces of cargo. This means that cargo isn't thrown on a big pile when it's put in a station or unloaded at a station, however the GUI does not reflect these changes yet so you will not actually see it.
rubidium
parents:
7002
diff
changeset
|
1777 |
v->cargo.Truncate((v->cargo_type == new_cid) ? amount : 0); |
1883
ad68cd0a0a25
(svn r2389) - Feature: [newgrf] Implement the mechanism for handling newgrf callbacks.
hackykid
parents:
1882
diff
changeset
|
1778 |
v->cargo_type = new_cid; |
ad68cd0a0a25
(svn r2389) - Feature: [newgrf] Implement the mechanism for handling newgrf callbacks.
hackykid
parents:
1882
diff
changeset
|
1779 |
v->cargo_cap = amount; |
3954
7b51d0046efb
(svn r5103) - Add cargo subtype parameter to refit commands (mart3p)
peter1138
parents:
3948
diff
changeset
|
1780 |
v->cargo_subtype = new_subtype; |
1883
ad68cd0a0a25
(svn r2389) - Feature: [newgrf] Implement the mechanism for handling newgrf callbacks.
hackykid
parents:
1882
diff
changeset
|
1781 |
InvalidateWindow(WC_VEHICLE_DETAILS, v->index); |
ad68cd0a0a25
(svn r2389) - Feature: [newgrf] Implement the mechanism for handling newgrf callbacks.
hackykid
parents:
1882
diff
changeset
|
1782 |
InvalidateWindow(WC_VEHICLE_DEPOT, v->tile); |
3954
7b51d0046efb
(svn r5103) - Add cargo subtype parameter to refit commands (mart3p)
peter1138
parents:
3948
diff
changeset
|
1783 |
RebuildVehicleLists(); |
1883
ad68cd0a0a25
(svn r2389) - Feature: [newgrf] Implement the mechanism for handling newgrf callbacks.
hackykid
parents:
1882
diff
changeset
|
1784 |
} |
0 | 1785 |
} |
193
0a7025304867
(svn r194) -Codechange: stripping trailing-spaces. Please keep this that way!
truelight
parents:
166
diff
changeset
|
1786 |
} |
7492
35acee076719
(svn r11003) -Codechange: replace Vehicle->next to Vehicle->Next() and Vehicle->SetNext() so we can trap instances that change a next pointer and (in the future) update the first/previous pointers based on that.
rubidium
parents:
7488
diff
changeset
|
1787 |
} while ((v = v->Next()) != NULL && !only_this); |
0 | 1788 |
|
3008
cef26520c91e
(svn r3588) - Refit: Use only one global to return the refit capacity rather than one per vehicle type.
peter1138
parents:
3007
diff
changeset
|
1789 |
_returned_refit_capacity = num; |
0 | 1790 |
|
4708
b2d7c0945664
(svn r6618) - After refitting a train, update its cached variables as they may change.
peter1138
parents:
4656
diff
changeset
|
1791 |
/* Update the train's cached variables */ |
7497
40e457c0a8ac
(svn r11011) -Fix [FS#1129]: GetFirstVehicleInChain did change the game state while being marked const.
rubidium
parents:
7493
diff
changeset
|
1792 |
if (flags & DC_EXEC) TrainConsistChanged(GetVehicle(p1)->First()); |
4708
b2d7c0945664
(svn r6618) - After refitting a train, update its cached variables as they may change.
peter1138
parents:
4656
diff
changeset
|
1793 |
|
0 | 1794 |
return cost; |
1795 |
} |
|
1796 |
||
6248
e4a2ed7e5613
(svn r9051) -Codechange: typedef [enum|struct] Y {} X; -> [enum|struct] X {};
rubidium
parents:
6247
diff
changeset
|
1797 |
struct TrainFindDepotData { |
0 | 1798 |
uint best_length; |
1977
37bbebf94434
(svn r2483) Replace almost 500 "uint tile" (and variants) with "TileIndex tile"
tron
parents:
1969
diff
changeset
|
1799 |
TileIndex tile; |
2475 | 1800 |
PlayerID owner; |
1777
f703cf05b5b9
(svn r2281) - Fix: [ 1115204 ] [NPF] When pressing the goto depot button, trains will now also look behind it if there is no depot in front. If so, the train reverses immediately. This also work anywhere, not just at stations.
matthijs
parents:
1770
diff
changeset
|
1801 |
/** |
2639 | 1802 |
* true if reversing is necessary for the train to get to this depot |
1803 |
* This value is unused when new depot finding and NPF are both disabled |
|
1777
f703cf05b5b9
(svn r2281) - Fix: [ 1115204 ] [NPF] When pressing the goto depot button, trains will now also look behind it if there is no depot in front. If so, the train reverses immediately. This also work anywhere, not just at stations.
matthijs
parents:
1770
diff
changeset
|
1804 |
*/ |
f703cf05b5b9
(svn r2281) - Fix: [ 1115204 ] [NPF] When pressing the goto depot button, trains will now also look behind it if there is no depot in front. If so, the train reverses immediately. This also work anywhere, not just at stations.
matthijs
parents:
1770
diff
changeset
|
1805 |
bool reverse; |
6248
e4a2ed7e5613
(svn r9051) -Codechange: typedef [enum|struct] Y {} X; -> [enum|struct] X {};
rubidium
parents:
6247
diff
changeset
|
1806 |
}; |
0 | 1807 |
|
2125
edc17858f9f6
(svn r2635) Fix: [ntp/misc] Improve the old pathfinder. Changed it to A* instead of Dijkstra.
ludde
parents:
2115
diff
changeset
|
1808 |
static bool NtpCallbFindDepot(TileIndex tile, TrainFindDepotData *tfdd, int track, uint length) |
0 | 1809 |
{ |
3269
62fb247bf94b
(svn r3981) More work for the rail accessing functions and enums
tron
parents:
3267
diff
changeset
|
1810 |
if (IsTileType(tile, MP_RAILWAY) && |
62fb247bf94b
(svn r3981) More work for the rail accessing functions and enums
tron
parents:
3267
diff
changeset
|
1811 |
IsTileOwner(tile, tfdd->owner) && |
4182
48dba107ff43
(svn r5624) Use {IsPlainRailTile,IsRailDepot,IsRailWaypoint,HasSignals}() instead of GetRailTile{T,Subt}ype() - this is more concise and a bit more flexible if/when the rail tile encoding changes
tron
parents:
4095
diff
changeset
|
1812 |
IsRailDepot(tile)) { |
4406
cc20171473bb
(svn r6159) -Fix: FindClosestTrainDepot hardly ever found a depot with NPF off due to absence of distance-normalization (Rojer)
Darkvater
parents:
4389
diff
changeset
|
1813 |
/* approximate number of tiles by dividing by DIAG_FACTOR */ |
cc20171473bb
(svn r6159) -Fix: FindClosestTrainDepot hardly ever found a depot with NPF off due to absence of distance-normalization (Rojer)
Darkvater
parents:
4389
diff
changeset
|
1814 |
tfdd->best_length = length / DIAG_FACTOR; |
3269
62fb247bf94b
(svn r3981) More work for the rail accessing functions and enums
tron
parents:
3267
diff
changeset
|
1815 |
tfdd->tile = tile; |
62fb247bf94b
(svn r3981) More work for the rail accessing functions and enums
tron
parents:
3267
diff
changeset
|
1816 |
return true; |
0 | 1817 |
} |
1818 |
||
2125
edc17858f9f6
(svn r2635) Fix: [ntp/misc] Improve the old pathfinder. Changed it to A* instead of Dijkstra.
ludde
parents:
2115
diff
changeset
|
1819 |
return false; |
0 | 1820 |
} |
1821 |
||
6422
6679df1c05ba
(svn r9558) -Documentation: doxygen and comment changes: 'T' now. Almost done
belugas
parents:
6407
diff
changeset
|
1822 |
/** returns the tile of a depot to goto to. The given vehicle must not be |
6679df1c05ba
(svn r9558) -Documentation: doxygen and comment changes: 'T' now. Almost done
belugas
parents:
6407
diff
changeset
|
1823 |
* crashed! */ |
3900
2c84ed52709d
(svn r4987) Feature: Merged YAPF into trunk. Thanks to devs for continuous support and users for testing.
KUDr
parents:
3870
diff
changeset
|
1824 |
static TrainFindDepotData FindClosestTrainDepot(Vehicle *v, int max_distance) |
0 | 1825 |
{ |
6150 | 1826 |
assert(!(v->vehstatus & VS_CRASHED)); |
1827 |
||
0 | 1828 |
TrainFindDepotData tfdd; |
308
8088f72d10f5
(svn r314) -Fix: [982611] Pathfinding bug; train likes the roundabout. If train needs servicing it will now look 16 tiles along the track instead of 12 tiles manhattan style (blathijs)
darkvater
parents:
300
diff
changeset
|
1829 |
tfdd.owner = v->owner; |
8088f72d10f5
(svn r314) -Fix: [982611] Pathfinding bug; train likes the roundabout. If train needs servicing it will now look 16 tiles along the track instead of 12 tiles manhattan style (blathijs)
darkvater
parents:
300
diff
changeset
|
1830 |
tfdd.best_length = (uint)-1; |
1777
f703cf05b5b9
(svn r2281) - Fix: [ 1115204 ] [NPF] When pressing the goto depot button, trains will now also look behind it if there is no depot in front. If so, the train reverses immediately. This also work anywhere, not just at stations.
matthijs
parents:
1770
diff
changeset
|
1831 |
tfdd.reverse = false; |
308
8088f72d10f5
(svn r314) -Fix: [982611] Pathfinding bug; train likes the roundabout. If train needs servicing it will now look 16 tiles along the track instead of 12 tiles manhattan style (blathijs)
darkvater
parents:
300
diff
changeset
|
1832 |
|
6150 | 1833 |
TileIndex tile = v->tile; |
1834 |
if (IsTileDepotType(tile, TRANSPORT_RAIL)) { |
|
308
8088f72d10f5
(svn r314) -Fix: [982611] Pathfinding bug; train likes the roundabout. If train needs servicing it will now look 16 tiles along the track instead of 12 tiles manhattan style (blathijs)
darkvater
parents:
300
diff
changeset
|
1835 |
tfdd.tile = tile; |
8088f72d10f5
(svn r314) -Fix: [982611] Pathfinding bug; train likes the roundabout. If train needs servicing it will now look 16 tiles along the track instead of 12 tiles manhattan style (blathijs)
darkvater
parents:
300
diff
changeset
|
1836 |
tfdd.best_length = 0; |
8088f72d10f5
(svn r314) -Fix: [982611] Pathfinding bug; train likes the roundabout. If train needs servicing it will now look 16 tiles along the track instead of 12 tiles manhattan style (blathijs)
darkvater
parents:
300
diff
changeset
|
1837 |
return tfdd; |
8088f72d10f5
(svn r314) -Fix: [982611] Pathfinding bug; train likes the roundabout. If train needs servicing it will now look 16 tiles along the track instead of 12 tiles manhattan style (blathijs)
darkvater
parents:
300
diff
changeset
|
1838 |
} |
0 | 1839 |
|
3900
2c84ed52709d
(svn r4987) Feature: Merged YAPF into trunk. Thanks to devs for continuous support and users for testing.
KUDr
parents:
3870
diff
changeset
|
1840 |
if (_patches.yapf.rail_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
|
1841 |
bool found = YapfFindNearestRailDepotTwoWay(v, max_distance, NPF_INFINITE_PENALTY, &tfdd.tile, &tfdd.reverse); |
2c84ed52709d
(svn r4987) Feature: Merged YAPF into trunk. Thanks to devs for continuous support and users for testing.
KUDr
parents:
3870
diff
changeset
|
1842 |
tfdd.best_length = found ? max_distance / 2 : -1; // some fake distance or NOT_FOUND |
2c84ed52709d
(svn r4987) Feature: Merged YAPF into trunk. Thanks to devs for continuous support and users for testing.
KUDr
parents:
3870
diff
changeset
|
1843 |
} else if (_patches.new_pathfinding_all) { |
1777
f703cf05b5b9
(svn r2281) - Fix: [ 1115204 ] [NPF] When pressing the goto depot button, trains will now also look behind it if there is no depot in front. If so, the train reverses immediately. This also work anywhere, not just at stations.
matthijs
parents:
1770
diff
changeset
|
1844 |
Vehicle* last = GetLastVehicleInChain(v); |
1942
c5d5cf5b0263
(svn r2448) General cleanup of rail related code, more to follow.
matthijs
parents:
1935
diff
changeset
|
1845 |
Trackdir trackdir = GetVehicleTrackdir(v); |
c5d5cf5b0263
(svn r2448) General cleanup of rail related code, more to follow.
matthijs
parents:
1935
diff
changeset
|
1846 |
Trackdir trackdir_rev = ReverseTrackdir(GetVehicleTrackdir(last)); |
c5d5cf5b0263
(svn r2448) General cleanup of rail related code, more to follow.
matthijs
parents:
1935
diff
changeset
|
1847 |
|
6150 | 1848 |
assert(trackdir != INVALID_TRACKDIR); |
6683
b88ae30866ce
(svn r9914) -Codechange: prepare GTTS and the pathfinders to handle multiple road types on a single tile.
rubidium
parents:
6644
diff
changeset
|
1849 |
NPFFoundTargetData ftd = NPFRouteToDepotBreadthFirstTwoWay(v->tile, trackdir, last->tile, trackdir_rev, TRANSPORT_RAIL, 0, v->owner, v->u.rail.compatible_railtypes, NPF_INFINITE_PENALTY); |
1247 | 1850 |
if (ftd.best_bird_dist == 0) { |
1851 |
/* Found target */ |
|
1852 |
tfdd.tile = ftd.node.tile; |
|
1675
dd557a4d108d
(svn r2179) - Fix: [ 1121437, 1114228 ] Vehicles not entering depots for auto servicing.
matthijs
parents:
1615
diff
changeset
|
1853 |
/* Our caller expects a number of tiles, so we just approximate that |
4549
106ed18a7675
(svn r6381) -Cleanup: make the '/* */' comments that span multiple lines more uniform.
rubidium
parents:
4546
diff
changeset
|
1854 |
* number by this. It might not be completely what we want, but it will |
106ed18a7675
(svn r6381) -Cleanup: make the '/* */' comments that span multiple lines more uniform.
rubidium
parents:
4546
diff
changeset
|
1855 |
* work for now :-) We can possibly change this when the old pathfinder |
106ed18a7675
(svn r6381) -Cleanup: make the '/* */' comments that span multiple lines more uniform.
rubidium
parents:
4546
diff
changeset
|
1856 |
* is removed. */ |
1777
f703cf05b5b9
(svn r2281) - Fix: [ 1115204 ] [NPF] When pressing the goto depot button, trains will now also look behind it if there is no depot in front. If so, the train reverses immediately. This also work anywhere, not just at stations.
matthijs
parents:
1770
diff
changeset
|
1857 |
tfdd.best_length = ftd.best_path_dist / NPF_TILE_LENGTH; |
3017
a75caf4efa2d
(svn r3597) Miscellaneous (I like that word) changes: Fix some indentation, add consts, reduce indentation level by short-circuit logic, convert if cascades to switch, whitespace, bracing, plus some minor stuff
tron
parents:
3008
diff
changeset
|
1858 |
if (NPFGetFlag(&ftd.node, NPF_FLAG_REVERSE)) tfdd.reverse = true; |
1247 | 1859 |
} |
0 | 1860 |
} else { |
6422
6679df1c05ba
(svn r9558) -Documentation: doxygen and comment changes: 'T' now. Almost done
belugas
parents:
6407
diff
changeset
|
1861 |
/* search in the forward direction first. */ |
6150 | 1862 |
DiagDirection i = DirToDiagDir(v->direction); |
3163
14e1eba3591d
(svn r3789) Add an enum and function to handle DiagDirection changes
tron
parents:
3161
diff
changeset
|
1863 |
if (!(v->direction & 1) && v->u.rail.track != _state_dir_table[i]) { |
14e1eba3591d
(svn r3789) Add an enum and function to handle DiagDirection changes
tron
parents:
3161
diff
changeset
|
1864 |
i = ChangeDiagDir(i, DIAGDIRDIFF_90LEFT); |
14e1eba3591d
(svn r3789) Add an enum and function to handle DiagDirection changes
tron
parents:
3161
diff
changeset
|
1865 |
} |
3355
e414a0b104a6
(svn r4150) -Feature: Merged elrails into trunk. Thanks to Tron for lots of code and proofreading, thanks to peter1138 for another lot of code and ideas.
celestar
parents:
3341
diff
changeset
|
1866 |
NewTrainPathfind(tile, 0, v->u.rail.compatible_railtypes, i, (NTPEnumProc*)NtpCallbFindDepot, &tfdd); |
308
8088f72d10f5
(svn r314) -Fix: [982611] Pathfinding bug; train likes the roundabout. If train needs servicing it will now look 16 tiles along the track instead of 12 tiles manhattan style (blathijs)
darkvater
parents:
300
diff
changeset
|
1867 |
if (tfdd.best_length == (uint)-1){ |
1777
f703cf05b5b9
(svn r2281) - Fix: [ 1115204 ] [NPF] When pressing the goto depot button, trains will now also look behind it if there is no depot in front. If so, the train reverses immediately. This also work anywhere, not just at stations.
matthijs
parents:
1770
diff
changeset
|
1868 |
tfdd.reverse = true; |
6422
6679df1c05ba
(svn r9558) -Documentation: doxygen and comment changes: 'T' now. Almost done
belugas
parents:
6407
diff
changeset
|
1869 |
/* search in backwards direction */ |
3153
e83501906eae
(svn r3776) Replace many ints and magic numbers by Direction, DiagDirection and friends
tron
parents:
3140
diff
changeset
|
1870 |
i = ReverseDiagDir(DirToDiagDir(v->direction)); |
3163
14e1eba3591d
(svn r3789) Add an enum and function to handle DiagDirection changes
tron
parents:
3161
diff
changeset
|
1871 |
if (!(v->direction & 1) && v->u.rail.track != _state_dir_table[i]) { |
14e1eba3591d
(svn r3789) Add an enum and function to handle DiagDirection changes
tron
parents:
3161
diff
changeset
|
1872 |
i = ChangeDiagDir(i, DIAGDIRDIFF_90LEFT); |
14e1eba3591d
(svn r3789) Add an enum and function to handle DiagDirection changes
tron
parents:
3161
diff
changeset
|
1873 |
} |
3355
e414a0b104a6
(svn r4150) -Feature: Merged elrails into trunk. Thanks to Tron for lots of code and proofreading, thanks to peter1138 for another lot of code and ideas.
celestar
parents:
3341
diff
changeset
|
1874 |
NewTrainPathfind(tile, 0, v->u.rail.compatible_railtypes, i, (NTPEnumProc*)NtpCallbFindDepot, &tfdd); |
308
8088f72d10f5
(svn r314) -Fix: [982611] Pathfinding bug; train likes the roundabout. If train needs servicing it will now look 16 tiles along the track instead of 12 tiles manhattan style (blathijs)
darkvater
parents:
300
diff
changeset
|
1875 |
} |
0 | 1876 |
} |
193
0a7025304867
(svn r194) -Codechange: stripping trailing-spaces. Please keep this that way!
truelight
parents:
166
diff
changeset
|
1877 |
|
308
8088f72d10f5
(svn r314) -Fix: [982611] Pathfinding bug; train likes the roundabout. If train needs servicing it will now look 16 tiles along the track instead of 12 tiles manhattan style (blathijs)
darkvater
parents:
300
diff
changeset
|
1878 |
return tfdd; |
0 | 1879 |
} |
1880 |
||
1784
d0698aac0c2e
(svn r2288) - CodeChange: protected the next batch of commands (41 so far, out of 115).
Darkvater
parents:
1779
diff
changeset
|
1881 |
/** Send a train to a 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:
3487
diff
changeset
|
1882 |
* @param tile unused |
6422
6679df1c05ba
(svn r9558) -Documentation: doxygen and comment changes: 'T' now. Almost done
belugas
parents:
6407
diff
changeset
|
1883 |
* @param flags type of operation |
1784
d0698aac0c2e
(svn r2288) - CodeChange: protected the next batch of commands (41 so far, out of 115).
Darkvater
parents:
1779
diff
changeset
|
1884 |
* @param p1 train to send to the depot |
4451
2e86da0081b5
(svn r6229) -Feature: Shared order lists now got a "goto depot" button
bjarni
parents:
4434
diff
changeset
|
1885 |
* @param p2 various bitmasked elements |
4506
e6a56518135c
(svn r6291) -Feature: Vehicle lists from the station window now also got the goto depot button
bjarni
parents:
4463
diff
changeset
|
1886 |
* - p2 bit 0-3 - DEPOT_ flags (see vehicle.h) |
e6a56518135c
(svn r6291) -Feature: Vehicle lists from the station window now also got the goto depot button
bjarni
parents:
4463
diff
changeset
|
1887 |
* - p2 bit 8-10 - VLW flag (for mass goto depot) |
1784
d0698aac0c2e
(svn r2288) - CodeChange: protected the next batch of commands (41 so far, out of 115).
Darkvater
parents:
1779
diff
changeset
|
1888 |
*/ |
6943
1914f26aee04
(svn r10197) -Codechange: replace int32 with CommandCost where appropriate.
rubidium
parents:
6924
diff
changeset
|
1889 |
CommandCost CmdSendTrainToDepot(TileIndex tile, uint32 flags, uint32 p1, uint32 p2) |
0 | 1890 |
{ |
4506
e6a56518135c
(svn r6291) -Feature: Vehicle lists from the station window now also got the goto depot button
bjarni
parents:
4463
diff
changeset
|
1891 |
if (p2 & DEPOT_MASS_SEND) { |
e6a56518135c
(svn r6291) -Feature: Vehicle lists from the station window now also got the goto depot button
bjarni
parents:
4463
diff
changeset
|
1892 |
/* Mass goto depot requested */ |
4546
507b7d9bd834
(svn r6378) -Codechange: Rename VLW_FLAGS to VLW_MASK as it is a mask
Darkvater
parents:
4544
diff
changeset
|
1893 |
if (!ValidVLWFlags(p2 & VLW_MASK)) return CMD_ERROR; |
6259
471b91a4b1d8
(svn r9068) -Codechange: capitalize the VEH_Train etc. enums to match the coding style (and rest of the code).
rubidium
parents:
6248
diff
changeset
|
1894 |
return SendAllVehiclesToDepot(VEH_TRAIN, flags, p2 & DEPOT_SERVICE, _current_player, (p2 & VLW_MASK), p1); |
4463
4d67d3a36fc5
(svn r6246) -Feature: added the many times requested "send all vehicle to depot" button
bjarni
parents:
4451
diff
changeset
|
1895 |
} |
4d67d3a36fc5
(svn r6246) -Feature: added the many times requested "send all vehicle to depot" button
bjarni
parents:
4451
diff
changeset
|
1896 |
|
4506
e6a56518135c
(svn r6291) -Feature: Vehicle lists from the station window now also got the goto depot button
bjarni
parents:
4463
diff
changeset
|
1897 |
if (!IsValidVehicleID(p1)) return CMD_ERROR; |
1237
1c7a3f9c94b9
(svn r1741) - Fix: added IsVehicleIndex() so it's possible to protect GetVehicle() from reading an invalid vehicle index
bjarni
parents:
1236
diff
changeset
|
1898 |
|
6150 | 1899 |
Vehicle *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:
1236
diff
changeset
|
1900 |
|
6259
471b91a4b1d8
(svn r9068) -Codechange: capitalize the VEH_Train etc. enums to match the coding style (and rest of the code).
rubidium
parents:
6248
diff
changeset
|
1901 |
if (v->type != VEH_TRAIN || !CheckOwnership(v->owner)) return CMD_ERROR; |
4506
e6a56518135c
(svn r6291) -Feature: Vehicle lists from the station window now also got the goto depot button
bjarni
parents:
4463
diff
changeset
|
1902 |
|
e6a56518135c
(svn r6291) -Feature: Vehicle lists from the station window now also got the goto depot button
bjarni
parents:
4463
diff
changeset
|
1903 |
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
|
1904 |
|
555
02df8a1b7f33
(svn r955) Replace uint16 for orders with struct Order
tron
parents:
541
diff
changeset
|
1905 |
if (v->current_order.type == OT_GOTO_DEPOT) { |
7928
63e18de69e50
(svn r11481) -Codechange: Rename the HASBIT function to fit with the naming style
skidd13
parents:
7923
diff
changeset
|
1906 |
if (!!(p2 & DEPOT_SERVICE) == HasBit(v->current_order.flags, OFB_HALT_IN_DEPOT)) { |
4510
54d30a2372c3
(svn r6295) -Feature: using goto depot with a different control selection will now alter the service/stopping in depot flag instead of cancelling the goto depot order
bjarni
parents:
4506
diff
changeset
|
1907 |
/* We called with a different DEPOT_SERVICE setting. |
4549
106ed18a7675
(svn r6381) -Cleanup: make the '/* */' comments that span multiple lines more uniform.
rubidium
parents:
4546
diff
changeset
|
1908 |
* Now we change the setting to apply the new one and let the vehicle head for the same depot. |
106ed18a7675
(svn r6381) -Cleanup: make the '/* */' comments that span multiple lines more uniform.
rubidium
parents:
4546
diff
changeset
|
1909 |
* Note: the if is (true for requesting service == true for ordered to stop in depot) */ |
4510
54d30a2372c3
(svn r6295) -Feature: using goto depot with a different control selection will now alter the service/stopping in depot flag instead of cancelling the goto depot order
bjarni
parents:
4506
diff
changeset
|
1910 |
if (flags & DC_EXEC) { |
7929
6c9b25842b0f
(svn r11482) -Codechange: Remove the doubled function ClrBitT and rename the remaining to fit with the naming style
skidd13
parents:
7928
diff
changeset
|
1911 |
ClrBit(v->current_order.flags, OFB_PART_OF_ORDERS); |
7932
6c3d71e8a129
(svn r11485) -Codechange: Remove the doubled function ToggleBitT and rename the remaining to fit with the naming style
skidd13
parents:
7931
diff
changeset
|
1912 |
ToggleBit(v->current_order.flags, OFB_HALT_IN_DEPOT); |
4510
54d30a2372c3
(svn r6295) -Feature: using goto depot with a different control selection will now alter the service/stopping in depot flag instead of cancelling the goto depot order
bjarni
parents:
4506
diff
changeset
|
1913 |
InvalidateWindowWidget(WC_VEHICLE_VIEW, v->index, STATUS_BAR); |
54d30a2372c3
(svn r6295) -Feature: using goto depot with a different control selection will now alter the service/stopping in depot flag instead of cancelling the goto depot order
bjarni
parents:
4506
diff
changeset
|
1914 |
} |
6950
14ecb0acdfb4
(svn r10205) -Codechange: refactor returning of cost, so it can be more easily modified.
rubidium
parents:
6943
diff
changeset
|
1915 |
return CommandCost(); |
4510
54d30a2372c3
(svn r6295) -Feature: using goto depot with a different control selection will now alter the service/stopping in depot flag instead of cancelling the goto depot order
bjarni
parents:
4506
diff
changeset
|
1916 |
} |
54d30a2372c3
(svn r6295) -Feature: using goto depot with a different control selection will now alter the service/stopping in depot flag instead of cancelling the goto depot order
bjarni
parents:
4506
diff
changeset
|
1917 |
|
4506
e6a56518135c
(svn r6291) -Feature: Vehicle lists from the station window now also got the goto depot button
bjarni
parents:
4463
diff
changeset
|
1918 |
if (p2 & DEPOT_DONT_CANCEL) return CMD_ERROR; // Requested no cancelation of depot orders |
0 | 1919 |
if (flags & DC_EXEC) { |
7928
63e18de69e50
(svn r11481) -Codechange: Rename the HASBIT function to fit with the naming style
skidd13
parents:
7923
diff
changeset
|
1920 |
if (HasBit(v->current_order.flags, OFB_PART_OF_ORDERS)) { |
0 | 1921 |
v->cur_order_index++; |
1922 |
} |
|
193
0a7025304867
(svn r194) -Codechange: stripping trailing-spaces. Please keep this that way!
truelight
parents:
166
diff
changeset
|
1923 |
|
555
02df8a1b7f33
(svn r955) Replace uint16 for orders with struct Order
tron
parents:
541
diff
changeset
|
1924 |
v->current_order.type = OT_DUMMY; |
02df8a1b7f33
(svn r955) Replace uint16 for orders with struct Order
tron
parents:
541
diff
changeset
|
1925 |
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:
744
diff
changeset
|
1926 |
InvalidateWindowWidget(WC_VEHICLE_VIEW, v->index, STATUS_BAR); |
0 | 1927 |
} |
6950
14ecb0acdfb4
(svn r10205) -Codechange: refactor returning of cost, so it can be more easily modified.
rubidium
parents:
6943
diff
changeset
|
1928 |
return CommandCost(); |
0 | 1929 |
} |
1930 |
||
4526 | 1931 |
/* check if at a standstill (not stopped only) in a depot |
1932 |
* the check is down here to make it possible to alter stop/service for trains entering the depot */ |
|
1933 |
if (IsTileDepotType(v->tile, TRANSPORT_RAIL) && v->cur_speed == 0) return CMD_ERROR; |
|
1934 |
||
6150 | 1935 |
TrainFindDepotData tfdd = FindClosestTrainDepot(v, 0); |
4506
e6a56518135c
(svn r6291) -Feature: Vehicle lists from the station window now also got the goto depot button
bjarni
parents:
4463
diff
changeset
|
1936 |
if (tfdd.best_length == (uint)-1) return_cmd_error(STR_883A_UNABLE_TO_FIND_ROUTE_TO); |
0 | 1937 |
|
1938 |
if (flags & DC_EXEC) { |
|
6502
8056fdc57aa9
(svn r9685) -Fix (r9683): Call v->LeaveStation() when a vehicle in a station is sent to a depot.
maedhros
parents:
6491
diff
changeset
|
1939 |
if (v->current_order.type == OT_LOADING) v->LeaveStation(); |
8056fdc57aa9
(svn r9685) -Fix (r9683): Call v->LeaveStation() when a vehicle in a station is sent to a depot.
maedhros
parents:
6491
diff
changeset
|
1940 |
|
308
8088f72d10f5
(svn r314) -Fix: [982611] Pathfinding bug; train likes the roundabout. If train needs servicing it will now look 16 tiles along the track instead of 12 tiles manhattan style (blathijs)
darkvater
parents:
300
diff
changeset
|
1941 |
v->dest_tile = tfdd.tile; |
555
02df8a1b7f33
(svn r955) Replace uint16 for orders with struct Order
tron
parents:
541
diff
changeset
|
1942 |
v->current_order.type = OT_GOTO_DEPOT; |
4412
cae52239a576
(svn r6165) -Feature: control click Goto Depot will now make the vehicle service
bjarni
parents:
4406
diff
changeset
|
1943 |
v->current_order.flags = OF_NON_STOP; |
7931
b0a46cd92225
(svn r11484) -Codechange: Remove the doubled function SetBitT and rename the remaining to fit with the naming style
skidd13
parents:
7929
diff
changeset
|
1944 |
if (!(p2 & DEPOT_SERVICE)) SetBit(v->current_order.flags, OFB_HALT_IN_DEPOT); |
4527
fa30d19685c2
(svn r6353) -Codechange: Make DestinationID a typedef of uin16, which is as large as any type of destinataion (StationID, DepotID, WaypointID) it can hold
tron
parents:
4526
diff
changeset
|
1945 |
v->current_order.dest = GetDepotByTile(tfdd.tile)->index; |
5259
9d7de9a6b364
(svn r7389) -Fix: when forcing a vehicle to go to a depot, clear refit orders from current orders (caused refit error popup when not having no orders)
bjarni
parents:
5256
diff
changeset
|
1946 |
v->current_order.refit_cargo = CT_INVALID; |
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:
744
diff
changeset
|
1947 |
InvalidateWindowWidget(WC_VEHICLE_VIEW, v->index, STATUS_BAR); |
1777
f703cf05b5b9
(svn r2281) - Fix: [ 1115204 ] [NPF] When pressing the goto depot button, trains will now also look behind it if there is no depot in front. If so, the train reverses immediately. This also work anywhere, not just at stations.
matthijs
parents:
1770
diff
changeset
|
1948 |
/* If there is no depot in front, reverse automatically */ |
6502
8056fdc57aa9
(svn r9685) -Fix (r9683): Call v->LeaveStation() when a vehicle in a station is sent to a depot.
maedhros
parents:
6491
diff
changeset
|
1949 |
if (tfdd.reverse) DoCommand(v->tile, v->index, 0, DC_EXEC, CMD_REVERSE_TRAIN_DIRECTION); |
0 | 1950 |
} |
193
0a7025304867
(svn r194) -Codechange: stripping trailing-spaces. Please keep this that way!
truelight
parents:
166
diff
changeset
|
1951 |
|
6950
14ecb0acdfb4
(svn r10205) -Codechange: refactor returning of cost, so it can be more easily modified.
rubidium
parents:
6943
diff
changeset
|
1952 |
return CommandCost(); |
0 | 1953 |
} |
1954 |
||
1955 |
||
6247 | 1956 |
void OnTick_Train() |
0 | 1957 |
{ |
1958 |
_age_cargo_skip_counter = (_age_cargo_skip_counter == 0) ? 184 : (_age_cargo_skip_counter - 1); |
|
1959 |
} |
|
1960 |
||
2595
1c5db200577c
(svn r3132) -NewGRF: support positioning of rail vehicle visual effects.
peter1138
parents:
2587
diff
changeset
|
1961 |
static const int8 _vehicle_smoke_pos[8] = { |
1c5db200577c
(svn r3132) -NewGRF: support positioning of rail vehicle visual effects.
peter1138
parents:
2587
diff
changeset
|
1962 |
1, 1, 1, 0, -1, -1, -1, 0 |
0 | 1963 |
}; |
1964 |
||
2630 | 1965 |
static void HandleLocomotiveSmokeCloud(const Vehicle* v) |
0 | 1966 |
{ |
4656
9c1d8c4d3e60
(svn r6532) - Feature: Add support for NewGRF sound effects. Currently sound priority isn't supported.
peter1138
parents:
4648
diff
changeset
|
1967 |
bool sound = false; |
0 | 1968 |
|
1969 |
if (v->vehstatus & VS_TRAIN_SLOWING || v->load_unload_time_rem != 0 || v->cur_speed < 2) |
|
1970 |
return; |
|
1971 |
||
6150 | 1972 |
const Vehicle* u = v; |
0 | 1973 |
|
1974 |
do { |
|
5823 | 1975 |
const RailVehicleInfo *rvi = RailVehInfo(v->engine_type); |
2595
1c5db200577c
(svn r3132) -NewGRF: support positioning of rail vehicle visual effects.
peter1138
parents:
2587
diff
changeset
|
1976 |
int effect_offset = GB(v->u.rail.cached_vis_effect, 0, 4) - 8; |
1c5db200577c
(svn r3132) -NewGRF: support positioning of rail vehicle visual effects.
peter1138
parents:
2587
diff
changeset
|
1977 |
byte effect_type = GB(v->u.rail.cached_vis_effect, 4, 2); |
7928
63e18de69e50
(svn r11481) -Codechange: Rename the HASBIT function to fit with the naming style
skidd13
parents:
7923
diff
changeset
|
1978 |
bool disable_effect = HasBit(v->u.rail.cached_vis_effect, 6); |
0 | 1979 |
|
6422
6679df1c05ba
(svn r9558) -Documentation: doxygen and comment changes: 'T' now. Almost done
belugas
parents:
6407
diff
changeset
|
1980 |
/* no smoke? */ |
5868
94430141c189
(svn r8455) -Codechange: Give a more meaningful name (railveh_type)to member flags of RailVehInfo, as well as changing the code to reflect the fact that it was not a flag but rather a one value only variable. Doing so, some evaluations have been simplified.
belugas
parents:
5858
diff
changeset
|
1981 |
if ((rvi->railveh_type == RAILVEH_WAGON && effect_type == 0) || |
2595
1c5db200577c
(svn r3132) -NewGRF: support positioning of rail vehicle visual effects.
peter1138
parents:
2587
diff
changeset
|
1982 |
disable_effect || |
3546
1bfb9cda57ab
(svn r4412) When a vehicle is in a depot or tunnel it's always flagged as VS_HIDDEN. So after checking for VS_HIDDEN and the result is false there's no need to check if it's flagged as being in a depot or tunnel
tron
parents:
3491
diff
changeset
|
1983 |
v->vehstatus & VS_HIDDEN) { |
0 | 1984 |
continue; |
2639 | 1985 |
} |
0 | 1986 |
|
6422
6679df1c05ba
(svn r9558) -Documentation: doxygen and comment changes: 'T' now. Almost done
belugas
parents:
6407
diff
changeset
|
1987 |
/* No smoke in depots or tunnels */ |
3590
215fc77ee7c6
(svn r4479) -Fix (FS#90) electric engines (or rather their pantographs) no longer emit sparks when engine is pulled on convrail (MeusH)
celestar
parents:
3560
diff
changeset
|
1988 |
if (IsTileDepotType(v->tile, TRANSPORT_RAIL) || IsTunnelTile(v->tile)) continue; |
215fc77ee7c6
(svn r4479) -Fix (FS#90) electric engines (or rather their pantographs) no longer emit sparks when engine is pulled on convrail (MeusH)
celestar
parents:
3560
diff
changeset
|
1989 |
|
6422
6679df1c05ba
(svn r9558) -Documentation: doxygen and comment changes: 'T' now. Almost done
belugas
parents:
6407
diff
changeset
|
1990 |
/* No sparks for electric vehicles on nonelectrified tracks */ |
6154 | 1991 |
if (!HasPowerOnRail(v->u.rail.railtype, GetTileRailType(v->tile))) continue; |
2612
eccc835aaa44
(svn r3150) Unify some code duplication in HandleLocomotiveSmokeCloud()
peter1138
parents:
2610
diff
changeset
|
1992 |
|
2595
1c5db200577c
(svn r3132) -NewGRF: support positioning of rail vehicle visual effects.
peter1138
parents:
2587
diff
changeset
|
1993 |
if (effect_type == 0) { |
6422
6679df1c05ba
(svn r9558) -Documentation: doxygen and comment changes: 'T' now. Almost done
belugas
parents:
6407
diff
changeset
|
1994 |
/* Use default effect type for engine class. */ |
5823 | 1995 |
effect_type = rvi->engclass; |
2595
1c5db200577c
(svn r3132) -NewGRF: support positioning of rail vehicle visual effects.
peter1138
parents:
2587
diff
changeset
|
1996 |
} else { |
1c5db200577c
(svn r3132) -NewGRF: support positioning of rail vehicle visual effects.
peter1138
parents:
2587
diff
changeset
|
1997 |
effect_type--; |
1c5db200577c
(svn r3132) -NewGRF: support positioning of rail vehicle visual effects.
peter1138
parents:
2587
diff
changeset
|
1998 |
} |
1c5db200577c
(svn r3132) -NewGRF: support positioning of rail vehicle visual effects.
peter1138
parents:
2587
diff
changeset
|
1999 |
|
6150 | 2000 |
int x = _vehicle_smoke_pos[v->direction] * effect_offset; |
2001 |
int y = _vehicle_smoke_pos[(v->direction + 2) % 8] * effect_offset; |
|
2595
1c5db200577c
(svn r3132) -NewGRF: support positioning of rail vehicle visual effects.
peter1138
parents:
2587
diff
changeset
|
2002 |
|
7928
63e18de69e50
(svn r11481) -Codechange: Rename the HASBIT function to fit with the naming style
skidd13
parents:
7923
diff
changeset
|
2003 |
if (HasBit(v->u.rail.flags, VRF_REVERSE_DIRECTION)) { |
3256
3ada27c81b7f
(svn r3944) -Feature: it's now possible to turn a single unit in a train
bjarni
parents:
3242
diff
changeset
|
2004 |
x = -x; |
3ada27c81b7f
(svn r3944) -Feature: it's now possible to turn a single unit in a train
bjarni
parents:
3242
diff
changeset
|
2005 |
y = -y; |
3ada27c81b7f
(svn r3944) -Feature: it's now possible to turn a single unit in a train
bjarni
parents:
3242
diff
changeset
|
2006 |
} |
3ada27c81b7f
(svn r3944) -Feature: it's now possible to turn a single unit in a train
bjarni
parents:
3242
diff
changeset
|
2007 |
|
2595
1c5db200577c
(svn r3132) -NewGRF: support positioning of rail vehicle visual effects.
peter1138
parents:
2587
diff
changeset
|
2008 |
switch (effect_type) { |
0 | 2009 |
case 0: |
6422
6679df1c05ba
(svn r9558) -Documentation: doxygen and comment changes: 'T' now. Almost done
belugas
parents:
6407
diff
changeset
|
2010 |
/* steam smoke. */ |
2612
eccc835aaa44
(svn r3150) Unify some code duplication in HandleLocomotiveSmokeCloud()
peter1138
parents:
2610
diff
changeset
|
2011 |
if (GB(v->tick_counter, 0, 4) == 0) { |
2595
1c5db200577c
(svn r3132) -NewGRF: support positioning of rail vehicle visual effects.
peter1138
parents:
2587
diff
changeset
|
2012 |
CreateEffectVehicleRel(v, x, y, 10, EV_STEAM_SMOKE); |
4656
9c1d8c4d3e60
(svn r6532) - Feature: Add support for NewGRF sound effects. Currently sound priority isn't supported.
peter1138
parents:
4648
diff
changeset
|
2013 |
sound = true; |
0 | 2014 |
} |
2015 |
break; |
|
2016 |
||
2017 |
case 1: |
|
6422
6679df1c05ba
(svn r9558) -Documentation: doxygen and comment changes: 'T' now. Almost done
belugas
parents:
6407
diff
changeset
|
2018 |
/* diesel smoke */ |
7967
a230c063a672
(svn r11523) -Codechange: Move the CHANCE macros to core/random_func.cpp cause they depend on Random()
skidd13
parents:
7932
diff
changeset
|
2019 |
if (u->cur_speed <= 40 && Chance16(15, 128)) { |
1359
52782e5cf7c9
(svn r1863) Give the effect vehicle type enums more descriptive names and use the enum as parameter type for CreateEffectVehicle*()
tron
parents:
1337
diff
changeset
|
2020 |
CreateEffectVehicleRel(v, 0, 0, 10, EV_DIESEL_SMOKE); |
4656
9c1d8c4d3e60
(svn r6532) - Feature: Add support for NewGRF sound effects. Currently sound priority isn't supported.
peter1138
parents:
4648
diff
changeset
|
2021 |
sound = true; |
0 | 2022 |
} |
2023 |
break; |
|
2024 |
||
2025 |
case 2: |
|
6422
6679df1c05ba
(svn r9558) -Documentation: doxygen and comment changes: 'T' now. Almost done
belugas
parents:
6407
diff
changeset
|
2026 |
/* blue spark */ |
7967
a230c063a672
(svn r11523) -Codechange: Move the CHANCE macros to core/random_func.cpp cause they depend on Random()
skidd13
parents:
7932
diff
changeset
|
2027 |
if (GB(v->tick_counter, 0, 2) == 0 && Chance16(1, 45)) { |
1359
52782e5cf7c9
(svn r1863) Give the effect vehicle type enums more descriptive names and use the enum as parameter type for CreateEffectVehicle*()
tron
parents:
1337
diff
changeset
|
2028 |
CreateEffectVehicleRel(v, 0, 0, 10, EV_ELECTRIC_SPARK); |
4656
9c1d8c4d3e60
(svn r6532) - Feature: Add support for NewGRF sound effects. Currently sound priority isn't supported.
peter1138
parents:
4648
diff
changeset
|
2029 |
sound = true; |
0 | 2030 |
} |
2031 |
break; |
|
2032 |
} |
|
7492
35acee076719
(svn r11003) -Codechange: replace Vehicle->next to Vehicle->Next() and Vehicle->SetNext() so we can trap instances that change a next pointer and (in the future) update the first/previous pointers based on that.
rubidium
parents:
7488
diff
changeset
|
2033 |
} while ((v = v->Next()) != NULL); |
4656
9c1d8c4d3e60
(svn r6532) - Feature: Add support for NewGRF sound effects. Currently sound priority isn't supported.
peter1138
parents:
4648
diff
changeset
|
2034 |
|
9c1d8c4d3e60
(svn r6532) - Feature: Add support for NewGRF sound effects. Currently sound priority isn't supported.
peter1138
parents:
4648
diff
changeset
|
2035 |
if (sound) PlayVehicleSound(u, VSE_TRAIN_EFFECT); |
0 | 2036 |
} |
2037 |
||
2549 | 2038 |
static void TrainPlayLeaveStationSound(const Vehicle* v) |
0 | 2039 |
{ |
541 | 2040 |
static const SoundFx sfx[] = { |
2041 |
SND_04_TRAIN, |
|
2042 |
SND_0A_TRAIN_HORN, |
|
6586
7491de82cefd
(svn r9800) -Codechange: play sound effects based on the engine class, not the rail type (mart3p).
rubidium
parents:
6580
diff
changeset
|
2043 |
SND_0A_TRAIN_HORN, |
7491de82cefd
(svn r9800) -Codechange: play sound effects based on the engine class, not the rail type (mart3p).
rubidium
parents:
6580
diff
changeset
|
2044 |
SND_47_MAGLEV_2, |
7491de82cefd
(svn r9800) -Codechange: play sound effects based on the engine class, not the rail type (mart3p).
rubidium
parents:
6580
diff
changeset
|
2045 |
SND_41_MAGLEV |
541 | 2046 |
}; |
2047 |
||
6150 | 2048 |
if (PlayVehicleSound(v, VSE_START)) return; |
2049 |
||
2477
225b2916fe2a
(svn r3003) Change int, uint, uin16 and byte to EngineID where appropriate, plus some related changes (mostly casts)
tron
parents:
2475
diff
changeset
|
2050 |
EngineID engtype = v->engine_type; |
6586
7491de82cefd
(svn r9800) -Codechange: play sound effects based on the engine class, not the rail type (mart3p).
rubidium
parents:
6580
diff
changeset
|
2051 |
SndPlayVehicleFx(sfx[RailVehInfo(engtype)->engclass], v); |
0 | 2052 |
} |
2053 |
||
6593
102aa05c5ca4
(svn r9807) -Codechange: unify playing of sound when vehicle has been loaded and leaves the station.
rubidium
parents:
6592
diff
changeset
|
2054 |
void Train::PlayLeaveStationSound() const |
102aa05c5ca4
(svn r9807) -Codechange: unify playing of sound when vehicle has been loaded and leaves the station.
rubidium
parents:
6592
diff
changeset
|
2055 |
{ |
102aa05c5ca4
(svn r9807) -Codechange: unify playing of sound when vehicle has been loaded and leaves the station.
rubidium
parents:
6592
diff
changeset
|
2056 |
TrainPlayLeaveStationSound(this); |
102aa05c5ca4
(svn r9807) -Codechange: unify playing of sound when vehicle has been loaded and leaves the station.
rubidium
parents:
6592
diff
changeset
|
2057 |
} |
102aa05c5ca4
(svn r9807) -Codechange: unify playing of sound when vehicle has been loaded and leaves the station.
rubidium
parents:
6592
diff
changeset
|
2058 |
|
0 | 2059 |
static bool CheckTrainStayInDepot(Vehicle *v) |
2060 |
{ |
|
6422
6679df1c05ba
(svn r9558) -Documentation: doxygen and comment changes: 'T' now. Almost done
belugas
parents:
6407
diff
changeset
|
2061 |
/* bail out if not all wagons are in the same depot or not in a depot at all */ |
7492
35acee076719
(svn r11003) -Codechange: replace Vehicle->next to Vehicle->Next() and Vehicle->SetNext() so we can trap instances that change a next pointer and (in the future) update the first/previous pointers based on that.
rubidium
parents:
7488
diff
changeset
|
2062 |
for (const Vehicle *u = v; u != NULL; u = u->Next()) { |
5993
956d341d930e
(svn r8701) -Codechange: replace magic numbers with enums for u.rail.track.
rubidium
parents:
5992
diff
changeset
|
2063 |
if (u->u.rail.track != TRACK_BIT_DEPOT || u->tile != v->tile) return false; |
2639 | 2064 |
} |
0 | 2065 |
|
6422
6679df1c05ba
(svn r9558) -Documentation: doxygen and comment changes: 'T' now. Almost done
belugas
parents:
6407
diff
changeset
|
2066 |
/* if the train got no power, then keep it in the depot */ |
4252
89a4206d3cb5
(svn r5854) -Fix: [elrails] now electric engines are stopped if they enter a non-electrified depot even if they would have left right away if the depot had catenary
bjarni
parents:
4251
diff
changeset
|
2067 |
if (v->u.rail.cached_power == 0) { |
89a4206d3cb5
(svn r5854) -Fix: [elrails] now electric engines are stopped if they enter a non-electrified depot even if they would have left right away if the depot had catenary
bjarni
parents:
4251
diff
changeset
|
2068 |
v->vehstatus |= VS_STOPPED; |
89a4206d3cb5
(svn r5854) -Fix: [elrails] now electric engines are stopped if they enter a non-electrified depot even if they would have left right away if the depot had catenary
bjarni
parents:
4251
diff
changeset
|
2069 |
InvalidateWindow(WC_VEHICLE_DEPOT, v->tile); |
89a4206d3cb5
(svn r5854) -Fix: [elrails] now electric engines are stopped if they enter a non-electrified depot even if they would have left right away if the depot had catenary
bjarni
parents:
4251
diff
changeset
|
2070 |
return true; |
89a4206d3cb5
(svn r5854) -Fix: [elrails] now electric engines are stopped if they enter a non-electrified depot even if they would have left right away if the depot had catenary
bjarni
parents:
4251
diff
changeset
|
2071 |
} |
89a4206d3cb5
(svn r5854) -Fix: [elrails] now electric engines are stopped if they enter a non-electrified depot even if they would have left right away if the depot had catenary
bjarni
parents:
4251
diff
changeset
|
2072 |
|
0 | 2073 |
if (v->u.rail.force_proceed == 0) { |
1151
06c115ce7b7a
(svn r1652) Fix: train and road vehicle lists are now redrawn when vehicles enters/leaves a depot (Hackykid)
bjarni
parents:
1137
diff
changeset
|
2074 |
if (++v->load_unload_time_rem < 37) { |
06c115ce7b7a
(svn r1652) Fix: train and road vehicle lists are now redrawn when vehicles enters/leaves a depot (Hackykid)
bjarni
parents:
1137
diff
changeset
|
2075 |
InvalidateWindowClasses(WC_TRAINS_LIST); |
0 | 2076 |
return true; |
1151
06c115ce7b7a
(svn r1652) Fix: train and road vehicle lists are now redrawn when vehicles enters/leaves a depot (Hackykid)
bjarni
parents:
1137
diff
changeset
|
2077 |
} |
06c115ce7b7a
(svn r1652) Fix: train and road vehicle lists are now redrawn when vehicles enters/leaves a depot (Hackykid)
bjarni
parents:
1137
diff
changeset
|
2078 |
|
0 | 2079 |
v->load_unload_time_rem = 0; |
2080 |
||
3172
ade284ef48ed
(svn r3803) Change the second parameter of UpdateSignalsOnSegment() from Direction to DiagDirection as that's what it really operates on
tron
parents:
3163
diff
changeset
|
2081 |
if (UpdateSignalsOnSegment(v->tile, DirToDiagDir(v->direction))) { |
1151
06c115ce7b7a
(svn r1652) Fix: train and road vehicle lists are now redrawn when vehicles enters/leaves a depot (Hackykid)
bjarni
parents:
1137
diff
changeset
|
2082 |
InvalidateWindowClasses(WC_TRAINS_LIST); |
0 | 2083 |
return true; |
1151
06c115ce7b7a
(svn r1652) Fix: train and road vehicle lists are now redrawn when vehicles enters/leaves a depot (Hackykid)
bjarni
parents:
1137
diff
changeset
|
2084 |
} |
0 | 2085 |
} |
2916
b687477adcba
(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:
2883
diff
changeset
|
2086 |
|
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
|
2087 |
VehicleServiceInDepot(v); |
1151
06c115ce7b7a
(svn r1652) Fix: train and road vehicle lists are now redrawn when vehicles enters/leaves a depot (Hackykid)
bjarni
parents:
1137
diff
changeset
|
2088 |
InvalidateWindowClasses(WC_TRAINS_LIST); |
0 | 2089 |
TrainPlayLeaveStationSound(v); |
193
0a7025304867
(svn r194) -Codechange: stripping trailing-spaces. Please keep this that way!
truelight
parents:
166
diff
changeset
|
2090 |
|
5587
167d9a91ef02
(svn r8038) -Merge: the cpp branch. Effort of KUDr, Celestar, glx, Smoovius, stillunknown and pv2b.
rubidium
parents:
5584
diff
changeset
|
2091 |
v->u.rail.track = TRACK_BIT_X; |
167d9a91ef02
(svn r8038) -Merge: the cpp branch. Effort of KUDr, Celestar, glx, Smoovius, stillunknown and pv2b.
rubidium
parents:
5584
diff
changeset
|
2092 |
if (v->direction & 2) v->u.rail.track = TRACK_BIT_Y; |
193
0a7025304867
(svn r194) -Codechange: stripping trailing-spaces. Please keep this that way!
truelight
parents:
166
diff
changeset
|
2093 |
|
0 | 2094 |
v->vehstatus &= ~VS_HIDDEN; |
2095 |
v->cur_speed = 0; |
|
193
0a7025304867
(svn r194) -Codechange: stripping trailing-spaces. Please keep this that way!
truelight
parents:
166
diff
changeset
|
2096 |
|
6558
c88e142f896e
(svn r9760) -Codechange: remove the need for saving some vehicle variables.
rubidium
parents:
6554
diff
changeset
|
2097 |
v->UpdateDeltaXY(v->direction); |
7134
5b2d47128d05
(svn r10408) -Codechange: make GetImage a class method of Vehicle instead of Get(Aircraft|RoadVeh|Ship|Train)Image.
rubidium
parents:
7109
diff
changeset
|
2098 |
v->cur_image = v->GetImage(v->direction); |
0 | 2099 |
VehiclePositionChanged(v); |
3172
ade284ef48ed
(svn r3803) Change the second parameter of UpdateSignalsOnSegment() from Direction to DiagDirection as that's what it really operates on
tron
parents:
3163
diff
changeset
|
2100 |
UpdateSignalsOnSegment(v->tile, DirToDiagDir(v->direction)); |
0 | 2101 |
UpdateTrainAcceleration(v); |
4739
e626ef1b522e
(svn r6651) -Coding feature: added the windowevent WE_INVALIDATE_DATA
bjarni
parents:
4737
diff
changeset
|
2102 |
InvalidateWindowData(WC_VEHICLE_DEPOT, v->tile); |
0 | 2103 |
|
2104 |
return false; |
|
2105 |
} |
|
2106 |
||
1247 | 2107 |
/* Check for station tiles */ |
6248
e4a2ed7e5613
(svn r9051) -Codechange: typedef [enum|struct] Y {} X; -> [enum|struct] X {};
rubidium
parents:
6247
diff
changeset
|
2108 |
struct TrainTrackFollowerData { |
0 | 2109 |
TileIndex dest_coords; |
1551
b1c7df6daa63
(svn r2055) -CodeChange: Begun introducting StationID
celestar
parents:
1542
diff
changeset
|
2110 |
StationID station_index; // station index we're heading for |
0 | 2111 |
uint best_bird_dist; |
2112 |
uint best_track_dist; |
|
5587
167d9a91ef02
(svn r8038) -Merge: the cpp branch. Effort of KUDr, Celestar, glx, Smoovius, stillunknown and pv2b.
rubidium
parents:
5584
diff
changeset
|
2113 |
TrackdirByte best_track; |
6248
e4a2ed7e5613
(svn r9051) -Codechange: typedef [enum|struct] Y {} X; -> [enum|struct] X {};
rubidium
parents:
6247
diff
changeset
|
2114 |
}; |
0 | 2115 |
|
5587
167d9a91ef02
(svn r8038) -Merge: the cpp branch. Effort of KUDr, Celestar, glx, Smoovius, stillunknown and pv2b.
rubidium
parents:
5584
diff
changeset
|
2116 |
static bool NtpCallbFindStation(TileIndex tile, TrainTrackFollowerData *ttfd, Trackdir track, uint length) |
1977
37bbebf94434
(svn r2483) Replace almost 500 "uint tile" (and variants) with "TileIndex tile"
tron
parents:
1969
diff
changeset
|
2117 |
{ |
6422
6679df1c05ba
(svn r9558) -Documentation: doxygen and comment changes: 'T' now. Almost done
belugas
parents:
6407
diff
changeset
|
2118 |
/* heading for nowhere? */ |
2951 | 2119 |
if (ttfd->dest_coords == 0) return false; |
0 | 2120 |
|
6422
6679df1c05ba
(svn r9558) -Documentation: doxygen and comment changes: 'T' now. Almost done
belugas
parents:
6407
diff
changeset
|
2121 |
/* did we reach the final station? */ |
3315
c9d989783c55
(svn r4079) Add GetSation{Index,ByTile}() to get the station index resp. the station from a tile
tron
parents:
3269
diff
changeset
|
2122 |
if ((ttfd->station_index == INVALID_STATION && tile == ttfd->dest_coords) || ( |
c9d989783c55
(svn r4079) Add GetSation{Index,ByTile}() to get the station index resp. the station from a tile
tron
parents:
3269
diff
changeset
|
2123 |
IsTileType(tile, MP_STATION) && |
3334
2999d2ddc0f9
(svn r4113) Moved all relevant map functions for stations to station_map.[ch]
celestar
parents:
3322
diff
changeset
|
2124 |
IsRailwayStation(tile) && |
3315
c9d989783c55
(svn r4079) Add GetSation{Index,ByTile}() to get the station index resp. the station from a tile
tron
parents:
3269
diff
changeset
|
2125 |
GetStationIndex(tile) == ttfd->station_index |
c9d989783c55
(svn r4079) Add GetSation{Index,ByTile}() to get the station index resp. the station from a tile
tron
parents:
3269
diff
changeset
|
2126 |
)) { |
2044
df63b9a7dec3
(svn r2553) - Fix: [pathfinding] Remove old-old train pathfinder. Enhanced old pathfinder.
ludde
parents:
2032
diff
changeset
|
2127 |
/* We do not check for dest_coords if we have a station_index, |
df63b9a7dec3
(svn r2553) - Fix: [pathfinding] Remove old-old train pathfinder. Enhanced old pathfinder.
ludde
parents:
2032
diff
changeset
|
2128 |
* because in that case the dest_coords are just an |
df63b9a7dec3
(svn r2553) - Fix: [pathfinding] Remove old-old train pathfinder. Enhanced old pathfinder.
ludde
parents:
2032
diff
changeset
|
2129 |
* approximation of where the station is */ |
6422
6679df1c05ba
(svn r9558) -Documentation: doxygen and comment changes: 'T' now. Almost done
belugas
parents:
6407
diff
changeset
|
2130 |
|
6679df1c05ba
(svn r9558) -Documentation: doxygen and comment changes: 'T' now. Almost done
belugas
parents:
6407
diff
changeset
|
2131 |
/* found station */ |
2125
edc17858f9f6
(svn r2635) Fix: [ntp/misc] Improve the old pathfinder. Changed it to A* instead of Dijkstra.
ludde
parents:
2115
diff
changeset
|
2132 |
ttfd->best_track = track; |
6303
584eb58fe283
(svn r9146) -Fix [NTP][FS#676](r6800): "Train is lost" message is generated incorrectly. Forgot to set the best bird distance to zero in case we found the destination to indicate success. (de_zeurkous)
KUDr
parents:
6263
diff
changeset
|
2133 |
ttfd->best_bird_dist = 0; |
0 | 2134 |
return true; |
2135 |
} else { |
|
6422
6679df1c05ba
(svn r9558) -Documentation: doxygen and comment changes: 'T' now. Almost done
belugas
parents:
6407
diff
changeset
|
2136 |
/* didn't find station, keep track of the best path so far. */ |
6150 | 2137 |
uint dist = DistanceManhattan(tile, ttfd->dest_coords); |
0 | 2138 |
if (dist < ttfd->best_bird_dist) { |
2139 |
ttfd->best_bird_dist = dist; |
|
2125
edc17858f9f6
(svn r2635) Fix: [ntp/misc] Improve the old pathfinder. Changed it to A* instead of Dijkstra.
ludde
parents:
2115
diff
changeset
|
2140 |
ttfd->best_track = track; |
0 | 2141 |
} |
2142 |
return false; |
|
2143 |
} |
|
2144 |
} |
|
2145 |
||
2630 | 2146 |
static void FillWithStationData(TrainTrackFollowerData* fd, const Vehicle* v) |
0 | 2147 |
{ |
2639 | 2148 |
fd->dest_coords = v->dest_tile; |
2149 |
if (v->current_order.type == OT_GOTO_STATION) { |
|
4527
fa30d19685c2
(svn r6353) -Codechange: Make DestinationID a typedef of uin16, which is as large as any type of destinataion (StationID, DepotID, WaypointID) it can hold
tron
parents:
4526
diff
changeset
|
2150 |
fd->station_index = v->current_order.dest; |
2639 | 2151 |
} else { |
2152 |
fd->station_index = INVALID_STATION; |
|
2153 |
} |
|
0 | 2154 |
} |
2155 |
||
2156 |
static const byte _initial_tile_subcoord[6][4][3] = { |
|
4344
7e123fec5b0b
(svn r6045) -Cleanup: align all table-like structures using spaces, i.e. whitespace fixes only except for a few comments to make them uniform for the whole enum/struct.
rubidium
parents:
4329
diff
changeset
|
2157 |
{{ 15, 8, 1 }, { 0, 0, 0 }, { 0, 8, 5 }, { 0, 0, 0 }}, |
7e123fec5b0b
(svn r6045) -Cleanup: align all table-like structures using spaces, i.e. whitespace fixes only except for a few comments to make them uniform for the whole enum/struct.
rubidium
parents:
4329
diff
changeset
|
2158 |
{{ 0, 0, 0 }, { 8, 0, 3 }, { 0, 0, 0 }, { 8, 15, 7 }}, |
7e123fec5b0b
(svn r6045) -Cleanup: align all table-like structures using spaces, i.e. whitespace fixes only except for a few comments to make them uniform for the whole enum/struct.
rubidium
parents:
4329
diff
changeset
|
2159 |
{{ 0, 0, 0 }, { 7, 0, 2 }, { 0, 7, 6 }, { 0, 0, 0 }}, |
7e123fec5b0b
(svn r6045) -Cleanup: align all table-like structures using spaces, i.e. whitespace fixes only except for a few comments to make them uniform for the whole enum/struct.
rubidium
parents:
4329
diff
changeset
|
2160 |
{{ 15, 8, 2 }, { 0, 0, 0 }, { 0, 0, 0 }, { 8, 15, 6 }}, |
7e123fec5b0b
(svn r6045) -Cleanup: align all table-like structures using spaces, i.e. whitespace fixes only except for a few comments to make them uniform for the whole enum/struct.
rubidium
parents:
4329
diff
changeset
|
2161 |
{{ 15, 7, 0 }, { 8, 0, 4 }, { 0, 0, 0 }, { 0, 0, 0 }}, |
7e123fec5b0b
(svn r6045) -Cleanup: align all table-like structures using spaces, i.e. whitespace fixes only except for a few comments to make them uniform for the whole enum/struct.
rubidium
parents:
4329
diff
changeset
|
2162 |
{{ 0, 0, 0 }, { 0, 0, 0 }, { 0, 8, 4 }, { 7, 15, 0 }}, |
0 | 2163 |
}; |
2164 |
||
2165 |
static const uint32 _reachable_tracks[4] = { |
|
2166 |
0x10091009, |
|
2167 |
0x00160016, |
|
2168 |
0x05200520, |
|
2169 |
0x2A002A00, |
|
2170 |
}; |
|
2171 |
||
2172 |
static const byte _search_directions[6][4] = { |
|
6422
6679df1c05ba
(svn r9558) -Documentation: doxygen and comment changes: 'T' now. Almost done
belugas
parents:
6407
diff
changeset
|
2173 |
{ 0, 9, 2, 9 }, ///< track 1 |
6679df1c05ba
(svn r9558) -Documentation: doxygen and comment changes: 'T' now. Almost done
belugas
parents:
6407
diff
changeset
|
2174 |
{ 9, 1, 9, 3 }, ///< track 2 |
6679df1c05ba
(svn r9558) -Documentation: doxygen and comment changes: 'T' now. Almost done
belugas
parents:
6407
diff
changeset
|
2175 |
{ 9, 0, 3, 9 }, ///< track upper |
6679df1c05ba
(svn r9558) -Documentation: doxygen and comment changes: 'T' now. Almost done
belugas
parents:
6407
diff
changeset
|
2176 |
{ 1, 9, 9, 2 }, ///< track lower |
6679df1c05ba
(svn r9558) -Documentation: doxygen and comment changes: 'T' now. Almost done
belugas
parents:
6407
diff
changeset
|
2177 |
{ 3, 2, 9, 9 }, ///< track left |
6679df1c05ba
(svn r9558) -Documentation: doxygen and comment changes: 'T' now. Almost done
belugas
parents:
6407
diff
changeset
|
2178 |
{ 9, 9, 1, 0 }, ///< track right |
0 | 2179 |
}; |
2180 |
||
2181 |
static const byte _pick_track_table[6] = {1, 3, 2, 2, 0, 0}; |
|
2182 |
||
2183 |
/* choose a track */ |
|
5587
167d9a91ef02
(svn r8038) -Merge: the cpp branch. Effort of KUDr, Celestar, glx, Smoovius, stillunknown and pv2b.
rubidium
parents:
5584
diff
changeset
|
2184 |
static Track ChooseTrainTrack(Vehicle* v, TileIndex tile, DiagDirection enterdir, TrackBits tracks) |
193
0a7025304867
(svn r194) -Codechange: stripping trailing-spaces. Please keep this that way!
truelight
parents:
166
diff
changeset
|
2185 |
{ |
5587
167d9a91ef02
(svn r8038) -Merge: the cpp branch. Effort of KUDr, Celestar, glx, Smoovius, stillunknown and pv2b.
rubidium
parents:
5584
diff
changeset
|
2186 |
Track best_track; |
6422
6679df1c05ba
(svn r9558) -Documentation: doxygen and comment changes: 'T' now. Almost done
belugas
parents:
6407
diff
changeset
|
2187 |
/* pathfinders are able to tell that route was only 'guessed' */ |
4870
2d8c7ffbbac9
(svn r6800) -Feature change: [train is lost] message is now generated immediately when pathfinder can't find the path. (thanks MeusH, peter1138 and Brianetta for ideas and help).
KUDr
parents:
4856
diff
changeset
|
2188 |
bool path_not_found = false; |
2d8c7ffbbac9
(svn r6800) -Feature change: [train is lost] message is now generated immediately when pathfinder can't find the path. (thanks MeusH, peter1138 and Brianetta for ideas and help).
KUDr
parents:
4856
diff
changeset
|
2189 |
|
2758
e962dd6c3ed4
(svn r3303) Change #if PF_BENCHMARK to #ifdef PF_BENCHMARK
peter1138
parents:
2752
diff
changeset
|
2190 |
#ifdef PF_BENCHMARK |
3341
b20541ef8945
(svn r4125) - Feature: Add a general TIC() TOC() mechanism using rdtsc or something similar on non-i386 architectures to performance-tune (critical) code. Some systems are probably missing, but those can be added later.
Darkvater
parents:
3334
diff
changeset
|
2191 |
TIC() |
0 | 2192 |
#endif |
2193 |
||
7833
ba402b153b79
(svn r11383) -Codechange: fixed all the mess around KillFirstBit (tnx to Rubidium and skidd13)
truelight
parents:
7802
diff
changeset
|
2194 |
assert((tracks & ~TRACK_BIT_MASK) == 0); |
0 | 2195 |
|
1247 | 2196 |
/* quick return in case only one possible track is available */ |
7833
ba402b153b79
(svn r11383) -Codechange: fixed all the mess around KillFirstBit (tnx to Rubidium and skidd13)
truelight
parents:
7802
diff
changeset
|
2197 |
if (KillFirstBit(tracks) == TRACK_BIT_NONE) return FindFirstTrack(tracks); |
0 | 2198 |
|
3900
2c84ed52709d
(svn r4987) Feature: Merged YAPF into trunk. Thanks to devs for continuous support and users for testing.
KUDr
parents:
3870
diff
changeset
|
2199 |
if (_patches.yapf.rail_use_yapf) { |
5587
167d9a91ef02
(svn r8038) -Merge: the cpp branch. Effort of KUDr, Celestar, glx, Smoovius, stillunknown and pv2b.
rubidium
parents:
5584
diff
changeset
|
2200 |
Trackdir trackdir = YapfChooseRailTrack(v, tile, enterdir, tracks, &path_not_found); |
3900
2c84ed52709d
(svn r4987) Feature: Merged YAPF into trunk. Thanks to devs for continuous support and users for testing.
KUDr
parents:
3870
diff
changeset
|
2201 |
if (trackdir != INVALID_TRACKDIR) { |
2c84ed52709d
(svn r4987) Feature: Merged YAPF into trunk. Thanks to devs for continuous support and users for testing.
KUDr
parents:
3870
diff
changeset
|
2202 |
best_track = TrackdirToTrack(trackdir); |
2c84ed52709d
(svn r4987) Feature: Merged YAPF into trunk. Thanks to devs for continuous support and users for testing.
KUDr
parents:
3870
diff
changeset
|
2203 |
} else { |
5587
167d9a91ef02
(svn r8038) -Merge: the cpp branch. Effort of KUDr, Celestar, glx, Smoovius, stillunknown and pv2b.
rubidium
parents:
5584
diff
changeset
|
2204 |
best_track = FindFirstTrack(tracks); |
3900
2c84ed52709d
(svn r4987) Feature: Merged YAPF into trunk. Thanks to devs for continuous support and users for testing.
KUDr
parents:
3870
diff
changeset
|
2205 |
} |
2c84ed52709d
(svn r4987) Feature: Merged YAPF into trunk. Thanks to devs for continuous support and users for testing.
KUDr
parents:
3870
diff
changeset
|
2206 |
} else if (_patches.new_pathfinding_all) { /* Use a new pathfinding for everything */ |
2c84ed52709d
(svn r4987) Feature: Merged YAPF into trunk. Thanks to devs for continuous support and users for testing.
KUDr
parents:
3870
diff
changeset
|
2207 |
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
|
2208 |
|
1247 | 2209 |
NPFFindStationOrTileData fstd; |
2210 |
NPFFillWithOrderData(&fstd, v); |
|
2211 |
/* The enterdir for the new tile, is the exitdir for the old tile */ |
|
6150 | 2212 |
Trackdir trackdir = GetVehicleTrackdir(v); |
1247 | 2213 |
assert(trackdir != 0xff); |
2214 |
||
6683
b88ae30866ce
(svn r9914) -Codechange: prepare GTTS and the pathfinders to handle multiple road types on a single tile.
rubidium
parents:
6644
diff
changeset
|
2215 |
NPFFoundTargetData ftd = NPFRouteToStationOrTile(tile - TileOffsByDiagDir(enterdir), trackdir, &fstd, TRANSPORT_RAIL, 0, v->owner, v->u.rail.compatible_railtypes); |
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:
1685
diff
changeset
|
2216 |
|
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:
1685
diff
changeset
|
2217 |
if (ftd.best_trackdir == 0xff) { |
6422
6679df1c05ba
(svn r9558) -Documentation: doxygen and comment changes: 'T' now. Almost done
belugas
parents:
6407
diff
changeset
|
2218 |
/* We are already at our target. Just do something |
6679df1c05ba
(svn r9558) -Documentation: doxygen and comment changes: 'T' now. Almost done
belugas
parents:
6407
diff
changeset
|
2219 |
* @todo maybe display error? |
6679df1c05ba
(svn r9558) -Documentation: doxygen and comment changes: 'T' now. Almost done
belugas
parents:
6407
diff
changeset
|
2220 |
* @todo: go straight ahead if possible? */ |
5587
167d9a91ef02
(svn r8038) -Merge: the cpp branch. Effort of KUDr, Celestar, glx, Smoovius, stillunknown and pv2b.
rubidium
parents:
5584
diff
changeset
|
2221 |
best_track = FindFirstTrack(tracks); |
0 | 2222 |
} 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:
1685
diff
changeset
|
2223 |
/* 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:
1685
diff
changeset
|
2224 |
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:
1685
diff
changeset
|
2225 |
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:
1685
diff
changeset
|
2226 |
to the tile closest to our target. */ |
4870
2d8c7ffbbac9
(svn r6800) -Feature change: [train is lost] message is now generated immediately when pathfinder can't find the path. (thanks MeusH, peter1138 and Brianetta for ideas and help).
KUDr
parents:
4856
diff
changeset
|
2227 |
if (ftd.best_bird_dist != 0) path_not_found = true; |
1247 | 2228 |
/* Discard enterdir information, making it a normal track */ |
2008
cdb444f6d43c
(svn r2516) - Feature: [pbs] Implement path-based-signalling. This allows multiple trains within the same signal block, provided their paths dont intersect. For this the block must have all exit and entry signals be pbs signals. Place these by ctrl-clicking 4 times on a normal signal.
hackykid
parents:
2006
diff
changeset
|
2229 |
best_track = TrackdirToTrack(ftd.best_trackdir); |
0 | 2230 |
} |
3900
2c84ed52709d
(svn r4987) Feature: Merged YAPF into trunk. Thanks to devs for continuous support and users for testing.
KUDr
parents:
3870
diff
changeset
|
2231 |
|
6150 | 2232 |
int time = NpfEndInterval(perf); |
5380
8ea58542b6e0
(svn r7565) -Codechange: Rework DEBUG functionality. Look for appropiate debugging levels to
Darkvater
parents:
5316
diff
changeset
|
2233 |
DEBUG(yapf, 4, "[NPFT] %d us - %d rounds - %d open - %d closed -- ", time, 0, _aystar_stats_open_size, _aystar_stats_closed_size); |
0 | 2234 |
} else { |
3900
2c84ed52709d
(svn r4987) Feature: Merged YAPF into trunk. Thanks to devs for continuous support and users for testing.
KUDr
parents:
3870
diff
changeset
|
2235 |
void* perf = NpfBeginInterval(); |
6150 | 2236 |
|
2237 |
TrainTrackFollowerData fd; |
|
1247 | 2238 |
FillWithStationData(&fd, v); |
2239 |
||
2044
df63b9a7dec3
(svn r2553) - Fix: [pathfinding] Remove old-old train pathfinder. Enhanced old pathfinder.
ludde
parents:
2032
diff
changeset
|
2240 |
/* New train pathfinding */ |
df63b9a7dec3
(svn r2553) - Fix: [pathfinding] Remove old-old train pathfinder. Enhanced old pathfinder.
ludde
parents:
2032
diff
changeset
|
2241 |
fd.best_bird_dist = (uint)-1; |
df63b9a7dec3
(svn r2553) - Fix: [pathfinding] Remove old-old train pathfinder. Enhanced old pathfinder.
ludde
parents:
2032
diff
changeset
|
2242 |
fd.best_track_dist = (uint)-1; |
5587
167d9a91ef02
(svn r8038) -Merge: the cpp branch. Effort of KUDr, Celestar, glx, Smoovius, stillunknown and pv2b.
rubidium
parents:
5584
diff
changeset
|
2243 |
fd.best_track = INVALID_TRACKDIR; |
2044
df63b9a7dec3
(svn r2553) - Fix: [pathfinding] Remove old-old train pathfinder. Enhanced old pathfinder.
ludde
parents:
2032
diff
changeset
|
2244 |
|
4559
aa0c13e39840
(svn r6406) -Codechange: Rename TileOffsByDir to TileOffsByDiagDir because it accepts
Darkvater
parents:
4556
diff
changeset
|
2245 |
NewTrainPathfind(tile - TileOffsByDiagDir(enterdir), v->dest_tile, |
3355
e414a0b104a6
(svn r4150) -Feature: Merged elrails into trunk. Thanks to Tron for lots of code and proofreading, thanks to peter1138 for another lot of code and ideas.
celestar
parents:
3341
diff
changeset
|
2246 |
v->u.rail.compatible_railtypes, enterdir, (NTPEnumProc*)NtpCallbFindStation, &fd); |
2044
df63b9a7dec3
(svn r2553) - Fix: [pathfinding] Remove old-old train pathfinder. Enhanced old pathfinder.
ludde
parents:
2032
diff
changeset
|
2247 |
|
6422
6679df1c05ba
(svn r9558) -Documentation: doxygen and comment changes: 'T' now. Almost done
belugas
parents:
6407
diff
changeset
|
2248 |
/* check whether the path was found or only 'guessed' */ |
4870
2d8c7ffbbac9
(svn r6800) -Feature change: [train is lost] message is now generated immediately when pathfinder can't find the path. (thanks MeusH, peter1138 and Brianetta for ideas and help).
KUDr
parents:
4856
diff
changeset
|
2249 |
if (fd.best_bird_dist != 0) path_not_found = true; |
2d8c7ffbbac9
(svn r6800) -Feature change: [train is lost] message is now generated immediately when pathfinder can't find the path. (thanks MeusH, peter1138 and Brianetta for ideas and help).
KUDr
parents:
4856
diff
changeset
|
2250 |
|
2044
df63b9a7dec3
(svn r2553) - Fix: [pathfinding] Remove old-old train pathfinder. Enhanced old pathfinder.
ludde
parents:
2032
diff
changeset
|
2251 |
if (fd.best_track == 0xff) { |
6422
6679df1c05ba
(svn r9558) -Documentation: doxygen and comment changes: 'T' now. Almost done
belugas
parents:
6407
diff
changeset
|
2252 |
/* blaha */ |
5587
167d9a91ef02
(svn r8038) -Merge: the cpp branch. Effort of KUDr, Celestar, glx, Smoovius, stillunknown and pv2b.
rubidium
parents:
5584
diff
changeset
|
2253 |
best_track = FindFirstTrack(tracks); |
1247 | 2254 |
} else { |
5587
167d9a91ef02
(svn r8038) -Merge: the cpp branch. Effort of KUDr, Celestar, glx, Smoovius, stillunknown and pv2b.
rubidium
parents:
5584
diff
changeset
|
2255 |
best_track = TrackdirToTrack(fd.best_track); |
1247 | 2256 |
} |
3900
2c84ed52709d
(svn r4987) Feature: Merged YAPF into trunk. Thanks to devs for continuous support and users for testing.
KUDr
parents:
3870
diff
changeset
|
2257 |
|
6150 | 2258 |
int time = NpfEndInterval(perf); |
5380
8ea58542b6e0
(svn r7565) -Codechange: Rework DEBUG functionality. Look for appropiate debugging levels to
Darkvater
parents:
5316
diff
changeset
|
2259 |
DEBUG(yapf, 4, "[NTPT] %d us - %d rounds - %d open - %d closed -- ", time, 0, 0, 0); |
0 | 2260 |
} |
6422
6679df1c05ba
(svn r9558) -Documentation: doxygen and comment changes: 'T' now. Almost done
belugas
parents:
6407
diff
changeset
|
2261 |
/* handle "path not found" state */ |
4870
2d8c7ffbbac9
(svn r6800) -Feature change: [train is lost] message is now generated immediately when pathfinder can't find the path. (thanks MeusH, peter1138 and Brianetta for ideas and help).
KUDr
parents:
4856
diff
changeset
|
2262 |
if (path_not_found) { |
6422
6679df1c05ba
(svn r9558) -Documentation: doxygen and comment changes: 'T' now. Almost done
belugas
parents:
6407
diff
changeset
|
2263 |
/* PF didn't find the route */ |
7928
63e18de69e50
(svn r11481) -Codechange: Rename the HASBIT function to fit with the naming style
skidd13
parents:
7923
diff
changeset
|
2264 |
if (!HasBit(v->u.rail.flags, VRF_NO_PATH_TO_DESTINATION)) { |
6422
6679df1c05ba
(svn r9558) -Documentation: doxygen and comment changes: 'T' now. Almost done
belugas
parents:
6407
diff
changeset
|
2265 |
/* it is first time the problem occurred, set the "path not found" flag */ |
7931
b0a46cd92225
(svn r11484) -Codechange: Remove the doubled function SetBitT and rename the remaining to fit with the naming style
skidd13
parents:
7929
diff
changeset
|
2266 |
SetBit(v->u.rail.flags, VRF_NO_PATH_TO_DESTINATION); |
6422
6679df1c05ba
(svn r9558) -Documentation: doxygen and comment changes: 'T' now. Almost done
belugas
parents:
6407
diff
changeset
|
2267 |
/* and notify user about the event */ |
4996
6e704c18c8ba
(svn r7003) -Fix: only the appropriate train owner can now see the "Train is lost" message (peter1138)
KUDr
parents:
4870
diff
changeset
|
2268 |
if (_patches.lost_train_warn && v->owner == _local_player) { |
4870
2d8c7ffbbac9
(svn r6800) -Feature change: [train is lost] message is now generated immediately when pathfinder can't find the path. (thanks MeusH, peter1138 and Brianetta for ideas and help).
KUDr
parents:
4856
diff
changeset
|
2269 |
SetDParam(0, v->unitnumber); |
2d8c7ffbbac9
(svn r6800) -Feature change: [train is lost] message is now generated immediately when pathfinder can't find the path. (thanks MeusH, peter1138 and Brianetta for ideas and help).
KUDr
parents:
4856
diff
changeset
|
2270 |
AddNewsItem( |
2d8c7ffbbac9
(svn r6800) -Feature change: [train is lost] message is now generated immediately when pathfinder can't find the path. (thanks MeusH, peter1138 and Brianetta for ideas and help).
KUDr
parents:
4856
diff
changeset
|
2271 |
STR_TRAIN_IS_LOST, |
2d8c7ffbbac9
(svn r6800) -Feature change: [train is lost] message is now generated immediately when pathfinder can't find the path. (thanks MeusH, peter1138 and Brianetta for ideas and help).
KUDr
parents:
4856
diff
changeset
|
2272 |
NEWS_FLAGS(NM_SMALL, NF_VIEWPORT|NF_VEHICLE, NT_ADVICE, 0), |
2d8c7ffbbac9
(svn r6800) -Feature change: [train is lost] message is now generated immediately when pathfinder can't find the path. (thanks MeusH, peter1138 and Brianetta for ideas and help).
KUDr
parents:
4856
diff
changeset
|
2273 |
v->index, |
2d8c7ffbbac9
(svn r6800) -Feature change: [train is lost] message is now generated immediately when pathfinder can't find the path. (thanks MeusH, peter1138 and Brianetta for ideas and help).
KUDr
parents:
4856
diff
changeset
|
2274 |
0); |
2d8c7ffbbac9
(svn r6800) -Feature change: [train is lost] message is now generated immediately when pathfinder can't find the path. (thanks MeusH, peter1138 and Brianetta for ideas and help).
KUDr
parents:
4856
diff
changeset
|
2275 |
} |
2d8c7ffbbac9
(svn r6800) -Feature change: [train is lost] message is now generated immediately when pathfinder can't find the path. (thanks MeusH, peter1138 and Brianetta for ideas and help).
KUDr
parents:
4856
diff
changeset
|
2276 |
} |
2d8c7ffbbac9
(svn r6800) -Feature change: [train is lost] message is now generated immediately when pathfinder can't find the path. (thanks MeusH, peter1138 and Brianetta for ideas and help).
KUDr
parents:
4856
diff
changeset
|
2277 |
} else { |
6422
6679df1c05ba
(svn r9558) -Documentation: doxygen and comment changes: 'T' now. Almost done
belugas
parents:
6407
diff
changeset
|
2278 |
/* route found, is the train marked with "path not found" flag? */ |
7928
63e18de69e50
(svn r11481) -Codechange: Rename the HASBIT function to fit with the naming style
skidd13
parents:
7923
diff
changeset
|
2279 |
if (HasBit(v->u.rail.flags, VRF_NO_PATH_TO_DESTINATION)) { |
6422
6679df1c05ba
(svn r9558) -Documentation: doxygen and comment changes: 'T' now. Almost done
belugas
parents:
6407
diff
changeset
|
2280 |
/* clear the flag as the PF's problem was solved */ |
7929
6c9b25842b0f
(svn r11482) -Codechange: Remove the doubled function ClrBitT and rename the remaining to fit with the naming style
skidd13
parents:
7928
diff
changeset
|
2281 |
ClrBit(v->u.rail.flags, VRF_NO_PATH_TO_DESTINATION); |
6422
6679df1c05ba
(svn r9558) -Documentation: doxygen and comment changes: 'T' now. Almost done
belugas
parents:
6407
diff
changeset
|
2282 |
/* can we also delete the "News" item somehow? */ |
4870
2d8c7ffbbac9
(svn r6800) -Feature change: [train is lost] message is now generated immediately when pathfinder can't find the path. (thanks MeusH, peter1138 and Brianetta for ideas and help).
KUDr
parents:
4856
diff
changeset
|
2283 |
} |
2d8c7ffbbac9
(svn r6800) -Feature change: [train is lost] message is now generated immediately when pathfinder can't find the path. (thanks MeusH, peter1138 and Brianetta for ideas and help).
KUDr
parents:
4856
diff
changeset
|
2284 |
} |
0 | 2285 |
|
2758
e962dd6c3ed4
(svn r3303) Change #if PF_BENCHMARK to #ifdef PF_BENCHMARK
peter1138
parents:
2752
diff
changeset
|
2286 |
#ifdef PF_BENCHMARK |
3341
b20541ef8945
(svn r4125) - Feature: Add a general TIC() TOC() mechanism using rdtsc or something similar on non-i386 architectures to performance-tune (critical) code. Some systems are probably missing, but those can be added later.
Darkvater
parents:
3334
diff
changeset
|
2287 |
TOC("PF time = ", 1) |
0 | 2288 |
#endif |
2289 |
||
2290 |
return best_track; |
|
2291 |
} |
|
2292 |
||
2293 |
||
2294 |
static bool CheckReverseTrain(Vehicle *v) |
|
2295 |
{ |
|
2296 |
if (_opt.diff.line_reverse_mode != 0 || |
|
5993
956d341d930e
(svn r8701) -Codechange: replace magic numbers with enums for u.rail.track.
rubidium
parents:
5992
diff
changeset
|
2297 |
v->u.rail.track == TRACK_BIT_DEPOT || v->u.rail.track == TRACK_BIT_WORMHOLE || |
0 | 2298 |
!(v->direction & 1)) |
2299 |
return false; |
|
2300 |
||
6150 | 2301 |
TrainTrackFollowerData fd; |
0 | 2302 |
FillWithStationData(&fd, v); |
2303 |
||
6150 | 2304 |
uint reverse_best = 0; |
0 | 2305 |
|
2306 |
assert(v->u.rail.track); |
|
2307 |
||
6150 | 2308 |
int i = _search_directions[FIND_FIRST_BIT(v->u.rail.track)][DirToDiagDir(v->direction)]; |
0 | 2309 |
|
3900
2c84ed52709d
(svn r4987) Feature: Merged YAPF into trunk. Thanks to devs for continuous support and users for testing.
KUDr
parents:
3870
diff
changeset
|
2310 |
if (_patches.yapf.rail_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
|
2311 |
reverse_best = YapfCheckReverseTrain(v); |
2c84ed52709d
(svn r4987) Feature: Merged YAPF into trunk. Thanks to devs for continuous support and users for testing.
KUDr
parents:
3870
diff
changeset
|
2312 |
} else if (_patches.new_pathfinding_all) { /* Use a new pathfinding for everything */ |
1247 | 2313 |
NPFFindStationOrTileData fstd; |
2314 |
NPFFoundTargetData ftd; |
|
5587
167d9a91ef02
(svn r8038) -Merge: the cpp branch. Effort of KUDr, Celestar, glx, Smoovius, stillunknown and pv2b.
rubidium
parents:
5584
diff
changeset
|
2315 |
Trackdir trackdir, trackdir_rev; |
1247 | 2316 |
Vehicle* last = GetLastVehicleInChain(v); |
2317 |
||
2318 |
NPFFillWithOrderData(&fstd, v); |
|
2319 |
||
1752
d65cd19f7117
(svn r2256) - Fix: Trains cannot find a depot when they are in a tunnel. (glx)
matthijs
parents:
1698
diff
changeset
|
2320 |
trackdir = GetVehicleTrackdir(v); |
1942
c5d5cf5b0263
(svn r2448) General cleanup of rail related code, more to follow.
matthijs
parents:
1935
diff
changeset
|
2321 |
trackdir_rev = ReverseTrackdir(GetVehicleTrackdir(last)); |
1247 | 2322 |
assert(trackdir != 0xff); |
2323 |
assert(trackdir_rev != 0xff); |
|
2324 |
||
6683
b88ae30866ce
(svn r9914) -Codechange: prepare GTTS and the pathfinders to handle multiple road types on a single tile.
rubidium
parents:
6644
diff
changeset
|
2325 |
ftd = NPFRouteToStationOrTileTwoWay(v->tile, trackdir, last->tile, trackdir_rev, &fstd, TRANSPORT_RAIL, 0, v->owner, v->u.rail.compatible_railtypes); |
1247 | 2326 |
if (ftd.best_bird_dist != 0) { |
2327 |
/* We didn't find anything, just keep on going straight ahead */ |
|
2328 |
reverse_best = false; |
|
2329 |
} else { |
|
3017
a75caf4efa2d
(svn r3597) Miscellaneous (I like that word) changes: Fix some indentation, add consts, reduce indentation level by short-circuit logic, convert if cascades to switch, whitespace, bracing, plus some minor stuff
tron
parents:
3008
diff
changeset
|
2330 |
if (NPFGetFlag(&ftd.node, NPF_FLAG_REVERSE)) { |
1247 | 2331 |
reverse_best = true; |
3017
a75caf4efa2d
(svn r3597) Miscellaneous (I like that word) changes: Fix some indentation, add consts, reduce indentation level by short-circuit logic, convert if cascades to switch, whitespace, bracing, plus some minor stuff
tron
parents:
3008
diff
changeset
|
2332 |
} else { |
1247 | 2333 |
reverse_best = false; |
3017
a75caf4efa2d
(svn r3597) Miscellaneous (I like that word) changes: Fix some indentation, add consts, reduce indentation level by short-circuit logic, convert if cascades to switch, whitespace, bracing, plus some minor stuff
tron
parents:
3008
diff
changeset
|
2334 |
} |
1247 | 2335 |
} |
2336 |
} else { |
|
6150 | 2337 |
int best_track = -1; |
2338 |
uint reverse = 0; |
|
2339 |
uint best_bird_dist = 0; |
|
2340 |
uint best_track_dist = 0; |
|
2341 |
||
2952 | 2342 |
for (;;) { |
1247 | 2343 |
fd.best_bird_dist = (uint)-1; |
2344 |
fd.best_track_dist = (uint)-1; |
|
2345 |
||
5587
167d9a91ef02
(svn r8038) -Merge: the cpp branch. Effort of KUDr, Celestar, glx, Smoovius, stillunknown and pv2b.
rubidium
parents:
5584
diff
changeset
|
2346 |
NewTrainPathfind(v->tile, v->dest_tile, v->u.rail.compatible_railtypes, (DiagDirection)(reverse ^ i), (NTPEnumProc*)NtpCallbFindStation, &fd); |
1247 | 2347 |
|
2348 |
if (best_track != -1) { |
|
2349 |
if (best_bird_dist != 0) { |
|
2350 |
if (fd.best_bird_dist != 0) { |
|
2351 |
/* neither reached the destination, pick the one with the smallest bird dist */ |
|
2352 |
if (fd.best_bird_dist > best_bird_dist) goto bad; |
|
2353 |
if (fd.best_bird_dist < best_bird_dist) goto good; |
|
2354 |
} else { |
|
2355 |
/* we found the destination for the first time */ |
|
2356 |
goto good; |
|
2357 |
} |
|
0 | 2358 |
} else { |
1247 | 2359 |
if (fd.best_bird_dist != 0) { |
2360 |
/* didn't find destination, but we've found the destination previously */ |
|
2361 |
goto bad; |
|
2362 |
} else { |
|
2363 |
/* both old & new reached the destination, compare track length */ |
|
2364 |
if (fd.best_track_dist > best_track_dist) goto bad; |
|
2365 |
if (fd.best_track_dist < best_track_dist) goto good; |
|
2366 |
} |
|
0 | 2367 |
} |
1247 | 2368 |
|
2369 |
/* if we reach this position, there's two paths of equal value so far. |
|
2370 |
* pick one randomly. */ |
|
6150 | 2371 |
int r = GB(Random(), 0, 8); |
1247 | 2372 |
if (_pick_track_table[i] == (v->direction & 3)) r += 80; |
2373 |
if (_pick_track_table[best_track] == (v->direction & 3)) r -= 80; |
|
2374 |
if (r <= 127) goto bad; |
|
0 | 2375 |
} |
1247 | 2376 |
good:; |
2377 |
best_track = i; |
|
2378 |
best_bird_dist = fd.best_bird_dist; |
|
2379 |
best_track_dist = fd.best_track_dist; |
|
2380 |
reverse_best = reverse; |
|
2381 |
bad:; |
|
3017
a75caf4efa2d
(svn r3597) Miscellaneous (I like that word) changes: Fix some indentation, add consts, reduce indentation level by short-circuit logic, convert if cascades to switch, whitespace, bracing, plus some minor stuff
tron
parents:
3008
diff
changeset
|
2382 |
if (reverse != 0) break; |
1247 | 2383 |
reverse = 2; |
0 | 2384 |
} |
2385 |
} |
|
2386 |
||
2387 |
return reverse_best != 0; |
|
2388 |
} |
|
2389 |
||
2390 |
static bool ProcessTrainOrder(Vehicle *v) |
|
2391 |
{ |
|
3005
2590b9b4823b
(svn r3585) Similar changes to the order handlers of the other vehicle types like r3584
tron
parents:
2999
diff
changeset
|
2392 |
switch (v->current_order.type) { |
2590b9b4823b
(svn r3585) Similar changes to the order handlers of the other vehicle types like r3584
tron
parents:
2999
diff
changeset
|
2393 |
case OT_GOTO_DEPOT: |
2590b9b4823b
(svn r3585) Similar changes to the order handlers of the other vehicle types like r3584
tron
parents:
2999
diff
changeset
|
2394 |
if (!(v->current_order.flags & OF_PART_OF_ORDERS)) return false; |
2590b9b4823b
(svn r3585) Similar changes to the order handlers of the other vehicle types like r3584
tron
parents:
2999
diff
changeset
|
2395 |
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:
2999
diff
changeset
|
2396 |
!VehicleNeedsService(v)) { |
7070
2f4e1b2facc6
(svn r10335) -Fix (r10331): Increment the current order index *after* using it in UpdateVehicleTimetable.
maedhros
parents:
7052
diff
changeset
|
2397 |
UpdateVehicleTimetable(v, true); |
3005
2590b9b4823b
(svn r3585) Similar changes to the order handlers of the other vehicle types like r3584
tron
parents:
2999
diff
changeset
|
2398 |
v->cur_order_index++; |
2590b9b4823b
(svn r3585) Similar changes to the order handlers of the other vehicle types like r3584
tron
parents:
2999
diff
changeset
|
2399 |
} |
2590b9b4823b
(svn r3585) Similar changes to the order handlers of the other vehicle types like r3584
tron
parents:
2999
diff
changeset
|
2400 |
break; |
2590b9b4823b
(svn r3585) Similar changes to the order handlers of the other vehicle types like r3584
tron
parents:
2999
diff
changeset
|
2401 |
|
2590b9b4823b
(svn r3585) Similar changes to the order handlers of the other vehicle types like r3584
tron
parents:
2999
diff
changeset
|
2402 |
case OT_LOADING: |
2590b9b4823b
(svn r3585) Similar changes to the order handlers of the other vehicle types like r3584
tron
parents:
2999
diff
changeset
|
2403 |
case OT_LEAVESTATION: |
0 | 2404 |
return false; |
4351
c9799dd53eec
(svn r6052) -Codechange: change OrderType (order->type) in a typedef
truelight
parents:
4344
diff
changeset
|
2405 |
|
c9799dd53eec
(svn r6052) -Codechange: change OrderType (order->type) in a typedef
truelight
parents:
4344
diff
changeset
|
2406 |
default: break; |
0 | 2407 |
} |
2408 |
||
7109
1e4193eb74ba
(svn r10381) -Fix [FS#951]: skipping an order made train reverse immediatelly. Patch by boekabart.
rubidium
parents:
7096
diff
changeset
|
2409 |
/** |
1e4193eb74ba
(svn r10381) -Fix [FS#951]: skipping an order made train reverse immediatelly. Patch by boekabart.
rubidium
parents:
7096
diff
changeset
|
2410 |
* Reversing because of order change is allowed only just after leaving a |
1e4193eb74ba
(svn r10381) -Fix [FS#951]: skipping an order made train reverse immediatelly. Patch by boekabart.
rubidium
parents:
7096
diff
changeset
|
2411 |
* station (and the difficulty setting to allowed, of course) |
1e4193eb74ba
(svn r10381) -Fix [FS#951]: skipping an order made train reverse immediatelly. Patch by boekabart.
rubidium
parents:
7096
diff
changeset
|
2412 |
* this can be detected because only after OT_LEAVESTATION, current_order |
1e4193eb74ba
(svn r10381) -Fix [FS#951]: skipping an order made train reverse immediatelly. Patch by boekabart.
rubidium
parents:
7096
diff
changeset
|
2413 |
* will be reset to nothing. (That also happens if no order, but in that case |
1e4193eb74ba
(svn r10381) -Fix [FS#951]: skipping an order made train reverse immediatelly. Patch by boekabart.
rubidium
parents:
7096
diff
changeset
|
2414 |
* it won't hit the point in code where may_reverse is checked) |
1e4193eb74ba
(svn r10381) -Fix [FS#951]: skipping an order made train reverse immediatelly. Patch by boekabart.
rubidium
parents:
7096
diff
changeset
|
2415 |
*/ |
1e4193eb74ba
(svn r10381) -Fix [FS#951]: skipping an order made train reverse immediatelly. Patch by boekabart.
rubidium
parents:
7096
diff
changeset
|
2416 |
bool may_reverse = v->current_order.type == OT_NOTHING; |
1e4193eb74ba
(svn r10381) -Fix [FS#951]: skipping an order made train reverse immediatelly. Patch by boekabart.
rubidium
parents:
7096
diff
changeset
|
2417 |
|
6422
6679df1c05ba
(svn r9558) -Documentation: doxygen and comment changes: 'T' now. Almost done
belugas
parents:
6407
diff
changeset
|
2418 |
/* check if we've reached the waypoint? */ |
555
02df8a1b7f33
(svn r955) Replace uint16 for orders with struct Order
tron
parents:
541
diff
changeset
|
2419 |
if (v->current_order.type == OT_GOTO_WAYPOINT && v->tile == v->dest_tile) { |
7070
2f4e1b2facc6
(svn r10335) -Fix (r10331): Increment the current order index *after* using it in UpdateVehicleTimetable.
maedhros
parents:
7052
diff
changeset
|
2420 |
UpdateVehicleTimetable(v, true); |
0 | 2421 |
v->cur_order_index++; |
2422 |
} |
|
2423 |
||
6422
6679df1c05ba
(svn r9558) -Documentation: doxygen and comment changes: 'T' now. Almost done
belugas
parents:
6407
diff
changeset
|
2424 |
/* check if we've reached a non-stop station while TTDPatch nonstop is enabled.. */ |
2549 | 2425 |
if (_patches.new_nonstop && |
2426 |
v->current_order.flags & OF_NON_STOP && |
|
2427 |
IsTileType(v->tile, MP_STATION) && |
|
4527
fa30d19685c2
(svn r6353) -Codechange: Make DestinationID a typedef of uin16, which is as large as any type of destinataion (StationID, DepotID, WaypointID) it can hold
tron
parents:
4526
diff
changeset
|
2428 |
v->current_order.dest == GetStationIndex(v->tile)) { |
7070
2f4e1b2facc6
(svn r10335) -Fix (r10331): Increment the current order index *after* using it in UpdateVehicleTimetable.
maedhros
parents:
7052
diff
changeset
|
2429 |
UpdateVehicleTimetable(v, true); |
193
0a7025304867
(svn r194) -Codechange: stripping trailing-spaces. Please keep this that way!
truelight
parents:
166
diff
changeset
|
2430 |
v->cur_order_index++; |
0 | 2431 |
} |
2432 |
||
6422
6679df1c05ba
(svn r9558) -Documentation: doxygen and comment changes: 'T' now. Almost done
belugas
parents:
6407
diff
changeset
|
2433 |
/* Get the current order */ |
2639 | 2434 |
if (v->cur_order_index >= v->num_orders) v->cur_order_index = 0; |
1024
5e446b5b3ec5
(svn r1525) -Codechange: rewrote the _order_array, now it can be made dynamic.
truelight
parents:
954
diff
changeset
|
2435 |
|
6150 | 2436 |
const Order *order = GetVehicleOrder(v, v->cur_order_index); |
0 | 2437 |
|
6422
6679df1c05ba
(svn r9558) -Documentation: doxygen and comment changes: 'T' now. Almost done
belugas
parents:
6407
diff
changeset
|
2438 |
/* If no order, do nothing. */ |
1024
5e446b5b3ec5
(svn r1525) -Codechange: rewrote the _order_array, now it can be made dynamic.
truelight
parents:
954
diff
changeset
|
2439 |
if (order == NULL) { |
6263
6bd0726c74e2
(svn r9072) -Codechange: [Orders] added methods to orders to free them and check if they are in use
bjarni
parents:
6259
diff
changeset
|
2440 |
v->current_order.Free(); |
0 | 2441 |
v->dest_tile = 0; |
2442 |
return false; |
|
2443 |
} |
|
2444 |
||
6422
6679df1c05ba
(svn r9558) -Documentation: doxygen and comment changes: 'T' now. Almost done
belugas
parents:
6407
diff
changeset
|
2445 |
/* If it is unchanged, keep it. */ |
4527
fa30d19685c2
(svn r6353) -Codechange: Make DestinationID a typedef of uin16, which is as large as any type of destinataion (StationID, DepotID, WaypointID) it can hold
tron
parents:
4526
diff
changeset
|
2446 |
if (order->type == v->current_order.type && |
fa30d19685c2
(svn r6353) -Codechange: Make DestinationID a typedef of uin16, which is as large as any type of destinataion (StationID, DepotID, WaypointID) it can hold
tron
parents:
4526
diff
changeset
|
2447 |
order->flags == v->current_order.flags && |
fa30d19685c2
(svn r6353) -Codechange: Make DestinationID a typedef of uin16, which is as large as any type of destinataion (StationID, DepotID, WaypointID) it can hold
tron
parents:
4526
diff
changeset
|
2448 |
order->dest == v->current_order.dest) |
0 | 2449 |
return false; |
2450 |
||
6422
6679df1c05ba
(svn r9558) -Documentation: doxygen and comment changes: 'T' now. Almost done
belugas
parents:
6407
diff
changeset
|
2451 |
/* Otherwise set it, and determine the destination tile. */ |
1024
5e446b5b3ec5
(svn r1525) -Codechange: rewrote the _order_array, now it can be made dynamic.
truelight
parents:
954
diff
changeset
|
2452 |
v->current_order = *order; |
0 | 2453 |
|
2454 |
v->dest_tile = 0; |
|
2455 |
||
3934
5aadf059954b
(svn r5071) - Fix (FS#184): "Erroneous train reversal on waypoints". When processing the next train order, do not even consider reversing the train if the last order was to a waypoint.
peter1138
parents:
3933
diff
changeset
|
2456 |
InvalidateVehicleOrder(v); |
5aadf059954b
(svn r5071) - Fix (FS#184): "Erroneous train reversal on waypoints". When processing the next train order, do not even consider reversing the train if the last order was to a waypoint.
peter1138
parents:
3933
diff
changeset
|
2457 |
|
1024
5e446b5b3ec5
(svn r1525) -Codechange: rewrote the _order_array, now it can be made dynamic.
truelight
parents:
954
diff
changeset
|
2458 |
switch (order->type) { |
5e446b5b3ec5
(svn r1525) -Codechange: rewrote the _order_array, now it can be made dynamic.
truelight
parents:
954
diff
changeset
|
2459 |
case OT_GOTO_STATION: |
4527
fa30d19685c2
(svn r6353) -Codechange: Make DestinationID a typedef of uin16, which is as large as any type of destinataion (StationID, DepotID, WaypointID) it can hold
tron
parents:
4526
diff
changeset
|
2460 |
if (order->dest == 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
|
2461 |
v->last_station_visited = INVALID_STATION; |
4527
fa30d19685c2
(svn r6353) -Codechange: Make DestinationID a typedef of uin16, which is as large as any type of destinataion (StationID, DepotID, WaypointID) it can hold
tron
parents:
4526
diff
changeset
|
2462 |
v->dest_tile = GetStation(order->dest)->xy; |
1024
5e446b5b3ec5
(svn r1525) -Codechange: rewrote the _order_array, now it can be made dynamic.
truelight
parents:
954
diff
changeset
|
2463 |
break; |
5e446b5b3ec5
(svn r1525) -Codechange: rewrote the _order_array, now it can be made dynamic.
truelight
parents:
954
diff
changeset
|
2464 |
|
5e446b5b3ec5
(svn r1525) -Codechange: rewrote the _order_array, now it can be made dynamic.
truelight
parents:
954
diff
changeset
|
2465 |
case OT_GOTO_DEPOT: |
4527
fa30d19685c2
(svn r6353) -Codechange: Make DestinationID a typedef of uin16, which is as large as any type of destinataion (StationID, DepotID, WaypointID) it can hold
tron
parents:
4526
diff
changeset
|
2466 |
v->dest_tile = GetDepot(order->dest)->xy; |
1024
5e446b5b3ec5
(svn r1525) -Codechange: rewrote the _order_array, now it can be made dynamic.
truelight
parents:
954
diff
changeset
|
2467 |
break; |
5e446b5b3ec5
(svn r1525) -Codechange: rewrote the _order_array, now it can be made dynamic.
truelight
parents:
954
diff
changeset
|
2468 |
|
5e446b5b3ec5
(svn r1525) -Codechange: rewrote the _order_array, now it can be made dynamic.
truelight
parents:
954
diff
changeset
|
2469 |
case OT_GOTO_WAYPOINT: |
4527
fa30d19685c2
(svn r6353) -Codechange: Make DestinationID a typedef of uin16, which is as large as any type of destinataion (StationID, DepotID, WaypointID) it can hold
tron
parents:
4526
diff
changeset
|
2470 |
v->dest_tile = GetWaypoint(order->dest)->xy; |
1024
5e446b5b3ec5
(svn r1525) -Codechange: rewrote the _order_array, now it can be made dynamic.
truelight
parents:
954
diff
changeset
|
2471 |
break; |
3934
5aadf059954b
(svn r5071) - Fix (FS#184): "Erroneous train reversal on waypoints". When processing the next train order, do not even consider reversing the train if the last order was to a waypoint.
peter1138
parents:
3933
diff
changeset
|
2472 |
|
5aadf059954b
(svn r5071) - Fix (FS#184): "Erroneous train reversal on waypoints". When processing the next train order, do not even consider reversing the train if the last order was to a waypoint.
peter1138
parents:
3933
diff
changeset
|
2473 |
default: |
5aadf059954b
(svn r5071) - Fix (FS#184): "Erroneous train reversal on waypoints". When processing the next train order, do not even consider reversing the train if the last order was to a waypoint.
peter1138
parents:
3933
diff
changeset
|
2474 |
return false; |
0 | 2475 |
} |
2476 |
||
7109
1e4193eb74ba
(svn r10381) -Fix [FS#951]: skipping an order made train reverse immediatelly. Patch by boekabart.
rubidium
parents:
7096
diff
changeset
|
2477 |
return may_reverse && CheckReverseTrain(v); |
0 | 2478 |
} |
2479 |
||
6553
976a684212ad
(svn r9755) -Codechange: refactor some more of the begin loading stuff.
rubidium
parents:
6552
diff
changeset
|
2480 |
void Train::MarkDirty() |
0 | 2481 |
{ |
6553
976a684212ad
(svn r9755) -Codechange: refactor some more of the begin loading stuff.
rubidium
parents:
6552
diff
changeset
|
2482 |
Vehicle *v = this; |
0 | 2483 |
do { |
7134
5b2d47128d05
(svn r10408) -Codechange: make GetImage a class method of Vehicle instead of Get(Aircraft|RoadVeh|Ship|Train)Image.
rubidium
parents:
7109
diff
changeset
|
2484 |
v->cur_image = v->GetImage(v->direction); |
0 | 2485 |
MarkAllViewportsDirty(v->left_coord, v->top_coord, v->right_coord + 1, v->bottom_coord + 1); |
7492
35acee076719
(svn r11003) -Codechange: replace Vehicle->next to Vehicle->Next() and Vehicle->SetNext() so we can trap instances that change a next pointer and (in the future) update the first/previous pointers based on that.
rubidium
parents:
7488
diff
changeset
|
2486 |
} while ((v = v->Next()) != NULL); |
6553
976a684212ad
(svn r9755) -Codechange: refactor some more of the begin loading stuff.
rubidium
parents:
6552
diff
changeset
|
2487 |
|
976a684212ad
(svn r9755) -Codechange: refactor some more of the begin loading stuff.
rubidium
parents:
6552
diff
changeset
|
2488 |
/* need to update acceleration and cached values since the goods on the train changed. */ |
976a684212ad
(svn r9755) -Codechange: refactor some more of the begin loading stuff.
rubidium
parents:
6552
diff
changeset
|
2489 |
TrainCargoChanged(this); |
976a684212ad
(svn r9755) -Codechange: refactor some more of the begin loading stuff.
rubidium
parents:
6552
diff
changeset
|
2490 |
UpdateTrainAcceleration(this); |
0 | 2491 |
} |
2492 |
||
2493 |
static int UpdateTrainSpeed(Vehicle *v) |
|
2494 |
{ |
|
2495 |
uint accel; |
|
2496 |
||
7928
63e18de69e50
(svn r11481) -Codechange: Rename the HASBIT function to fit with the naming style
skidd13
parents:
7923
diff
changeset
|
2497 |
if (v->vehstatus & VS_STOPPED || HasBit(v->u.rail.flags, VRF_REVERSING)) { |
2639 | 2498 |
if (_patches.realistic_acceleration) { |
1179
ce0a75460808
(svn r1681) -Feature: New realistic acceleration.
celestar
parents:
1174
diff
changeset
|
2499 |
accel = GetTrainAcceleration(v, AM_BRAKE) * 2; |
2639 | 2500 |
} else { |
1179
ce0a75460808
(svn r1681) -Feature: New realistic acceleration.
celestar
parents:
1174
diff
changeset
|
2501 |
accel = v->acceleration * -2; |
2639 | 2502 |
} |
0 | 2503 |
} else { |
2639 | 2504 |
if (_patches.realistic_acceleration) { |
1179
ce0a75460808
(svn r1681) -Feature: New realistic acceleration.
celestar
parents:
1174
diff
changeset
|
2505 |
accel = GetTrainAcceleration(v, AM_ACCEL); |
2639 | 2506 |
} else { |
1179
ce0a75460808
(svn r1681) -Feature: New realistic acceleration.
celestar
parents:
1174
diff
changeset
|
2507 |
accel = v->acceleration; |
2639 | 2508 |
} |
0 | 2509 |
} |
2510 |
||
6150 | 2511 |
uint spd = v->subspeed + accel * 2; |
0 | 2512 |
v->subspeed = (byte)spd; |
1179
ce0a75460808
(svn r1681) -Feature: New realistic acceleration.
celestar
parents:
1174
diff
changeset
|
2513 |
{ |
ce0a75460808
(svn r1681) -Feature: New realistic acceleration.
celestar
parents:
1174
diff
changeset
|
2514 |
int tempmax = v->max_speed; |
ce0a75460808
(svn r1681) -Feature: New realistic acceleration.
celestar
parents:
1174
diff
changeset
|
2515 |
if (v->cur_speed > v->max_speed) |
ce0a75460808
(svn r1681) -Feature: New realistic acceleration.
celestar
parents:
1174
diff
changeset
|
2516 |
tempmax = v->cur_speed - (v->cur_speed / 10) - 1; |
7922
a7e266f966d9
(svn r11475) -Codechange: rename clamp and clampu to Clamp and ClampU to fit with the coding style
skidd13
parents:
7881
diff
changeset
|
2517 |
v->cur_speed = spd = Clamp(v->cur_speed + ((int)spd >> 8), 0, tempmax); |
1179
ce0a75460808
(svn r1681) -Feature: New realistic acceleration.
celestar
parents:
1174
diff
changeset
|
2518 |
} |
0 | 2519 |
|
2520 |
if (!(v->direction & 1)) spd = spd * 3 >> 2; |
|
2521 |
||
2522 |
spd += v->progress; |
|
2523 |
v->progress = (byte)spd; |
|
2524 |
return (spd >> 8); |
|
2525 |
} |
|
2526 |
||
1551
b1c7df6daa63
(svn r2055) -CodeChange: Begun introducting StationID
celestar
parents:
1542
diff
changeset
|
2527 |
static void TrainEnterStation(Vehicle *v, StationID station) |
0 | 2528 |
{ |
2529 |
v->last_station_visited = station; |
|
2530 |
||
2531 |
/* check if a train ever visited this station before */ |
|
6150 | 2532 |
Station *st = GetStation(station); |
0 | 2533 |
if (!(st->had_vehicle_of_type & HVOT_TRAIN)) { |
2534 |
st->had_vehicle_of_type |= HVOT_TRAIN; |
|
534
306bc86eb23e
(svn r901) Small step in the process to clean up the DPARAM mess:
tron
parents:
507
diff
changeset
|
2535 |
SetDParam(0, st->index); |
6150 | 2536 |
uint32 flags = v->owner == _local_player ? |
2537 |
NEWS_FLAGS(NM_THIN, NF_VIEWPORT | NF_VEHICLE, NT_ARRIVAL_PLAYER, 0) : |
|
2538 |
NEWS_FLAGS(NM_THIN, NF_VIEWPORT | NF_VEHICLE, NT_ARRIVAL_OTHER, 0); |
|
0 | 2539 |
AddNewsItem( |
2540 |
STR_8801_CITIZENS_CELEBRATE_FIRST, |
|
2541 |
flags, |
|
2542 |
v->index, |
|
3017
a75caf4efa2d
(svn r3597) Miscellaneous (I like that word) changes: Fix some indentation, add consts, reduce indentation level by short-circuit logic, convert if cascades to switch, whitespace, bracing, plus some minor stuff
tron
parents:
3008
diff
changeset
|
2543 |
0 |
a75caf4efa2d
(svn r3597) Miscellaneous (I like that word) changes: Fix some indentation, add consts, reduce indentation level by short-circuit logic, convert if cascades to switch, whitespace, bracing, plus some minor stuff
tron
parents:
3008
diff
changeset
|
2544 |
); |
0 | 2545 |
} |
2546 |
||
6550
8bdb954bba16
(svn r9752) -Codechange: remove some duplication related to BeginLoading.
rubidium
parents:
6546
diff
changeset
|
2547 |
v->BeginLoading(); |
4527
fa30d19685c2
(svn r6353) -Codechange: Make DestinationID a typedef of uin16, which is as large as any type of destinataion (StationID, DepotID, WaypointID) it can hold
tron
parents:
4526
diff
changeset
|
2548 |
v->current_order.dest = 0; |
0 | 2549 |
} |
2550 |
||
954
66c89362a778
(svn r1445) -Fix: reversing a train also reverses the UP and DOWN status for the
truelight
parents:
926
diff
changeset
|
2551 |
static byte AfterSetTrainPos(Vehicle *v, bool new_tile) |
0 | 2552 |
{ |
6150 | 2553 |
byte old_z = v->z_pos; |
7079
9cdb1b4f9928
(svn r10344) -Fix (r10317): confusion between TRACK_n and TRACK_BIT_n stopped NW/SE slopes being picked up, and compare middle of tile against current z, not previous.
peter1138
parents:
7070
diff
changeset
|
2554 |
v->z_pos = GetSlopeZ(v->x_pos, v->y_pos); |
0 | 2555 |
|
954
66c89362a778
(svn r1445) -Fix: reversing a train also reverses the UP and DOWN status for the
truelight
parents:
926
diff
changeset
|
2556 |
if (new_tile) { |
7929
6c9b25842b0f
(svn r11482) -Codechange: Remove the doubled function ClrBitT and rename the remaining to fit with the naming style
skidd13
parents:
7928
diff
changeset
|
2557 |
ClrBit(v->u.rail.flags, VRF_GOINGUP); |
6c9b25842b0f
(svn r11482) -Codechange: Remove the doubled function ClrBitT and rename the remaining to fit with the naming style
skidd13
parents:
7928
diff
changeset
|
2558 |
ClrBit(v->u.rail.flags, VRF_GOINGDOWN); |
954
66c89362a778
(svn r1445) -Fix: reversing a train also reverses the UP and DOWN status for the
truelight
parents:
926
diff
changeset
|
2559 |
|
7079
9cdb1b4f9928
(svn r10344) -Fix (r10317): confusion between TRACK_n and TRACK_BIT_n stopped NW/SE slopes being picked up, and compare middle of tile against current z, not previous.
peter1138
parents:
7070
diff
changeset
|
2560 |
if (v->u.rail.track == TRACK_BIT_X || v->u.rail.track == TRACK_BIT_Y) { |
9cdb1b4f9928
(svn r10344) -Fix (r10317): confusion between TRACK_n and TRACK_BIT_n stopped NW/SE slopes being picked up, and compare middle of tile against current z, not previous.
peter1138
parents:
7070
diff
changeset
|
2561 |
/* Any track that isn't TRACK_BIT_X or TRACK_BIT_Y cannot be sloped. |
7052
80fd9b1cc0cd
(svn r10317) -Fix [FS#786]: acceleration not calculated properly when a train goes up a hill between tunnels.
rubidium
parents:
7024
diff
changeset
|
2562 |
* To check whether the current tile is sloped, and in which |
80fd9b1cc0cd
(svn r10317) -Fix [FS#786]: acceleration not calculated properly when a train goes up a hill between tunnels.
rubidium
parents:
7024
diff
changeset
|
2563 |
* direction it is sloped, we get the 'z' at the center of |
80fd9b1cc0cd
(svn r10317) -Fix [FS#786]: acceleration not calculated properly when a train goes up a hill between tunnels.
rubidium
parents:
7024
diff
changeset
|
2564 |
* the tile (middle_z) and the edge of the tile (old_z), |
80fd9b1cc0cd
(svn r10317) -Fix [FS#786]: acceleration not calculated properly when a train goes up a hill between tunnels.
rubidium
parents:
7024
diff
changeset
|
2565 |
* which we then can compare. */ |
80fd9b1cc0cd
(svn r10317) -Fix [FS#786]: acceleration not calculated properly when a train goes up a hill between tunnels.
rubidium
parents:
7024
diff
changeset
|
2566 |
static const int HALF_TILE_SIZE = TILE_SIZE / 2; |
80fd9b1cc0cd
(svn r10317) -Fix [FS#786]: acceleration not calculated properly when a train goes up a hill between tunnels.
rubidium
parents:
7024
diff
changeset
|
2567 |
static const int INV_TILE_SIZE_MASK = ~(TILE_SIZE - 1); |
80fd9b1cc0cd
(svn r10317) -Fix [FS#786]: acceleration not calculated properly when a train goes up a hill between tunnels.
rubidium
parents:
7024
diff
changeset
|
2568 |
|
80fd9b1cc0cd
(svn r10317) -Fix [FS#786]: acceleration not calculated properly when a train goes up a hill between tunnels.
rubidium
parents:
7024
diff
changeset
|
2569 |
byte middle_z = GetSlopeZ((v->x_pos & INV_TILE_SIZE_MASK) | HALF_TILE_SIZE, (v->y_pos & INV_TILE_SIZE_MASK) | HALF_TILE_SIZE); |
80fd9b1cc0cd
(svn r10317) -Fix [FS#786]: acceleration not calculated properly when a train goes up a hill between tunnels.
rubidium
parents:
7024
diff
changeset
|
2570 |
|
80fd9b1cc0cd
(svn r10317) -Fix [FS#786]: acceleration not calculated properly when a train goes up a hill between tunnels.
rubidium
parents:
7024
diff
changeset
|
2571 |
/* For some reason tunnel tiles are always given as sloped :( |
80fd9b1cc0cd
(svn r10317) -Fix [FS#786]: acceleration not calculated properly when a train goes up a hill between tunnels.
rubidium
parents:
7024
diff
changeset
|
2572 |
* But they are not sloped... */ |
7079
9cdb1b4f9928
(svn r10344) -Fix (r10317): confusion between TRACK_n and TRACK_BIT_n stopped NW/SE slopes being picked up, and compare middle of tile against current z, not previous.
peter1138
parents:
7070
diff
changeset
|
2573 |
if (middle_z != v->z_pos && !IsTunnelTile(TileVirtXY(v->x_pos, v->y_pos))) { |
7931
b0a46cd92225
(svn r11484) -Codechange: Remove the doubled function SetBitT and rename the remaining to fit with the naming style
skidd13
parents:
7929
diff
changeset
|
2574 |
SetBit(v->u.rail.flags, (middle_z > old_z) ? VRF_GOINGUP : VRF_GOINGDOWN); |
3184
118a520164e4
(svn r3830) Move IsTunnelTile() from tile.h to tunnel_map.h and add IsTunnel(), which just checks for a tunnel, but not the tile type as IsTunnelTile() does
tron
parents:
3183
diff
changeset
|
2575 |
} |
954
66c89362a778
(svn r1445) -Fix: reversing a train also reverses the UP and DOWN status for the
truelight
parents:
926
diff
changeset
|
2576 |
} |
0 | 2577 |
} |
2578 |
||
2579 |
VehiclePositionChanged(v); |
|
2580 |
EndVehicleMove(v); |
|
2581 |
return old_z; |
|
2582 |
} |
|
2583 |
||
3157
3f35e2d9c8e3
(svn r3783) Replace further ints and magic numbers by Direction, DiagDirection and friends
tron
parents:
3154
diff
changeset
|
2584 |
static const Direction _new_vehicle_direction_table[11] = { |
5587
167d9a91ef02
(svn r8038) -Merge: the cpp branch. Effort of KUDr, Celestar, glx, Smoovius, stillunknown and pv2b.
rubidium
parents:
5584
diff
changeset
|
2585 |
DIR_N , DIR_NW, DIR_W , INVALID_DIR, |
167d9a91ef02
(svn r8038) -Merge: the cpp branch. Effort of KUDr, Celestar, glx, Smoovius, stillunknown and pv2b.
rubidium
parents:
5584
diff
changeset
|
2586 |
DIR_NE, DIR_N , DIR_SW, INVALID_DIR, |
3157
3f35e2d9c8e3
(svn r3783) Replace further ints and magic numbers by Direction, DiagDirection and friends
tron
parents:
3154
diff
changeset
|
2587 |
DIR_E , DIR_SE, DIR_S |
0 | 2588 |
}; |
2589 |
||
3153
e83501906eae
(svn r3776) Replace many ints and magic numbers by Direction, DiagDirection and friends
tron
parents:
3140
diff
changeset
|
2590 |
static Direction GetNewVehicleDirectionByTile(TileIndex new_tile, TileIndex old_tile) |
0 | 2591 |
{ |
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
|
2592 |
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
|
2593 |
TileX(new_tile) - TileX(old_tile) + 1; |
0 | 2594 |
assert(offs < 11); |
2595 |
return _new_vehicle_direction_table[offs]; |
|
2596 |
} |
|
2597 |
||
3153
e83501906eae
(svn r3776) Replace many ints and magic numbers by Direction, DiagDirection and friends
tron
parents:
3140
diff
changeset
|
2598 |
static Direction GetNewVehicleDirection(const Vehicle *v, int x, int y) |
0 | 2599 |
{ |
2600 |
uint offs = (y - v->y_pos + 1) * 4 + (x - v->x_pos + 1); |
|
2601 |
assert(offs < 11); |
|
2602 |
return _new_vehicle_direction_table[offs]; |
|
2603 |
} |
|
2604 |
||
2436
7d5df545bd5d
(svn r2962) - const correctness for all Get* functions and most Draw* functions that don't change their pointer parameters
Darkvater
parents:
2425
diff
changeset
|
2605 |
static int GetDirectionToVehicle(const Vehicle *v, int x, int y) |
0 | 2606 |
{ |
2607 |
byte offs; |
|
2608 |
||
2609 |
x -= v->x_pos; |
|
2610 |
if (x >= 0) { |
|
2611 |
offs = (x > 2) ? 0 : 1; |
|
2612 |
} else { |
|
2613 |
offs = (x < -2) ? 2 : 1; |
|
2614 |
} |
|
2615 |
||
2616 |
y -= v->y_pos; |
|
2617 |
if (y >= 0) { |
|
2618 |
offs += ((y > 2) ? 0 : 1) * 4; |
|
2619 |
} else { |
|
2620 |
offs += ((y < -2) ? 2 : 1) * 4; |
|
2621 |
} |
|
2622 |
||
2623 |
assert(offs < 11); |
|
2624 |
return _new_vehicle_direction_table[offs]; |
|
2625 |
} |
|
2626 |
||
2627 |
/* Check if the vehicle is compatible with the specified tile */ |
|
1048 | 2628 |
static bool CheckCompatibleRail(const Vehicle *v, TileIndex tile) |
0 | 2629 |
{ |
1048 | 2630 |
return |
2549 | 2631 |
IsTileOwner(tile, v->owner) && ( |
2676
59b65b4fb480
(svn r3218) -Feature: Multiheaded train engines will now stay in the same train
bjarni
parents:
2666
diff
changeset
|
2632 |
!IsFrontEngine(v) || |
7928
63e18de69e50
(svn r11481) -Codechange: Rename the HASBIT function to fit with the naming style
skidd13
parents:
7923
diff
changeset
|
2633 |
HasBit(v->u.rail.compatible_railtypes, GetRailType(tile)) |
2549 | 2634 |
); |
0 | 2635 |
} |
2636 |
||
6248
e4a2ed7e5613
(svn r9051) -Codechange: typedef [enum|struct] Y {} X; -> [enum|struct] X {};
rubidium
parents:
6247
diff
changeset
|
2637 |
struct RailtypeSlowdownParams { |
0 | 2638 |
byte small_turn, large_turn; |
2639 |
byte z_up; // fraction to remove when moving up |
|
2640 |
byte z_down; // fraction to remove when moving down |
|
6248
e4a2ed7e5613
(svn r9051) -Codechange: typedef [enum|struct] Y {} X; -> [enum|struct] X {};
rubidium
parents:
6247
diff
changeset
|
2641 |
}; |
0 | 2642 |
|
3355
e414a0b104a6
(svn r4150) -Feature: Merged elrails into trunk. Thanks to Tron for lots of code and proofreading, thanks to peter1138 for another lot of code and ideas.
celestar
parents:
3341
diff
changeset
|
2643 |
static const RailtypeSlowdownParams _railtype_slowdown[] = { |
0 | 2644 |
// normal accel |
6422
6679df1c05ba
(svn r9558) -Documentation: doxygen and comment changes: 'T' now. Almost done
belugas
parents:
6407
diff
changeset
|
2645 |
{256 / 4, 256 / 2, 256 / 4, 2}, ///< normal |
6679df1c05ba
(svn r9558) -Documentation: doxygen and comment changes: 'T' now. Almost done
belugas
parents:
6407
diff
changeset
|
2646 |
{256 / 4, 256 / 2, 256 / 4, 2}, ///< electrified |
6679df1c05ba
(svn r9558) -Documentation: doxygen and comment changes: 'T' now. Almost done
belugas
parents:
6407
diff
changeset
|
2647 |
{256 / 4, 256 / 2, 256 / 4, 2}, ///< monorail |
6679df1c05ba
(svn r9558) -Documentation: doxygen and comment changes: 'T' now. Almost done
belugas
parents:
6407
diff
changeset
|
2648 |
{0, 256 / 2, 256 / 4, 2}, ///< maglev |
0 | 2649 |
}; |
2650 |
||
6422
6679df1c05ba
(svn r9558) -Documentation: doxygen and comment changes: 'T' now. Almost done
belugas
parents:
6407
diff
changeset
|
2651 |
/** Modify the speed of the vehicle due to a turn */ |
3157
3f35e2d9c8e3
(svn r3783) Replace further ints and magic numbers by Direction, DiagDirection and friends
tron
parents:
3154
diff
changeset
|
2652 |
static void AffectSpeedByDirChange(Vehicle* v, Direction new_dir) |
0 | 2653 |
{ |
3158
696a6ca0bfa9
(svn r3784) Add a type and functions to handle direction changes
tron
parents:
3157
diff
changeset
|
2654 |
if (_patches.realistic_acceleration) return; |
696a6ca0bfa9
(svn r3784) Add a type and functions to handle direction changes
tron
parents:
3157
diff
changeset
|
2655 |
|
6150 | 2656 |
DirDiff diff = DirDifference(v->direction, new_dir); |
3158
696a6ca0bfa9
(svn r3784) Add a type and functions to handle direction changes
tron
parents:
3157
diff
changeset
|
2657 |
if (diff == DIRDIFF_SAME) return; |
0 | 2658 |
|
6150 | 2659 |
const RailtypeSlowdownParams *rsp = &_railtype_slowdown[v->u.rail.railtype]; |
3158
696a6ca0bfa9
(svn r3784) Add a type and functions to handle direction changes
tron
parents:
3157
diff
changeset
|
2660 |
v->cur_speed -= (diff == DIRDIFF_45RIGHT || diff == DIRDIFF_45LEFT ? rsp->small_turn : rsp->large_turn) * v->cur_speed >> 8; |
0 | 2661 |
} |
2662 |
||
6422
6679df1c05ba
(svn r9558) -Documentation: doxygen and comment changes: 'T' now. Almost done
belugas
parents:
6407
diff
changeset
|
2663 |
/** Modify the speed of the vehicle due to a change in altitude */ |
0 | 2664 |
static void AffectSpeedByZChange(Vehicle *v, byte old_z) |
2665 |
{ |
|
2639 | 2666 |
if (old_z == v->z_pos || _patches.realistic_acceleration) return; |
0 | 2667 |
|
6150 | 2668 |
const RailtypeSlowdownParams *rsp = &_railtype_slowdown[v->u.rail.railtype]; |
0 | 2669 |
|
2670 |
if (old_z < v->z_pos) { |
|
2671 |
v->cur_speed -= (v->cur_speed * rsp->z_up >> 8); |
|
2672 |
} else { |
|
2673 |
uint16 spd = v->cur_speed + rsp->z_down; |
|
2639 | 2674 |
if (spd <= v->max_speed) v->cur_speed = spd; |
0 | 2675 |
} |
2676 |
} |
|
2677 |
||
3172
ade284ef48ed
(svn r3803) Change the second parameter of UpdateSignalsOnSegment() from Direction to DiagDirection as that's what it really operates on
tron
parents:
3163
diff
changeset
|
2678 |
static const DiagDirection _otherside_signal_directions[] = { |
5587
167d9a91ef02
(svn r8038) -Merge: the cpp branch. Effort of KUDr, Celestar, glx, Smoovius, stillunknown and pv2b.
rubidium
parents:
5584
diff
changeset
|
2679 |
DIAGDIR_NE, DIAGDIR_SE, DIAGDIR_NE, DIAGDIR_SE, DIAGDIR_SW, DIAGDIR_SE, INVALID_DIAGDIR, INVALID_DIAGDIR, |
3172
ade284ef48ed
(svn r3803) Change the second parameter of UpdateSignalsOnSegment() from Direction to DiagDirection as that's what it really operates on
tron
parents:
3163
diff
changeset
|
2680 |
DIAGDIR_SW, DIAGDIR_NW, DIAGDIR_NW, DIAGDIR_SW, DIAGDIR_NW, DIAGDIR_NE |
0 | 2681 |
}; |
2682 |
||
3153
e83501906eae
(svn r3776) Replace many ints and magic numbers by Direction, DiagDirection and friends
tron
parents:
3140
diff
changeset
|
2683 |
static void TrainMovedChangeSignals(TileIndex tile, DiagDirection dir) |
0 | 2684 |
{ |
3267
feff95208a9f
(svn r3979) Move GetRailFoundation() to rail_map.h and use it and friends to get information about rail tiles
tron
parents:
3259
diff
changeset
|
2685 |
if (IsTileType(tile, MP_RAILWAY) && |
3792
67c865c9315c
(svn r4788) - Codechange: RAILTYPE_{NORMAL,ELECTRIC,...} and RAIL_TYPE_{NORMAL,SIGNAL,...} have nearly the same name, rename RAIL_TYPE_* to RAIL_TILE_* of extra clarity
rubidium
parents:
3773
diff
changeset
|
2686 |
GetRailTileType(tile) == RAIL_TILE_SIGNALS) { |
3269
62fb247bf94b
(svn r3981) More work for the rail accessing functions and enums
tron
parents:
3267
diff
changeset
|
2687 |
uint i = FindFirstBit2x64(GetTrackBits(tile) * 0x101 & _reachable_tracks[dir]); |
0 | 2688 |
UpdateSignalsOnSegment(tile, _otherside_signal_directions[i]); |
2689 |
} |
|
2690 |
} |
|
2691 |
||
2692 |
||
2693 |
static void SetVehicleCrashed(Vehicle *v) |
|
2694 |
{ |
|
3017
a75caf4efa2d
(svn r3597) Miscellaneous (I like that word) changes: Fix some indentation, add consts, reduce indentation level by short-circuit logic, convert if cascades to switch, whitespace, bracing, plus some minor stuff
tron
parents:
3008
diff
changeset
|
2695 |
if (v->u.rail.crash_anim_pos != 0) return; |
0 | 2696 |
|
2697 |
v->u.rail.crash_anim_pos++; |
|
193
0a7025304867
(svn r194) -Codechange: stripping trailing-spaces. Please keep this that way!
truelight
parents:
166
diff
changeset
|
2698 |
|
6150 | 2699 |
Vehicle *u = v; |
0 | 2700 |
BEGIN_ENUM_WAGONS(v) |
2701 |
v->vehstatus |= VS_CRASHED; |
|
2702 |
END_ENUM_WAGONS(v) |
|
2703 |
||
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:
744
diff
changeset
|
2704 |
InvalidateWindowWidget(WC_VEHICLE_VIEW, u->index, STATUS_BAR); |
0 | 2705 |
} |
2706 |
||
2549 | 2707 |
static uint CountPassengersInTrain(const Vehicle* v) |
0 | 2708 |
{ |
2549 | 2709 |
uint num = 0; |
0 | 2710 |
BEGIN_ENUM_WAGONS(v) |
7010
6f0d9f03180d
(svn r10266) -Codechange: keep track of the origin, time of travel and accumulated feeder share (transfers) of individual pieces of cargo. This means that cargo isn't thrown on a big pile when it's put in a station or unloaded at a station, however the GUI does not reflect these changes yet so you will not actually see it.
rubidium
parents:
7002
diff
changeset
|
2711 |
if (IsCargoInClass(v->cargo_type, CC_PASSENGERS)) num += v->cargo.Count(); |
0 | 2712 |
END_ENUM_WAGONS(v) |
2713 |
return num; |
|
2714 |
} |
|
2715 |
||
6966
e13afa08b151
(svn r10222) -Fix [FS#892]: Only 2 trains could crash at one time as collision checking stopped on the first hit. This could cause desyncs in network games as the collision hash order is not guaranteed. (patch by B. N. Smatz)
peter1138
parents:
6953
diff
changeset
|
2716 |
struct TrainCollideChecker { |
e13afa08b151
(svn r10222) -Fix [FS#892]: Only 2 trains could crash at one time as collision checking stopped on the first hit. This could cause desyncs in network games as the collision hash order is not guaranteed. (patch by B. N. Smatz)
peter1138
parents:
6953
diff
changeset
|
2717 |
Vehicle *v; |
e13afa08b151
(svn r10222) -Fix [FS#892]: Only 2 trains could crash at one time as collision checking stopped on the first hit. This could cause desyncs in network games as the collision hash order is not guaranteed. (patch by B. N. Smatz)
peter1138
parents:
6953
diff
changeset
|
2718 |
const Vehicle *v_skip; |
e13afa08b151
(svn r10222) -Fix [FS#892]: Only 2 trains could crash at one time as collision checking stopped on the first hit. This could cause desyncs in network games as the collision hash order is not guaranteed. (patch by B. N. Smatz)
peter1138
parents:
6953
diff
changeset
|
2719 |
uint num; |
e13afa08b151
(svn r10222) -Fix [FS#892]: Only 2 trains could crash at one time as collision checking stopped on the first hit. This could cause desyncs in network games as the collision hash order is not guaranteed. (patch by B. N. Smatz)
peter1138
parents:
6953
diff
changeset
|
2720 |
}; |
e13afa08b151
(svn r10222) -Fix [FS#892]: Only 2 trains could crash at one time as collision checking stopped on the first hit. This could cause desyncs in network games as the collision hash order is not guaranteed. (patch by B. N. Smatz)
peter1138
parents:
6953
diff
changeset
|
2721 |
|
e13afa08b151
(svn r10222) -Fix [FS#892]: Only 2 trains could crash at one time as collision checking stopped on the first hit. This could cause desyncs in network games as the collision hash order is not guaranteed. (patch by B. N. Smatz)
peter1138
parents:
6953
diff
changeset
|
2722 |
static void *FindTrainCollideEnum(Vehicle *v, void *data) |
e13afa08b151
(svn r10222) -Fix [FS#892]: Only 2 trains could crash at one time as collision checking stopped on the first hit. This could cause desyncs in network games as the collision hash order is not guaranteed. (patch by B. N. Smatz)
peter1138
parents:
6953
diff
changeset
|
2723 |
{ |
e13afa08b151
(svn r10222) -Fix [FS#892]: Only 2 trains could crash at one time as collision checking stopped on the first hit. This could cause desyncs in network games as the collision hash order is not guaranteed. (patch by B. N. Smatz)
peter1138
parents:
6953
diff
changeset
|
2724 |
TrainCollideChecker* tcc = (TrainCollideChecker*)data; |
e13afa08b151
(svn r10222) -Fix [FS#892]: Only 2 trains could crash at one time as collision checking stopped on the first hit. This could cause desyncs in network games as the collision hash order is not guaranteed. (patch by B. N. Smatz)
peter1138
parents:
6953
diff
changeset
|
2725 |
|
e13afa08b151
(svn r10222) -Fix [FS#892]: Only 2 trains could crash at one time as collision checking stopped on the first hit. This could cause desyncs in network games as the collision hash order is not guaranteed. (patch by B. N. Smatz)
peter1138
parents:
6953
diff
changeset
|
2726 |
if (v != tcc->v && |
e13afa08b151
(svn r10222) -Fix [FS#892]: Only 2 trains could crash at one time as collision checking stopped on the first hit. This could cause desyncs in network games as the collision hash order is not guaranteed. (patch by B. N. Smatz)
peter1138
parents:
6953
diff
changeset
|
2727 |
v != tcc->v_skip && |
e13afa08b151
(svn r10222) -Fix [FS#892]: Only 2 trains could crash at one time as collision checking stopped on the first hit. This could cause desyncs in network games as the collision hash order is not guaranteed. (patch by B. N. Smatz)
peter1138
parents:
6953
diff
changeset
|
2728 |
v->type == VEH_TRAIN && |
e13afa08b151
(svn r10222) -Fix [FS#892]: Only 2 trains could crash at one time as collision checking stopped on the first hit. This could cause desyncs in network games as the collision hash order is not guaranteed. (patch by B. N. Smatz)
peter1138
parents:
6953
diff
changeset
|
2729 |
v->u.rail.track != TRACK_BIT_DEPOT && |
7923
91982bd3c549
(svn r11476) -Codechange: rename the function myabs to abs to get rid of an unneeded define
skidd13
parents:
7922
diff
changeset
|
2730 |
abs(v->z_pos - tcc->v->z_pos) < 6 && |
91982bd3c549
(svn r11476) -Codechange: rename the function myabs to abs to get rid of an unneeded define
skidd13
parents:
7922
diff
changeset
|
2731 |
abs(v->x_pos - tcc->v->x_pos) < 6 && |
91982bd3c549
(svn r11476) -Codechange: rename the function myabs to abs to get rid of an unneeded define
skidd13
parents:
7922
diff
changeset
|
2732 |
abs(v->y_pos - tcc->v->y_pos) < 6 ) { |
6966
e13afa08b151
(svn r10222) -Fix [FS#892]: Only 2 trains could crash at one time as collision checking stopped on the first hit. This could cause desyncs in network games as the collision hash order is not guaranteed. (patch by B. N. Smatz)
peter1138
parents:
6953
diff
changeset
|
2733 |
|
7497
40e457c0a8ac
(svn r11011) -Fix [FS#1129]: GetFirstVehicleInChain did change the game state while being marked const.
rubidium
parents:
7493
diff
changeset
|
2734 |
Vehicle *coll = v->First(); |
6966
e13afa08b151
(svn r10222) -Fix [FS#892]: Only 2 trains could crash at one time as collision checking stopped on the first hit. This could cause desyncs in network games as the collision hash order is not guaranteed. (patch by B. N. Smatz)
peter1138
parents:
6953
diff
changeset
|
2735 |
|
e13afa08b151
(svn r10222) -Fix [FS#892]: Only 2 trains could crash at one time as collision checking stopped on the first hit. This could cause desyncs in network games as the collision hash order is not guaranteed. (patch by B. N. Smatz)
peter1138
parents:
6953
diff
changeset
|
2736 |
/* it can't collide with its own wagons */ |
e13afa08b151
(svn r10222) -Fix [FS#892]: Only 2 trains could crash at one time as collision checking stopped on the first hit. This could cause desyncs in network games as the collision hash order is not guaranteed. (patch by B. N. Smatz)
peter1138
parents:
6953
diff
changeset
|
2737 |
if (tcc->v == coll || |
e13afa08b151
(svn r10222) -Fix [FS#892]: Only 2 trains could crash at one time as collision checking stopped on the first hit. This could cause desyncs in network games as the collision hash order is not guaranteed. (patch by B. N. Smatz)
peter1138
parents:
6953
diff
changeset
|
2738 |
(tcc->v->u.rail.track == TRACK_BIT_WORMHOLE && (tcc->v->direction & 2) != (v->direction & 2))) |
e13afa08b151
(svn r10222) -Fix [FS#892]: Only 2 trains could crash at one time as collision checking stopped on the first hit. This could cause desyncs in network games as the collision hash order is not guaranteed. (patch by B. N. Smatz)
peter1138
parents:
6953
diff
changeset
|
2739 |
return NULL; |
e13afa08b151
(svn r10222) -Fix [FS#892]: Only 2 trains could crash at one time as collision checking stopped on the first hit. This could cause desyncs in network games as the collision hash order is not guaranteed. (patch by B. N. Smatz)
peter1138
parents:
6953
diff
changeset
|
2740 |
|
e13afa08b151
(svn r10222) -Fix [FS#892]: Only 2 trains could crash at one time as collision checking stopped on the first hit. This could cause desyncs in network games as the collision hash order is not guaranteed. (patch by B. N. Smatz)
peter1138
parents:
6953
diff
changeset
|
2741 |
/* two drivers + passengers killed in train tcc->v (if it was not crashed already) */ |
e13afa08b151
(svn r10222) -Fix [FS#892]: Only 2 trains could crash at one time as collision checking stopped on the first hit. This could cause desyncs in network games as the collision hash order is not guaranteed. (patch by B. N. Smatz)
peter1138
parents:
6953
diff
changeset
|
2742 |
if (!(tcc->v->vehstatus & VS_CRASHED)) { |
e13afa08b151
(svn r10222) -Fix [FS#892]: Only 2 trains could crash at one time as collision checking stopped on the first hit. This could cause desyncs in network games as the collision hash order is not guaranteed. (patch by B. N. Smatz)
peter1138
parents:
6953
diff
changeset
|
2743 |
tcc->num += 2 + CountPassengersInTrain(tcc->v); |
e13afa08b151
(svn r10222) -Fix [FS#892]: Only 2 trains could crash at one time as collision checking stopped on the first hit. This could cause desyncs in network games as the collision hash order is not guaranteed. (patch by B. N. Smatz)
peter1138
parents:
6953
diff
changeset
|
2744 |
SetVehicleCrashed(tcc->v); |
e13afa08b151
(svn r10222) -Fix [FS#892]: Only 2 trains could crash at one time as collision checking stopped on the first hit. This could cause desyncs in network games as the collision hash order is not guaranteed. (patch by B. N. Smatz)
peter1138
parents:
6953
diff
changeset
|
2745 |
} |
e13afa08b151
(svn r10222) -Fix [FS#892]: Only 2 trains could crash at one time as collision checking stopped on the first hit. This could cause desyncs in network games as the collision hash order is not guaranteed. (patch by B. N. Smatz)
peter1138
parents:
6953
diff
changeset
|
2746 |
|
e13afa08b151
(svn r10222) -Fix [FS#892]: Only 2 trains could crash at one time as collision checking stopped on the first hit. This could cause desyncs in network games as the collision hash order is not guaranteed. (patch by B. N. Smatz)
peter1138
parents:
6953
diff
changeset
|
2747 |
if (!(coll->vehstatus & VS_CRASHED)) { |
e13afa08b151
(svn r10222) -Fix [FS#892]: Only 2 trains could crash at one time as collision checking stopped on the first hit. This could cause desyncs in network games as the collision hash order is not guaranteed. (patch by B. N. Smatz)
peter1138
parents:
6953
diff
changeset
|
2748 |
/* two drivers + passengers killed in train coll (if it was not crashed already) */ |
e13afa08b151
(svn r10222) -Fix [FS#892]: Only 2 trains could crash at one time as collision checking stopped on the first hit. This could cause desyncs in network games as the collision hash order is not guaranteed. (patch by B. N. Smatz)
peter1138
parents:
6953
diff
changeset
|
2749 |
tcc->num += 2 + CountPassengersInTrain(coll); |
e13afa08b151
(svn r10222) -Fix [FS#892]: Only 2 trains could crash at one time as collision checking stopped on the first hit. This could cause desyncs in network games as the collision hash order is not guaranteed. (patch by B. N. Smatz)
peter1138
parents:
6953
diff
changeset
|
2750 |
SetVehicleCrashed(coll); |
e13afa08b151
(svn r10222) -Fix [FS#892]: Only 2 trains could crash at one time as collision checking stopped on the first hit. This could cause desyncs in network games as the collision hash order is not guaranteed. (patch by B. N. Smatz)
peter1138
parents:
6953
diff
changeset
|
2751 |
} |
e13afa08b151
(svn r10222) -Fix [FS#892]: Only 2 trains could crash at one time as collision checking stopped on the first hit. This could cause desyncs in network games as the collision hash order is not guaranteed. (patch by B. N. Smatz)
peter1138
parents:
6953
diff
changeset
|
2752 |
} |
e13afa08b151
(svn r10222) -Fix [FS#892]: Only 2 trains could crash at one time as collision checking stopped on the first hit. This could cause desyncs in network games as the collision hash order is not guaranteed. (patch by B. N. Smatz)
peter1138
parents:
6953
diff
changeset
|
2753 |
|
e13afa08b151
(svn r10222) -Fix [FS#892]: Only 2 trains could crash at one time as collision checking stopped on the first hit. This could cause desyncs in network games as the collision hash order is not guaranteed. (patch by B. N. Smatz)
peter1138
parents:
6953
diff
changeset
|
2754 |
return NULL; |
e13afa08b151
(svn r10222) -Fix [FS#892]: Only 2 trains could crash at one time as collision checking stopped on the first hit. This could cause desyncs in network games as the collision hash order is not guaranteed. (patch by B. N. Smatz)
peter1138
parents:
6953
diff
changeset
|
2755 |
} |
e13afa08b151
(svn r10222) -Fix [FS#892]: Only 2 trains could crash at one time as collision checking stopped on the first hit. This could cause desyncs in network games as the collision hash order is not guaranteed. (patch by B. N. Smatz)
peter1138
parents:
6953
diff
changeset
|
2756 |
|
6422
6679df1c05ba
(svn r9558) -Documentation: doxygen and comment changes: 'T' now. Almost done
belugas
parents:
6407
diff
changeset
|
2757 |
/** |
1434
e3f4a55b8bcc
(svn r1938) Miscellaneous cleanups: const correctness, kill a goto, ...
tron
parents:
1432
diff
changeset
|
2758 |
* Checks whether the specified train has a collision with another vehicle. If |
2676
59b65b4fb480
(svn r3218) -Feature: Multiheaded train engines will now stay in the same train
bjarni
parents:
2666
diff
changeset
|
2759 |
* so, destroys this vehicle, and the other vehicle if its subtype has TS_Front. |
22 | 2760 |
* Reports the incident in a flashy news item, modifies station ratings and |
2761 |
* plays a sound. |
|
2762 |
*/ |
|
0 | 2763 |
static void CheckTrainCollision(Vehicle *v) |
2764 |
{ |
|
2765 |
/* can't collide in depot */ |
|
5993
956d341d930e
(svn r8701) -Codechange: replace magic numbers with enums for u.rail.track.
rubidium
parents:
5992
diff
changeset
|
2766 |
if (v->u.rail.track == TRACK_BIT_DEPOT) return; |
956d341d930e
(svn r8701) -Codechange: replace magic numbers with enums for u.rail.track.
rubidium
parents:
5992
diff
changeset
|
2767 |
|
956d341d930e
(svn r8701) -Codechange: replace magic numbers with enums for u.rail.track.
rubidium
parents:
5992
diff
changeset
|
2768 |
assert(v->u.rail.track == TRACK_BIT_WORMHOLE || TileVirtXY(v->x_pos, v->y_pos) == v->tile); |
0 | 2769 |
|
6150 | 2770 |
TrainCollideChecker tcc; |
0 | 2771 |
tcc.v = v; |
7492
35acee076719
(svn r11003) -Codechange: replace Vehicle->next to Vehicle->Next() and Vehicle->SetNext() so we can trap instances that change a next pointer and (in the future) update the first/previous pointers based on that.
rubidium
parents:
7488
diff
changeset
|
2772 |
tcc.v_skip = v->Next(); |
6966
e13afa08b151
(svn r10222) -Fix [FS#892]: Only 2 trains could crash at one time as collision checking stopped on the first hit. This could cause desyncs in network games as the collision hash order is not guaranteed. (patch by B. N. Smatz)
peter1138
parents:
6953
diff
changeset
|
2773 |
tcc.num = 0; |
e13afa08b151
(svn r10222) -Fix [FS#892]: Only 2 trains could crash at one time as collision checking stopped on the first hit. This could cause desyncs in network games as the collision hash order is not guaranteed. (patch by B. N. Smatz)
peter1138
parents:
6953
diff
changeset
|
2774 |
|
e13afa08b151
(svn r10222) -Fix [FS#892]: Only 2 trains could crash at one time as collision checking stopped on the first hit. This could cause desyncs in network games as the collision hash order is not guaranteed. (patch by B. N. Smatz)
peter1138
parents:
6953
diff
changeset
|
2775 |
/* find colliding vehicles */ |
7371
0bb7e1279675
(svn r10734) -Fix [FS#1030]: Revert r10513) and add special cases for collision detection on bridges/tunnels.
peter1138
parents:
7334
diff
changeset
|
2776 |
if (v->u.rail.track == TRACK_BIT_WORMHOLE) { |
0bb7e1279675
(svn r10734) -Fix [FS#1030]: Revert r10513) and add special cases for collision detection on bridges/tunnels.
peter1138
parents:
7334
diff
changeset
|
2777 |
VehicleFromPos(v->tile, &tcc, FindTrainCollideEnum); |
0bb7e1279675
(svn r10734) -Fix [FS#1030]: Revert r10513) and add special cases for collision detection on bridges/tunnels.
peter1138
parents:
7334
diff
changeset
|
2778 |
if (IsBridgeTile(v->tile)) { |
0bb7e1279675
(svn r10734) -Fix [FS#1030]: Revert r10513) and add special cases for collision detection on bridges/tunnels.
peter1138
parents:
7334
diff
changeset
|
2779 |
VehicleFromPos(GetOtherBridgeEnd(v->tile), &tcc, FindTrainCollideEnum); |
0bb7e1279675
(svn r10734) -Fix [FS#1030]: Revert r10513) and add special cases for collision detection on bridges/tunnels.
peter1138
parents:
7334
diff
changeset
|
2780 |
} else { |
0bb7e1279675
(svn r10734) -Fix [FS#1030]: Revert r10513) and add special cases for collision detection on bridges/tunnels.
peter1138
parents:
7334
diff
changeset
|
2781 |
VehicleFromPos(GetOtherTunnelEnd(v->tile), &tcc, FindTrainCollideEnum); |
0bb7e1279675
(svn r10734) -Fix [FS#1030]: Revert r10513) and add special cases for collision detection on bridges/tunnels.
peter1138
parents:
7334
diff
changeset
|
2782 |
} |
0bb7e1279675
(svn r10734) -Fix [FS#1030]: Revert r10513) and add special cases for collision detection on bridges/tunnels.
peter1138
parents:
7334
diff
changeset
|
2783 |
} else { |
0bb7e1279675
(svn r10734) -Fix [FS#1030]: Revert r10513) and add special cases for collision detection on bridges/tunnels.
peter1138
parents:
7334
diff
changeset
|
2784 |
VehicleFromPosXY(v->x_pos, v->y_pos, &tcc, FindTrainCollideEnum); |
0bb7e1279675
(svn r10734) -Fix [FS#1030]: Revert r10513) and add special cases for collision detection on bridges/tunnels.
peter1138
parents:
7334
diff
changeset
|
2785 |
} |
6966
e13afa08b151
(svn r10222) -Fix [FS#892]: Only 2 trains could crash at one time as collision checking stopped on the first hit. This could cause desyncs in network games as the collision hash order is not guaranteed. (patch by B. N. Smatz)
peter1138
parents:
6953
diff
changeset
|
2786 |
|
e13afa08b151
(svn r10222) -Fix [FS#892]: Only 2 trains could crash at one time as collision checking stopped on the first hit. This could cause desyncs in network games as the collision hash order is not guaranteed. (patch by B. N. Smatz)
peter1138
parents:
6953
diff
changeset
|
2787 |
/* any dead -> no crash */ |
e13afa08b151
(svn r10222) -Fix [FS#892]: Only 2 trains could crash at one time as collision checking stopped on the first hit. This could cause desyncs in network games as the collision hash order is not guaranteed. (patch by B. N. Smatz)
peter1138
parents:
6953
diff
changeset
|
2788 |
if (tcc.num == 0) return; |
e13afa08b151
(svn r10222) -Fix [FS#892]: Only 2 trains could crash at one time as collision checking stopped on the first hit. This could cause desyncs in network games as the collision hash order is not guaranteed. (patch by B. N. Smatz)
peter1138
parents:
6953
diff
changeset
|
2789 |
|
e13afa08b151
(svn r10222) -Fix [FS#892]: Only 2 trains could crash at one time as collision checking stopped on the first hit. This could cause desyncs in network games as the collision hash order is not guaranteed. (patch by B. N. Smatz)
peter1138
parents:
6953
diff
changeset
|
2790 |
SetDParam(0, tcc.num); |
0 | 2791 |
AddNewsItem(STR_8868_TRAIN_CRASH_DIE_IN_FIREBALL, |
1434
e3f4a55b8bcc
(svn r1938) Miscellaneous cleanups: const correctness, kill a goto, ...
tron
parents:
1432
diff
changeset
|
2792 |
NEWS_FLAGS(NM_THIN, NF_VIEWPORT | NF_VEHICLE, NT_ACCIDENT, 0), |
0 | 2793 |
v->index, |
1434
e3f4a55b8bcc
(svn r1938) Miscellaneous cleanups: const correctness, kill a goto, ...
tron
parents:
1432
diff
changeset
|
2794 |
0 |
e3f4a55b8bcc
(svn r1938) Miscellaneous cleanups: const correctness, kill a goto, ...
tron
parents:
1432
diff
changeset
|
2795 |
); |
0 | 2796 |
|
2797 |
ModifyStationRatingAround(v->tile, v->owner, -160, 30); |
|
541 | 2798 |
SndPlayVehicleFx(SND_13_BIG_CRASH, v); |
0 | 2799 |
} |
2800 |
||
6248
e4a2ed7e5613
(svn r9051) -Codechange: typedef [enum|struct] Y {} X; -> [enum|struct] X {};
rubidium
parents:
6247
diff
changeset
|
2801 |
struct VehicleAtSignalData { |
1432
768af765b5be
(svn r1936) End some void-pointer-as-int-abuse; this also fixes a latent bug where a TileIndex was only 24bit wide (on 32bit architectures)
tron
parents:
1431
diff
changeset
|
2802 |
TileIndex tile; |
3157
3f35e2d9c8e3
(svn r3783) Replace further ints and magic numbers by Direction, DiagDirection and friends
tron
parents:
3154
diff
changeset
|
2803 |
Direction direction; |
6248
e4a2ed7e5613
(svn r9051) -Codechange: typedef [enum|struct] Y {} X; -> [enum|struct] X {};
rubidium
parents:
6247
diff
changeset
|
2804 |
}; |
1432
768af765b5be
(svn r1936) End some void-pointer-as-int-abuse; this also fixes a latent bug where a TileIndex was only 24bit wide (on 32bit architectures)
tron
parents:
1431
diff
changeset
|
2805 |
|
0 | 2806 |
static void *CheckVehicleAtSignal(Vehicle *v, void *data) |
2807 |
{ |
|
5587
167d9a91ef02
(svn r8038) -Merge: the cpp branch. Effort of KUDr, Celestar, glx, Smoovius, stillunknown and pv2b.
rubidium
parents:
5584
diff
changeset
|
2808 |
const VehicleAtSignalData* vasd = (VehicleAtSignalData*)data; |
1432
768af765b5be
(svn r1936) End some void-pointer-as-int-abuse; this also fixes a latent bug where a TileIndex was only 24bit wide (on 32bit architectures)
tron
parents:
1431
diff
changeset
|
2809 |
|
6259
471b91a4b1d8
(svn r9068) -Codechange: capitalize the VEH_Train etc. enums to match the coding style (and rest of the code).
rubidium
parents:
6248
diff
changeset
|
2810 |
if (v->type == VEH_TRAIN && IsFrontEngine(v) && v->tile == vasd->tile) { |
3158
696a6ca0bfa9
(svn r3784) Add a type and functions to handle direction changes
tron
parents:
3157
diff
changeset
|
2811 |
DirDiff diff = ChangeDirDiff(DirDifference(v->direction, vasd->direction), DIRDIFF_90RIGHT); |
696a6ca0bfa9
(svn r3784) Add a type and functions to handle direction changes
tron
parents:
3157
diff
changeset
|
2812 |
|
696a6ca0bfa9
(svn r3784) Add a type and functions to handle direction changes
tron
parents:
3157
diff
changeset
|
2813 |
if (diff == DIRDIFF_90RIGHT || (v->cur_speed <= 5 && diff <= DIRDIFF_REVERSE)) return v; |
0 | 2814 |
} |
1432
768af765b5be
(svn r1936) End some void-pointer-as-int-abuse; this also fixes a latent bug where a TileIndex was only 24bit wide (on 32bit architectures)
tron
parents:
1431
diff
changeset
|
2815 |
return NULL; |
0 | 2816 |
} |
2817 |
||
5252
d4b78248de25
(svn r7378) -Fix (r2428): Don't update vehicle images when turning a train around.
peter1138
parents:
5215
diff
changeset
|
2818 |
static void TrainController(Vehicle *v, bool update_image) |
0 | 2819 |
{ |
1961
60efcaa14311
(svn r2467) - Fix: [newgrf] Prevent trains with shorter wagons breaking apart when reversing in some cases. (Therax)
hackykid
parents:
1942
diff
changeset
|
2820 |
Vehicle *prev; |
0 | 2821 |
|
22 | 2822 |
/* For every vehicle after and including the given vehicle */ |
7497
40e457c0a8ac
(svn r11011) -Fix [FS#1129]: GetFirstVehicleInChain did change the game state while being marked const.
rubidium
parents:
7493
diff
changeset
|
2823 |
for (prev = v->Previous(); v != NULL; prev = v, v = v->Next()) { |
6871
d8b53c9f0b13
(svn r10111) -Codechange: Add new vehicle hash table for collision detection and finding vehicles on a tile. The hash area scanned is far smaller than the old hash table, which is now used for viewport updates only. This should give a significant performance improvement for games with many vehicles. (Based on work by 'B. N. SmatZ!' and 'madman2003')
peter1138
parents:
6857
diff
changeset
|
2824 |
DiagDirection enterdir = DIAGDIR_BEGIN; |
d8b53c9f0b13
(svn r10111) -Codechange: Add new vehicle hash table for collision detection and finding vehicles on a tile. The hash area scanned is far smaller than the old hash table, which is now used for viewport updates only. This should give a significant performance improvement for games with many vehicles. (Based on work by 'B. N. SmatZ!' and 'madman2003')
peter1138
parents:
6857
diff
changeset
|
2825 |
bool update_signals = false; |
0 | 2826 |
BeginVehicleMove(v); |
193
0a7025304867
(svn r194) -Codechange: stripping trailing-spaces. Please keep this that way!
truelight
parents:
166
diff
changeset
|
2827 |
|
6153 | 2828 |
GetNewVehiclePosResult gp = GetNewVehiclePos(v); |
5993
956d341d930e
(svn r8701) -Codechange: replace magic numbers with enums for u.rail.track.
rubidium
parents:
5992
diff
changeset
|
2829 |
if (v->u.rail.track != TRACK_BIT_WORMHOLE) { |
22 | 2830 |
/* Not inside tunnel */ |
6152 | 2831 |
if (gp.old_tile == gp.new_tile) { |
22 | 2832 |
/* Staying in the old tile */ |
5993
956d341d930e
(svn r8701) -Codechange: replace magic numbers with enums for u.rail.track.
rubidium
parents:
5992
diff
changeset
|
2833 |
if (v->u.rail.track == TRACK_BIT_DEPOT) { |
5994
a067afdb59b1
(svn r8703) -Codechange/cleanup: some magic numbers -> enums and other small coding style changes to the ShipController and TrainController.
rubidium
parents:
5993
diff
changeset
|
2834 |
/* Inside depot */ |
0 | 2835 |
gp.x = v->x_pos; |
2836 |
gp.y = v->y_pos; |
|
2837 |
} else { |
|
5994
a067afdb59b1
(svn r8703) -Codechange/cleanup: some magic numbers -> enums and other small coding style changes to the ShipController and TrainController.
rubidium
parents:
5993
diff
changeset
|
2838 |
/* Not inside depot */ |
742
c71e6120b789
(svn r1198) -Fix: [ 1087701 ] It is no longer possible to crash trains of other
truelight
parents:
737
diff
changeset
|
2839 |
|
5668
36b39f4a9032
(svn r8128) -Codechange: Split sprite and palette remap into separate 32 bit values.
peter1138
parents:
5651
diff
changeset
|
2840 |
if (IsFrontEngine(v) && !TrainCheckIfLineEnds(v)) return; |
742
c71e6120b789
(svn r1198) -Fix: [ 1087701 ] It is no longer possible to crash trains of other
truelight
parents:
737
diff
changeset
|
2841 |
|
6150 | 2842 |
uint32 r = VehicleEnterTile(v, gp.new_tile, gp.x, gp.y); |
7928
63e18de69e50
(svn r11481) -Codechange: Rename the HASBIT function to fit with the naming style
skidd13
parents:
7923
diff
changeset
|
2843 |
if (HasBit(r, VETS_CANNOT_ENTER)) { |
0 | 2844 |
goto invalid_rail; |
1247 | 2845 |
} |
7928
63e18de69e50
(svn r11481) -Codechange: Rename the HASBIT function to fit with the naming style
skidd13
parents:
7923
diff
changeset
|
2846 |
if (HasBit(r, VETS_ENTERED_STATION)) { |
5991
ec2eebfe86de
(svn r8698) -Codechange: enumify the returns of VehicleEnterTile
rubidium
parents:
5944
diff
changeset
|
2847 |
TrainEnterStation(v, r >> VETS_STATION_ID_OFFSET); |
0 | 2848 |
return; |
2849 |
} |
|
2850 |
||
555
02df8a1b7f33
(svn r955) Replace uint16 for orders with struct Order
tron
parents:
541
diff
changeset
|
2851 |
if (v->current_order.type == OT_LEAVESTATION) { |
6263
6bd0726c74e2
(svn r9072) -Codechange: [Orders] added methods to orders to free them and check if they are in use
bjarni
parents:
6259
diff
changeset
|
2852 |
v->current_order.Free(); |
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:
744
diff
changeset
|
2853 |
InvalidateWindowWidget(WC_VEHICLE_VIEW, v->index, STATUS_BAR); |
0 | 2854 |
} |
2855 |
} |
|
2856 |
} else { |
|
2857 |
/* A new tile is about to be entered. */ |
|
2858 |
||
2859 |
/* Determine what direction we're entering the new tile from */ |
|
6151 | 2860 |
Direction dir = GetNewVehicleDirectionByTile(gp.new_tile, gp.old_tile); |
6871
d8b53c9f0b13
(svn r10111) -Codechange: Add new vehicle hash table for collision detection and finding vehicles on a tile. The hash area scanned is far smaller than the old hash table, which is now used for viewport updates only. This should give a significant performance improvement for games with many vehicles. (Based on work by 'B. N. SmatZ!' and 'madman2003')
peter1138
parents:
6857
diff
changeset
|
2861 |
enterdir = DirToDiagDir(dir); |
5994
a067afdb59b1
(svn r8703) -Codechange/cleanup: some magic numbers -> enums and other small coding style changes to the ShipController and TrainController.
rubidium
parents:
5993
diff
changeset
|
2862 |
assert(IsValidDiagDirection(enterdir)); |
193
0a7025304867
(svn r194) -Codechange: stripping trailing-spaces. Please keep this that way!
truelight
parents:
166
diff
changeset
|
2863 |
|
0 | 2864 |
/* Get the status of the tracks in the new tile and mask |
2865 |
* away the bits that aren't reachable. */ |
|
6683
b88ae30866ce
(svn r9914) -Codechange: prepare GTTS and the pathfinders to handle multiple road types on a single tile.
rubidium
parents:
6644
diff
changeset
|
2866 |
uint32 ts = GetTileTrackStatus(gp.new_tile, TRANSPORT_RAIL, 0) & _reachable_tracks[enterdir]; |
0 | 2867 |
|
2868 |
/* Combine the from & to directions. |
|
2869 |
* Now, the lower byte contains the track status, and the byte at bit 16 contains |
|
2870 |
* the signal status. */ |
|
6150 | 2871 |
uint32 tracks = ts | (ts >> 8); |
6151 | 2872 |
TrackBits bits = (TrackBits)(tracks & TRACK_BIT_MASK); |
3900
2c84ed52709d
(svn r4987) Feature: Merged YAPF into trunk. Thanks to devs for continuous support and users for testing.
KUDr
parents:
3870
diff
changeset
|
2873 |
if ((_patches.new_pathfinding_all || _patches.yapf.rail_use_yapf) && _patches.forbid_90_deg && prev == NULL) { |
1247 | 2874 |
/* We allow wagons to make 90 deg turns, because forbid_90_deg |
2875 |
* can be switched on halfway a turn */ |
|
5587
167d9a91ef02
(svn r8038) -Merge: the cpp branch. Effort of KUDr, Celestar, glx, Smoovius, stillunknown and pv2b.
rubidium
parents:
5584
diff
changeset
|
2876 |
bits &= ~TrackCrossesTracks(FindFirstTrack(v->u.rail.track)); |
3017
a75caf4efa2d
(svn r3597) Miscellaneous (I like that word) changes: Fix some indentation, add consts, reduce indentation level by short-circuit logic, convert if cascades to switch, whitespace, bracing, plus some minor stuff
tron
parents:
3008
diff
changeset
|
2877 |
} |
a75caf4efa2d
(svn r3597) Miscellaneous (I like that word) changes: Fix some indentation, add consts, reduce indentation level by short-circuit logic, convert if cascades to switch, whitespace, bracing, plus some minor stuff
tron
parents:
3008
diff
changeset
|
2878 |
|
5994
a067afdb59b1
(svn r8703) -Codechange/cleanup: some magic numbers -> enums and other small coding style changes to the ShipController and TrainController.
rubidium
parents:
5993
diff
changeset
|
2879 |
if (bits == TRACK_BIT_NONE) goto invalid_rail; |
0 | 2880 |
|
2881 |
/* Check if the new tile contrains tracks that are compatible |
|
2882 |
* with the current train, if not, bail out. */ |
|
5994
a067afdb59b1
(svn r8703) -Codechange/cleanup: some magic numbers -> enums and other small coding style changes to the ShipController and TrainController.
rubidium
parents:
5993
diff
changeset
|
2883 |
if (!CheckCompatibleRail(v, gp.new_tile)) goto invalid_rail; |
0 | 2884 |
|
6150 | 2885 |
TrackBits chosen_track; |
0 | 2886 |
if (prev == NULL) { |
2887 |
/* Currently the locomotive is active. Determine which one of the |
|
2888 |
* available tracks to choose */ |
|
6155 | 2889 |
chosen_track = TrackToTrackBits(ChooseTrainTrack(v, gp.new_tile, enterdir, bits)); |
1247 | 2890 |
assert(chosen_track & tracks); |
0 | 2891 |
|
2892 |
/* Check if it's a red signal and that force proceed is not clicked. */ |
|
6151 | 2893 |
if ((tracks >> 16) & chosen_track && v->u.rail.force_proceed == 0) { |
6422
6679df1c05ba
(svn r9558) -Documentation: doxygen and comment changes: 'T' now. Almost done
belugas
parents:
6407
diff
changeset
|
2894 |
/* In front of a red signal |
6679df1c05ba
(svn r9558) -Documentation: doxygen and comment changes: 'T' now. Almost done
belugas
parents:
6407
diff
changeset
|
2895 |
* find the first set bit in ts. need to do it in 2 steps, since |
6151 | 2896 |
* FIND_FIRST_BIT only handles 6 bits at a time. */ |
2897 |
Trackdir i = FindFirstTrackdir((TrackdirBits)(uint16)ts); |
|
2898 |
||
2899 |
if (!HasSignalOnTrackdir(gp.new_tile, ReverseTrackdir(i))) { |
|
2900 |
v->cur_speed = 0; |
|
2901 |
v->subspeed = 0; |
|
2902 |
v->progress = 255 - 100; |
|
2903 |
if (++v->load_unload_time_rem < _patches.wait_oneway_signal * 20) return; |
|
2904 |
} else if (HasSignalOnTrackdir(gp.new_tile, i)) { |
|
2905 |
v->cur_speed = 0; |
|
2906 |
v->subspeed = 0; |
|
6491
00dc414c909d
(svn r9672) -Cleanup: lots of coding style fixes around operands.
rubidium
parents:
6490
diff
changeset
|
2907 |
v->progress = 255 - 10; |
6151 | 2908 |
if (++v->load_unload_time_rem < _patches.wait_twoway_signal * 73) { |
2909 |
TileIndex o_tile = gp.new_tile + TileOffsByDiagDir(enterdir); |
|
2910 |
VehicleAtSignalData vasd; |
|
2911 |
vasd.tile = o_tile; |
|
2912 |
vasd.direction = ReverseDir(dir); |
|
2913 |
||
2914 |
/* check if a train is waiting on the other side */ |
|
2915 |
if (VehicleFromPos(o_tile, &vasd, CheckVehicleAtSignal) == NULL) return; |
|
2916 |
} |
|
2917 |
} |
|
2918 |
goto reverse_train_direction; |
|
2919 |
} |
|
0 | 2920 |
} else { |
5994
a067afdb59b1
(svn r8703) -Codechange/cleanup: some magic numbers -> enums and other small coding style changes to the ShipController and TrainController.
rubidium
parents:
5993
diff
changeset
|
2921 |
static const TrackBits _matching_tracks[8] = { |
a067afdb59b1
(svn r8703) -Codechange/cleanup: some magic numbers -> enums and other small coding style changes to the ShipController and TrainController.
rubidium
parents:
5993
diff
changeset
|
2922 |
TRACK_BIT_LEFT | TRACK_BIT_RIGHT, TRACK_BIT_X, |
a067afdb59b1
(svn r8703) -Codechange/cleanup: some magic numbers -> enums and other small coding style changes to the ShipController and TrainController.
rubidium
parents:
5993
diff
changeset
|
2923 |
TRACK_BIT_UPPER | TRACK_BIT_LOWER, TRACK_BIT_Y, |
a067afdb59b1
(svn r8703) -Codechange/cleanup: some magic numbers -> enums and other small coding style changes to the ShipController and TrainController.
rubidium
parents:
5993
diff
changeset
|
2924 |
TRACK_BIT_LEFT | TRACK_BIT_RIGHT, TRACK_BIT_X, |
a067afdb59b1
(svn r8703) -Codechange/cleanup: some magic numbers -> enums and other small coding style changes to the ShipController and TrainController.
rubidium
parents:
5993
diff
changeset
|
2925 |
TRACK_BIT_UPPER | TRACK_BIT_LOWER, TRACK_BIT_Y |
a067afdb59b1
(svn r8703) -Codechange/cleanup: some magic numbers -> enums and other small coding style changes to the ShipController and TrainController.
rubidium
parents:
5993
diff
changeset
|
2926 |
}; |
193
0a7025304867
(svn r194) -Codechange: stripping trailing-spaces. Please keep this that way!
truelight
parents:
166
diff
changeset
|
2927 |
|
0 | 2928 |
/* The wagon is active, simply follow the prev vehicle. */ |
5587
167d9a91ef02
(svn r8038) -Merge: the cpp branch. Effort of KUDr, Celestar, glx, Smoovius, stillunknown and pv2b.
rubidium
parents:
5584
diff
changeset
|
2929 |
chosen_track = (TrackBits)(byte)(_matching_tracks[GetDirectionToVehicle(prev, gp.x, gp.y)] & bits); |
0 | 2930 |
} |
2931 |
||
5994
a067afdb59b1
(svn r8703) -Codechange/cleanup: some magic numbers -> enums and other small coding style changes to the ShipController and TrainController.
rubidium
parents:
5993
diff
changeset
|
2932 |
/* Make sure chosen track is a valid track */ |
a067afdb59b1
(svn r8703) -Codechange/cleanup: some magic numbers -> enums and other small coding style changes to the ShipController and TrainController.
rubidium
parents:
5993
diff
changeset
|
2933 |
assert( |
a067afdb59b1
(svn r8703) -Codechange/cleanup: some magic numbers -> enums and other small coding style changes to the ShipController and TrainController.
rubidium
parents:
5993
diff
changeset
|
2934 |
chosen_track == TRACK_BIT_X || chosen_track == TRACK_BIT_Y || |
a067afdb59b1
(svn r8703) -Codechange/cleanup: some magic numbers -> enums and other small coding style changes to the ShipController and TrainController.
rubidium
parents:
5993
diff
changeset
|
2935 |
chosen_track == TRACK_BIT_UPPER || chosen_track == TRACK_BIT_LOWER || |
a067afdb59b1
(svn r8703) -Codechange/cleanup: some magic numbers -> enums and other small coding style changes to the ShipController and TrainController.
rubidium
parents:
5993
diff
changeset
|
2936 |
chosen_track == TRACK_BIT_LEFT || chosen_track == TRACK_BIT_RIGHT); |
0 | 2937 |
|
2938 |
/* Update XY to reflect the entrance to the new tile, and select the direction to use */ |
|
6150 | 2939 |
const byte *b = _initial_tile_subcoord[FIND_FIRST_BIT(chosen_track)][enterdir]; |
2940 |
gp.x = (gp.x & ~0xF) | b[0]; |
|
2941 |
gp.y = (gp.y & ~0xF) | b[1]; |
|
2942 |
Direction chosen_dir = (Direction)b[2]; |
|
193
0a7025304867
(svn r194) -Codechange: stripping trailing-spaces. Please keep this that way!
truelight
parents:
166
diff
changeset
|
2943 |
|
0 | 2944 |
/* Call the landscape function and tell it that the vehicle entered the tile */ |
6150 | 2945 |
uint32 r = VehicleEnterTile(v, gp.new_tile, gp.x, gp.y); |
7928
63e18de69e50
(svn r11481) -Codechange: Rename the HASBIT function to fit with the naming style
skidd13
parents:
7923
diff
changeset
|
2946 |
if (HasBit(r, VETS_CANNOT_ENTER)) { |
0 | 2947 |
goto invalid_rail; |
1247 | 2948 |
} |
0 | 2949 |
|
7492
35acee076719
(svn r11003) -Codechange: replace Vehicle->next to Vehicle->Next() and Vehicle->SetNext() so we can trap instances that change a next pointer and (in the future) update the first/previous pointers based on that.
rubidium
parents:
7488
diff
changeset
|
2950 |
if (IsLevelCrossingTile(v->tile) && v->Next() == NULL) { |
3657 | 2951 |
UnbarCrossing(v->tile); |
2952 |
MarkTileDirtyByTile(v->tile); |
|
2953 |
} |
|
2954 |
||
2676
59b65b4fb480
(svn r3218) -Feature: Multiheaded train engines will now stay in the same train
bjarni
parents:
2666
diff
changeset
|
2955 |
if (IsFrontEngine(v)) v->load_unload_time_rem = 0; |
0 | 2956 |
|
7928
63e18de69e50
(svn r11481) -Codechange: Rename the HASBIT function to fit with the naming style
skidd13
parents:
7923
diff
changeset
|
2957 |
if (!HasBit(r, VETS_ENTERED_WORMHOLE)) { |
0 | 2958 |
v->tile = gp.new_tile; |
3355
e414a0b104a6
(svn r4150) -Feature: Merged elrails into trunk. Thanks to Tron for lots of code and proofreading, thanks to peter1138 for another lot of code and ideas.
celestar
parents:
3341
diff
changeset
|
2959 |
|
6154 | 2960 |
if (GetTileRailType(gp.new_tile) != GetTileRailType(gp.old_tile)) { |
7497
40e457c0a8ac
(svn r11011) -Fix [FS#1129]: GetFirstVehicleInChain did change the game state while being marked const.
rubidium
parents:
7493
diff
changeset
|
2961 |
TrainPowerChanged(v->First()); |
3355
e414a0b104a6
(svn r4150) -Feature: Merged elrails into trunk. Thanks to Tron for lots of code and proofreading, thanks to peter1138 for another lot of code and ideas.
celestar
parents:
3341
diff
changeset
|
2962 |
} |
e414a0b104a6
(svn r4150) -Feature: Merged elrails into trunk. Thanks to Tron for lots of code and proofreading, thanks to peter1138 for another lot of code and ideas.
celestar
parents:
3341
diff
changeset
|
2963 |
|
0 | 2964 |
v->u.rail.track = chosen_track; |
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
|
2965 |
assert(v->u.rail.track); |
0 | 2966 |
} |
2967 |
||
6871
d8b53c9f0b13
(svn r10111) -Codechange: Add new vehicle hash table for collision detection and finding vehicles on a tile. The hash area scanned is far smaller than the old hash table, which is now used for viewport updates only. This should give a significant performance improvement for games with many vehicles. (Based on work by 'B. N. SmatZ!' and 'madman2003')
peter1138
parents:
6857
diff
changeset
|
2968 |
/* We need to update signal status, but after the vehicle position hash |
d8b53c9f0b13
(svn r10111) -Codechange: Add new vehicle hash table for collision detection and finding vehicles on a tile. The hash area scanned is far smaller than the old hash table, which is now used for viewport updates only. This should give a significant performance improvement for games with many vehicles. (Based on work by 'B. N. SmatZ!' and 'madman2003')
peter1138
parents:
6857
diff
changeset
|
2969 |
* has been updated by AfterSetTrainPos() */ |
d8b53c9f0b13
(svn r10111) -Codechange: Add new vehicle hash table for collision detection and finding vehicles on a tile. The hash area scanned is far smaller than the old hash table, which is now used for viewport updates only. This should give a significant performance improvement for games with many vehicles. (Based on work by 'B. N. SmatZ!' and 'madman2003')
peter1138
parents:
6857
diff
changeset
|
2970 |
update_signals = true; |
193
0a7025304867
(svn r194) -Codechange: stripping trailing-spaces. Please keep this that way!
truelight
parents:
166
diff
changeset
|
2971 |
|
3017
a75caf4efa2d
(svn r3597) Miscellaneous (I like that word) changes: Fix some indentation, add consts, reduce indentation level by short-circuit logic, convert if cascades to switch, whitespace, bracing, plus some minor stuff
tron
parents:
3008
diff
changeset
|
2972 |
if (prev == NULL) AffectSpeedByDirChange(v, chosen_dir); |
0 | 2973 |
|
2974 |
v->direction = chosen_dir; |
|
2975 |
} |
|
2976 |
} else { |
|
5994
a067afdb59b1
(svn r8703) -Codechange/cleanup: some magic numbers -> enums and other small coding style changes to the ShipController and TrainController.
rubidium
parents:
5993
diff
changeset
|
2977 |
/* In tunnel or on a bridge */ |
6141 | 2978 |
if (!(v->vehstatus & VS_HIDDEN)) { |
2979 |
v->cur_speed = |
|
2980 |
min(v->cur_speed, GetBridge(GetBridgeType(v->tile))->speed); |
|
2981 |
} |
|
5385
3868f2e6db9b
(svn r7573) -Merged the bridge branch. Allows to build bridges of arbitrary rail/road combinations (including signals)
celestar
parents:
5380
diff
changeset
|
2982 |
|
7928
63e18de69e50
(svn r11481) -Codechange: Rename the HASBIT function to fit with the naming style
skidd13
parents:
7923
diff
changeset
|
2983 |
if (!(IsTunnelTile(gp.new_tile) || IsBridgeTile(gp.new_tile)) || !HasBit(VehicleEnterTile(v, gp.new_tile, gp.x, gp.y), VETS_ENTERED_WORMHOLE)) { |
2125
edc17858f9f6
(svn r2635) Fix: [ntp/misc] Improve the old pathfinder. Changed it to A* instead of Dijkstra.
ludde
parents:
2115
diff
changeset
|
2984 |
v->x_pos = gp.x; |
edc17858f9f6
(svn r2635) Fix: [ntp/misc] Improve the old pathfinder. Changed it to A* instead of Dijkstra.
ludde
parents:
2115
diff
changeset
|
2985 |
v->y_pos = gp.y; |
edc17858f9f6
(svn r2635) Fix: [ntp/misc] Improve the old pathfinder. Changed it to A* instead of Dijkstra.
ludde
parents:
2115
diff
changeset
|
2986 |
VehiclePositionChanged(v); |
5385
3868f2e6db9b
(svn r7573) -Merged the bridge branch. Allows to build bridges of arbitrary rail/road combinations (including signals)
celestar
parents:
5380
diff
changeset
|
2987 |
if (!(v->vehstatus & VS_HIDDEN)) EndVehicleMove(v); |
2125
edc17858f9f6
(svn r2635) Fix: [ntp/misc] Improve the old pathfinder. Changed it to A* instead of Dijkstra.
ludde
parents:
2115
diff
changeset
|
2988 |
continue; |
0 | 2989 |
} |
2990 |
} |
|
2991 |
||
2992 |
/* update image of train, as well as delta XY */ |
|
6150 | 2993 |
Direction newdir = GetNewVehicleDirection(v, gp.x, gp.y); |
6558
c88e142f896e
(svn r9760) -Codechange: remove the need for saving some vehicle variables.
rubidium
parents:
6554
diff
changeset
|
2994 |
v->UpdateDeltaXY(newdir); |
7134
5b2d47128d05
(svn r10408) -Codechange: make GetImage a class method of Vehicle instead of Get(Aircraft|RoadVeh|Ship|Train)Image.
rubidium
parents:
7109
diff
changeset
|
2995 |
if (update_image) v->cur_image = v->GetImage(newdir); |
0 | 2996 |
|
2997 |
v->x_pos = gp.x; |
|
2998 |
v->y_pos = gp.y; |
|
2999 |
||
3000 |
/* update the Z position of the vehicle */ |
|
6150 | 3001 |
byte old_z = AfterSetTrainPos(v, (gp.new_tile != gp.old_tile)); |
193
0a7025304867
(svn r194) -Codechange: stripping trailing-spaces. Please keep this that way!
truelight
parents:
166
diff
changeset
|
3002 |
|
0 | 3003 |
if (prev == NULL) { |
22 | 3004 |
/* This is the first vehicle in the train */ |
0 | 3005 |
AffectSpeedByZChange(v, old_z); |
3006 |
} |
|
6871
d8b53c9f0b13
(svn r10111) -Codechange: Add new vehicle hash table for collision detection and finding vehicles on a tile. The hash area scanned is far smaller than the old hash table, which is now used for viewport updates only. This should give a significant performance improvement for games with many vehicles. (Based on work by 'B. N. SmatZ!' and 'madman2003')
peter1138
parents:
6857
diff
changeset
|
3007 |
|
d8b53c9f0b13
(svn r10111) -Codechange: Add new vehicle hash table for collision detection and finding vehicles on a tile. The hash area scanned is far smaller than the old hash table, which is now used for viewport updates only. This should give a significant performance improvement for games with many vehicles. (Based on work by 'B. N. SmatZ!' and 'madman2003')
peter1138
parents:
6857
diff
changeset
|
3008 |
if (update_signals) { |
d8b53c9f0b13
(svn r10111) -Codechange: Add new vehicle hash table for collision detection and finding vehicles on a tile. The hash area scanned is far smaller than the old hash table, which is now used for viewport updates only. This should give a significant performance improvement for games with many vehicles. (Based on work by 'B. N. SmatZ!' and 'madman2003')
peter1138
parents:
6857
diff
changeset
|
3009 |
if (IsFrontEngine(v)) TrainMovedChangeSignals(gp.new_tile, enterdir); |
d8b53c9f0b13
(svn r10111) -Codechange: Add new vehicle hash table for collision detection and finding vehicles on a tile. The hash area scanned is far smaller than the old hash table, which is now used for viewport updates only. This should give a significant performance improvement for games with many vehicles. (Based on work by 'B. N. SmatZ!' and 'madman2003')
peter1138
parents:
6857
diff
changeset
|
3010 |
|
d8b53c9f0b13
(svn r10111) -Codechange: Add new vehicle hash table for collision detection and finding vehicles on a tile. The hash area scanned is far smaller than the old hash table, which is now used for viewport updates only. This should give a significant performance improvement for games with many vehicles. (Based on work by 'B. N. SmatZ!' and 'madman2003')
peter1138
parents:
6857
diff
changeset
|
3011 |
/* Signals can only change when the first |
d8b53c9f0b13
(svn r10111) -Codechange: Add new vehicle hash table for collision detection and finding vehicles on a tile. The hash area scanned is far smaller than the old hash table, which is now used for viewport updates only. This should give a significant performance improvement for games with many vehicles. (Based on work by 'B. N. SmatZ!' and 'madman2003')
peter1138
parents:
6857
diff
changeset
|
3012 |
* (above) or the last vehicle moves. */ |
7492
35acee076719
(svn r11003) -Codechange: replace Vehicle->next to Vehicle->Next() and Vehicle->SetNext() so we can trap instances that change a next pointer and (in the future) update the first/previous pointers based on that.
rubidium
parents:
7488
diff
changeset
|
3013 |
if (v->Next() == NULL) TrainMovedChangeSignals(gp.old_tile, ReverseDiagDir(enterdir)); |
6871
d8b53c9f0b13
(svn r10111) -Codechange: Add new vehicle hash table for collision detection and finding vehicles on a tile. The hash area scanned is far smaller than the old hash table, which is now used for viewport updates only. This should give a significant performance improvement for games with many vehicles. (Based on work by 'B. N. SmatZ!' and 'madman2003')
peter1138
parents:
6857
diff
changeset
|
3014 |
} |
0 | 3015 |
} |
1438 | 3016 |
return; |
0 | 3017 |
|
3018 |
invalid_rail: |
|
22 | 3019 |
/* We've reached end of line?? */ |
2639 | 3020 |
if (prev != NULL) error("!Disconnecting train"); |
193
0a7025304867
(svn r194) -Codechange: stripping trailing-spaces. Please keep this that way!
truelight
parents:
166
diff
changeset
|
3021 |
|
0 | 3022 |
reverse_train_direction: |
3023 |
v->load_unload_time_rem = 0; |
|
3024 |
v->cur_speed = 0; |
|
3025 |
v->subspeed = 0; |
|
3026 |
ReverseTrainDirection(v); |
|
3027 |
} |
|
3028 |
||
1430
967f56d158a5
(svn r1934) Small cleanup (uint -> TileIndex, (uint)-1 -> INVALID_TILE and similar stuff)
tron
parents:
1418
diff
changeset
|
3029 |
extern TileIndex CheckTunnelBusy(TileIndex tile, uint *length); |
98 | 3030 |
|
1418
f71b68950a6f
(svn r1922) - Fix: Disappearing of crashed trains inside tunnels were not checked properly.
Darkvater
parents:
1394
diff
changeset
|
3031 |
/** |
f71b68950a6f
(svn r1922) - Fix: Disappearing of crashed trains inside tunnels were not checked properly.
Darkvater
parents:
1394
diff
changeset
|
3032 |
* Deletes/Clears the last wagon of a crashed train. It takes the engine of the |
f71b68950a6f
(svn r1922) - Fix: Disappearing of crashed trains inside tunnels were not checked properly.
Darkvater
parents:
1394
diff
changeset
|
3033 |
* train, then goes to the last wagon and deletes that. Each call to this function |
f71b68950a6f
(svn r1922) - Fix: Disappearing of crashed trains inside tunnels were not checked properly.
Darkvater
parents:
1394
diff
changeset
|
3034 |
* will remove the last wagon of a crashed train. If this wagon was on a crossing, |
f71b68950a6f
(svn r1922) - Fix: Disappearing of crashed trains inside tunnels were not checked properly.
Darkvater
parents:
1394
diff
changeset
|
3035 |
* or inside a tunnel, recalculate the signals as they might need updating |
6484
79156627e1ba
(svn r9665) -Documentation: Doxygen corrections,errors, corrections of corrections...
belugas
parents:
6453
diff
changeset
|
3036 |
* @param v the Vehicle of which last wagon is to be removed |
1418
f71b68950a6f
(svn r1922) - Fix: Disappearing of crashed trains inside tunnels were not checked properly.
Darkvater
parents:
1394
diff
changeset
|
3037 |
*/ |
0 | 3038 |
static void DeleteLastWagon(Vehicle *v) |
3039 |
{ |
|
1418
f71b68950a6f
(svn r1922) - Fix: Disappearing of crashed trains inside tunnels were not checked properly.
Darkvater
parents:
1394
diff
changeset
|
3040 |
/* Go to the last wagon and delete the link pointing there |
f71b68950a6f
(svn r1922) - Fix: Disappearing of crashed trains inside tunnels were not checked properly.
Darkvater
parents:
1394
diff
changeset
|
3041 |
* *u is then the one-before-last wagon, and *v the last |
f71b68950a6f
(svn r1922) - Fix: Disappearing of crashed trains inside tunnels were not checked properly.
Darkvater
parents:
1394
diff
changeset
|
3042 |
* one which will physicially be removed */ |
6150 | 3043 |
Vehicle *u = v; |
7492
35acee076719
(svn r11003) -Codechange: replace Vehicle->next to Vehicle->Next() and Vehicle->SetNext() so we can trap instances that change a next pointer and (in the future) update the first/previous pointers based on that.
rubidium
parents:
7488
diff
changeset
|
3044 |
for (; v->Next() != NULL; v = v->Next()) u = v; |
35acee076719
(svn r11003) -Codechange: replace Vehicle->next to Vehicle->Next() and Vehicle->SetNext() so we can trap instances that change a next pointer and (in the future) update the first/previous pointers based on that.
rubidium
parents:
7488
diff
changeset
|
3045 |
u->SetNext(NULL); |
0 | 3046 |
|
3047 |
InvalidateWindow(WC_VEHICLE_DETAILS, v->index); |
|
3048 |
DeleteWindowById(WC_VEHICLE_VIEW, v->index); |
|
588 | 3049 |
RebuildVehicleLists(); |
0 | 3050 |
InvalidateWindow(WC_COMPANY, v->owner); |
3051 |
||
3052 |
BeginVehicleMove(v); |
|
3053 |
EndVehicleMove(v); |
|
6643
f81bee57bc09
(svn r9874) -Feature: advanced vehicle lists a.k.a. group interface. Now you can make groups of vehicles and perform all kinds of tasks on that given group. Original code by nycom and graphics by skidd13.
rubidium
parents:
6608
diff
changeset
|
3054 |
|
7398
b933416cf32b
(svn r10770) -Codechange: use the pool item class as super class for the vehicle struct.
rubidium
parents:
7371
diff
changeset
|
3055 |
delete v; |
0 | 3056 |
|
5993
956d341d930e
(svn r8701) -Codechange: replace magic numbers with enums for u.rail.track.
rubidium
parents:
5992
diff
changeset
|
3057 |
if (v->u.rail.track != TRACK_BIT_DEPOT && v->u.rail.track != TRACK_BIT_WORMHOLE) |
1418
f71b68950a6f
(svn r1922) - Fix: Disappearing of crashed trains inside tunnels were not checked properly.
Darkvater
parents:
1394
diff
changeset
|
3058 |
SetSignalsOnBothDir(v->tile, FIND_FIRST_BIT(v->u.rail.track)); |
193
0a7025304867
(svn r194) -Codechange: stripping trailing-spaces. Please keep this that way!
truelight
parents:
166
diff
changeset
|
3059 |
|
1434
e3f4a55b8bcc
(svn r1938) Miscellaneous cleanups: const correctness, kill a goto, ...
tron
parents:
1432
diff
changeset
|
3060 |
/* Check if the wagon was on a road/rail-crossing and disable it if no |
e3f4a55b8bcc
(svn r1938) Miscellaneous cleanups: const correctness, kill a goto, ...
tron
parents:
1432
diff
changeset
|
3061 |
* others are on it */ |
1103
530d0a75f91c
(svn r1604) Fix: [ 1105112 ] Destroyed train locks crossings
dominik
parents:
1095
diff
changeset
|
3062 |
DisableTrainCrossing(v->tile); |
530d0a75f91c
(svn r1604) Fix: [ 1105112 ] Destroyed train locks crossings
dominik
parents:
1095
diff
changeset
|
3063 |
|
5993
956d341d930e
(svn r8701) -Codechange: replace magic numbers with enums for u.rail.track.
rubidium
parents:
5992
diff
changeset
|
3064 |
if ((v->u.rail.track == TRACK_BIT_WORMHOLE && v->vehstatus & VS_HIDDEN)) { // inside a tunnel |
1430
967f56d158a5
(svn r1934) Small cleanup (uint -> TileIndex, (uint)-1 -> INVALID_TILE and similar stuff)
tron
parents:
1418
diff
changeset
|
3065 |
TileIndex endtile = CheckTunnelBusy(v->tile, NULL); |
967f56d158a5
(svn r1934) Small cleanup (uint -> TileIndex, (uint)-1 -> INVALID_TILE and similar stuff)
tron
parents:
1418
diff
changeset
|
3066 |
|
3017
a75caf4efa2d
(svn r3597) Miscellaneous (I like that word) changes: Fix some indentation, add consts, reduce indentation level by short-circuit logic, convert if cascades to switch, whitespace, bracing, plus some minor stuff
tron
parents:
3008
diff
changeset
|
3067 |
if (endtile == INVALID_TILE) return; // tunnel is busy (error returned) |
1418
f71b68950a6f
(svn r1922) - Fix: Disappearing of crashed trains inside tunnels were not checked properly.
Darkvater
parents:
1394
diff
changeset
|
3068 |
|
1431
37f7348421d0
(svn r1935) Missing braces; while here turn the ifs into a single switch
tron
parents:
1430
diff
changeset
|
3069 |
switch (v->direction) { |
37f7348421d0
(svn r1935) Missing braces; while here turn the ifs into a single switch
tron
parents:
1430
diff
changeset
|
3070 |
case 1: |
37f7348421d0
(svn r1935) Missing braces; while here turn the ifs into a single switch
tron
parents:
1430
diff
changeset
|
3071 |
case 5: |
37f7348421d0
(svn r1935) Missing braces; while here turn the ifs into a single switch
tron
parents:
1430
diff
changeset
|
3072 |
SetSignalsOnBothDir(v->tile, 0); |
37f7348421d0
(svn r1935) Missing braces; while here turn the ifs into a single switch
tron
parents:
1430
diff
changeset
|
3073 |
SetSignalsOnBothDir(endtile, 0); |
37f7348421d0
(svn r1935) Missing braces; while here turn the ifs into a single switch
tron
parents:
1430
diff
changeset
|
3074 |
break; |
37f7348421d0
(svn r1935) Missing braces; while here turn the ifs into a single switch
tron
parents:
1430
diff
changeset
|
3075 |
|
37f7348421d0
(svn r1935) Missing braces; while here turn the ifs into a single switch
tron
parents:
1430
diff
changeset
|
3076 |
case 3: |
37f7348421d0
(svn r1935) Missing braces; while here turn the ifs into a single switch
tron
parents:
1430
diff
changeset
|
3077 |
case 7: |
37f7348421d0
(svn r1935) Missing braces; while here turn the ifs into a single switch
tron
parents:
1430
diff
changeset
|
3078 |
SetSignalsOnBothDir(v->tile, 1); |
37f7348421d0
(svn r1935) Missing braces; while here turn the ifs into a single switch
tron
parents:
1430
diff
changeset
|
3079 |
SetSignalsOnBothDir(endtile, 1); |
37f7348421d0
(svn r1935) Missing braces; while here turn the ifs into a single switch
tron
parents:
1430
diff
changeset
|
3080 |
break; |
37f7348421d0
(svn r1935) Missing braces; while here turn the ifs into a single switch
tron
parents:
1430
diff
changeset
|
3081 |
|
37f7348421d0
(svn r1935) Missing braces; while here turn the ifs into a single switch
tron
parents:
1430
diff
changeset
|
3082 |
default: |
37f7348421d0
(svn r1935) Missing braces; while here turn the ifs into a single switch
tron
parents:
1430
diff
changeset
|
3083 |
break; |
37f7348421d0
(svn r1935) Missing braces; while here turn the ifs into a single switch
tron
parents:
1430
diff
changeset
|
3084 |
} |
98 | 3085 |
} |
0 | 3086 |
} |
3087 |
||
3088 |
static void ChangeTrainDirRandomly(Vehicle *v) |
|
3089 |
{ |
|
3160 | 3090 |
static const DirDiff delta[] = { |
3091 |
DIRDIFF_45LEFT, DIRDIFF_SAME, DIRDIFF_SAME, DIRDIFF_45RIGHT |
|
3092 |
}; |
|
193
0a7025304867
(svn r194) -Codechange: stripping trailing-spaces. Please keep this that way!
truelight
parents:
166
diff
changeset
|
3093 |
|
0 | 3094 |
do { |
5385
3868f2e6db9b
(svn r7573) -Merged the bridge branch. Allows to build bridges of arbitrary rail/road combinations (including signals)
celestar
parents:
5380
diff
changeset
|
3095 |
/* We don't need to twist around vehicles if they're not visible */ |
3868f2e6db9b
(svn r7573) -Merged the bridge branch. Allows to build bridges of arbitrary rail/road combinations (including signals)
celestar
parents:
5380
diff
changeset
|
3096 |
if (!(v->vehstatus & VS_HIDDEN)) { |
3977
513433ebd092
(svn r5155) - Remove the bridge branch merge (revision r5070)
tron
parents:
3956
diff
changeset
|
3097 |
v->direction = ChangeDir(v->direction, delta[GB(Random(), 0, 2)]); |
0 | 3098 |
BeginVehicleMove(v); |
6558
c88e142f896e
(svn r9760) -Codechange: remove the need for saving some vehicle variables.
rubidium
parents:
6554
diff
changeset
|
3099 |
v->UpdateDeltaXY(v->direction); |
7134
5b2d47128d05
(svn r10408) -Codechange: make GetImage a class method of Vehicle instead of Get(Aircraft|RoadVeh|Ship|Train)Image.
rubidium
parents:
7109
diff
changeset
|
3100 |
v->cur_image = v->GetImage(v->direction); |
5385
3868f2e6db9b
(svn r7573) -Merged the bridge branch. Allows to build bridges of arbitrary rail/road combinations (including signals)
celestar
parents:
5380
diff
changeset
|
3101 |
/* Refrain from updating the z position of the vehicle when on |
3868f2e6db9b
(svn r7573) -Merged the bridge branch. Allows to build bridges of arbitrary rail/road combinations (including signals)
celestar
parents:
5380
diff
changeset
|
3102 |
a bridge, because AfterSetTrainPos will put the vehicle under |
3868f2e6db9b
(svn r7573) -Merged the bridge branch. Allows to build bridges of arbitrary rail/road combinations (including signals)
celestar
parents:
5380
diff
changeset
|
3103 |
the bridge in that case */ |
5993
956d341d930e
(svn r8701) -Codechange: replace magic numbers with enums for u.rail.track.
rubidium
parents:
5992
diff
changeset
|
3104 |
if (v->u.rail.track != TRACK_BIT_WORMHOLE) AfterSetTrainPos(v, false); |
0 | 3105 |
} |
7492
35acee076719
(svn r11003) -Codechange: replace Vehicle->next to Vehicle->Next() and Vehicle->SetNext() so we can trap instances that change a next pointer and (in the future) update the first/previous pointers based on that.
rubidium
parents:
7488
diff
changeset
|
3106 |
} while ((v = v->Next()) != NULL); |
0 | 3107 |
} |
3108 |
||
3109 |
static void HandleCrashedTrain(Vehicle *v) |
|
3110 |
{ |
|
3017
a75caf4efa2d
(svn r3597) Miscellaneous (I like that word) changes: Fix some indentation, add consts, reduce indentation level by short-circuit logic, convert if cascades to switch, whitespace, bracing, plus some minor stuff
tron
parents:
3008
diff
changeset
|
3111 |
int state = ++v->u.rail.crash_anim_pos; |
193
0a7025304867
(svn r194) -Codechange: stripping trailing-spaces. Please keep this that way!
truelight
parents:
166
diff
changeset
|
3112 |
|
5993
956d341d930e
(svn r8701) -Codechange: replace magic numbers with enums for u.rail.track.
rubidium
parents:
5992
diff
changeset
|
3113 |
if (state == 4 && !(v->vehstatus & VS_HIDDEN)) { |
1359
52782e5cf7c9
(svn r1863) Give the effect vehicle type enums more descriptive names and use the enum as parameter type for CreateEffectVehicle*()
tron
parents:
1337
diff
changeset
|
3114 |
CreateEffectVehicleRel(v, 4, 4, 8, EV_EXPLOSION_LARGE); |
0 | 3115 |
} |
3116 |
||
6150 | 3117 |
uint32 r; |
7967
a230c063a672
(svn r11523) -Codechange: Move the CHANCE macros to core/random_func.cpp cause they depend on Random()
skidd13
parents:
7932
diff
changeset
|
3118 |
if (state <= 200 && Chance16R(1, 7, r)) { |
3017
a75caf4efa2d
(svn r3597) Miscellaneous (I like that word) changes: Fix some indentation, add consts, reduce indentation level by short-circuit logic, convert if cascades to switch, whitespace, bracing, plus some minor stuff
tron
parents:
3008
diff
changeset
|
3119 |
int index = (r * 10 >> 16); |
0 | 3120 |
|
6150 | 3121 |
Vehicle *u = v; |
0 | 3122 |
do { |
3123 |
if (--index < 0) { |
|
1137
bce056e230ce
(svn r1638) -Fix: Train crashes should no longer desync the game. This is more of a
celestar
parents:
1132
diff
changeset
|
3124 |
r = Random(); |
0 | 3125 |
|
3126 |
CreateEffectVehicleRel(u, |
|
2140
a04d0142ad65
(svn r2650) Convert many explicit shifts+ands to extract bits to invocations of GB - should be a bit nicer to read
tron
parents:
2135
diff
changeset
|
3127 |
GB(r, 8, 3) + 2, |
a04d0142ad65
(svn r2650) Convert many explicit shifts+ands to extract bits to invocations of GB - should be a bit nicer to read
tron
parents:
2135
diff
changeset
|
3128 |
GB(r, 16, 3) + 2, |
a04d0142ad65
(svn r2650) Convert many explicit shifts+ands to extract bits to invocations of GB - should be a bit nicer to read
tron
parents:
2135
diff
changeset
|
3129 |
GB(r, 0, 3) + 5, |
1359
52782e5cf7c9
(svn r1863) Give the effect vehicle type enums more descriptive names and use the enum as parameter type for CreateEffectVehicle*()
tron
parents:
1337
diff
changeset
|
3130 |
EV_EXPLOSION_SMALL); |
0 | 3131 |
break; |
3132 |
} |
|
7492
35acee076719
(svn r11003) -Codechange: replace Vehicle->next to Vehicle->Next() and Vehicle->SetNext() so we can trap instances that change a next pointer and (in the future) update the first/previous pointers based on that.
rubidium
parents:
7488
diff
changeset
|
3133 |
} while ((u = u->Next()) != NULL); |
0 | 3134 |
} |
3135 |
||
3017
a75caf4efa2d
(svn r3597) Miscellaneous (I like that word) changes: Fix some indentation, add consts, reduce indentation level by short-circuit logic, convert if cascades to switch, whitespace, bracing, plus some minor stuff
tron
parents:
3008
diff
changeset
|
3136 |
if (state <= 240 && !(v->tick_counter & 3)) ChangeTrainDirRandomly(v); |
0 | 3137 |
|
1128
ca7f860db7ac
(svn r1629) added a counter to tell how many engines you have of each type to the autoreplace vehicle windows and made them show only the vehicles you actually have in the left list.
bjarni
parents:
1109
diff
changeset
|
3138 |
if (state >= 4440 && !(v->tick_counter&0x1F)) { |
0 | 3139 |
DeleteLastWagon(v); |
6643
f81bee57bc09
(svn r9874) -Feature: advanced vehicle lists a.k.a. group interface. Now you can make groups of vehicles and perform all kinds of tasks on that given group. Original code by nycom and graphics by skidd13.
rubidium
parents:
6608
diff
changeset
|
3140 |
InvalidateWindow(WC_REPLACE_VEHICLE, (v->group_id << 16) | VEH_TRAIN); |
1128
ca7f860db7ac
(svn r1629) added a counter to tell how many engines you have of each type to the autoreplace vehicle windows and made them show only the vehicles you actually have in the left list.
bjarni
parents:
1109
diff
changeset
|
3141 |
} |
0 | 3142 |
} |
3143 |
||
3144 |
static void HandleBrokenTrain(Vehicle *v) |
|
3145 |
{ |
|
3146 |
if (v->breakdown_ctr != 1) { |
|
3147 |
v->breakdown_ctr = 1; |
|
3148 |
v->cur_speed = 0; |
|
3149 |
||
3150 |
if (v->breakdowns_since_last_service != 255) |
|
3151 |
v->breakdowns_since_last_service++; |
|
193
0a7025304867
(svn r194) -Codechange: stripping trailing-spaces. Please keep this that way!
truelight
parents:
166
diff
changeset
|
3152 |
|
0 | 3153 |
InvalidateWindow(WC_VEHICLE_VIEW, v->index); |
3154 |
InvalidateWindow(WC_VEHICLE_DETAILS, v->index); |
|
193
0a7025304867
(svn r194) -Codechange: stripping trailing-spaces. Please keep this that way!
truelight
parents:
166
diff
changeset
|
3155 |
|
4656
9c1d8c4d3e60
(svn r6532) - Feature: Add support for NewGRF sound effects. Currently sound priority isn't supported.
peter1138
parents:
4648
diff
changeset
|
3156 |
if (!PlayVehicleSound(v, VSE_BREAKDOWN)) { |
6357
f0f5e7d1713c
(svn r9400) -Codechange: Use some more representative enum names for landscape types.
belugas
parents:
6334
diff
changeset
|
3157 |
SndPlayVehicleFx((_opt.landscape != LT_TOYLAND) ? |
4656
9c1d8c4d3e60
(svn r6532) - Feature: Add support for NewGRF sound effects. Currently sound priority isn't supported.
peter1138
parents:
4648
diff
changeset
|
3158 |
SND_10_TRAIN_BREAKDOWN : SND_3A_COMEDY_BREAKDOWN_2, v); |
9c1d8c4d3e60
(svn r6532) - Feature: Add support for NewGRF sound effects. Currently sound priority isn't supported.
peter1138
parents:
4648
diff
changeset
|
3159 |
} |
0 | 3160 |
|
3161 |
if (!(v->vehstatus & VS_HIDDEN)) { |
|
3162 |
Vehicle *u = CreateEffectVehicleRel(v, 4, 4, 5, EV_BREAKDOWN_SMOKE); |
|
7334
ed9a43cf642a
(svn r10697) -Codechange: give a more sensible names to some of the unkX variables.
rubidium
parents:
7266
diff
changeset
|
3163 |
if (u != NULL) u->u.special.animation_state = v->breakdown_delay * 2; |
0 | 3164 |
} |
3165 |
} |
|
3166 |
||
3167 |
if (!(v->tick_counter & 3)) { |
|
3168 |
if (!--v->breakdown_delay) { |
|
3169 |
v->breakdown_ctr = 0; |
|
3170 |
InvalidateWindow(WC_VEHICLE_VIEW, v->index); |
|
3171 |
} |
|
3172 |
} |
|
3173 |
} |
|
3174 |
||
3175 |
static const byte _breakdown_speeds[16] = { |
|
3176 |
225, 210, 195, 180, 165, 150, 135, 120, 105, 90, 75, 60, 45, 30, 15, 15 |
|
3177 |
}; |
|
3178 |
||
742
c71e6120b789
(svn r1198) -Fix: [ 1087701 ] It is no longer possible to crash trains of other
truelight
parents:
737
diff
changeset
|
3179 |
static bool TrainCheckIfLineEnds(Vehicle *v) |
0 | 3180 |
{ |
6150 | 3181 |
int t = v->breakdown_ctr; |
2484
0e45d70ae908
(svn r3010) Get rid of quite some dubious casts, either by using GB(), proper types or just removing them
tron
parents:
2482
diff
changeset
|
3182 |
if (t > 1) { |
0 | 3183 |
v->vehstatus |= VS_TRAIN_SLOWING; |
193
0a7025304867
(svn r194) -Codechange: stripping trailing-spaces. Please keep this that way!
truelight
parents:
166
diff
changeset
|
3184 |
|
6150 | 3185 |
uint16 break_speed = _breakdown_speeds[GB(~t, 4, 4)]; |
2484
0e45d70ae908
(svn r3010) Get rid of quite some dubious casts, either by using GB(), proper types or just removing them
tron
parents:
2482
diff
changeset
|
3186 |
if (break_speed < v->cur_speed) v->cur_speed = break_speed; |
0 | 3187 |
} else { |
3188 |
v->vehstatus &= ~VS_TRAIN_SLOWING; |
|
3189 |
} |
|
3190 |
||
5993
956d341d930e
(svn r8701) -Codechange: replace magic numbers with enums for u.rail.track.
rubidium
parents:
5992
diff
changeset
|
3191 |
if (v->u.rail.track == TRACK_BIT_WORMHOLE) return true; // exit if inside a tunnel |
956d341d930e
(svn r8701) -Codechange: replace magic numbers with enums for u.rail.track.
rubidium
parents:
5992
diff
changeset
|
3192 |
if (v->u.rail.track == TRACK_BIT_DEPOT) return true; // exit if inside a depot |
2008
cdb444f6d43c
(svn r2516) - Feature: [pbs] Implement path-based-signalling. This allows multiple trains within the same signal block, provided their paths dont intersect. For this the block must have all exit and entry signals be pbs signals. Place these by ctrl-clicking 4 times on a normal signal.
hackykid
parents:
2006
diff
changeset
|
3193 |
|
6150 | 3194 |
TileIndex tile = v->tile; |
0 | 3195 |
|
5385
3868f2e6db9b
(svn r7573) -Merged the bridge branch. Allows to build bridges of arbitrary rail/road combinations (including signals)
celestar
parents:
5380
diff
changeset
|
3196 |
if (IsTileType(tile, MP_TUNNELBRIDGE)) { |
6150 | 3197 |
DiagDirection dir = IsTunnel(tile) ? GetTunnelDirection(tile) : GetBridgeRampDirection(tile); |
5385
3868f2e6db9b
(svn r7573) -Merged the bridge branch. Allows to build bridges of arbitrary rail/road combinations (including signals)
celestar
parents:
5380
diff
changeset
|
3198 |
if (DiagDirToDir(dir) == v->direction) return true; |
3154 | 3199 |
} |
193
0a7025304867
(svn r194) -Codechange: stripping trailing-spaces. Please keep this that way!
truelight
parents:
166
diff
changeset
|
3200 |
|
0 | 3201 |
// depot? |
742
c71e6120b789
(svn r1198) -Fix: [ 1087701 ] It is no longer possible to crash trains of other
truelight
parents:
737
diff
changeset
|
3202 |
/* XXX -- When enabled, this makes it possible to crash trains of others |
c71e6120b789
(svn r1198) -Fix: [ 1087701 ] It is no longer possible to crash trains of other
truelight
parents:
737
diff
changeset
|
3203 |
(by building a depot right against a station) */ |
4632
1141148a11bf
(svn r6496) -Codechange: removed direct map access in train_cmd.c (Rubidium)
glx
parents:
4574
diff
changeset
|
3204 |
/* if (IsTileType(tile, MP_RAILWAY) && GetRailTileType(tile) == RAIL_TILE_DEPOT_WAYPOINT) |
742
c71e6120b789
(svn r1198) -Fix: [ 1087701 ] It is no longer possible to crash trains of other
truelight
parents:
737
diff
changeset
|
3205 |
return true;*/ |
0 | 3206 |
|
22 | 3207 |
/* Determine the non-diagonal direction in which we will exit this tile */ |
6150 | 3208 |
DiagDirection dir = DirToDiagDir(v->direction); |
3163
14e1eba3591d
(svn r3789) Add an enum and function to handle DiagDirection changes
tron
parents:
3161
diff
changeset
|
3209 |
if (!(v->direction & 1) && v->u.rail.track != _state_dir_table[dir]) { |
14e1eba3591d
(svn r3789) Add an enum and function to handle DiagDirection changes
tron
parents:
3161
diff
changeset
|
3210 |
dir = ChangeDiagDir(dir, DIAGDIRDIFF_90LEFT); |
0 | 3211 |
} |
22 | 3212 |
/* Calculate next tile */ |
4559
aa0c13e39840
(svn r6406) -Codechange: Rename TileOffsByDir to TileOffsByDiagDir because it accepts
Darkvater
parents:
4556
diff
changeset
|
3213 |
tile += TileOffsByDiagDir(dir); |
22 | 3214 |
// determine the track status on the next tile. |
6683
b88ae30866ce
(svn r9914) -Codechange: prepare GTTS and the pathfinders to handle multiple road types on a single tile.
rubidium
parents:
6644
diff
changeset
|
3215 |
uint32 ts = GetTileTrackStatus(tile, TRANSPORT_RAIL, 0) & _reachable_tracks[dir]; |
193
0a7025304867
(svn r194) -Codechange: stripping trailing-spaces. Please keep this that way!
truelight
parents:
166
diff
changeset
|
3216 |
|
22 | 3217 |
/* Calc position within the current tile ?? */ |
6150 | 3218 |
uint x = v->x_pos & 0xF; |
3219 |
uint y = v->y_pos & 0xF; |
|
193
0a7025304867
(svn r194) -Codechange: stripping trailing-spaces. Please keep this that way!
truelight
parents:
166
diff
changeset
|
3220 |
|
2639 | 3221 |
switch (v->direction) { |
3186
4317b5b295c4
(svn r3832) Replace some magic numbers by (Diag)Direction enums
tron
parents:
3185
diff
changeset
|
3222 |
case DIR_N : x = ~x + ~y + 24; break; |
4317b5b295c4
(svn r3832) Replace some magic numbers by (Diag)Direction enums
tron
parents:
3185
diff
changeset
|
3223 |
case DIR_NW: x = y; /* FALLTHROUGH */ |
4317b5b295c4
(svn r3832) Replace some magic numbers by (Diag)Direction enums
tron
parents:
3185
diff
changeset
|
3224 |
case DIR_NE: x = ~x + 16; break; |
4317b5b295c4
(svn r3832) Replace some magic numbers by (Diag)Direction enums
tron
parents:
3185
diff
changeset
|
3225 |
case DIR_E : x = ~x + y + 8; break; |
4317b5b295c4
(svn r3832) Replace some magic numbers by (Diag)Direction enums
tron
parents:
3185
diff
changeset
|
3226 |
case DIR_SE: x = y; break; |
4317b5b295c4
(svn r3832) Replace some magic numbers by (Diag)Direction enums
tron
parents:
3185
diff
changeset
|
3227 |
case DIR_S : x = x + y - 8; break; |
4317b5b295c4
(svn r3832) Replace some magic numbers by (Diag)Direction enums
tron
parents:
3185
diff
changeset
|
3228 |
case DIR_W : x = ~y + x + 8; break; |
5587
167d9a91ef02
(svn r8038) -Merge: the cpp branch. Effort of KUDr, Celestar, glx, Smoovius, stillunknown and pv2b.
rubidium
parents:
5584
diff
changeset
|
3229 |
default: break; |
0 | 3230 |
} |
3231 |
||
2484
0e45d70ae908
(svn r3010) Get rid of quite some dubious casts, either by using GB(), proper types or just removing them
tron
parents:
2482
diff
changeset
|
3232 |
if (GB(ts, 0, 16) != 0) { |
2874
3dcc067a7946
(svn r3422) - Fix: If an engine reaches the rear of a depot, make the engine turn around before it reaches the tile end (same as a normal end of line.) This fixes a bug whereby the engine could poke into the depot and crash with another engine just leaving it.
peter1138
parents:
2855
diff
changeset
|
3233 |
/* If we approach a rail-piece which we can't enter, or the back of a depot, don't enter it! */ |
3645
7f950533d510
(svn r4554) Replace magic numbers by TILE_{HEIGHT,SIZE}
tron
parents:
3636
diff
changeset
|
3234 |
if (x + 4 >= TILE_SIZE && |
2874
3dcc067a7946
(svn r3422) - Fix: If an engine reaches the rear of a depot, make the engine turn around before it reaches the tile end (same as a normal end of line.) This fixes a bug whereby the engine could poke into the depot and crash with another engine just leaving it.
peter1138
parents:
2855
diff
changeset
|
3235 |
(!CheckCompatibleRail(v, tile) || |
3dcc067a7946
(svn r3422) - Fix: If an engine reaches the rear of a depot, make the engine turn around before it reaches the tile end (same as a normal end of line.) This fixes a bug whereby the engine could poke into the depot and crash with another engine just leaving it.
peter1138
parents:
2855
diff
changeset
|
3236 |
(IsTileDepotType(tile, TRANSPORT_RAIL) && |
3185 | 3237 |
GetRailDepotDirection(tile) == dir))) { |
742
c71e6120b789
(svn r1198) -Fix: [ 1087701 ] It is no longer possible to crash trains of other
truelight
parents:
737
diff
changeset
|
3238 |
v->cur_speed = 0; |
c71e6120b789
(svn r1198) -Fix: [ 1087701 ] It is no longer possible to crash trains of other
truelight
parents:
737
diff
changeset
|
3239 |
ReverseTrainDirection(v); |
c71e6120b789
(svn r1198) -Fix: [ 1087701 ] It is no longer possible to crash trains of other
truelight
parents:
737
diff
changeset
|
3240 |
return false; |
c71e6120b789
(svn r1198) -Fix: [ 1087701 ] It is no longer possible to crash trains of other
truelight
parents:
737
diff
changeset
|
3241 |
} |
0 | 3242 |
if ((ts &= (ts >> 16)) == 0) { |
8058
5d32eaa21927
(svn r11619) -Fix [FS#1531]: do not make crossing red behind depot the train is entering
smatz
parents:
8007
diff
changeset
|
3243 |
/* make a rail/road crossing red |
5d32eaa21927
(svn r11619) -Fix [FS#1531]: do not make crossing red behind depot the train is entering
smatz
parents:
8007
diff
changeset
|
3244 |
* do not make crossing red behind depot the train is entering */ |
8062
eb133d21f363
(svn r11623) -Fix [FS#1533] (r11619): assert when train is going over two crossings next to each other
smatz
parents:
8058
diff
changeset
|
3245 |
if (IsLevelCrossingTile(tile) && (!IsTileDepotType(v->tile, TRANSPORT_RAIL) || GetRailDepotDirection(v->tile) == dir)) { |
3322
41b4d25b126d
(svn r4088) -Codechange: Introduce {Unb,B}arCrossing and IsCrossingBarred to put and get the status of a level crossing
celestar
parents:
3315
diff
changeset
|
3246 |
if (!IsCrossingBarred(tile)) { |
41b4d25b126d
(svn r4088) -Codechange: Introduce {Unb,B}arCrossing and IsCrossingBarred to put and get the status of a level crossing
celestar
parents:
3315
diff
changeset
|
3247 |
BarCrossing(tile); |
541 | 3248 |
SndPlayVehicleFx(SND_0E_LEVEL_CROSSING, v); |
0 | 3249 |
MarkTileDirtyByTile(tile); |
3250 |
} |
|
3251 |
} |
|
742
c71e6120b789
(svn r1198) -Fix: [ 1087701 ] It is no longer possible to crash trains of other
truelight
parents:
737
diff
changeset
|
3252 |
return true; |
0 | 3253 |
} |
3645
7f950533d510
(svn r4554) Replace magic numbers by TILE_{HEIGHT,SIZE}
tron
parents:
3636
diff
changeset
|
3254 |
} else if (x + 4 >= TILE_SIZE) { |
0 | 3255 |
v->cur_speed = 0; |
3256 |
ReverseTrainDirection(v); |
|
742
c71e6120b789
(svn r1198) -Fix: [ 1087701 ] It is no longer possible to crash trains of other
truelight
parents:
737
diff
changeset
|
3257 |
return false; |
0 | 3258 |
} |
3259 |
||
6422
6679df1c05ba
(svn r9558) -Documentation: doxygen and comment changes: 'T' now. Almost done
belugas
parents:
6407
diff
changeset
|
3260 |
/* slow down */ |
0 | 3261 |
v->vehstatus |= VS_TRAIN_SLOWING; |
6150 | 3262 |
uint16 break_speed = _breakdown_speeds[x & 0xF]; |
3017
a75caf4efa2d
(svn r3597) Miscellaneous (I like that word) changes: Fix some indentation, add consts, reduce indentation level by short-circuit logic, convert if cascades to switch, whitespace, bracing, plus some minor stuff
tron
parents:
3008
diff
changeset
|
3263 |
if (!(v->direction & 1)) break_speed >>= 1; |
2484
0e45d70ae908
(svn r3010) Get rid of quite some dubious casts, either by using GB(), proper types or just removing them
tron
parents:
2482
diff
changeset
|
3264 |
if (break_speed < v->cur_speed) v->cur_speed = break_speed; |
742
c71e6120b789
(svn r1198) -Fix: [ 1087701 ] It is no longer possible to crash trains of other
truelight
parents:
737
diff
changeset
|
3265 |
|
c71e6120b789
(svn r1198) -Fix: [ 1087701 ] It is no longer possible to crash trains of other
truelight
parents:
737
diff
changeset
|
3266 |
return true; |
0 | 3267 |
} |
3268 |
||
3269 |
static void TrainLocoHandler(Vehicle *v, bool mode) |
|
3270 |
{ |
|
3271 |
/* train has crashed? */ |
|
7476
f6eb56e8b8a7
(svn r10983) -Codechange: use vehstatus & VS_CRASHED instead of some other "methods" custom to each vehicle to determine whether the vehicle is crashed.
rubidium
parents:
7425
diff
changeset
|
3272 |
if (v->vehstatus & VS_CRASHED) { |
0 | 3273 |
if (!mode) HandleCrashedTrain(v); |
3274 |
return; |
|
3275 |
} |
|
3276 |
||
3017
a75caf4efa2d
(svn r3597) Miscellaneous (I like that word) changes: Fix some indentation, add consts, reduce indentation level by short-circuit logic, convert if cascades to switch, whitespace, bracing, plus some minor stuff
tron
parents:
3008
diff
changeset
|
3277 |
if (v->u.rail.force_proceed != 0) v->u.rail.force_proceed--; |
0 | 3278 |
|
3279 |
/* train is broken down? */ |
|
3280 |
if (v->breakdown_ctr != 0) { |
|
3281 |
if (v->breakdown_ctr <= 2) { |
|
3282 |
HandleBrokenTrain(v); |
|
3283 |
return; |
|
3284 |
} |
|
3285 |
v->breakdown_ctr--; |
|
3286 |
} |
|
3287 |
||
7928
63e18de69e50
(svn r11481) -Codechange: Rename the HASBIT function to fit with the naming style
skidd13
parents:
7923
diff
changeset
|
3288 |
if (HasBit(v->u.rail.flags, VRF_REVERSING) && v->cur_speed == 0) { |
0 | 3289 |
ReverseTrainDirection(v); |
3290 |
} |
|
3291 |
||
3292 |
/* exit if train is stopped */ |
|
3017
a75caf4efa2d
(svn r3597) Miscellaneous (I like that word) changes: Fix some indentation, add consts, reduce indentation level by short-circuit logic, convert if cascades to switch, whitespace, bracing, plus some minor stuff
tron
parents:
3008
diff
changeset
|
3293 |
if (v->vehstatus & VS_STOPPED && v->cur_speed == 0) return; |
0 | 3294 |
|
3295 |
if (ProcessTrainOrder(v)) { |
|
3296 |
v->load_unload_time_rem = 0; |
|
3297 |
v->cur_speed = 0; |
|
3298 |
v->subspeed = 0; |
|
3299 |
ReverseTrainDirection(v); |
|
3300 |
return; |
|
3301 |
} |
|
3302 |
||
6594
9673331eb174
(svn r9808) -Codechange: unify the Handle<VehicleType>Loading functions.
rubidium
parents:
6593
diff
changeset
|
3303 |
v->HandleLoading(mode); |
0 | 3304 |
|
3017
a75caf4efa2d
(svn r3597) Miscellaneous (I like that word) changes: Fix some indentation, add consts, reduce indentation level by short-circuit logic, convert if cascades to switch, whitespace, bracing, plus some minor stuff
tron
parents:
3008
diff
changeset
|
3305 |
if (v->current_order.type == OT_LOADING) return; |
a75caf4efa2d
(svn r3597) Miscellaneous (I like that word) changes: Fix some indentation, add consts, reduce indentation level by short-circuit logic, convert if cascades to switch, whitespace, bracing, plus some minor stuff
tron
parents:
3008
diff
changeset
|
3306 |
|
a75caf4efa2d
(svn r3597) Miscellaneous (I like that word) changes: Fix some indentation, add consts, reduce indentation level by short-circuit logic, convert if cascades to switch, whitespace, bracing, plus some minor stuff
tron
parents:
3008
diff
changeset
|
3307 |
if (CheckTrainStayInDepot(v)) return; |
0 | 3308 |
|
3309 |
if (!mode) HandleLocomotiveSmokeCloud(v); |
|
3310 |
||
6150 | 3311 |
int j = UpdateTrainSpeed(v); |
0 | 3312 |
if (j == 0) { |
6422
6679df1c05ba
(svn r9558) -Documentation: doxygen and comment changes: 'T' now. Almost done
belugas
parents:
6407
diff
changeset
|
3313 |
/* if the vehicle has speed 0, update the last_speed field. */ |
3017
a75caf4efa2d
(svn r3597) Miscellaneous (I like that word) changes: Fix some indentation, add consts, reduce indentation level by short-circuit logic, convert if cascades to switch, whitespace, bracing, plus some minor stuff
tron
parents:
3008
diff
changeset
|
3314 |
if (v->cur_speed != 0) return; |
0 | 3315 |
} else { |
3316 |
TrainCheckIfLineEnds(v); |
|
3317 |
||
3318 |
do { |
|
5252
d4b78248de25
(svn r7378) -Fix (r2428): Don't update vehicle images when turning a train around.
peter1138
parents:
5215
diff
changeset
|
3319 |
TrainController(v, true); |
1922
bda6f85eefaa
(svn r2428) - Feature: [newgrf] Implement shorter train vehicles (Therax), and the callback that goes with it.
hackykid
parents:
1921
diff
changeset
|
3320 |
CheckTrainCollision(v); |
0 | 3321 |
if (v->cur_speed <= 0x100) |
3322 |
break; |
|
3323 |
} while (--j != 0); |
|
3324 |
} |
|
3325 |
||
3326 |
SetLastSpeed(v, v->cur_speed); |
|
3327 |
} |
|
3328 |
||
3329 |
||
7488
6f51ddf4c225
(svn r10999) -Codechange: unify the way the running cost of a vehicle is determined. Patch by nycom.
rubidium
parents:
7486
diff
changeset
|
3330 |
|
6f51ddf4c225
(svn r10999) -Codechange: unify the way the running cost of a vehicle is determined. Patch by nycom.
rubidium
parents:
7486
diff
changeset
|
3331 |
Money Train::GetRunningCost() const |
6f51ddf4c225
(svn r10999) -Codechange: unify the way the running cost of a vehicle is determined. Patch by nycom.
rubidium
parents:
7486
diff
changeset
|
3332 |
{ |
6f51ddf4c225
(svn r10999) -Codechange: unify the way the running cost of a vehicle is determined. Patch by nycom.
rubidium
parents:
7486
diff
changeset
|
3333 |
Money cost = 0; |
6f51ddf4c225
(svn r10999) -Codechange: unify the way the running cost of a vehicle is determined. Patch by nycom.
rubidium
parents:
7486
diff
changeset
|
3334 |
const Vehicle *v = this; |
6f51ddf4c225
(svn r10999) -Codechange: unify the way the running cost of a vehicle is determined. Patch by nycom.
rubidium
parents:
7486
diff
changeset
|
3335 |
|
6f51ddf4c225
(svn r10999) -Codechange: unify the way the running cost of a vehicle is determined. Patch by nycom.
rubidium
parents:
7486
diff
changeset
|
3336 |
do { |
6f51ddf4c225
(svn r10999) -Codechange: unify the way the running cost of a vehicle is determined. Patch by nycom.
rubidium
parents:
7486
diff
changeset
|
3337 |
const RailVehicleInfo *rvi = RailVehInfo(v->engine_type); |
6f51ddf4c225
(svn r10999) -Codechange: unify the way the running cost of a vehicle is determined. Patch by nycom.
rubidium
parents:
7486
diff
changeset
|
3338 |
|
6f51ddf4c225
(svn r10999) -Codechange: unify the way the running cost of a vehicle is determined. Patch by nycom.
rubidium
parents:
7486
diff
changeset
|
3339 |
byte cost_factor = GetVehicleProperty(v, 0x0D, rvi->running_cost_base); |
6f51ddf4c225
(svn r10999) -Codechange: unify the way the running cost of a vehicle is determined. Patch by nycom.
rubidium
parents:
7486
diff
changeset
|
3340 |
if (cost_factor == 0) continue; |
6f51ddf4c225
(svn r10999) -Codechange: unify the way the running cost of a vehicle is determined. Patch by nycom.
rubidium
parents:
7486
diff
changeset
|
3341 |
|
6f51ddf4c225
(svn r10999) -Codechange: unify the way the running cost of a vehicle is determined. Patch by nycom.
rubidium
parents:
7486
diff
changeset
|
3342 |
cost += cost_factor * _price.running_rail[rvi->running_cost_class]; |
6f51ddf4c225
(svn r10999) -Codechange: unify the way the running cost of a vehicle is determined. Patch by nycom.
rubidium
parents:
7486
diff
changeset
|
3343 |
} while ((v = GetNextVehicle(v)) != NULL); |
6f51ddf4c225
(svn r10999) -Codechange: unify the way the running cost of a vehicle is determined. Patch by nycom.
rubidium
parents:
7486
diff
changeset
|
3344 |
|
6f51ddf4c225
(svn r10999) -Codechange: unify the way the running cost of a vehicle is determined. Patch by nycom.
rubidium
parents:
7486
diff
changeset
|
3345 |
return cost; |
6f51ddf4c225
(svn r10999) -Codechange: unify the way the running cost of a vehicle is determined. Patch by nycom.
rubidium
parents:
7486
diff
changeset
|
3346 |
} |
6f51ddf4c225
(svn r10999) -Codechange: unify the way the running cost of a vehicle is determined. Patch by nycom.
rubidium
parents:
7486
diff
changeset
|
3347 |
|
6f51ddf4c225
(svn r10999) -Codechange: unify the way the running cost of a vehicle is determined. Patch by nycom.
rubidium
parents:
7486
diff
changeset
|
3348 |
|
7135
3c1bcca0d6bb
(svn r10409) -Codechange: replace (Aircraft|RoadVeh|Ship|Train)_Tick with a Tick method in the Vehicle class.
rubidium
parents:
7134
diff
changeset
|
3349 |
void Train::Tick() |
0 | 3350 |
{ |
7135
3c1bcca0d6bb
(svn r10409) -Codechange: replace (Aircraft|RoadVeh|Ship|Train)_Tick with a Tick method in the Vehicle class.
rubidium
parents:
7134
diff
changeset
|
3351 |
if (_age_cargo_skip_counter == 0) this->cargo.AgeCargo(); |
3c1bcca0d6bb
(svn r10409) -Codechange: replace (Aircraft|RoadVeh|Ship|Train)_Tick with a Tick method in the Vehicle class.
rubidium
parents:
7134
diff
changeset
|
3352 |
|
3c1bcca0d6bb
(svn r10409) -Codechange: replace (Aircraft|RoadVeh|Ship|Train)_Tick with a Tick method in the Vehicle class.
rubidium
parents:
7134
diff
changeset
|
3353 |
this->tick_counter++; |
3c1bcca0d6bb
(svn r10409) -Codechange: replace (Aircraft|RoadVeh|Ship|Train)_Tick with a Tick method in the Vehicle class.
rubidium
parents:
7134
diff
changeset
|
3354 |
|
3c1bcca0d6bb
(svn r10409) -Codechange: replace (Aircraft|RoadVeh|Ship|Train)_Tick with a Tick method in the Vehicle class.
rubidium
parents:
7134
diff
changeset
|
3355 |
if (IsFrontEngine(this)) { |
3c1bcca0d6bb
(svn r10409) -Codechange: replace (Aircraft|RoadVeh|Ship|Train)_Tick with a Tick method in the Vehicle class.
rubidium
parents:
7134
diff
changeset
|
3356 |
this->current_order_time++; |
3c1bcca0d6bb
(svn r10409) -Codechange: replace (Aircraft|RoadVeh|Ship|Train)_Tick with a Tick method in the Vehicle class.
rubidium
parents:
7134
diff
changeset
|
3357 |
|
3c1bcca0d6bb
(svn r10409) -Codechange: replace (Aircraft|RoadVeh|Ship|Train)_Tick with a Tick method in the Vehicle class.
rubidium
parents:
7134
diff
changeset
|
3358 |
TrainLocoHandler(this, false); |
193
0a7025304867
(svn r194) -Codechange: stripping trailing-spaces. Please keep this that way!
truelight
parents:
166
diff
changeset
|
3359 |
|
6422
6679df1c05ba
(svn r9558) -Documentation: doxygen and comment changes: 'T' now. Almost done
belugas
parents:
6407
diff
changeset
|
3360 |
/* make sure vehicle wasn't deleted. */ |
7135
3c1bcca0d6bb
(svn r10409) -Codechange: replace (Aircraft|RoadVeh|Ship|Train)_Tick with a Tick method in the Vehicle class.
rubidium
parents:
7134
diff
changeset
|
3361 |
if (this->type == VEH_TRAIN && IsFrontEngine(this)) |
3c1bcca0d6bb
(svn r10409) -Codechange: replace (Aircraft|RoadVeh|Ship|Train)_Tick with a Tick method in the Vehicle class.
rubidium
parents:
7134
diff
changeset
|
3362 |
TrainLocoHandler(this, true); |
3c1bcca0d6bb
(svn r10409) -Codechange: replace (Aircraft|RoadVeh|Ship|Train)_Tick with a Tick method in the Vehicle class.
rubidium
parents:
7134
diff
changeset
|
3363 |
} else if (IsFreeWagon(this) && HASBITS(this->vehstatus, VS_CRASHED)) { |
7696
ecb9955c0a4a
(svn r11230) -Fix [FS#1228]: one could construct trains out of crashed wagons and engines. Based on a patch by SmatZ.
rubidium
parents:
7695
diff
changeset
|
3364 |
/* Delete flooded standalone wagon chain */ |
ecb9955c0a4a
(svn r11230) -Fix [FS#1228]: one could construct trains out of crashed wagons and engines. Based on a patch by SmatZ.
rubidium
parents:
7695
diff
changeset
|
3365 |
if (++this->u.rail.crash_anim_pos >= 4400) DeleteVehicleChain(this); |
0 | 3366 |
} |
3367 |
} |
|
3368 |
||
3900
2c84ed52709d
(svn r4987) Feature: Merged YAPF into trunk. Thanks to devs for continuous support and users for testing.
KUDr
parents:
3870
diff
changeset
|
3369 |
#define MAX_ACCEPTABLE_DEPOT_DIST 16 |
2c84ed52709d
(svn r4987) Feature: Merged YAPF into trunk. Thanks to devs for continuous support and users for testing.
KUDr
parents:
3870
diff
changeset
|
3370 |
|
0 | 3371 |
static void CheckIfTrainNeedsService(Vehicle *v) |
3372 |
{ |
|
7502
f821f134ec5a
(svn r11017) -Codechange: unify determining whether a vehicle needs/can be service a little more.
rubidium
parents:
7497
diff
changeset
|
3373 |
if (_patches.servint_trains == 0 || !VehicleNeedsService(v)) return; |
f821f134ec5a
(svn r11017) -Codechange: unify determining whether a vehicle needs/can be service a little more.
rubidium
parents:
7497
diff
changeset
|
3374 |
if (v->IsInDepot()) { |
4529
18bd5e7e35aa
(svn r6356) -Fix: FS#263 planes come out of hangar and drive back into hangar
bjarni
parents:
4527
diff
changeset
|
3375 |
VehicleServiceInDepot(v); |
18bd5e7e35aa
(svn r6356) -Fix: FS#263 planes come out of hangar and drive back into hangar
bjarni
parents:
4527
diff
changeset
|
3376 |
return; |
18bd5e7e35aa
(svn r6356) -Fix: FS#263 planes come out of hangar and drive back into hangar
bjarni
parents:
4527
diff
changeset
|
3377 |
} |
18bd5e7e35aa
(svn r6356) -Fix: FS#263 planes come out of hangar and drive back into hangar
bjarni
parents:
4527
diff
changeset
|
3378 |
|
6150 | 3379 |
TrainFindDepotData tfdd = FindClosestTrainDepot(v, MAX_ACCEPTABLE_DEPOT_DIST); |
308
8088f72d10f5
(svn r314) -Fix: [982611] Pathfinding bug; train likes the roundabout. If train needs servicing it will now look 16 tiles along the track instead of 12 tiles manhattan style (blathijs)
darkvater
parents:
300
diff
changeset
|
3380 |
/* Only go to the depot if it is not too far out of our way. */ |
3900
2c84ed52709d
(svn r4987) Feature: Merged YAPF into trunk. Thanks to devs for continuous support and users for testing.
KUDr
parents:
3870
diff
changeset
|
3381 |
if (tfdd.best_length == (uint)-1 || tfdd.best_length > MAX_ACCEPTABLE_DEPOT_DIST) { |
555
02df8a1b7f33
(svn r955) Replace uint16 for orders with struct Order
tron
parents:
541
diff
changeset
|
3382 |
if (v->current_order.type == OT_GOTO_DEPOT) { |
308
8088f72d10f5
(svn r314) -Fix: [982611] Pathfinding bug; train likes the roundabout. If train needs servicing it will now look 16 tiles along the track instead of 12 tiles manhattan style (blathijs)
darkvater
parents:
300
diff
changeset
|
3383 |
/* If we were already heading for a depot but it has |
8088f72d10f5
(svn r314) -Fix: [982611] Pathfinding bug; train likes the roundabout. If train needs servicing it will now look 16 tiles along the track instead of 12 tiles manhattan style (blathijs)
darkvater
parents:
300
diff
changeset
|
3384 |
* suddenly moved farther away, we continue our normal |
8088f72d10f5
(svn r314) -Fix: [982611] Pathfinding bug; train likes the roundabout. If train needs servicing it will now look 16 tiles along the track instead of 12 tiles manhattan style (blathijs)
darkvater
parents:
300
diff
changeset
|
3385 |
* schedule? */ |
555
02df8a1b7f33
(svn r955) Replace uint16 for orders with struct Order
tron
parents:
541
diff
changeset
|
3386 |
v->current_order.type = OT_DUMMY; |
02df8a1b7f33
(svn r955) Replace uint16 for orders with struct Order
tron
parents:
541
diff
changeset
|
3387 |
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:
744
diff
changeset
|
3388 |
InvalidateWindowWidget(WC_VEHICLE_VIEW, v->index, STATUS_BAR); |
0 | 3389 |
} |
3390 |
return; |
|
3391 |
} |
|
3392 |
||
6150 | 3393 |
const Depot* depot = GetDepotByTile(tfdd.tile); |
0 | 3394 |
|
555
02df8a1b7f33
(svn r955) Replace uint16 for orders with struct Order
tron
parents:
541
diff
changeset
|
3395 |
if (v->current_order.type == OT_GOTO_DEPOT && |
4527
fa30d19685c2
(svn r6353) -Codechange: Make DestinationID a typedef of uin16, which is as large as any type of destinataion (StationID, DepotID, WaypointID) it can hold
tron
parents:
4526
diff
changeset
|
3396 |
v->current_order.dest != depot->index && |
7967
a230c063a672
(svn r11523) -Codechange: Move the CHANCE macros to core/random_func.cpp cause they depend on Random()
skidd13
parents:
7932
diff
changeset
|
3397 |
!Chance16(3, 16)) { |
0 | 3398 |
return; |
3017
a75caf4efa2d
(svn r3597) Miscellaneous (I like that word) changes: Fix some indentation, add consts, reduce indentation level by short-circuit logic, convert if cascades to switch, whitespace, bracing, plus some minor stuff
tron
parents:
3008
diff
changeset
|
3399 |
} |
0 | 3400 |
|
555
02df8a1b7f33
(svn r955) Replace uint16 for orders with struct Order
tron
parents:
541
diff
changeset
|
3401 |
v->current_order.type = OT_GOTO_DEPOT; |
02df8a1b7f33
(svn r955) Replace uint16 for orders with struct Order
tron
parents:
541
diff
changeset
|
3402 |
v->current_order.flags = OF_NON_STOP; |
4527
fa30d19685c2
(svn r6353) -Codechange: Make DestinationID a typedef of uin16, which is as large as any type of destinataion (StationID, DepotID, WaypointID) it can hold
tron
parents:
4526
diff
changeset
|
3403 |
v->current_order.dest = depot->index; |
308
8088f72d10f5
(svn r314) -Fix: [982611] Pathfinding bug; train likes the roundabout. If train needs servicing it will now look 16 tiles along the track instead of 12 tiles manhattan style (blathijs)
darkvater
parents:
300
diff
changeset
|
3404 |
v->dest_tile = tfdd.tile; |
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:
744
diff
changeset
|
3405 |
InvalidateWindowWidget(WC_VEHICLE_VIEW, v->index, STATUS_BAR); |
0 | 3406 |
} |
3407 |
||
3408 |
void OnNewDay_Train(Vehicle *v) |
|
3409 |
{ |
|
3017
a75caf4efa2d
(svn r3597) Miscellaneous (I like that word) changes: Fix some indentation, add consts, reduce indentation level by short-circuit logic, convert if cascades to switch, whitespace, bracing, plus some minor stuff
tron
parents:
3008
diff
changeset
|
3410 |
if ((++v->day_counter & 7) == 0) DecreaseVehicleValue(v); |
0 | 3411 |
|
2676
59b65b4fb480
(svn r3218) -Feature: Multiheaded train engines will now stay in the same train
bjarni
parents:
2666
diff
changeset
|
3412 |
if (IsFrontEngine(v)) { |
0 | 3413 |
CheckVehicleBreakdown(v); |
3414 |
AgeVehicle(v); |
|
193
0a7025304867
(svn r194) -Codechange: stripping trailing-spaces. Please keep this that way!
truelight
parents:
166
diff
changeset
|
3415 |
|
0 | 3416 |
CheckIfTrainNeedsService(v); |
193
0a7025304867
(svn r194) -Codechange: stripping trailing-spaces. Please keep this that way!
truelight
parents:
166
diff
changeset
|
3417 |
|
3140
5555cc95043a
(svn r3758) Remove the news validation callback. It is superseded by r3757.
tron
parents:
3139
diff
changeset
|
3418 |
CheckOrders(v); |
193
0a7025304867
(svn r194) -Codechange: stripping trailing-spaces. Please keep this that way!
truelight
parents:
166
diff
changeset
|
3419 |
|
0 | 3420 |
/* update destination */ |
6150 | 3421 |
if (v->current_order.type == OT_GOTO_STATION) { |
3422 |
TileIndex tile = GetStation(v->current_order.dest)->train_tile; |
|
3423 |
if (tile != 0) v->dest_tile = tile; |
|
2639 | 3424 |
} |
0 | 3425 |
|
3426 |
if ((v->vehstatus & VS_STOPPED) == 0) { |
|
3427 |
/* running costs */ |
|
7488
6f51ddf4c225
(svn r10999) -Codechange: unify the way the running cost of a vehicle is determined. Patch by nycom.
rubidium
parents:
7486
diff
changeset
|
3428 |
CommandCost cost(v->GetRunningCost() / 364); |
6950
14ecb0acdfb4
(svn r10205) -Codechange: refactor returning of cost, so it can be more easily modified.
rubidium
parents:
6943
diff
changeset
|
3429 |
|
14ecb0acdfb4
(svn r10205) -Codechange: refactor returning of cost, so it can be more easily modified.
rubidium
parents:
6943
diff
changeset
|
3430 |
v->profit_this_year -= cost.GetCost() >> 8; |
0 | 3431 |
|
3432 |
SET_EXPENSES_TYPE(EXPENSES_TRAIN_RUN); |
|
3433 |
SubtractMoneyFromPlayerFract(v->owner, cost); |
|
3434 |
||
3435 |
InvalidateWindow(WC_VEHICLE_DETAILS, v->index); |
|
1151
06c115ce7b7a
(svn r1652) Fix: train and road vehicle lists are now redrawn when vehicles enters/leaves a depot (Hackykid)
bjarni
parents:
1137
diff
changeset
|
3436 |
InvalidateWindowClasses(WC_TRAINS_LIST); |
0 | 3437 |
} |
7024
918963b35c5f
(svn r10288) -Fix [FS#202]: also age engines that aren't front-engines (based on a patch by kaan)
truelight
parents:
7023
diff
changeset
|
3438 |
} else if (IsTrainEngine(v)) { |
918963b35c5f
(svn r10288) -Fix [FS#202]: also age engines that aren't front-engines (based on a patch by kaan)
truelight
parents:
7023
diff
changeset
|
3439 |
/* Also age engines that aren't front engines */ |
918963b35c5f
(svn r10288) -Fix [FS#202]: also age engines that aren't front-engines (based on a patch by kaan)
truelight
parents:
7023
diff
changeset
|
3440 |
AgeVehicle(v); |
0 | 3441 |
} |
3442 |
} |
|
3443 |
||
6247 | 3444 |
void TrainsYearlyLoop() |
0 | 3445 |
{ |
3446 |
Vehicle *v; |
|
3447 |
||
3448 |
FOR_ALL_VEHICLES(v) { |
|
6259
471b91a4b1d8
(svn r9068) -Codechange: capitalize the VEH_Train etc. enums to match the coding style (and rest of the code).
rubidium
parents:
6248
diff
changeset
|
3449 |
if (v->type == VEH_TRAIN && IsFrontEngine(v)) { |
6422
6679df1c05ba
(svn r9558) -Documentation: doxygen and comment changes: 'T' now. Almost done
belugas
parents:
6407
diff
changeset
|
3450 |
/* show warning if train is not generating enough income last 2 years (corresponds to a red icon in the vehicle list) */ |
0 | 3451 |
if (_patches.train_income_warn && v->owner == _local_player && v->age >= 730 && v->profit_this_year < 0) { |
7002
1bf6a62b0fcb
(svn r10258) -Codechange: as we are now using int64 all over the place, it's better to use int64 variables in the string generating too instead of packing them into two int32s.
rubidium
parents:
6991
diff
changeset
|
3452 |
SetDParam(1, v->profit_this_year); |
534
306bc86eb23e
(svn r901) Small step in the process to clean up the DPARAM mess:
tron
parents:
507
diff
changeset
|
3453 |
SetDParam(0, v->unitnumber); |
0 | 3454 |
AddNewsItem( |
3455 |
STR_TRAIN_IS_UNPROFITABLE, |
|
3456 |
NEWS_FLAGS(NM_SMALL, NF_VIEWPORT|NF_VEHICLE, NT_ADVICE, 0), |
|
3457 |
v->index, |
|
3458 |
0); |
|
3459 |
} |
|
3460 |
||
3461 |
v->profit_last_year = v->profit_this_year; |
|
3462 |
v->profit_this_year = 0; |
|
3463 |
InvalidateWindow(WC_VEHICLE_DETAILS, v->index); |
|
3464 |
} |
|
3465 |
} |
|
3466 |
} |
|
3467 |
||
3468 |
||
6247 | 3469 |
void InitializeTrains() |
0 | 3470 |
{ |
3471 |
_age_cargo_skip_counter = 1; |
|
3472 |
} |
|
2855
56c39efde08a
(svn r3403) -Codechange: [multiheaded engines] the references between the front and rear engines are no longer saved
bjarni
parents:
2854
diff
changeset
|
3473 |
|
56c39efde08a
(svn r3403) -Codechange: [multiheaded engines] the references between the front and rear engines are no longer saved
bjarni
parents:
2854
diff
changeset
|
3474 |
/* |
56c39efde08a
(svn r3403) -Codechange: [multiheaded engines] the references between the front and rear engines are no longer saved
bjarni
parents:
2854
diff
changeset
|
3475 |
* Link front and rear multiheaded engines to each other |
56c39efde08a
(svn r3403) -Codechange: [multiheaded engines] the references between the front and rear engines are no longer saved
bjarni
parents:
2854
diff
changeset
|
3476 |
* This is done when loading a savegame |
56c39efde08a
(svn r3403) -Codechange: [multiheaded engines] the references between the front and rear engines are no longer saved
bjarni
parents:
2854
diff
changeset
|
3477 |
*/ |
6247 | 3478 |
void ConnectMultiheadedTrains() |
2855
56c39efde08a
(svn r3403) -Codechange: [multiheaded engines] the references between the front and rear engines are no longer saved
bjarni
parents:
2854
diff
changeset
|
3479 |
{ |
56c39efde08a
(svn r3403) -Codechange: [multiheaded engines] the references between the front and rear engines are no longer saved
bjarni
parents:
2854
diff
changeset
|
3480 |
Vehicle *v; |
56c39efde08a
(svn r3403) -Codechange: [multiheaded engines] the references between the front and rear engines are no longer saved
bjarni
parents:
2854
diff
changeset
|
3481 |
|
56c39efde08a
(svn r3403) -Codechange: [multiheaded engines] the references between the front and rear engines are no longer saved
bjarni
parents:
2854
diff
changeset
|
3482 |
FOR_ALL_VEHICLES(v) { |
6259
471b91a4b1d8
(svn r9068) -Codechange: capitalize the VEH_Train etc. enums to match the coding style (and rest of the code).
rubidium
parents:
6248
diff
changeset
|
3483 |
if (v->type == VEH_TRAIN) { |
2855
56c39efde08a
(svn r3403) -Codechange: [multiheaded engines] the references between the front and rear engines are no longer saved
bjarni
parents:
2854
diff
changeset
|
3484 |
v->u.rail.other_multiheaded_part = NULL; |
56c39efde08a
(svn r3403) -Codechange: [multiheaded engines] the references between the front and rear engines are no longer saved
bjarni
parents:
2854
diff
changeset
|
3485 |
} |
56c39efde08a
(svn r3403) -Codechange: [multiheaded engines] the references between the front and rear engines are no longer saved
bjarni
parents:
2854
diff
changeset
|
3486 |
} |
56c39efde08a
(svn r3403) -Codechange: [multiheaded engines] the references between the front and rear engines are no longer saved
bjarni
parents:
2854
diff
changeset
|
3487 |
|
56c39efde08a
(svn r3403) -Codechange: [multiheaded engines] the references between the front and rear engines are no longer saved
bjarni
parents:
2854
diff
changeset
|
3488 |
FOR_ALL_VEHICLES(v) { |
6259
471b91a4b1d8
(svn r9068) -Codechange: capitalize the VEH_Train etc. enums to match the coding style (and rest of the code).
rubidium
parents:
6248
diff
changeset
|
3489 |
if (v->type == VEH_TRAIN && IsFrontEngine(v)) { |
2855
56c39efde08a
(svn r3403) -Codechange: [multiheaded engines] the references between the front and rear engines are no longer saved
bjarni
parents:
2854
diff
changeset
|
3490 |
Vehicle *u = v; |
56c39efde08a
(svn r3403) -Codechange: [multiheaded engines] the references between the front and rear engines are no longer saved
bjarni
parents:
2854
diff
changeset
|
3491 |
|
56c39efde08a
(svn r3403) -Codechange: [multiheaded engines] the references between the front and rear engines are no longer saved
bjarni
parents:
2854
diff
changeset
|
3492 |
BEGIN_ENUM_WAGONS(u) { |
56c39efde08a
(svn r3403) -Codechange: [multiheaded engines] the references between the front and rear engines are no longer saved
bjarni
parents:
2854
diff
changeset
|
3493 |
if (u->u.rail.other_multiheaded_part != NULL) continue; // we already linked this one |
56c39efde08a
(svn r3403) -Codechange: [multiheaded engines] the references between the front and rear engines are no longer saved
bjarni
parents:
2854
diff
changeset
|
3494 |
|
56c39efde08a
(svn r3403) -Codechange: [multiheaded engines] the references between the front and rear engines are no longer saved
bjarni
parents:
2854
diff
changeset
|
3495 |
if (IsMultiheaded(u)) { |
56c39efde08a
(svn r3403) -Codechange: [multiheaded engines] the references between the front and rear engines are no longer saved
bjarni
parents:
2854
diff
changeset
|
3496 |
if (!IsTrainEngine(u)) { |
56c39efde08a
(svn r3403) -Codechange: [multiheaded engines] the references between the front and rear engines are no longer saved
bjarni
parents:
2854
diff
changeset
|
3497 |
/* we got a rear car without a front car. We will convert it to a front one */ |
56c39efde08a
(svn r3403) -Codechange: [multiheaded engines] the references between the front and rear engines are no longer saved
bjarni
parents:
2854
diff
changeset
|
3498 |
SetTrainEngine(u); |
56c39efde08a
(svn r3403) -Codechange: [multiheaded engines] the references between the front and rear engines are no longer saved
bjarni
parents:
2854
diff
changeset
|
3499 |
u->spritenum--; |
56c39efde08a
(svn r3403) -Codechange: [multiheaded engines] the references between the front and rear engines are no longer saved
bjarni
parents:
2854
diff
changeset
|
3500 |
} |
56c39efde08a
(svn r3403) -Codechange: [multiheaded engines] the references between the front and rear engines are no longer saved
bjarni
parents:
2854
diff
changeset
|
3501 |
|
6150 | 3502 |
Vehicle *w; |
7492
35acee076719
(svn r11003) -Codechange: replace Vehicle->next to Vehicle->Next() and Vehicle->SetNext() so we can trap instances that change a next pointer and (in the future) update the first/previous pointers based on that.
rubidium
parents:
7488
diff
changeset
|
3503 |
for (w = u->Next(); w != NULL && (w->engine_type != u->engine_type || w->u.rail.other_multiheaded_part != NULL); w = GetNextVehicle(w)); |
6150 | 3504 |
if (w != NULL) { |
3505 |
/* we found a car to partner with this engine. Now we will make sure it face the right way */ |
|
3506 |
if (IsTrainEngine(w)) { |
|
3507 |
ClearTrainEngine(w); |
|
3508 |
w->spritenum++; |
|
2855
56c39efde08a
(svn r3403) -Codechange: [multiheaded engines] the references between the front and rear engines are no longer saved
bjarni
parents:
2854
diff
changeset
|
3509 |
} |
6150 | 3510 |
w->u.rail.other_multiheaded_part = u; |
3511 |
u->u.rail.other_multiheaded_part = w; |
|
3512 |
} else { |
|
3513 |
/* we got a front car and no rear cars. We will fake this one for forget that it should have been multiheaded */ |
|
3514 |
ClearMultiheaded(u); |
|
2855
56c39efde08a
(svn r3403) -Codechange: [multiheaded engines] the references between the front and rear engines are no longer saved
bjarni
parents:
2854
diff
changeset
|
3515 |
} |
56c39efde08a
(svn r3403) -Codechange: [multiheaded engines] the references between the front and rear engines are no longer saved
bjarni
parents:
2854
diff
changeset
|
3516 |
} |
56c39efde08a
(svn r3403) -Codechange: [multiheaded engines] the references between the front and rear engines are no longer saved
bjarni
parents:
2854
diff
changeset
|
3517 |
} END_ENUM_WAGONS(u) |
56c39efde08a
(svn r3403) -Codechange: [multiheaded engines] the references between the front and rear engines are no longer saved
bjarni
parents:
2854
diff
changeset
|
3518 |
} |
56c39efde08a
(svn r3403) -Codechange: [multiheaded engines] the references between the front and rear engines are no longer saved
bjarni
parents:
2854
diff
changeset
|
3519 |
} |
56c39efde08a
(svn r3403) -Codechange: [multiheaded engines] the references between the front and rear engines are no longer saved
bjarni
parents:
2854
diff
changeset
|
3520 |
} |
56c39efde08a
(svn r3403) -Codechange: [multiheaded engines] the references between the front and rear engines are no longer saved
bjarni
parents:
2854
diff
changeset
|
3521 |
|
6422
6679df1c05ba
(svn r9558) -Documentation: doxygen and comment changes: 'T' now. Almost done
belugas
parents:
6407
diff
changeset
|
3522 |
/** |
2855
56c39efde08a
(svn r3403) -Codechange: [multiheaded engines] the references between the front and rear engines are no longer saved
bjarni
parents:
2854
diff
changeset
|
3523 |
* Converts all trains to the new subtype format introduced in savegame 16.2 |
56c39efde08a
(svn r3403) -Codechange: [multiheaded engines] the references between the front and rear engines are no longer saved
bjarni
parents:
2854
diff
changeset
|
3524 |
* It also links multiheaded engines or make them forget they are multiheaded if no suitable partner is found |
56c39efde08a
(svn r3403) -Codechange: [multiheaded engines] the references between the front and rear engines are no longer saved
bjarni
parents:
2854
diff
changeset
|
3525 |
*/ |
6247 | 3526 |
void ConvertOldMultiheadToNew() |
2855
56c39efde08a
(svn r3403) -Codechange: [multiheaded engines] the references between the front and rear engines are no longer saved
bjarni
parents:
2854
diff
changeset
|
3527 |
{ |
56c39efde08a
(svn r3403) -Codechange: [multiheaded engines] the references between the front and rear engines are no longer saved
bjarni
parents:
2854
diff
changeset
|
3528 |
Vehicle *v; |
56c39efde08a
(svn r3403) -Codechange: [multiheaded engines] the references between the front and rear engines are no longer saved
bjarni
parents:
2854
diff
changeset
|
3529 |
FOR_ALL_VEHICLES(v) { |
6259
471b91a4b1d8
(svn r9068) -Codechange: capitalize the VEH_Train etc. enums to match the coding style (and rest of the code).
rubidium
parents:
6248
diff
changeset
|
3530 |
if (v->type == VEH_TRAIN) { |
7931
b0a46cd92225
(svn r11484) -Codechange: Remove the doubled function SetBitT and rename the remaining to fit with the naming style
skidd13
parents:
7929
diff
changeset
|
3531 |
SetBit(v->subtype, 7); // indicates that it's the old format and needs to be converted in the next loop |
2855
56c39efde08a
(svn r3403) -Codechange: [multiheaded engines] the references between the front and rear engines are no longer saved
bjarni
parents:
2854
diff
changeset
|
3532 |
} |
56c39efde08a
(svn r3403) -Codechange: [multiheaded engines] the references between the front and rear engines are no longer saved
bjarni
parents:
2854
diff
changeset
|
3533 |
} |
56c39efde08a
(svn r3403) -Codechange: [multiheaded engines] the references between the front and rear engines are no longer saved
bjarni
parents:
2854
diff
changeset
|
3534 |
|
56c39efde08a
(svn r3403) -Codechange: [multiheaded engines] the references between the front and rear engines are no longer saved
bjarni
parents:
2854
diff
changeset
|
3535 |
FOR_ALL_VEHICLES(v) { |
6259
471b91a4b1d8
(svn r9068) -Codechange: capitalize the VEH_Train etc. enums to match the coding style (and rest of the code).
rubidium
parents:
6248
diff
changeset
|
3536 |
if (v->type == VEH_TRAIN) { |
7928
63e18de69e50
(svn r11481) -Codechange: Rename the HASBIT function to fit with the naming style
skidd13
parents:
7923
diff
changeset
|
3537 |
if (HasBit(v->subtype, 7) && ((v->subtype & ~0x80) == 0 || (v->subtype & ~0x80) == 4)) { |
2855
56c39efde08a
(svn r3403) -Codechange: [multiheaded engines] the references between the front and rear engines are no longer saved
bjarni
parents:
2854
diff
changeset
|
3538 |
Vehicle *u = v; |
56c39efde08a
(svn r3403) -Codechange: [multiheaded engines] the references between the front and rear engines are no longer saved
bjarni
parents:
2854
diff
changeset
|
3539 |
|
3017
a75caf4efa2d
(svn r3597) Miscellaneous (I like that word) changes: Fix some indentation, add consts, reduce indentation level by short-circuit logic, convert if cascades to switch, whitespace, bracing, plus some minor stuff
tron
parents:
3008
diff
changeset
|
3540 |
BEGIN_ENUM_WAGONS(u) { |
2855
56c39efde08a
(svn r3403) -Codechange: [multiheaded engines] the references between the front and rear engines are no longer saved
bjarni
parents:
2854
diff
changeset
|
3541 |
const RailVehicleInfo *rvi = RailVehInfo(u->engine_type); |
3017
a75caf4efa2d
(svn r3597) Miscellaneous (I like that word) changes: Fix some indentation, add consts, reduce indentation level by short-circuit logic, convert if cascades to switch, whitespace, bracing, plus some minor stuff
tron
parents:
3008
diff
changeset
|
3542 |
|
7929
6c9b25842b0f
(svn r11482) -Codechange: Remove the doubled function ClrBitT and rename the remaining to fit with the naming style
skidd13
parents:
7928
diff
changeset
|
3543 |
ClrBit(u->subtype, 7); |
3017
a75caf4efa2d
(svn r3597) Miscellaneous (I like that word) changes: Fix some indentation, add consts, reduce indentation level by short-circuit logic, convert if cascades to switch, whitespace, bracing, plus some minor stuff
tron
parents:
3008
diff
changeset
|
3544 |
switch (u->subtype) { |
4434
a08cb4b5c179
(svn r6204) -Cleanup: replace non-indentation with spaces; like '}<TAB>else {' -> '} else {', tabs between code and comment, etc.
rubidium
parents:
4432
diff
changeset
|
3545 |
case 0: /* TS_Front_Engine */ |
5868
94430141c189
(svn r8455) -Codechange: Give a more meaningful name (railveh_type)to member flags of RailVehInfo, as well as changing the code to reflect the fact that it was not a flag but rather a one value only variable. Doing so, some evaluations have been simplified.
belugas
parents:
5858
diff
changeset
|
3546 |
if (rvi->railveh_type == RAILVEH_MULTIHEAD) SetMultiheaded(u); |
3017
a75caf4efa2d
(svn r3597) Miscellaneous (I like that word) changes: Fix some indentation, add consts, reduce indentation level by short-circuit logic, convert if cascades to switch, whitespace, bracing, plus some minor stuff
tron
parents:
3008
diff
changeset
|
3547 |
SetFrontEngine(u); |
a75caf4efa2d
(svn r3597) Miscellaneous (I like that word) changes: Fix some indentation, add consts, reduce indentation level by short-circuit logic, convert if cascades to switch, whitespace, bracing, plus some minor stuff
tron
parents:
3008
diff
changeset
|
3548 |
SetTrainEngine(u); |
2855
56c39efde08a
(svn r3403) -Codechange: [multiheaded engines] the references between the front and rear engines are no longer saved
bjarni
parents:
2854
diff
changeset
|
3549 |
break; |
3017
a75caf4efa2d
(svn r3597) Miscellaneous (I like that word) changes: Fix some indentation, add consts, reduce indentation level by short-circuit logic, convert if cascades to switch, whitespace, bracing, plus some minor stuff
tron
parents:
3008
diff
changeset
|
3550 |
|
4434
a08cb4b5c179
(svn r6204) -Cleanup: replace non-indentation with spaces; like '}<TAB>else {' -> '} else {', tabs between code and comment, etc.
rubidium
parents:
4432
diff
changeset
|
3551 |
case 1: /* TS_Artic_Part */ |
3017
a75caf4efa2d
(svn r3597) Miscellaneous (I like that word) changes: Fix some indentation, add consts, reduce indentation level by short-circuit logic, convert if cascades to switch, whitespace, bracing, plus some minor stuff
tron
parents:
3008
diff
changeset
|
3552 |
u->subtype = 0; |
a75caf4efa2d
(svn r3597) Miscellaneous (I like that word) changes: Fix some indentation, add consts, reduce indentation level by short-circuit logic, convert if cascades to switch, whitespace, bracing, plus some minor stuff
tron
parents:
3008
diff
changeset
|
3553 |
SetArticulatedPart(u); |
a75caf4efa2d
(svn r3597) Miscellaneous (I like that word) changes: Fix some indentation, add consts, reduce indentation level by short-circuit logic, convert if cascades to switch, whitespace, bracing, plus some minor stuff
tron
parents:
3008
diff
changeset
|
3554 |
break; |
a75caf4efa2d
(svn r3597) Miscellaneous (I like that word) changes: Fix some indentation, add consts, reduce indentation level by short-circuit logic, convert if cascades to switch, whitespace, bracing, plus some minor stuff
tron
parents:
3008
diff
changeset
|
3555 |
|
4434
a08cb4b5c179
(svn r6204) -Cleanup: replace non-indentation with spaces; like '}<TAB>else {' -> '} else {', tabs between code and comment, etc.
rubidium
parents:
4432
diff
changeset
|
3556 |
case 2: /* TS_Not_First */ |
3017
a75caf4efa2d
(svn r3597) Miscellaneous (I like that word) changes: Fix some indentation, add consts, reduce indentation level by short-circuit logic, convert if cascades to switch, whitespace, bracing, plus some minor stuff
tron
parents:
3008
diff
changeset
|
3557 |
u->subtype = 0; |
5868
94430141c189
(svn r8455) -Codechange: Give a more meaningful name (railveh_type)to member flags of RailVehInfo, as well as changing the code to reflect the fact that it was not a flag but rather a one value only variable. Doing so, some evaluations have been simplified.
belugas
parents:
5858
diff
changeset
|
3558 |
if (rvi->railveh_type == RAILVEH_WAGON) { |
3017
a75caf4efa2d
(svn r3597) Miscellaneous (I like that word) changes: Fix some indentation, add consts, reduce indentation level by short-circuit logic, convert if cascades to switch, whitespace, bracing, plus some minor stuff
tron
parents:
3008
diff
changeset
|
3559 |
// normal wagon |
a75caf4efa2d
(svn r3597) Miscellaneous (I like that word) changes: Fix some indentation, add consts, reduce indentation level by short-circuit logic, convert if cascades to switch, whitespace, bracing, plus some minor stuff
tron
parents:
3008
diff
changeset
|
3560 |
SetTrainWagon(u); |
a75caf4efa2d
(svn r3597) Miscellaneous (I like that word) changes: Fix some indentation, add consts, reduce indentation level by short-circuit logic, convert if cascades to switch, whitespace, bracing, plus some minor stuff
tron
parents:
3008
diff
changeset
|
3561 |
break; |
a75caf4efa2d
(svn r3597) Miscellaneous (I like that word) changes: Fix some indentation, add consts, reduce indentation level by short-circuit logic, convert if cascades to switch, whitespace, bracing, plus some minor stuff
tron
parents:
3008
diff
changeset
|
3562 |
} |
5868
94430141c189
(svn r8455) -Codechange: Give a more meaningful name (railveh_type)to member flags of RailVehInfo, as well as changing the code to reflect the fact that it was not a flag but rather a one value only variable. Doing so, some evaluations have been simplified.
belugas
parents:
5858
diff
changeset
|
3563 |
if (rvi->railveh_type == RAILVEH_MULTIHEAD && rvi->image_index == u->spritenum - 1) { |
2855
56c39efde08a
(svn r3403) -Codechange: [multiheaded engines] the references between the front and rear engines are no longer saved
bjarni
parents:
2854
diff
changeset
|
3564 |
// rear end of a multiheaded engine |
56c39efde08a
(svn r3403) -Codechange: [multiheaded engines] the references between the front and rear engines are no longer saved
bjarni
parents:
2854
diff
changeset
|
3565 |
SetMultiheaded(u); |
56c39efde08a
(svn r3403) -Codechange: [multiheaded engines] the references between the front and rear engines are no longer saved
bjarni
parents:
2854
diff
changeset
|
3566 |
break; |
56c39efde08a
(svn r3403) -Codechange: [multiheaded engines] the references between the front and rear engines are no longer saved
bjarni
parents:
2854
diff
changeset
|
3567 |
} |
5868
94430141c189
(svn r8455) -Codechange: Give a more meaningful name (railveh_type)to member flags of RailVehInfo, as well as changing the code to reflect the fact that it was not a flag but rather a one value only variable. Doing so, some evaluations have been simplified.
belugas
parents:
5858
diff
changeset
|
3568 |
if (rvi->railveh_type == RAILVEH_MULTIHEAD) SetMultiheaded(u); |
2855
56c39efde08a
(svn r3403) -Codechange: [multiheaded engines] the references between the front and rear engines are no longer saved
bjarni
parents:
2854
diff
changeset
|
3569 |
SetTrainEngine(u); |
3017
a75caf4efa2d
(svn r3597) Miscellaneous (I like that word) changes: Fix some indentation, add consts, reduce indentation level by short-circuit logic, convert if cascades to switch, whitespace, bracing, plus some minor stuff
tron
parents:
3008
diff
changeset
|
3570 |
break; |
a75caf4efa2d
(svn r3597) Miscellaneous (I like that word) changes: Fix some indentation, add consts, reduce indentation level by short-circuit logic, convert if cascades to switch, whitespace, bracing, plus some minor stuff
tron
parents:
3008
diff
changeset
|
3571 |
|
4434
a08cb4b5c179
(svn r6204) -Cleanup: replace non-indentation with spaces; like '}<TAB>else {' -> '} else {', tabs between code and comment, etc.
rubidium
parents:
4432
diff
changeset
|
3572 |
case 4: /* TS_Free_Car */ |
3017
a75caf4efa2d
(svn r3597) Miscellaneous (I like that word) changes: Fix some indentation, add consts, reduce indentation level by short-circuit logic, convert if cascades to switch, whitespace, bracing, plus some minor stuff
tron
parents:
3008
diff
changeset
|
3573 |
u->subtype = 0; |
a75caf4efa2d
(svn r3597) Miscellaneous (I like that word) changes: Fix some indentation, add consts, reduce indentation level by short-circuit logic, convert if cascades to switch, whitespace, bracing, plus some minor stuff
tron
parents:
3008
diff
changeset
|
3574 |
SetTrainWagon(u); |
a75caf4efa2d
(svn r3597) Miscellaneous (I like that word) changes: Fix some indentation, add consts, reduce indentation level by short-circuit logic, convert if cascades to switch, whitespace, bracing, plus some minor stuff
tron
parents:
3008
diff
changeset
|
3575 |
SetFreeWagon(u); |
a75caf4efa2d
(svn r3597) Miscellaneous (I like that word) changes: Fix some indentation, add consts, reduce indentation level by short-circuit logic, convert if cascades to switch, whitespace, bracing, plus some minor stuff
tron
parents:
3008
diff
changeset
|
3576 |
break; |
a75caf4efa2d
(svn r3597) Miscellaneous (I like that word) changes: Fix some indentation, add consts, reduce indentation level by short-circuit logic, convert if cascades to switch, whitespace, bracing, plus some minor stuff
tron
parents:
3008
diff
changeset
|
3577 |
default: NOT_REACHED(); break; |
a75caf4efa2d
(svn r3597) Miscellaneous (I like that word) changes: Fix some indentation, add consts, reduce indentation level by short-circuit logic, convert if cascades to switch, whitespace, bracing, plus some minor stuff
tron
parents:
3008
diff
changeset
|
3578 |
} |
a75caf4efa2d
(svn r3597) Miscellaneous (I like that word) changes: Fix some indentation, add consts, reduce indentation level by short-circuit logic, convert if cascades to switch, whitespace, bracing, plus some minor stuff
tron
parents:
3008
diff
changeset
|
3579 |
} END_ENUM_WAGONS(u) |
2855
56c39efde08a
(svn r3403) -Codechange: [multiheaded engines] the references between the front and rear engines are no longer saved
bjarni
parents:
2854
diff
changeset
|
3580 |
} |
56c39efde08a
(svn r3403) -Codechange: [multiheaded engines] the references between the front and rear engines are no longer saved
bjarni
parents:
2854
diff
changeset
|
3581 |
} |
56c39efde08a
(svn r3403) -Codechange: [multiheaded engines] the references between the front and rear engines are no longer saved
bjarni
parents:
2854
diff
changeset
|
3582 |
} |
56c39efde08a
(svn r3403) -Codechange: [multiheaded engines] the references between the front and rear engines are no longer saved
bjarni
parents:
2854
diff
changeset
|
3583 |
} |