openttd: src/ship_cmd.cpp annotate

annotate src/ship_cmd.cpp @ 12020:e9a4f34044d8 draft

(svn r16427) -Codechange: replace a few magic numbers with an existing constant and unduplicate a few lines.

author	rubidium <rubidium@openttd.org>
date	Tue, 26 May 2009 08:53:16 +0000
parents	d0bf08a7c260
children	2afeb10ae6ba

rev	line source
5584 4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	1 /* $Id$ */
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	2
9111 d48433370037 (svn r12971) -Documentation: add @file in files that missed them and add something more than whitespace as description of files that don't have a description. rubidium <rubidium@openttd.org> parents: 9070 diff changeset	3 /** @file ship_cmd.cpp Handling of ships. */
6420 080aae477331 (svn r9556) -Documentation: doxygen and comment-style changes. 'R', 'S'.. The end of the preliminary work is near belugas <belugas@openttd.org> parents: 6407 diff changeset	4
5584 4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	5 #include "stdafx.h"
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	6 #include "ship.h"
6453 666fc3ef3174 (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 <maedhros@openttd.org> parents: 6420 diff changeset	7 #include "landscape.h"
6980 cb6b3e277df0 (svn r10236) -Feature: Introduce a form of timetabling for vehicles. maedhros <maedhros@openttd.org> parents: 6953 diff changeset	8 #include "timetable.h"
8116 9cc845deddfe (svn r11677) -Codechange: move price and command related types/functions to their respective places. rubidium <rubidium@openttd.org> parents: 8114 diff changeset	9 #include "command_func.h"
5584 4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	10 #include "station_map.h"
8763 d6e363672edb (svn r12459) -Codechange: split news.h into news_type.h and news_func.h. rubidium <rubidium@openttd.org> parents: 8616 diff changeset	11 #include "news_func.h"
10208 39cf8eebfda5 (svn r14422) -Codechange: also reflect the changes of r14421 in the filenames. rubidium <rubidium@openttd.org> parents: 10207 diff changeset	12 #include "company_func.h"
5584 4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	13 #include "npf.h"
8962 322e2779f67a (svn r12754) -Codechange: split depot.h into depot_map.h, depot_func.h and depot_base.h and remove quite a lot of unneeded (before this) includes of depot.h. rubidium <rubidium@openttd.org> parents: 8961 diff changeset	14 #include "depot_base.h"
5584 4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	15 #include "vehicle_gui.h"
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	16 #include "newgrf_engine.h"
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	17 #include "yapf/yapf.h"
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	18 #include "newgrf_sound.h"
5972 6ece78140826 (svn r8661) -Fix: [depot windows] Enlarge the blocks in the depot window if a sprite is too big to fit (ships and aircraft only) bjarni <bjarni@openttd.org> parents: 5944 diff changeset	19 #include "spritecache.h"
8114 2d6af5d7a142 (svn r11675) -Codechange: split the string types from the string functions. rubidium <rubidium@openttd.org> parents: 8108 diff changeset	20 #include "strings_func.h"
8131 e300ac8001ae (svn r11692) -Codechange: move some functions from 'functions.h' to a more logical place and remove about 50% of the includes of 'functions.h' rubidium <rubidium@openttd.org> parents: 8119 diff changeset	21 #include "functions.h"
e300ac8001ae (svn r11692) -Codechange: move some functions from 'functions.h' to a more logical place and remove about 50% of the includes of 'functions.h' rubidium <rubidium@openttd.org> parents: 8119 diff changeset	22 #include "window_func.h"
8140 fb8a05d579da (svn r11702) -Codechange: move all date related stuff to date. rubidium <rubidium@openttd.org>* parents: 8139 diff changeset	23 #include "date_func.h"
8144 d18c8a0bb638 (svn r11706) -Codechange: split vehicle.h and remove another bunch of useless includes. rubidium <rubidium@openttd.org> parents: 8140 diff changeset	24 #include "vehicle_func.h"
8157 019833e42fda (svn r11719) -Codechange: split sound.h in a header with types and one with functions. rubidium <rubidium@openttd.org> parents: 8145 diff changeset	25 #include "sound_func.h"
8211 165064de4629 (svn r11774) -Change: do not include variables.h in a header when it is not needed. rubidium <rubidium@openttd.org> parents: 8157 diff changeset	26 #include "variables.h"
8212 11263ebe590a (svn r11775) -Codechange: move all autoreplace/autorenew functions to a single location. rubidium <rubidium@openttd.org> parents: 8211 diff changeset	27 #include "autoreplace_gui.h"
8224 c45446125bf0 (svn r11787) -Codechange: more header rewrites. This time related to viewport.h. rubidium <rubidium@openttd.org> parents: 8212 diff changeset	28 #include "gfx_func.h"
10960 a4e5b5d2837c (svn r15299) -Cleanup: remove many redundant includes smatz <smatz@openttd.org> parents: 10947 diff changeset	29 #include "effectvehicle_func.h"
8270 5613b863190d (svn r11834) -Codechange: only include settings_type.h if needed. rubidium <rubidium@openttd.org> parents: 8264 diff changeset	30 #include "settings_type.h"
10696 7edccbb67398 (svn r15027) -Merge: tomatos and bananas left to be, here is NoAI for all to see. truebrain <truebrain@openttd.org> parents: 10647 diff changeset	31 #include "ai/ai.hpp"
11168 8687f5906a6f (svn r15518) -Fix [FS#2631]: use distance to closest station tile as estimate for YAPF too (NPF already does so). This makes it behave 'better' with wide stations. rubidium <rubidium@openttd.org> parents: 11090 diff changeset	32 #include "pathfind.h"
8211 165064de4629 (svn r11774) -Change: do not include variables.h in a header when it is not needed. rubidium <rubidium@openttd.org> parents: 8157 diff changeset	33
8264 2495310e220f (svn r11828) -Codechange: include table/* as the last includes and remove an unneeded include from openttd.h. rubidium <rubidium@openttd.org> parents: 8258 diff changeset	34 #include "table/strings.h"
10947 0b3cbaa54996 (svn r15286) -Fix: Refitting did not invalidate vehicle-colour-maps of road-vehicles, ships and aircraft, as well vehicle-length of road-vehicles. frosch <frosch@openttd.org> parents: 10927 diff changeset	35 #include "table/sprites.h"
5584 4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	36
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	37 static const uint16 _ship_sprites[] = {0x0E5D, 0x0E55, 0x0E65, 0x0E6D};
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	38
5587 c44c070c5032 (svn r8038) -Merge: the cpp branch. Effort of KUDr, Celestar, glx, Smoovius, stillunknown and pv2b. rubidium <rubidium@openttd.org> parents: 5584 diff changeset	39 static const TrackBits _ship_sometracks[4] = {
c44c070c5032 (svn r8038) -Merge: the cpp branch. Effort of KUDr, Celestar, glx, Smoovius, stillunknown and pv2b. rubidium <rubidium@openttd.org> parents: 5584 diff changeset	40 TRACK_BIT_X \| TRACK_BIT_LOWER \| TRACK_BIT_LEFT, // 0x19, // DIAGDIR_NE
c44c070c5032 (svn r8038) -Merge: the cpp branch. Effort of KUDr, Celestar, glx, Smoovius, stillunknown and pv2b. rubidium <rubidium@openttd.org> parents: 5584 diff changeset	41 TRACK_BIT_Y \| TRACK_BIT_UPPER \| TRACK_BIT_LEFT, // 0x16, // DIAGDIR_SE
c44c070c5032 (svn r8038) -Merge: the cpp branch. Effort of KUDr, Celestar, glx, Smoovius, stillunknown and pv2b. rubidium <rubidium@openttd.org> parents: 5584 diff changeset	42 TRACK_BIT_X \| TRACK_BIT_UPPER \| TRACK_BIT_RIGHT, // 0x25, // DIAGDIR_SW
c44c070c5032 (svn r8038) -Merge: the cpp branch. Effort of KUDr, Celestar, glx, Smoovius, stillunknown and pv2b. rubidium <rubidium@openttd.org> parents: 5584 diff changeset	43 TRACK_BIT_Y \| TRACK_BIT_LOWER \| TRACK_BIT_RIGHT, // 0x2A, // DIAGDIR_NW
c44c070c5032 (svn r8038) -Merge: the cpp branch. Effort of KUDr, Celestar, glx, Smoovius, stillunknown and pv2b. rubidium <rubidium@openttd.org> parents: 5584 diff changeset	44 };
c44c070c5032 (svn r8038) -Merge: the cpp branch. Effort of KUDr, Celestar, glx, Smoovius, stillunknown and pv2b. rubidium <rubidium@openttd.org> parents: 5584 diff changeset	45
8616 9e46ac001a8c (svn r12199) -Codechange: Remove magic around the results of GetTileTrackStatus(). frosch <frosch@openttd.org> parents: 8611 diff changeset	46 static inline TrackBits GetTileShipTrackStatus(TileIndex tile)
5584 4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	47 {
8616 9e46ac001a8c (svn r12199) -Codechange: Remove magic around the results of GetTileTrackStatus(). frosch <frosch@openttd.org> parents: 8611 diff changeset	48 return TrackStatusToTrackBits(GetTileTrackStatus(tile, TRANSPORT_WATER, 0));
5584 4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	49 }
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	50
9022 db43607c4798 (svn r12824) -Codechange: Standardise routines for drawing vehicle images, using correct types and less duplication. peter1138 <peter1138@openttd.org> parents: 9019 diff changeset	51 static SpriteID GetShipIcon(EngineID engine)
5584 4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	52 {
9022 db43607c4798 (svn r12824) -Codechange: Standardise routines for drawing vehicle images, using correct types and less duplication. peter1138 <peter1138@openttd.org> parents: 9019 diff changeset	53 uint8 spritenum = ShipVehInfo(engine)->image_index;
5584 4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	54
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	55 if (is_custom_sprite(spritenum)) {
9022 db43607c4798 (svn r12824) -Codechange: Standardise routines for drawing vehicle images, using correct types and less duplication. peter1138 <peter1138@openttd.org> parents: 9019 diff changeset	56 SpriteID sprite = GetCustomVehicleIcon(engine, DIR_W);
db43607c4798 (svn r12824) -Codechange: Standardise routines for drawing vehicle images, using correct types and less duplication. peter1138 <peter1138@openttd.org> parents: 9019 diff changeset	57 if (sprite != 0) return sprite;
5584 4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	58
11922 0a4b63f3f3c3 (svn r16325) -Codechange: replace GetPoolItem(index) by PoolItem::Get(index) smatz <smatz@openttd.org> parents: 11903 diff changeset	59 spritenum = Engine::Get(engine)->image_index;
5584 4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	60 }
9022 db43607c4798 (svn r12824) -Codechange: Standardise routines for drawing vehicle images, using correct types and less duplication. peter1138 <peter1138@openttd.org> parents: 9019 diff changeset	61
12020 e9a4f34044d8 (svn r16427) -Codechange: replace a few magic numbers with an existing constant and unduplicate a few lines. rubidium <rubidium@openttd.org> parents: 12010 diff changeset	62 return DIR_W + _ship_sprites[spritenum];
9022 db43607c4798 (svn r12824) -Codechange: Standardise routines for drawing vehicle images, using correct types and less duplication. peter1138 <peter1138@openttd.org> parents: 9019 diff changeset	63 }
db43607c4798 (svn r12824) -Codechange: Standardise routines for drawing vehicle images, using correct types and less duplication. peter1138 <peter1138@openttd.org> parents: 9019 diff changeset	64
db43607c4798 (svn r12824) -Codechange: Standardise routines for drawing vehicle images, using correct types and less duplication. peter1138 <peter1138@openttd.org> parents: 9019 diff changeset	65 void DrawShipEngine(int x, int y, EngineID engine, SpriteID pal)
db43607c4798 (svn r12824) -Codechange: Standardise routines for drawing vehicle images, using correct types and less duplication. peter1138 <peter1138@openttd.org> parents: 9019 diff changeset	66 {
db43607c4798 (svn r12824) -Codechange: Standardise routines for drawing vehicle images, using correct types and less duplication. peter1138 <peter1138@openttd.org> parents: 9019 diff changeset	67 DrawSprite(GetShipIcon(engine), pal, x, y);
5584 4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	68 }
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	69
5972 6ece78140826 (svn r8661) -Fix: [depot windows] Enlarge the blocks in the depot window if a sprite is too big to fit (ships and aircraft only) bjarni <bjarni@openttd.org> parents: 5944 diff changeset	70 /** Get the size of the sprite of a ship sprite heading west (used for lists)
6ece78140826 (svn r8661) -Fix: [depot windows] Enlarge the blocks in the depot window if a sprite is too big to fit (ships and aircraft only) bjarni <bjarni@openttd.org> parents: 5944 diff changeset	71 * @param engine The engine to get the sprite from
6420 080aae477331 (svn r9556) -Documentation: doxygen and comment-style changes. 'R', 'S'.. The end of the preliminary work is near belugas <belugas@openttd.org> parents: 6407 diff changeset	72 * @param width The width of the sprite
080aae477331 (svn r9556) -Documentation: doxygen and comment-style changes. 'R', 'S'.. The end of the preliminary work is near belugas <belugas@openttd.org> parents: 6407 diff changeset	73 * @param height The height of the sprite
5972 6ece78140826 (svn r8661) -Fix: [depot windows] Enlarge the blocks in the depot window if a sprite is too big to fit (ships and aircraft only) bjarni <bjarni@openttd.org> parents: 5944 diff changeset	74 */
6ece78140826 (svn r8661) -Fix: [depot windows] Enlarge the blocks in the depot window if a sprite is too big to fit (ships and aircraft only) bjarni <bjarni@openttd.org> parents: 5944 diff changeset	75 void GetShipSpriteSize(EngineID engine, uint &width, uint &height)
6ece78140826 (svn r8661) -Fix: [depot windows] Enlarge the blocks in the depot window if a sprite is too big to fit (ships and aircraft only) bjarni <bjarni@openttd.org> parents: 5944 diff changeset	76 {
10056 7867701f63e4 (svn r14223) -Codechange: make GetSprite aware of the 4 different types of sprites: fonts, recolour, mapgen and normal sprites. rubidium <rubidium@openttd.org> parents: 9923 diff changeset	77 const Sprite *spr = GetSprite(GetShipIcon(engine), ST_NORMAL);
5972 6ece78140826 (svn r8661) -Fix: [depot windows] Enlarge the blocks in the depot window if a sprite is too big to fit (ships and aircraft only) bjarni <bjarni@openttd.org> parents: 5944 diff changeset	78
6ece78140826 (svn r8661) -Fix: [depot windows] Enlarge the blocks in the depot window if a sprite is too big to fit (ships and aircraft only) bjarni <bjarni@openttd.org> parents: 5944 diff changeset	79 width = spr->width;
6ece78140826 (svn r8661) -Fix: [depot windows] Enlarge the blocks in the depot window if a sprite is too big to fit (ships and aircraft only) bjarni <bjarni@openttd.org> parents: 5944 diff changeset	80 height = spr->height;
6ece78140826 (svn r8661) -Fix: [depot windows] Enlarge the blocks in the depot window if a sprite is too big to fit (ships and aircraft only) bjarni <bjarni@openttd.org> parents: 5944 diff changeset	81 }
6ece78140826 (svn r8661) -Fix: [depot windows] Enlarge the blocks in the depot window if a sprite is too big to fit (ships and aircraft only) bjarni <bjarni@openttd.org> parents: 5944 diff changeset	82
9022 db43607c4798 (svn r12824) -Codechange: Standardise routines for drawing vehicle images, using correct types and less duplication. peter1138 <peter1138@openttd.org> parents: 9019 diff changeset	83 SpriteID Ship::GetImage(Direction direction) const
5584 4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	84 {
9022 db43607c4798 (svn r12824) -Codechange: Standardise routines for drawing vehicle images, using correct types and less duplication. peter1138 <peter1138@openttd.org> parents: 9019 diff changeset	85 uint8 spritenum = this->spritenum;
5584 4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	86
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	87 if (is_custom_sprite(spritenum)) {
9022 db43607c4798 (svn r12824) -Codechange: Standardise routines for drawing vehicle images, using correct types and less duplication. peter1138 <peter1138@openttd.org> parents: 9019 diff changeset	88 SpriteID sprite = GetCustomVehicleSprite(this, direction);
db43607c4798 (svn r12824) -Codechange: Standardise routines for drawing vehicle images, using correct types and less duplication. peter1138 <peter1138@openttd.org> parents: 9019 diff changeset	89 if (sprite != 0) return sprite;
5584 4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	90
11922 0a4b63f3f3c3 (svn r16325) -Codechange: replace GetPoolItem(index) by PoolItem::Get(index) smatz <smatz@openttd.org> parents: 11903 diff changeset	91 spritenum = Engine::Get(this->engine_type)->image_index;
5584 4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	92 }
9022 db43607c4798 (svn r12824) -Codechange: Standardise routines for drawing vehicle images, using correct types and less duplication. peter1138 <peter1138@openttd.org> parents: 9019 diff changeset	93
5584 4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	94 return _ship_sprites[spritenum] + direction;
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	95 }
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	96
10647 592ae9307430 (svn r14949) -Cleanup: pointer coding style rubidium <rubidium@openttd.org> parents: 10634 diff changeset	97 static const Depot FindClosestShipDepot(const Vehicle v)
5584 4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	98 {
11368 82c90cd591ab (svn r15718) -Cleanup: apply some comment coding style on the rest of the sources too rubidium <rubidium@openttd.org> parents: 11361 diff changeset	99 if (_settings_game.pf.pathfinder_for_ships == VPF_NPF) { // NPF is used
11976 7f11f2a71193 (svn r16382) -Codechange: make GetVehicleTrackdir a member function of Vehicle. rubidium <rubidium@openttd.org> parents: 11970 diff changeset	100 Trackdir trackdir = v->GetVehicleTrackdir();
8554 9bf902b801c6 (svn r12132) -Cleanup: convert pathfinder selection from if/else to switch/case at many places smatz <smatz@openttd.org> parents: 8551 diff changeset	101 NPFFoundTargetData ftd = NPFRouteToDepotTrialError(v->tile, trackdir, false, TRANSPORT_WATER, 0, v->owner, INVALID_RAILTYPES);
9bf902b801c6 (svn r12132) -Cleanup: convert pathfinder selection from if/else to switch/case at many places smatz <smatz@openttd.org> parents: 8551 diff changeset	102
11368 82c90cd591ab (svn r15718) -Cleanup: apply some comment coding style on the rest of the sources too rubidium <rubidium@openttd.org> parents: 11361 diff changeset	103 if (ftd.best_bird_dist == 0) return GetDepotByTile(ftd.node.tile); // Found target
8554 9bf902b801c6 (svn r12132) -Cleanup: convert pathfinder selection from if/else to switch/case at many places smatz <smatz@openttd.org> parents: 8551 diff changeset	104
11368 82c90cd591ab (svn r15718) -Cleanup: apply some comment coding style on the rest of the sources too rubidium <rubidium@openttd.org> parents: 11361 diff changeset	105 return NULL; // Did not find target
8554 9bf902b801c6 (svn r12132) -Cleanup: convert pathfinder selection from if/else to switch/case at many places smatz <smatz@openttd.org> parents: 8551 diff changeset	106 }
9bf902b801c6 (svn r12132) -Cleanup: convert pathfinder selection from if/else to switch/case at many places smatz <smatz@openttd.org> parents: 8551 diff changeset	107
9bf902b801c6 (svn r12132) -Cleanup: convert pathfinder selection from if/else to switch/case at many places smatz <smatz@openttd.org> parents: 8551 diff changeset	108 /* OPF or YAPF - find the closest depot */
9bf902b801c6 (svn r12132) -Cleanup: convert pathfinder selection from if/else to switch/case at many places smatz <smatz@openttd.org> parents: 8551 diff changeset	109
10647 592ae9307430 (svn r14949) -Cleanup: pointer coding style rubidium <rubidium@openttd.org> parents: 10634 diff changeset	110 const Depot *depot;
592ae9307430 (svn r14949) -Cleanup: pointer coding style rubidium <rubidium@openttd.org> parents: 10634 diff changeset	111 const Depot *best_depot = NULL;
8554 9bf902b801c6 (svn r12132) -Cleanup: convert pathfinder selection from if/else to switch/case at many places smatz <smatz@openttd.org> parents: 8551 diff changeset	112 uint best_dist = UINT_MAX;
5584 4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	113
8554 9bf902b801c6 (svn r12132) -Cleanup: convert pathfinder selection from if/else to switch/case at many places smatz <smatz@openttd.org> parents: 8551 diff changeset	114 FOR_ALL_DEPOTS(depot) {
9bf902b801c6 (svn r12132) -Cleanup: convert pathfinder selection from if/else to switch/case at many places smatz <smatz@openttd.org> parents: 8551 diff changeset	115 TileIndex tile = depot->xy;
8961 b33bcd7fa037 (svn r12753) -Codechange: do not use IsDepotTypeTile() where simpler function can be used smatz <smatz@openttd.org> parents: 8954 diff changeset	116 if (IsShipDepotTile(tile) && IsTileOwner(tile, v->owner)) {
8554 9bf902b801c6 (svn r12132) -Cleanup: convert pathfinder selection from if/else to switch/case at many places smatz <smatz@openttd.org> parents: 8551 diff changeset	117 uint dist = DistanceManhattan(tile, v->tile);
9bf902b801c6 (svn r12132) -Cleanup: convert pathfinder selection from if/else to switch/case at many places smatz <smatz@openttd.org> parents: 8551 diff changeset	118 if (dist < best_dist) {
9bf902b801c6 (svn r12132) -Cleanup: convert pathfinder selection from if/else to switch/case at many places smatz <smatz@openttd.org> parents: 8551 diff changeset	119 best_dist = dist;
9bf902b801c6 (svn r12132) -Cleanup: convert pathfinder selection from if/else to switch/case at many places smatz <smatz@openttd.org> parents: 8551 diff changeset	120 best_depot = depot;
5584 4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	121 }
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	122 }
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	123 }
8554 9bf902b801c6 (svn r12132) -Cleanup: convert pathfinder selection from if/else to switch/case at many places smatz <smatz@openttd.org> parents: 8551 diff changeset	124
5584 4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	125 return best_depot;
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	126 }
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	127
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	128 static void CheckIfShipNeedsService(Vehicle *v)
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	129 {
9413 512ea64da840 (svn r13325) -Codechange: split the client-side only settings from the settings stored in the savegame so there is no need to have a duplicate copy of it for new games. rubidium <rubidium@openttd.org> parents: 9358 diff changeset	130 if (_settings_game.vehicle.servint_ships == 0 \|\| !v->NeedsAutomaticServicing()) return;
7490 f538c635385c (svn r11001) -Codechange: unify the way to determine whether a vehicle is in a depot. rubidium <rubidium@openttd.org> parents: 7425 diff changeset	131 if (v->IsInDepot()) {
5584 4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	132 VehicleServiceInDepot(v);
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	133 return;
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	134 }
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	135
7502 2250b8ea9466 (svn r11017) -Codechange: unify determining whether a vehicle needs/can be service a little more. rubidium <rubidium@openttd.org> parents: 7490 diff changeset	136 const Depot *depot = FindClosestShipDepot(v);
5584 4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	137
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	138 if (depot == NULL \|\| DistanceManhattan(v->tile, depot->xy) > 12) {
8836 890a77315801 (svn r12584) -Codechange: do not access the order type directly. rubidium <rubidium@openttd.org> parents: 8830 diff changeset	139 if (v->current_order.IsType(OT_GOTO_DEPOT)) {
890a77315801 (svn r12584) -Codechange: do not access the order type directly. rubidium <rubidium@openttd.org> parents: 8830 diff changeset	140 v->current_order.MakeDummy();
8350 8cde0dcc6818 (svn r11916) -Codechange: use enums from VehicleViewWindowWidgets instead of constants smatz <smatz@openttd.org> parents: 8317 diff changeset	141 InvalidateWindowWidget(WC_VEHICLE_VIEW, v->index, VVW_WIDGET_START_STOP_VEH);
5584 4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	142 }
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	143 return;
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	144 }
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	145
8853 02787d6f3834 (svn r12615) -Codechange: rename some enums related to depot orders to make it more clear that they are no loading/unloading flags. Also add more type strictness. rubidium <rubidium@openttd.org> parents: 8843 diff changeset	146 v->current_order.MakeGoToDepot(depot->index, ODTFB_SERVICE);
5584 4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	147 v->dest_tile = depot->xy;
8350 8cde0dcc6818 (svn r11916) -Codechange: use enums from VehicleViewWindowWidgets instead of constants smatz <smatz@openttd.org> parents: 8317 diff changeset	148 InvalidateWindowWidget(WC_VEHICLE_VIEW, v->index, VVW_WIDGET_START_STOP_VEH);
5584 4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	149 }
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	150
10875 ba2eab4caf4a (svn r15210) -Fix: Vehicle::GetRunningCost() was wrong for ships and aircraft glx <glx@openttd.org> parents: 10744 diff changeset	151 Money Ship::GetRunningCost() const
ba2eab4caf4a (svn r15210) -Fix: Vehicle::GetRunningCost() was wrong for ships and aircraft glx <glx@openttd.org> parents: 10744 diff changeset	152 {
ba2eab4caf4a (svn r15210) -Fix: Vehicle::GetRunningCost() was wrong for ships and aircraft glx <glx@openttd.org> parents: 10744 diff changeset	153 return GetVehicleProperty(this, 0x0F, ShipVehInfo(this->engine_type)->running_cost) * _price.ship_running;
ba2eab4caf4a (svn r15210) -Fix: Vehicle::GetRunningCost() was wrong for ships and aircraft glx <glx@openttd.org> parents: 10744 diff changeset	154 }
ba2eab4caf4a (svn r15210) -Fix: Vehicle::GetRunningCost() was wrong for ships and aircraft glx <glx@openttd.org> parents: 10744 diff changeset	155
8467 284a76aa2868 (svn r12037) -Codechange: replace OnNewDay_(Aircraft\|RoadVeh\|Ship\|Train) with an OnNewDay method in the Vehicle class glx <glx@openttd.org> parents: 8392 diff changeset	156 void Ship::OnNewDay()
5584 4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	157 {
8467 284a76aa2868 (svn r12037) -Codechange: replace OnNewDay_(Aircraft\|RoadVeh\|Ship\|Train) with an OnNewDay method in the Vehicle class glx <glx@openttd.org> parents: 8392 diff changeset	158 if ((++this->day_counter & 7) == 0)
284a76aa2868 (svn r12037) -Codechange: replace OnNewDay_(Aircraft\|RoadVeh\|Ship\|Train) with an OnNewDay method in the Vehicle class glx <glx@openttd.org> parents: 8392 diff changeset	159 DecreaseVehicleValue(this);
5584 4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	160
8467 284a76aa2868 (svn r12037) -Codechange: replace OnNewDay_(Aircraft\|RoadVeh\|Ship\|Train) with an OnNewDay method in the Vehicle class glx <glx@openttd.org> parents: 8392 diff changeset	161 CheckVehicleBreakdown(this);
284a76aa2868 (svn r12037) -Codechange: replace OnNewDay_(Aircraft\|RoadVeh\|Ship\|Train) with an OnNewDay method in the Vehicle class glx <glx@openttd.org> parents: 8392 diff changeset	162 AgeVehicle(this);
284a76aa2868 (svn r12037) -Codechange: replace OnNewDay_(Aircraft\|RoadVeh\|Ship\|Train) with an OnNewDay method in the Vehicle class glx <glx@openttd.org> parents: 8392 diff changeset	163 CheckIfShipNeedsService(this);
5584 4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	164
8467 284a76aa2868 (svn r12037) -Codechange: replace OnNewDay_(Aircraft\|RoadVeh\|Ship\|Train) with an OnNewDay method in the Vehicle class glx <glx@openttd.org> parents: 8392 diff changeset	165 CheckOrders(this);
5584 4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	166
8556 8aae08d562cc (svn r12134) -Change: count the number of ticks a vehicle was running this day to calculate running cost smatz <smatz@openttd.org> parents: 8554 diff changeset	167 if (this->running_ticks == 0) return;
5584 4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	168
10875 ba2eab4caf4a (svn r15210) -Fix: Vehicle::GetRunningCost() was wrong for ships and aircraft glx <glx@openttd.org> parents: 10744 diff changeset	169 CommandCost cost(EXPENSES_SHIP_RUN, this->GetRunningCost() * this->running_ticks / (DAYS_IN_YEAR * DAY_TICKS));
8556 8aae08d562cc (svn r12134) -Change: count the number of ticks a vehicle was running this day to calculate running cost smatz <smatz@openttd.org> parents: 8554 diff changeset	170
8aae08d562cc (svn r12134) -Change: count the number of ticks a vehicle was running this day to calculate running cost smatz <smatz@openttd.org> parents: 8554 diff changeset	171 this->profit_this_year -= cost.GetCost();
8aae08d562cc (svn r12134) -Change: count the number of ticks a vehicle was running this day to calculate running cost smatz <smatz@openttd.org> parents: 8554 diff changeset	172 this->running_ticks = 0;
5584 4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	173
10207 c54d140df948 (svn r14421) -Codechange: rename all player variables/types to company or client so it is immediatelly clear which one you are working with. rubidium <rubidium@openttd.org> parents: 10184 diff changeset	174 SubtractMoneyFromCompanyFract(this->owner, cost);
5584 4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	175
8467 284a76aa2868 (svn r12037) -Codechange: replace OnNewDay_(Aircraft\|RoadVeh\|Ship\|Train) with an OnNewDay method in the Vehicle class glx <glx@openttd.org> parents: 8392 diff changeset	176 InvalidateWindow(WC_VEHICLE_DETAILS, this->index);
6420 080aae477331 (svn r9556) -Documentation: doxygen and comment-style changes. 'R', 'S'.. The end of the preliminary work is near belugas <belugas@openttd.org> parents: 6407 diff changeset	177 /* we need this for the profit */
5584 4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	178 InvalidateWindowClasses(WC_SHIPS_LIST);
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	179 }
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	180
11976 7f11f2a71193 (svn r16382) -Codechange: make GetVehicleTrackdir a member function of Vehicle. rubidium <rubidium@openttd.org> parents: 11970 diff changeset	181 Trackdir Ship::GetVehicleTrackdir() const
7f11f2a71193 (svn r16382) -Codechange: make GetVehicleTrackdir a member function of Vehicle. rubidium <rubidium@openttd.org> parents: 11970 diff changeset	182 {
7f11f2a71193 (svn r16382) -Codechange: make GetVehicleTrackdir a member function of Vehicle. rubidium <rubidium@openttd.org> parents: 11970 diff changeset	183 if (this->vehstatus & VS_CRASHED) return INVALID_TRACKDIR;
7f11f2a71193 (svn r16382) -Codechange: make GetVehicleTrackdir a member function of Vehicle. rubidium <rubidium@openttd.org> parents: 11970 diff changeset	184
7f11f2a71193 (svn r16382) -Codechange: make GetVehicleTrackdir a member function of Vehicle. rubidium <rubidium@openttd.org> parents: 11970 diff changeset	185 if (this->IsInDepot()) {
7f11f2a71193 (svn r16382) -Codechange: make GetVehicleTrackdir a member function of Vehicle. rubidium <rubidium@openttd.org> parents: 11970 diff changeset	186 /* We'll assume the ship is facing outwards */
7f11f2a71193 (svn r16382) -Codechange: make GetVehicleTrackdir a member function of Vehicle. rubidium <rubidium@openttd.org> parents: 11970 diff changeset	187 return DiagDirToDiagTrackdir(GetShipDepotDirection(this->tile));
7f11f2a71193 (svn r16382) -Codechange: make GetVehicleTrackdir a member function of Vehicle. rubidium <rubidium@openttd.org> parents: 11970 diff changeset	188 }
7f11f2a71193 (svn r16382) -Codechange: make GetVehicleTrackdir a member function of Vehicle. rubidium <rubidium@openttd.org> parents: 11970 diff changeset	189
7f11f2a71193 (svn r16382) -Codechange: make GetVehicleTrackdir a member function of Vehicle. rubidium <rubidium@openttd.org> parents: 11970 diff changeset	190 if (this->state == TRACK_BIT_WORMHOLE) {
7f11f2a71193 (svn r16382) -Codechange: make GetVehicleTrackdir a member function of Vehicle. rubidium <rubidium@openttd.org> parents: 11970 diff changeset	191 /* ship on aqueduct, so just use his direction and assume a diagonal track */
7f11f2a71193 (svn r16382) -Codechange: make GetVehicleTrackdir a member function of Vehicle. rubidium <rubidium@openttd.org> parents: 11970 diff changeset	192 return DiagDirToDiagTrackdir(DirToDiagDir(this->direction));
7f11f2a71193 (svn r16382) -Codechange: make GetVehicleTrackdir a member function of Vehicle. rubidium <rubidium@openttd.org> parents: 11970 diff changeset	193 }
7f11f2a71193 (svn r16382) -Codechange: make GetVehicleTrackdir a member function of Vehicle. rubidium <rubidium@openttd.org> parents: 11970 diff changeset	194
7f11f2a71193 (svn r16382) -Codechange: make GetVehicleTrackdir a member function of Vehicle. rubidium <rubidium@openttd.org> parents: 11970 diff changeset	195 return TrackDirectionToTrackdir(FindFirstTrack(this->state), this->direction);
7f11f2a71193 (svn r16382) -Codechange: make GetVehicleTrackdir a member function of Vehicle. rubidium <rubidium@openttd.org> parents: 11970 diff changeset	196 }
7f11f2a71193 (svn r16382) -Codechange: make GetVehicleTrackdir a member function of Vehicle. rubidium <rubidium@openttd.org> parents: 11970 diff changeset	197
5584 4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	198 static void HandleBrokenShip(Vehicle *v)
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	199 {
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	200 if (v->breakdown_ctr != 1) {
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	201 v->breakdown_ctr = 1;
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	202 v->cur_speed = 0;
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	203
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	204 if (v->breakdowns_since_last_service != 255)
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	205 v->breakdowns_since_last_service++;
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	206
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	207 InvalidateWindow(WC_VEHICLE_VIEW, v->index);
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	208 InvalidateWindow(WC_VEHICLE_DETAILS, v->index);
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	209
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	210 if (!PlayVehicleSound(v, VSE_BREAKDOWN)) {
9413 512ea64da840 (svn r13325) -Codechange: split the client-side only settings from the settings stored in the savegame so there is no need to have a duplicate copy of it for new games. rubidium <rubidium@openttd.org> parents: 9358 diff changeset	211 SndPlayVehicleFx((_settings_game.game_creation.landscape != LT_TOYLAND) ?
5584 4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	212 SND_10_TRAIN_BREAKDOWN : SND_3A_COMEDY_BREAKDOWN_2, v);
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	213 }
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	214
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	215 if (!(v->vehstatus & VS_HIDDEN)) {
11978 2e291154df46 (svn r16384) -Codechange: move u.effect to EffectVehicle rubidium <rubidium@openttd.org> parents: 11976 diff changeset	216 EffectVehicle *u = CreateEffectVehicleRel(v, 4, 4, 5, EV_BREAKDOWN_SMOKE);
2e291154df46 (svn r16384) -Codechange: move u.effect to EffectVehicle rubidium <rubidium@openttd.org> parents: 11976 diff changeset	217 if (u != NULL) u->animation_state = v->breakdown_delay * 2;
5584 4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	218 }
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	219 }
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	220
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	221 if (!(v->tick_counter & 1)) {
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	222 if (!--v->breakdown_delay) {
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	223 v->breakdown_ctr = 0;
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	224 InvalidateWindow(WC_VEHICLE_VIEW, v->index);
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	225 }
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	226 }
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	227 }
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	228
6553 733ef9947fe2 (svn r9755) -Codechange: refactor some more of the begin loading stuff. rubidium <rubidium@openttd.org> parents: 6552 diff changeset	229 void Ship::MarkDirty()
5584 4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	230 {
7134 e1c4f52f82cd (svn r10408) -Codechange: make GetImage a class method of Vehicle instead of Get(Aircraft\|RoadVeh\|Ship\|Train)Image. rubidium <rubidium@openttd.org> parents: 7096 diff changeset	231 this->cur_image = this->GetImage(this->direction);
8317 7ce2445db70c (svn r11882) -Codechange: introduce MarkSingleVehicleDirty() and simplify the code at some places smatz <smatz@openttd.org> parents: 8302 diff changeset	232 MarkSingleVehicleDirty(this);
5584 4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	233 }
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	234
6593 431c5039b1f1 (svn r9807) -Codechange: unify playing of sound when vehicle has been loaded and leaves the station. rubidium <rubidium@openttd.org> parents: 6592 diff changeset	235 static void PlayShipSound(const Vehicle *v)
5584 4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	236 {
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	237 if (!PlayVehicleSound(v, VSE_START)) {
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	238 SndPlayVehicleFx(ShipVehInfo(v->engine_type)->sfx, v);
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	239 }
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	240 }
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	241
6593 431c5039b1f1 (svn r9807) -Codechange: unify playing of sound when vehicle has been loaded and leaves the station. rubidium <rubidium@openttd.org> parents: 6592 diff changeset	242 void Ship::PlayLeaveStationSound() const
431c5039b1f1 (svn r9807) -Codechange: unify playing of sound when vehicle has been loaded and leaves the station. rubidium <rubidium@openttd.org> parents: 6592 diff changeset	243 {
431c5039b1f1 (svn r9807) -Codechange: unify playing of sound when vehicle has been loaded and leaves the station. rubidium <rubidium@openttd.org> parents: 6592 diff changeset	244 PlayShipSound(this);
431c5039b1f1 (svn r9807) -Codechange: unify playing of sound when vehicle has been loaded and leaves the station. rubidium <rubidium@openttd.org> parents: 6592 diff changeset	245 }
431c5039b1f1 (svn r9807) -Codechange: unify playing of sound when vehicle has been loaded and leaves the station. rubidium <rubidium@openttd.org> parents: 6592 diff changeset	246
8827 095c429c5fa7 (svn r12575) -Codechange: unduplicate ProcessOrders for trains, ships and road vehicles. rubidium <rubidium@openttd.org>* parents: 8800 diff changeset	247 TileIndex Ship::GetOrderStationLocation(StationID station)
5584 4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	248 {
8830 981a95f3204d (svn r12578) -Codechange: merge the aircrafts ProcessOrder too into the 'unified' ProcessOrder. rubidium <rubidium@openttd.org> parents: 8827 diff changeset	249 if (station == this->last_station_visited) this->last_station_visited = INVALID_STATION;
981a95f3204d (svn r12578) -Codechange: merge the aircrafts ProcessOrder too into the 'unified' ProcessOrder. rubidium <rubidium@openttd.org> parents: 8827 diff changeset	250
11922 0a4b63f3f3c3 (svn r16325) -Codechange: replace GetPoolItem(index) by PoolItem::Get(index) smatz <smatz@openttd.org> parents: 11903 diff changeset	251 const Station *st = Station::Get(station);
10488 a9ecb9be9814 (svn r14743) -Codechange: use INVALID_TILE to indicate station doesn't have queried facility (or station/roadstop is invalid) instead of 0 (Yexo) smatz <smatz@openttd.org> parents: 10236 diff changeset	252 if (st->dock_tile != INVALID_TILE) {
8827 095c429c5fa7 (svn r12575) -Codechange: unduplicate ProcessOrders for trains, ships and road vehicles. rubidium <rubidium@openttd.org>* parents: 8800 diff changeset	253 return TILE_ADD(st->dock_tile, ToTileIndexDiff(GetDockOffset(st->dock_tile)));
095c429c5fa7 (svn r12575) -Codechange: unduplicate ProcessOrders for trains, ships and road vehicles. rubidium <rubidium@openttd.org>* parents: 8800 diff changeset	254 } else {
11866 1e159ef634d5 (svn r16260) -Codechange: Add Vehicle::IncrementOrderIndex() to deduplicate some code. frosch <frosch@openttd.org> parents: 11730 diff changeset	255 this->IncrementOrderIndex();
8827 095c429c5fa7 (svn r12575) -Codechange: unduplicate ProcessOrders for trains, ships and road vehicles. rubidium <rubidium@openttd.org>* parents: 8800 diff changeset	256 return 0;
5584 4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	257 }
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	258 }
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	259
6558 2fc024ee8217 (svn r9760) -Codechange: remove the need for saving some vehicle variables. rubidium <rubidium@openttd.org> parents: 6553 diff changeset	260 void Ship::UpdateDeltaXY(Direction direction)
5584 4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	261 {
6558 2fc024ee8217 (svn r9760) -Codechange: remove the need for saving some vehicle variables. rubidium <rubidium@openttd.org> parents: 6553 diff changeset	262 #define MKIT(a, b, c, d) ((a & 0xFF) << 24) \| ((b & 0xFF) << 16) \| ((c & 0xFF) << 8) \| ((d & 0xFF) << 0)
5584 4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	263 static const uint32 _delta_xy_table[8] = {
6558 2fc024ee8217 (svn r9760) -Codechange: remove the need for saving some vehicle variables. rubidium <rubidium@openttd.org> parents: 6553 diff changeset	264 MKIT( 6, 6, -3, -3),
2fc024ee8217 (svn r9760) -Codechange: remove the need for saving some vehicle variables. rubidium <rubidium@openttd.org> parents: 6553 diff changeset	265 MKIT( 6, 32, -3, -16),
2fc024ee8217 (svn r9760) -Codechange: remove the need for saving some vehicle variables. rubidium <rubidium@openttd.org> parents: 6553 diff changeset	266 MKIT( 6, 6, -3, -3),
2fc024ee8217 (svn r9760) -Codechange: remove the need for saving some vehicle variables. rubidium <rubidium@openttd.org> parents: 6553 diff changeset	267 MKIT(32, 6, -16, -3),
2fc024ee8217 (svn r9760) -Codechange: remove the need for saving some vehicle variables. rubidium <rubidium@openttd.org> parents: 6553 diff changeset	268 MKIT( 6, 6, -3, -3),
2fc024ee8217 (svn r9760) -Codechange: remove the need for saving some vehicle variables. rubidium <rubidium@openttd.org> parents: 6553 diff changeset	269 MKIT( 6, 32, -3, -16),
2fc024ee8217 (svn r9760) -Codechange: remove the need for saving some vehicle variables. rubidium <rubidium@openttd.org> parents: 6553 diff changeset	270 MKIT( 6, 6, -3, -3),
2fc024ee8217 (svn r9760) -Codechange: remove the need for saving some vehicle variables. rubidium <rubidium@openttd.org> parents: 6553 diff changeset	271 MKIT(32, 6, -16, -3),
5584 4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	272 };
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	273 #undef MKIT
6558 2fc024ee8217 (svn r9760) -Codechange: remove the need for saving some vehicle variables. rubidium <rubidium@openttd.org> parents: 6553 diff changeset	274
2fc024ee8217 (svn r9760) -Codechange: remove the need for saving some vehicle variables. rubidium <rubidium@openttd.org> parents: 6553 diff changeset	275 uint32 x = _delta_xy_table[direction];
2fc024ee8217 (svn r9760) -Codechange: remove the need for saving some vehicle variables. rubidium <rubidium@openttd.org> parents: 6553 diff changeset	276 this->x_offs = GB(x, 0, 8);
2fc024ee8217 (svn r9760) -Codechange: remove the need for saving some vehicle variables. rubidium <rubidium@openttd.org> parents: 6553 diff changeset	277 this->y_offs = GB(x, 8, 8);
8793 27556e5b9388 (svn r12531) -Codechange: Rename some variables for consistency. frosch <frosch@openttd.org> parents: 8786 diff changeset	278 this->x_extent = GB(x, 16, 8);
27556e5b9388 (svn r12531) -Codechange: Rename some variables for consistency. frosch <frosch@openttd.org> parents: 8786 diff changeset	279 this->y_extent = GB(x, 24, 8);
27556e5b9388 (svn r12531) -Codechange: Rename some variables for consistency. frosch <frosch@openttd.org> parents: 8786 diff changeset	280 this->z_extent = 6;
5584 4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	281 }
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	282
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	283 void RecalcShipStuff(Vehicle *v)
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	284 {
6558 2fc024ee8217 (svn r9760) -Codechange: remove the need for saving some vehicle variables. rubidium <rubidium@openttd.org> parents: 6553 diff changeset	285 v->UpdateDeltaXY(v->direction);
7134 e1c4f52f82cd (svn r10408) -Codechange: make GetImage a class method of Vehicle instead of Get(Aircraft\|RoadVeh\|Ship\|Train)Image. rubidium <rubidium@openttd.org> parents: 7096 diff changeset	286 v->cur_image = v->GetImage(v->direction);
6553 733ef9947fe2 (svn r9755) -Codechange: refactor some more of the begin loading stuff. rubidium <rubidium@openttd.org> parents: 6552 diff changeset	287 v->MarkDirty();
5584 4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	288 InvalidateWindow(WC_VEHICLE_DEPOT, v->tile);
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	289 }
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	290
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	291 static const TileIndexDiffC _ship_leave_depot_offs[] = {
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	292 {-1, 0},
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	293 { 0, -1}
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	294 };
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	295
11976 7f11f2a71193 (svn r16382) -Codechange: make GetVehicleTrackdir a member function of Vehicle. rubidium <rubidium@openttd.org> parents: 11970 diff changeset	296 static void CheckShipLeaveDepot(Ship *v)
5584 4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	297 {
7490 f538c635385c (svn r11001) -Codechange: unify the way to determine whether a vehicle is in a depot. rubidium <rubidium@openttd.org> parents: 7425 diff changeset	298 if (!v->IsInDepot()) return;
5584 4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	299
9045 bd6941096b6a (svn r12870) -Codechange: remove some magic numbers from u.ship.state handling smatz <smatz@openttd.org> parents: 9036 diff changeset	300 TileIndex tile = v->tile;
bd6941096b6a (svn r12870) -Codechange: remove some magic numbers from u.ship.state handling smatz <smatz@openttd.org> parents: 9036 diff changeset	301 Axis axis = GetShipDepotAxis(tile);
5584 4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	302
9045 bd6941096b6a (svn r12870) -Codechange: remove some magic numbers from u.ship.state handling smatz <smatz@openttd.org> parents: 9036 diff changeset	303 /* Check first (north) side */
5584 4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	304 if (_ship_sometracks[axis] & GetTileShipTrackStatus(TILE_ADD(tile, ToTileIndexDiff(_ship_leave_depot_offs[axis])))) {
9045 bd6941096b6a (svn r12870) -Codechange: remove some magic numbers from u.ship.state handling smatz <smatz@openttd.org> parents: 9036 diff changeset	305 v->direction = ReverseDir(AxisToDirection(axis));
bd6941096b6a (svn r12870) -Codechange: remove some magic numbers from u.ship.state handling smatz <smatz@openttd.org> parents: 9036 diff changeset	306 /* Check second (south) side */
5584 4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	307 } else if (_ship_sometracks[axis + 2] & GetTileShipTrackStatus(TILE_ADD(tile, -2 * ToTileIndexDiff(_ship_leave_depot_offs[axis])))) {
9045 bd6941096b6a (svn r12870) -Codechange: remove some magic numbers from u.ship.state handling smatz <smatz@openttd.org> parents: 9036 diff changeset	308 v->direction = AxisToDirection(axis);
5584 4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	309 } else {
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	310 return;
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	311 }
9045 bd6941096b6a (svn r12870) -Codechange: remove some magic numbers from u.ship.state handling smatz <smatz@openttd.org> parents: 9036 diff changeset	312
11976 7f11f2a71193 (svn r16382) -Codechange: make GetVehicleTrackdir a member function of Vehicle. rubidium <rubidium@openttd.org> parents: 11970 diff changeset	313 v->state = AxisToTrackBits(axis);
5584 4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	314 v->vehstatus &= ~VS_HIDDEN;
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	315
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	316 v->cur_speed = 0;
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	317 RecalcShipStuff(v);
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	318
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	319 PlayShipSound(v);
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	320 VehicleServiceInDepot(v);
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	321 InvalidateWindowData(WC_VEHICLE_DEPOT, v->tile);
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	322 InvalidateWindowClasses(WC_SHIPS_LIST);
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	323 }
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	324
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	325 static bool ShipAccelerate(Vehicle *v)
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	326 {
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	327 uint spd;
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	328 byte t;
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	329
6490 fcc1843c68c6 (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 <peter1138@openttd.org> parents: 6453 diff changeset	330 spd = min(v->cur_speed + 1, GetVehicleProperty(v, 0x0B, v->max_speed));
5584 4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	331
11368 82c90cd591ab (svn r15718) -Cleanup: apply some comment coding style on the rest of the sources too rubidium <rubidium@openttd.org> parents: 11361 diff changeset	332 /* updates statusbar only if speed have changed to save CPU time */
5584 4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	333 if (spd != v->cur_speed) {
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	334 v->cur_speed = spd;
9413 512ea64da840 (svn r13325) -Codechange: split the client-side only settings from the settings stored in the savegame so there is no need to have a duplicate copy of it for new games. rubidium <rubidium@openttd.org> parents: 9358 diff changeset	335 if (_settings_client.gui.vehicle_speed)
8350 8cde0dcc6818 (svn r11916) -Codechange: use enums from VehicleViewWindowWidgets instead of constants smatz <smatz@openttd.org> parents: 8317 diff changeset	336 InvalidateWindowWidget(WC_VEHICLE_VIEW, v->index, VVW_WIDGET_START_STOP_VEH);
5584 4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	337 }
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	338
6420 080aae477331 (svn r9556) -Documentation: doxygen and comment-style changes. 'R', 'S'.. The end of the preliminary work is near belugas <belugas@openttd.org> parents: 6407 diff changeset	339 /* Decrease somewhat when turning */
5584 4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	340 if (!(v->direction & 1)) spd = spd * 3 / 4;
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	341
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	342 if (spd == 0) return false;
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	343 if ((byte)++spd == 0) return true;
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	344
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	345 v->progress = (t = v->progress) - (byte)spd;
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	346
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	347 return (t < v->progress);
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	348 }
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	349
10647 592ae9307430 (svn r14949) -Cleanup: pointer coding style rubidium <rubidium@openttd.org> parents: 10634 diff changeset	350 static void ShipArrivesAt(const Vehicle v, Station st)
5584 4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	351 {
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	352 /* Check if station was ever visited before */
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	353 if (!(st->had_vehicle_of_type & HVOT_SHIP)) {
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	354 st->had_vehicle_of_type \|= HVOT_SHIP;
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	355
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	356 SetDParam(0, st->index);
12010 d0bf08a7c260 (svn r16416) -Fix [FS#2912]: Rework deleting of news when referenced vehicles/stations/industries are deleted. frosch <frosch@openttd.org> parents: 11978 diff changeset	357 AddVehicleNewsItem(
11730 a39da1e4c1f5 (svn r16118) -Change/cleanup: remove the hexadecimal 'in TTD the string had this ID' from 'some' strings and replace the string name with something more sensible. rubidium <rubidium@openttd.org> parents: 11368 diff changeset	358 STR_NEWS_FIRST_SHIP_ARRIVAL,
10207 c54d140df948 (svn r14421) -Codechange: rename all player variables/types to company or client so it is immediatelly clear which one you are working with. rubidium <rubidium@openttd.org> parents: 10184 diff changeset	359 (v->owner == _local_company) ? NS_ARRIVAL_COMPANY : NS_ARRIVAL_OTHER,
5584 4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	360 v->index,
10123 57aa34285d05 (svn r14307) -Fix: when deleting a station, remove news items regarding it smatz <smatz@openttd.org> parents: 10056 diff changeset	361 st->index
57aa34285d05 (svn r14307) -Fix: when deleting a station, remove news items regarding it smatz <smatz@openttd.org> parents: 10056 diff changeset	362 );
10696 7edccbb67398 (svn r15027) -Merge: tomatos and bananas left to be, here is NoAI for all to see. truebrain <truebrain@openttd.org> parents: 10647 diff changeset	363 AI::NewEvent(v->owner, new AIEventStationFirstVehicle(st->index, v->index));
5584 4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	364 }
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	365 }
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	366
6248 0789677a15a0 (svn r9051) -Codechange: typedef [enum\|struct] Y {} X; -> [enum\|struct] X {}; rubidium <rubidium@openttd.org> parents: 6247 diff changeset	367 struct PathFindShip {
5584 4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	368 TileIndex skiptile;
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	369 TileIndex dest_coords;
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	370 uint best_bird_dist;
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	371 uint best_length;
6248 0789677a15a0 (svn r9051) -Codechange: typedef [enum\|struct] Y {} X; -> [enum\|struct] X {}; rubidium <rubidium@openttd.org> parents: 6247 diff changeset	372 };
5584 4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	373
8611 6992dec7779c (svn r12193) -Codechange: Rename a magic variable, give it a decent type, and remove a 'goto'. frosch <frosch@openttd.org> parents: 8556 diff changeset	374 static bool ShipTrackFollower(TileIndex tile, PathFindShip *pfs, int track, uint length)
5584 4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	375 {
6420 080aae477331 (svn r9556) -Documentation: doxygen and comment-style changes. 'R', 'S'.. The end of the preliminary work is near belugas <belugas@openttd.org> parents: 6407 diff changeset	376 /* Found dest? */
5584 4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	377 if (tile == pfs->dest_coords) {
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	378 pfs->best_bird_dist = 0;
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	379
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	380 pfs->best_length = minu(pfs->best_length, length);
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	381 return true;
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	382 }
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	383
6420 080aae477331 (svn r9556) -Documentation: doxygen and comment-style changes. 'R', 'S'.. The end of the preliminary work is near belugas <belugas@openttd.org> parents: 6407 diff changeset	384 /* Skip this tile in the calculation */
5584 4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	385 if (tile != pfs->skiptile) {
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	386 pfs->best_bird_dist = minu(pfs->best_bird_dist, DistanceMaxPlusManhattan(pfs->dest_coords, tile));
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	387 }
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	388
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	389 return false;
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	390 }
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	391
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	392 static const byte _ship_search_directions[6][4] = {
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	393 { 0, 9, 2, 9 },
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	394 { 9, 1, 9, 3 },
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	395 { 9, 0, 3, 9 },
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	396 { 1, 9, 9, 2 },
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	397 { 3, 2, 9, 9 },
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	398 { 9, 9, 1, 0 },
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	399 };
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	400
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	401 static const byte _pick_shiptrack_table[6] = {1, 3, 2, 2, 0, 0};
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	402
5587 c44c070c5032 (svn r8038) -Merge: the cpp branch. Effort of KUDr, Celestar, glx, Smoovius, stillunknown and pv2b. rubidium <rubidium@openttd.org> parents: 5584 diff changeset	403 static uint FindShipTrack(Vehicle v, TileIndex tile, DiagDirection dir, TrackBits bits, TileIndex skiptile, Track track)
5584 4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	404 {
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	405 PathFindShip pfs;
5587 c44c070c5032 (svn r8038) -Merge: the cpp branch. Effort of KUDr, Celestar, glx, Smoovius, stillunknown and pv2b. rubidium <rubidium@openttd.org> parents: 5584 diff changeset	406 Track i, best_track;
5584 4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	407 uint best_bird_dist = 0;
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	408 uint best_length = 0;
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	409 uint r;
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	410 byte ship_dir = v->direction & 3;
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	411
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	412 pfs.dest_coords = v->dest_tile;
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	413 pfs.skiptile = skiptile;
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	414
5587 c44c070c5032 (svn r8038) -Merge: the cpp branch. Effort of KUDr, Celestar, glx, Smoovius, stillunknown and pv2b. rubidium <rubidium@openttd.org> parents: 5584 diff changeset	415 best_track = INVALID_TRACK;
5584 4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	416
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	417 do {
5598 b73ad40222d0 (svn r8052) - Codechange: RemoveFirstTrack() and RemoveFirstTrackdir() now accept pointer to TrackBits/TrackdirBits instead of reference. KUDr <KUDr@openttd.org> parents: 5587 diff changeset	418 i = RemoveFirstTrack(&bits);
5584 4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	419
10236 59398a628f10 (svn r14464) -Codechange: replace (uint)-1 with UINT_MAX (PhilSophus) rubidium <rubidium@openttd.org> parents: 10208 diff changeset	420 pfs.best_bird_dist = UINT_MAX;
59398a628f10 (svn r14464) -Codechange: replace (uint)-1 with UINT_MAX (PhilSophus) rubidium <rubidium@openttd.org> parents: 10208 diff changeset	421 pfs.best_length = UINT_MAX;
5584 4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	422
8800 2a908464da27 (svn r12540) -Codechange: Enumify some values in original pathfinder and remove an unused variable. frosch <frosch@openttd.org> parents: 8793 diff changeset	423 FollowTrack(tile, PATHFIND_FLAGS_SHIP_MODE \| PATHFIND_FLAGS_DISABLE_TILE_HASH, TRANSPORT_WATER, 0, (DiagDirection)_ship_search_directions[i][dir], (TPFEnumProc*)ShipTrackFollower, NULL, &pfs);
5584 4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	424
5587 c44c070c5032 (svn r8038) -Merge: the cpp branch. Effort of KUDr, Celestar, glx, Smoovius, stillunknown and pv2b. rubidium <rubidium@openttd.org> parents: 5584 diff changeset	425 if (best_track != INVALID_TRACK) {
5584 4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	426 if (pfs.best_bird_dist != 0) {
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	427 /* neither reached the destination, pick the one with the smallest bird dist */
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	428 if (pfs.best_bird_dist > best_bird_dist) goto bad;
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	429 if (pfs.best_bird_dist < best_bird_dist) goto good;
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	430 } else {
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	431 if (pfs.best_length > best_length) goto bad;
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	432 if (pfs.best_length < best_length) goto good;
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	433 }
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	434
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	435 /* if we reach this position, there's two paths of equal value so far.
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	436 * pick one randomly. */
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	437 r = GB(Random(), 0, 8);
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	438 if (_pick_shiptrack_table[i] == ship_dir) r += 80;
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	439 if (_pick_shiptrack_table[best_track] == ship_dir) r -= 80;
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	440 if (r <= 127) goto bad;
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	441 }
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	442 good:;
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	443 best_track = i;
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	444 best_bird_dist = pfs.best_bird_dist;
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	445 best_length = pfs.best_length;
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	446 bad:;
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	447
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	448 } while (bits != 0);
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	449
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	450 *track = best_track;
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	451 return best_bird_dist;
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	452 }
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	453
10647 592ae9307430 (svn r14949) -Cleanup: pointer coding style rubidium <rubidium@openttd.org> parents: 10634 diff changeset	454 static inline NPFFoundTargetData PerfNPFRouteToStationOrTile(TileIndex tile, Trackdir trackdir, bool ignore_start_tile, NPFFindStationOrTileData *target, TransportType type, Owner owner, RailTypes railtypes)
5584 4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	455 {
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	456
10647 592ae9307430 (svn r14949) -Cleanup: pointer coding style rubidium <rubidium@openttd.org> parents: 10634 diff changeset	457 void *perf = NpfBeginInterval();
8510 a4d67e09d191 (svn r12085) -Fix(r12058): Road vehicles could get stuck, when NPF told them to reverse on junction tiles. (spotted by SmatZ) frosch <frosch@openttd.org> parents: 8467 diff changeset	458 NPFFoundTargetData ret = NPFRouteToStationOrTile(tile, trackdir, ignore_start_tile, target, type, 0, owner, railtypes);
5584 4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	459 int t = NpfEndInterval(perf);
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	460 DEBUG(yapf, 4, "[NPFW] %d us - %d rounds - %d open - %d closed -- ", t, 0, _aystar_stats_open_size, _aystar_stats_closed_size);
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	461 return ret;
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	462 }
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	463
6420 080aae477331 (svn r9556) -Documentation: doxygen and comment-style changes. 'R', 'S'.. The end of the preliminary work is near belugas <belugas@openttd.org> parents: 6407 diff changeset	464 /** returns the track to choose on the next tile, or -1 when it's better to
5584 4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	465 * reverse. The tile given is the tile we are about to enter, enterdir is the
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	466 * direction in which we are entering the tile */
11976 7f11f2a71193 (svn r16382) -Codechange: make GetVehicleTrackdir a member function of Vehicle. rubidium <rubidium@openttd.org> parents: 11970 diff changeset	467 static Track ChooseShipTrack(Ship *v, TileIndex tile, DiagDirection enterdir, TrackBits tracks)
5584 4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	468 {
8554 9bf902b801c6 (svn r12132) -Cleanup: convert pathfinder selection from if/else to switch/case at many places smatz <smatz@openttd.org> parents: 8551 diff changeset	469 assert(IsValidDiagDirection(enterdir));
9bf902b801c6 (svn r12132) -Cleanup: convert pathfinder selection from if/else to switch/case at many places smatz <smatz@openttd.org> parents: 8551 diff changeset	470
9413 512ea64da840 (svn r13325) -Codechange: split the client-side only settings from the settings stored in the savegame so there is no need to have a duplicate copy of it for new games. rubidium <rubidium@openttd.org> parents: 9358 diff changeset	471 switch (_settings_game.pf.pathfinder_for_ships) {
11368 82c90cd591ab (svn r15718) -Cleanup: apply some comment coding style on the rest of the sources too rubidium <rubidium@openttd.org> parents: 11361 diff changeset	472 case VPF_YAPF: { // YAPF
8554 9bf902b801c6 (svn r12132) -Cleanup: convert pathfinder selection from if/else to switch/case at many places smatz <smatz@openttd.org> parents: 8551 diff changeset	473 Trackdir trackdir = YapfChooseShipTrack(v, tile, enterdir, tracks);
9bf902b801c6 (svn r12132) -Cleanup: convert pathfinder selection from if/else to switch/case at many places smatz <smatz@openttd.org> parents: 8551 diff changeset	474 if (trackdir != INVALID_TRACKDIR) return TrackdirToTrack(trackdir);
9bf902b801c6 (svn r12132) -Cleanup: convert pathfinder selection from if/else to switch/case at many places smatz <smatz@openttd.org> parents: 8551 diff changeset	475 } break;
5584 4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	476
11368 82c90cd591ab (svn r15718) -Cleanup: apply some comment coding style on the rest of the sources too rubidium <rubidium@openttd.org> parents: 11361 diff changeset	477 case VPF_NPF: { // NPF
8554 9bf902b801c6 (svn r12132) -Cleanup: convert pathfinder selection from if/else to switch/case at many places smatz <smatz@openttd.org> parents: 8551 diff changeset	478 NPFFindStationOrTileData fstd;
11976 7f11f2a71193 (svn r16382) -Codechange: make GetVehicleTrackdir a member function of Vehicle. rubidium <rubidium@openttd.org> parents: 11970 diff changeset	479 Trackdir trackdir = v->GetVehicleTrackdir();
8554 9bf902b801c6 (svn r12132) -Cleanup: convert pathfinder selection from if/else to switch/case at many places smatz <smatz@openttd.org> parents: 8551 diff changeset	480 assert(trackdir != INVALID_TRACKDIR); // Check that we are not in a depot
5584 4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	481
8554 9bf902b801c6 (svn r12132) -Cleanup: convert pathfinder selection from if/else to switch/case at many places smatz <smatz@openttd.org> parents: 8551 diff changeset	482 NPFFillWithOrderData(&fstd, v);
5584 4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	483
8554 9bf902b801c6 (svn r12132) -Cleanup: convert pathfinder selection from if/else to switch/case at many places smatz <smatz@openttd.org> parents: 8551 diff changeset	484 NPFFoundTargetData ftd = PerfNPFRouteToStationOrTile(tile - TileOffsByDiagDir(enterdir), trackdir, true, &fstd, TRANSPORT_WATER, v->owner, INVALID_RAILTYPES);
5584 4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	485
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	486 /* If ftd.best_bird_dist is 0, we found our target and ftd.best_trackdir contains
8554 9bf902b801c6 (svn r12132) -Cleanup: convert pathfinder selection from if/else to switch/case at many places smatz <smatz@openttd.org> parents: 8551 diff changeset	487 * the direction we need to take to get there, if ftd.best_bird_dist is not 0,
9bf902b801c6 (svn r12132) -Cleanup: convert pathfinder selection from if/else to switch/case at many places smatz <smatz@openttd.org> parents: 8551 diff changeset	488 * we did not find our target, but ftd.best_trackdir contains the direction leading
9bf902b801c6 (svn r12132) -Cleanup: convert pathfinder selection from if/else to switch/case at many places smatz <smatz@openttd.org> parents: 8551 diff changeset	489 * to the tile closest to our target. */
11368 82c90cd591ab (svn r15718) -Cleanup: apply some comment coding style on the rest of the sources too rubidium <rubidium@openttd.org> parents: 11361 diff changeset	490 if (ftd.best_trackdir != 0xff) return TrackdirToTrack(ftd.best_trackdir); // TODO: Wrapper function?
8554 9bf902b801c6 (svn r12132) -Cleanup: convert pathfinder selection from if/else to switch/case at many places smatz <smatz@openttd.org> parents: 8551 diff changeset	491 } break;
5584 4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	492
8554 9bf902b801c6 (svn r12132) -Cleanup: convert pathfinder selection from if/else to switch/case at many places smatz <smatz@openttd.org> parents: 8551 diff changeset	493 default:
11368 82c90cd591ab (svn r15718) -Cleanup: apply some comment coding style on the rest of the sources too rubidium <rubidium@openttd.org> parents: 11361 diff changeset	494 case VPF_OPF: { // OPF
8554 9bf902b801c6 (svn r12132) -Cleanup: convert pathfinder selection from if/else to switch/case at many places smatz <smatz@openttd.org> parents: 8551 diff changeset	495 TileIndex tile2 = TILE_ADD(tile, -TileOffsByDiagDir(enterdir));
9bf902b801c6 (svn r12132) -Cleanup: convert pathfinder selection from if/else to switch/case at many places smatz <smatz@openttd.org> parents: 8551 diff changeset	496 Track track;
9bf902b801c6 (svn r12132) -Cleanup: convert pathfinder selection from if/else to switch/case at many places smatz <smatz@openttd.org> parents: 8551 diff changeset	497
9bf902b801c6 (svn r12132) -Cleanup: convert pathfinder selection from if/else to switch/case at many places smatz <smatz@openttd.org> parents: 8551 diff changeset	498 /* Let's find out how far it would be if we would reverse first */
11976 7f11f2a71193 (svn r16382) -Codechange: make GetVehicleTrackdir a member function of Vehicle. rubidium <rubidium@openttd.org> parents: 11970 diff changeset	499 TrackBits b = GetTileShipTrackStatus(tile2) & _ship_sometracks[ReverseDiagDir(enterdir)] & v->state;
5584 4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	500
8554 9bf902b801c6 (svn r12132) -Cleanup: convert pathfinder selection from if/else to switch/case at many places smatz <smatz@openttd.org> parents: 8551 diff changeset	501 uint distr = UINT_MAX; // distance if we reversed
9bf902b801c6 (svn r12132) -Cleanup: convert pathfinder selection from if/else to switch/case at many places smatz <smatz@openttd.org> parents: 8551 diff changeset	502 if (b != 0) {
9bf902b801c6 (svn r12132) -Cleanup: convert pathfinder selection from if/else to switch/case at many places smatz <smatz@openttd.org> parents: 8551 diff changeset	503 distr = FindShipTrack(v, tile2, ReverseDiagDir(enterdir), b, tile, &track);
9bf902b801c6 (svn r12132) -Cleanup: convert pathfinder selection from if/else to switch/case at many places smatz <smatz@openttd.org> parents: 8551 diff changeset	504 if (distr != UINT_MAX) distr++; // penalty for reversing
9bf902b801c6 (svn r12132) -Cleanup: convert pathfinder selection from if/else to switch/case at many places smatz <smatz@openttd.org> parents: 8551 diff changeset	505 }
9bf902b801c6 (svn r12132) -Cleanup: convert pathfinder selection from if/else to switch/case at many places smatz <smatz@openttd.org> parents: 8551 diff changeset	506
9bf902b801c6 (svn r12132) -Cleanup: convert pathfinder selection from if/else to switch/case at many places smatz <smatz@openttd.org> parents: 8551 diff changeset	507 /* And if we would not reverse? */
9bf902b801c6 (svn r12132) -Cleanup: convert pathfinder selection from if/else to switch/case at many places smatz <smatz@openttd.org> parents: 8551 diff changeset	508 uint dist = FindShipTrack(v, tile, enterdir, tracks, 0, &track);
9bf902b801c6 (svn r12132) -Cleanup: convert pathfinder selection from if/else to switch/case at many places smatz <smatz@openttd.org> parents: 8551 diff changeset	509
9bf902b801c6 (svn r12132) -Cleanup: convert pathfinder selection from if/else to switch/case at many places smatz <smatz@openttd.org> parents: 8551 diff changeset	510 if (dist <= distr) return track;
9bf902b801c6 (svn r12132) -Cleanup: convert pathfinder selection from if/else to switch/case at many places smatz <smatz@openttd.org> parents: 8551 diff changeset	511 } break;
5584 4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	512 }
8554 9bf902b801c6 (svn r12132) -Cleanup: convert pathfinder selection from if/else to switch/case at many places smatz <smatz@openttd.org> parents: 8551 diff changeset	513
11368 82c90cd591ab (svn r15718) -Cleanup: apply some comment coding style on the rest of the sources too rubidium <rubidium@openttd.org> parents: 11361 diff changeset	514 return INVALID_TRACK; // We could better reverse
5584 4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	515 }
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	516
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	517 static const Direction _new_vehicle_direction_table[] = {
5587 c44c070c5032 (svn r8038) -Merge: the cpp branch. Effort of KUDr, Celestar, glx, Smoovius, stillunknown and pv2b. rubidium <rubidium@openttd.org> parents: 5584 diff changeset	518 DIR_N , DIR_NW, DIR_W , INVALID_DIR,
c44c070c5032 (svn r8038) -Merge: the cpp branch. Effort of KUDr, Celestar, glx, Smoovius, stillunknown and pv2b. rubidium <rubidium@openttd.org> parents: 5584 diff changeset	519 DIR_NE, DIR_N , DIR_SW, INVALID_DIR,
5584 4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	520 DIR_E , DIR_SE, DIR_S
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	521 };
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	522
5587 c44c070c5032 (svn r8038) -Merge: the cpp branch. Effort of KUDr, Celestar, glx, Smoovius, stillunknown and pv2b. rubidium <rubidium@openttd.org> parents: 5584 diff changeset	523 static Direction ShipGetNewDirectionFromTiles(TileIndex new_tile, TileIndex old_tile)
5584 4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	524 {
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	525 uint offs = (TileY(new_tile) - TileY(old_tile) + 1) * 4 +
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	526 TileX(new_tile) - TileX(old_tile) + 1;
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	527 assert(offs < 11 && offs != 3 && offs != 7);
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	528 return _new_vehicle_direction_table[offs];
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	529 }
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	530
5587 c44c070c5032 (svn r8038) -Merge: the cpp branch. Effort of KUDr, Celestar, glx, Smoovius, stillunknown and pv2b. rubidium <rubidium@openttd.org> parents: 5584 diff changeset	531 static Direction ShipGetNewDirection(Vehicle *v, int x, int y)
5584 4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	532 {
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	533 uint offs = (y - v->y_pos + 1) * 4 + (x - v->x_pos + 1);
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	534 assert(offs < 11 && offs != 3 && offs != 7);
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	535 return _new_vehicle_direction_table[offs];
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	536 }
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	537
8616 9e46ac001a8c (svn r12199) -Codechange: Remove magic around the results of GetTileTrackStatus(). frosch <frosch@openttd.org> parents: 8611 diff changeset	538 static inline TrackBits GetAvailShipTracks(TileIndex tile, int dir)
5584 4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	539 {
8616 9e46ac001a8c (svn r12199) -Codechange: Remove magic around the results of GetTileTrackStatus(). frosch <frosch@openttd.org> parents: 8611 diff changeset	540 return GetTileShipTrackStatus(tile) & _ship_sometracks[dir];
5584 4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	541 }
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	542
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	543 static const byte _ship_subcoord[4][6][3] = {
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	544 {
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	545 {15, 8, 1},
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	546 { 0, 0, 0},
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	547 { 0, 0, 0},
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	548 {15, 8, 2},
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	549 {15, 7, 0},
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	550 { 0, 0, 0},
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	551 },
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	552 {
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	553 { 0, 0, 0},
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	554 { 8, 0, 3},
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	555 { 7, 0, 2},
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	556 { 0, 0, 0},
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	557 { 8, 0, 4},
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	558 { 0, 0, 0},
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	559 },
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	560 {
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	561 { 0, 8, 5},
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	562 { 0, 0, 0},
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	563 { 0, 7, 6},
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	564 { 0, 0, 0},
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	565 { 0, 0, 0},
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	566 { 0, 8, 4},
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	567 },
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	568 {
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	569 { 0, 0, 0},
6491 696f0e1b046e (svn r9672) -Cleanup: lots of coding style fixes around operands. rubidium <rubidium@openttd.org> parents: 6490 diff changeset	570 { 8, 15, 7},
5584 4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	571 { 0, 0, 0},
6491 696f0e1b046e (svn r9672) -Cleanup: lots of coding style fixes around operands. rubidium <rubidium@openttd.org> parents: 6490 diff changeset	572 { 8, 15, 6},
5584 4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	573 { 0, 0, 0},
6491 696f0e1b046e (svn r9672) -Cleanup: lots of coding style fixes around operands. rubidium <rubidium@openttd.org> parents: 6490 diff changeset	574 { 7, 15, 0},
5584 4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	575 }
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	576 };
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	577
11976 7f11f2a71193 (svn r16382) -Codechange: make GetVehicleTrackdir a member function of Vehicle. rubidium <rubidium@openttd.org> parents: 11970 diff changeset	578 static void ShipController(Ship *v)
5584 4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	579 {
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	580 uint32 r;
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	581 const byte *b;
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	582 Direction dir;
5587 c44c070c5032 (svn r8038) -Merge: the cpp branch. Effort of KUDr, Celestar, glx, Smoovius, stillunknown and pv2b. rubidium <rubidium@openttd.org> parents: 5584 diff changeset	583 Track track;
c44c070c5032 (svn r8038) -Merge: the cpp branch. Effort of KUDr, Celestar, glx, Smoovius, stillunknown and pv2b. rubidium <rubidium@openttd.org> parents: 5584 diff changeset	584 TrackBits tracks;
5584 4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	585
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	586 v->tick_counter++;
6980 cb6b3e277df0 (svn r10236) -Feature: Introduce a form of timetabling for vehicles. maedhros <maedhros@openttd.org> parents: 6953 diff changeset	587 v->current_order_time++;
5584 4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	588
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	589 if (v->breakdown_ctr != 0) {
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	590 if (v->breakdown_ctr <= 2) {
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	591 HandleBrokenShip(v);
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	592 return;
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	593 }
9000 75ae4890d738 (svn r12795) -Fix [FS#1938]: vehicles could break down during loading and keep loading. The intention of the break down code is not to break down when having zero speed, therefor break downs now do not happen when loading. rubidium <rubidium@openttd.org> parents: 8962 diff changeset	594 if (!v->current_order.IsType(OT_LOADING)) v->breakdown_ctr--;
5584 4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	595 }
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	596
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	597 if (v->vehstatus & VS_STOPPED) return;
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	598
8827 095c429c5fa7 (svn r12575) -Codechange: unduplicate ProcessOrders for trains, ships and road vehicles. rubidium <rubidium@openttd.org>* parents: 8800 diff changeset	599 ProcessOrders(v);
6594 7535dcf42683 (svn r9808) -Codechange: unify the Handle<VehicleType>Loading functions. rubidium <rubidium@openttd.org> parents: 6593 diff changeset	600 v->HandleLoading();
5584 4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	601
8836 890a77315801 (svn r12584) -Codechange: do not access the order type directly. rubidium <rubidium@openttd.org> parents: 8830 diff changeset	602 if (v->current_order.IsType(OT_LOADING)) return;
5584 4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	603
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	604 CheckShipLeaveDepot(v);
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	605
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	606 if (!ShipAccelerate(v)) return;
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	607
6153 42ef9b98d898 (svn r8897) -Fix tron <tron@openttd.org> parents: 6152 diff changeset	608 GetNewVehiclePosResult gp = GetNewVehiclePos(v);
11976 7f11f2a71193 (svn r16382) -Codechange: make GetVehicleTrackdir a member function of Vehicle. rubidium <rubidium@openttd.org> parents: 11970 diff changeset	609 if (v->state != TRACK_BIT_WORMHOLE) {
9490 8622c9315e8c (svn r13464) -Codechange: support NewGRF Action 0x05, type 12. rubidium <rubidium@openttd.org> parents: 9413 diff changeset	610 /* Not on a bridge */
8622c9315e8c (svn r13464) -Codechange: support NewGRF Action 0x05, type 12. rubidium <rubidium@openttd.org> parents: 9413 diff changeset	611 if (gp.old_tile == gp.new_tile) {
8622c9315e8c (svn r13464) -Codechange: support NewGRF Action 0x05, type 12. rubidium <rubidium@openttd.org> parents: 9413 diff changeset	612 /* Staying in tile */
8622c9315e8c (svn r13464) -Codechange: support NewGRF Action 0x05, type 12. rubidium <rubidium@openttd.org> parents: 9413 diff changeset	613 if (v->IsInDepot()) {
8622c9315e8c (svn r13464) -Codechange: support NewGRF Action 0x05, type 12. rubidium <rubidium@openttd.org> parents: 9413 diff changeset	614 gp.x = v->x_pos;
8622c9315e8c (svn r13464) -Codechange: support NewGRF Action 0x05, type 12. rubidium <rubidium@openttd.org> parents: 9413 diff changeset	615 gp.y = v->y_pos;
8622c9315e8c (svn r13464) -Codechange: support NewGRF Action 0x05, type 12. rubidium <rubidium@openttd.org> parents: 9413 diff changeset	616 } else {
8622c9315e8c (svn r13464) -Codechange: support NewGRF Action 0x05, type 12. rubidium <rubidium@openttd.org> parents: 9413 diff changeset	617 /* Not inside depot */
8622c9315e8c (svn r13464) -Codechange: support NewGRF Action 0x05, type 12. rubidium <rubidium@openttd.org> parents: 9413 diff changeset	618 r = VehicleEnterTile(v, gp.new_tile, gp.x, gp.y);
8622c9315e8c (svn r13464) -Codechange: support NewGRF Action 0x05, type 12. rubidium <rubidium@openttd.org> parents: 9413 diff changeset	619 if (HasBit(r, VETS_CANNOT_ENTER)) goto reverse_direction;
5584 4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	620
9490 8622c9315e8c (svn r13464) -Codechange: support NewGRF Action 0x05, type 12. rubidium <rubidium@openttd.org> parents: 9413 diff changeset	621 /* A leave station order only needs one tick to get processed, so we can
11361 02313cc6114e (svn r15711) -Codechange: lots of whitespace cleanup/fixes rubidium <rubidium@openttd.org> parents: 11326 diff changeset	622 * always skip ahead. */
9490 8622c9315e8c (svn r13464) -Codechange: support NewGRF Action 0x05, type 12. rubidium <rubidium@openttd.org> parents: 9413 diff changeset	623 if (v->current_order.IsType(OT_LEAVESTATION)) {
8622c9315e8c (svn r13464) -Codechange: support NewGRF Action 0x05, type 12. rubidium <rubidium@openttd.org> parents: 9413 diff changeset	624 v->current_order.Free();
8622c9315e8c (svn r13464) -Codechange: support NewGRF Action 0x05, type 12. rubidium <rubidium@openttd.org> parents: 9413 diff changeset	625 InvalidateWindowWidget(WC_VEHICLE_VIEW, v->index, VVW_WIDGET_START_STOP_VEH);
8622c9315e8c (svn r13464) -Codechange: support NewGRF Action 0x05, type 12. rubidium <rubidium@openttd.org> parents: 9413 diff changeset	626 } else if (v->dest_tile != 0) {
8622c9315e8c (svn r13464) -Codechange: support NewGRF Action 0x05, type 12. rubidium <rubidium@openttd.org> parents: 9413 diff changeset	627 /* We have a target, let's see if we reached it... */
8622c9315e8c (svn r13464) -Codechange: support NewGRF Action 0x05, type 12. rubidium <rubidium@openttd.org> parents: 9413 diff changeset	628 if (v->current_order.IsType(OT_GOTO_STATION) &&
11922 0a4b63f3f3c3 (svn r16325) -Codechange: replace GetPoolItem(index) by PoolItem::Get(index) smatz <smatz@openttd.org> parents: 11903 diff changeset	629 Station::Get(v->current_order.GetDestination())->IsBuoy() &&
9490 8622c9315e8c (svn r13464) -Codechange: support NewGRF Action 0x05, type 12. rubidium <rubidium@openttd.org> parents: 9413 diff changeset	630 DistanceManhattan(v->dest_tile, gp.new_tile) <= 3) {
8622c9315e8c (svn r13464) -Codechange: support NewGRF Action 0x05, type 12. rubidium <rubidium@openttd.org> parents: 9413 diff changeset	631 /* We got within 3 tiles of our target buoy, so let's skip to our
11361 02313cc6114e (svn r15711) -Codechange: lots of whitespace cleanup/fixes rubidium <rubidium@openttd.org> parents: 11326 diff changeset	632 * next order */
9490 8622c9315e8c (svn r13464) -Codechange: support NewGRF Action 0x05, type 12. rubidium <rubidium@openttd.org> parents: 9413 diff changeset	633 UpdateVehicleTimetable(v, true);
11866 1e159ef634d5 (svn r16260) -Codechange: Add Vehicle::IncrementOrderIndex() to deduplicate some code. frosch <frosch@openttd.org> parents: 11730 diff changeset	634 v->IncrementOrderIndex();
9490 8622c9315e8c (svn r13464) -Codechange: support NewGRF Action 0x05, type 12. rubidium <rubidium@openttd.org> parents: 9413 diff changeset	635 v->current_order.MakeDummy();
8622c9315e8c (svn r13464) -Codechange: support NewGRF Action 0x05, type 12. rubidium <rubidium@openttd.org> parents: 9413 diff changeset	636 } else {
8622c9315e8c (svn r13464) -Codechange: support NewGRF Action 0x05, type 12. rubidium <rubidium@openttd.org> parents: 9413 diff changeset	637 /* Non-buoy orders really need to reach the tile */
8622c9315e8c (svn r13464) -Codechange: support NewGRF Action 0x05, type 12. rubidium <rubidium@openttd.org> parents: 9413 diff changeset	638 if (v->dest_tile == gp.new_tile) {
8622c9315e8c (svn r13464) -Codechange: support NewGRF Action 0x05, type 12. rubidium <rubidium@openttd.org> parents: 9413 diff changeset	639 if (v->current_order.IsType(OT_GOTO_DEPOT)) {
8622c9315e8c (svn r13464) -Codechange: support NewGRF Action 0x05, type 12. rubidium <rubidium@openttd.org> parents: 9413 diff changeset	640 if ((gp.x & 0xF) == 8 && (gp.y & 0xF) == 8) {
8622c9315e8c (svn r13464) -Codechange: support NewGRF Action 0x05, type 12. rubidium <rubidium@openttd.org> parents: 9413 diff changeset	641 VehicleEnterDepot(v);
8622c9315e8c (svn r13464) -Codechange: support NewGRF Action 0x05, type 12. rubidium <rubidium@openttd.org> parents: 9413 diff changeset	642 return;
8622c9315e8c (svn r13464) -Codechange: support NewGRF Action 0x05, type 12. rubidium <rubidium@openttd.org> parents: 9413 diff changeset	643 }
8622c9315e8c (svn r13464) -Codechange: support NewGRF Action 0x05, type 12. rubidium <rubidium@openttd.org> parents: 9413 diff changeset	644 } else if (v->current_order.IsType(OT_GOTO_STATION)) {
8622c9315e8c (svn r13464) -Codechange: support NewGRF Action 0x05, type 12. rubidium <rubidium@openttd.org> parents: 9413 diff changeset	645 v->last_station_visited = v->current_order.GetDestination();
5584 4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	646
9490 8622c9315e8c (svn r13464) -Codechange: support NewGRF Action 0x05, type 12. rubidium <rubidium@openttd.org> parents: 9413 diff changeset	647 /* Process station in the orderlist. */
11922 0a4b63f3f3c3 (svn r16325) -Codechange: replace GetPoolItem(index) by PoolItem::Get(index) smatz <smatz@openttd.org> parents: 11903 diff changeset	648 Station *st = Station::Get(v->current_order.GetDestination());
9490 8622c9315e8c (svn r13464) -Codechange: support NewGRF Action 0x05, type 12. rubidium <rubidium@openttd.org> parents: 9413 diff changeset	649 if (st->facilities & FACIL_DOCK) { // ugly, ugly workaround for problem with ships able to drop off cargo at wrong stations
8622c9315e8c (svn r13464) -Codechange: support NewGRF Action 0x05, type 12. rubidium <rubidium@openttd.org> parents: 9413 diff changeset	650 ShipArrivesAt(v, st);
8622c9315e8c (svn r13464) -Codechange: support NewGRF Action 0x05, type 12. rubidium <rubidium@openttd.org> parents: 9413 diff changeset	651 v->BeginLoading();
8622c9315e8c (svn r13464) -Codechange: support NewGRF Action 0x05, type 12. rubidium <rubidium@openttd.org> parents: 9413 diff changeset	652 } else { // leave stations without docks right aways
8622c9315e8c (svn r13464) -Codechange: support NewGRF Action 0x05, type 12. rubidium <rubidium@openttd.org> parents: 9413 diff changeset	653 v->current_order.MakeLeaveStation();
11866 1e159ef634d5 (svn r16260) -Codechange: Add Vehicle::IncrementOrderIndex() to deduplicate some code. frosch <frosch@openttd.org> parents: 11730 diff changeset	654 v->IncrementOrderIndex();
9490 8622c9315e8c (svn r13464) -Codechange: support NewGRF Action 0x05, type 12. rubidium <rubidium@openttd.org> parents: 9413 diff changeset	655 }
5584 4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	656 }
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	657 }
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	658 }
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	659 }
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	660 }
9490 8622c9315e8c (svn r13464) -Codechange: support NewGRF Action 0x05, type 12. rubidium <rubidium@openttd.org> parents: 9413 diff changeset	661 } else {
8622c9315e8c (svn r13464) -Codechange: support NewGRF Action 0x05, type 12. rubidium <rubidium@openttd.org> parents: 9413 diff changeset	662 DiagDirection diagdir;
8622c9315e8c (svn r13464) -Codechange: support NewGRF Action 0x05, type 12. rubidium <rubidium@openttd.org> parents: 9413 diff changeset	663 /* New tile */
8622c9315e8c (svn r13464) -Codechange: support NewGRF Action 0x05, type 12. rubidium <rubidium@openttd.org> parents: 9413 diff changeset	664 if (TileX(gp.new_tile) >= MapMaxX() \|\| TileY(gp.new_tile) >= MapMaxY()) {
8622c9315e8c (svn r13464) -Codechange: support NewGRF Action 0x05, type 12. rubidium <rubidium@openttd.org> parents: 9413 diff changeset	665 goto reverse_direction;
8622c9315e8c (svn r13464) -Codechange: support NewGRF Action 0x05, type 12. rubidium <rubidium@openttd.org> parents: 9413 diff changeset	666 }
8622c9315e8c (svn r13464) -Codechange: support NewGRF Action 0x05, type 12. rubidium <rubidium@openttd.org> parents: 9413 diff changeset	667
8622c9315e8c (svn r13464) -Codechange: support NewGRF Action 0x05, type 12. rubidium <rubidium@openttd.org> parents: 9413 diff changeset	668 dir = ShipGetNewDirectionFromTiles(gp.new_tile, gp.old_tile);
8622c9315e8c (svn r13464) -Codechange: support NewGRF Action 0x05, type 12. rubidium <rubidium@openttd.org> parents: 9413 diff changeset	669 assert(dir == DIR_NE \|\| dir == DIR_SE \|\| dir == DIR_SW \|\| dir == DIR_NW);
8622c9315e8c (svn r13464) -Codechange: support NewGRF Action 0x05, type 12. rubidium <rubidium@openttd.org> parents: 9413 diff changeset	670 diagdir = DirToDiagDir(dir);
8622c9315e8c (svn r13464) -Codechange: support NewGRF Action 0x05, type 12. rubidium <rubidium@openttd.org> parents: 9413 diff changeset	671 tracks = GetAvailShipTracks(gp.new_tile, diagdir);
8622c9315e8c (svn r13464) -Codechange: support NewGRF Action 0x05, type 12. rubidium <rubidium@openttd.org> parents: 9413 diff changeset	672 if (tracks == TRACK_BIT_NONE) goto reverse_direction;
8622c9315e8c (svn r13464) -Codechange: support NewGRF Action 0x05, type 12. rubidium <rubidium@openttd.org> parents: 9413 diff changeset	673
8622c9315e8c (svn r13464) -Codechange: support NewGRF Action 0x05, type 12. rubidium <rubidium@openttd.org> parents: 9413 diff changeset	674 /* Choose a direction, and continue if we find one */
8622c9315e8c (svn r13464) -Codechange: support NewGRF Action 0x05, type 12. rubidium <rubidium@openttd.org> parents: 9413 diff changeset	675 track = ChooseShipTrack(v, gp.new_tile, diagdir, tracks);
8622c9315e8c (svn r13464) -Codechange: support NewGRF Action 0x05, type 12. rubidium <rubidium@openttd.org> parents: 9413 diff changeset	676 if (track == INVALID_TRACK) goto reverse_direction;
8622c9315e8c (svn r13464) -Codechange: support NewGRF Action 0x05, type 12. rubidium <rubidium@openttd.org> parents: 9413 diff changeset	677
8622c9315e8c (svn r13464) -Codechange: support NewGRF Action 0x05, type 12. rubidium <rubidium@openttd.org> parents: 9413 diff changeset	678 b = _ship_subcoord[diagdir][track];
8622c9315e8c (svn r13464) -Codechange: support NewGRF Action 0x05, type 12. rubidium <rubidium@openttd.org> parents: 9413 diff changeset	679
8622c9315e8c (svn r13464) -Codechange: support NewGRF Action 0x05, type 12. rubidium <rubidium@openttd.org> parents: 9413 diff changeset	680 gp.x = (gp.x & ~0xF) \| b[0];
8622c9315e8c (svn r13464) -Codechange: support NewGRF Action 0x05, type 12. rubidium <rubidium@openttd.org> parents: 9413 diff changeset	681 gp.y = (gp.y & ~0xF) \| b[1];
8622c9315e8c (svn r13464) -Codechange: support NewGRF Action 0x05, type 12. rubidium <rubidium@openttd.org> parents: 9413 diff changeset	682
8622c9315e8c (svn r13464) -Codechange: support NewGRF Action 0x05, type 12. rubidium <rubidium@openttd.org> parents: 9413 diff changeset	683 /* Call the landscape function and tell it that the vehicle entered the tile */
8622c9315e8c (svn r13464) -Codechange: support NewGRF Action 0x05, type 12. rubidium <rubidium@openttd.org> parents: 9413 diff changeset	684 r = VehicleEnterTile(v, gp.new_tile, gp.x, gp.y);
8622c9315e8c (svn r13464) -Codechange: support NewGRF Action 0x05, type 12. rubidium <rubidium@openttd.org> parents: 9413 diff changeset	685 if (HasBit(r, VETS_CANNOT_ENTER)) goto reverse_direction;
8622c9315e8c (svn r13464) -Codechange: support NewGRF Action 0x05, type 12. rubidium <rubidium@openttd.org> parents: 9413 diff changeset	686
8622c9315e8c (svn r13464) -Codechange: support NewGRF Action 0x05, type 12. rubidium <rubidium@openttd.org> parents: 9413 diff changeset	687 if (!HasBit(r, VETS_ENTERED_WORMHOLE)) {
8622c9315e8c (svn r13464) -Codechange: support NewGRF Action 0x05, type 12. rubidium <rubidium@openttd.org> parents: 9413 diff changeset	688 v->tile = gp.new_tile;
11976 7f11f2a71193 (svn r16382) -Codechange: make GetVehicleTrackdir a member function of Vehicle. rubidium <rubidium@openttd.org> parents: 11970 diff changeset	689 v->state = TrackToTrackBits(track);
9490 8622c9315e8c (svn r13464) -Codechange: support NewGRF Action 0x05, type 12. rubidium <rubidium@openttd.org> parents: 9413 diff changeset	690 }
8622c9315e8c (svn r13464) -Codechange: support NewGRF Action 0x05, type 12. rubidium <rubidium@openttd.org> parents: 9413 diff changeset	691
8622c9315e8c (svn r13464) -Codechange: support NewGRF Action 0x05, type 12. rubidium <rubidium@openttd.org> parents: 9413 diff changeset	692 v->direction = (Direction)b[2];
5584 4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	693 }
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	694 } else {
9490 8622c9315e8c (svn r13464) -Codechange: support NewGRF Action 0x05, type 12. rubidium <rubidium@openttd.org> parents: 9413 diff changeset	695 /* On a bridge */
8622c9315e8c (svn r13464) -Codechange: support NewGRF Action 0x05, type 12. rubidium <rubidium@openttd.org> parents: 9413 diff changeset	696 if (!IsTileType(gp.new_tile, MP_TUNNELBRIDGE) \|\| !HasBit(VehicleEnterTile(v, gp.new_tile, gp.x, gp.y), VETS_ENTERED_WORMHOLE)) {
8622c9315e8c (svn r13464) -Codechange: support NewGRF Action 0x05, type 12. rubidium <rubidium@openttd.org> parents: 9413 diff changeset	697 v->x_pos = gp.x;
8622c9315e8c (svn r13464) -Codechange: support NewGRF Action 0x05, type 12. rubidium <rubidium@openttd.org> parents: 9413 diff changeset	698 v->y_pos = gp.y;
11326 557dd16a7c24 (svn r15676) -Codechange: remove the need for BeginVehicleMove and merge VehiclePositionChanged and EndVehicleMove. rubidium <rubidium@openttd.org> parents: 11192 diff changeset	699 VehicleMove(v, !(v->vehstatus & VS_HIDDEN));
9490 8622c9315e8c (svn r13464) -Codechange: support NewGRF Action 0x05, type 12. rubidium <rubidium@openttd.org> parents: 9413 diff changeset	700 return;
5994 f7885ece4c67 (svn r8703) -Codechange/cleanup: some magic numbers -> enums and other small coding style changes to the ShipController and TrainController. rubidium <rubidium@openttd.org> parents: 5993 diff changeset	701 }
5584 4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	702 }
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	703
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	704 /* update image of ship, as well as delta XY */
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	705 dir = ShipGetNewDirection(v, gp.x, gp.y);
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	706 v->x_pos = gp.x;
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	707 v->y_pos = gp.y;
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	708 v->z_pos = GetSlopeZ(gp.x, gp.y);
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	709
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	710 getout:
6558 2fc024ee8217 (svn r9760) -Codechange: remove the need for saving some vehicle variables. rubidium <rubidium@openttd.org> parents: 6553 diff changeset	711 v->UpdateDeltaXY(dir);
7134 e1c4f52f82cd (svn r10408) -Codechange: make GetImage a class method of Vehicle instead of Get(Aircraft\|RoadVeh\|Ship\|Train)Image. rubidium <rubidium@openttd.org> parents: 7096 diff changeset	712 v->cur_image = v->GetImage(dir);
11326 557dd16a7c24 (svn r15676) -Codechange: remove the need for BeginVehicleMove and merge VehiclePositionChanged and EndVehicleMove. rubidium <rubidium@openttd.org> parents: 11192 diff changeset	713 VehicleMove(v, true);
5584 4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	714 return;
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	715
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	716 reverse_direction:
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	717 dir = ReverseDir(v->direction);
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	718 v->direction = dir;
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	719 goto getout;
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	720 }
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	721
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	722 static void AgeShipCargo(Vehicle *v)
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	723 {
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	724 if (_age_cargo_skip_counter != 0) return;
7010 f0f87c5a431e (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 <rubidium@openttd.org> parents: 6980 diff changeset	725 v->cargo.AgeCargo();
5584 4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	726 }
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	727
11970 2286db6ac0bb (svn r16376) -Codechange: Vehicle::Tick() now returns false if the vehicle was deleted smatz <smatz@openttd.org> parents: 11949 diff changeset	728 bool Ship::Tick()
5584 4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	729 {
8556 8aae08d562cc (svn r12134) -Change: count the number of ticks a vehicle was running this day to calculate running cost smatz <smatz@openttd.org> parents: 8554 diff changeset	730 if (!(this->vehstatus & VS_STOPPED)) this->running_ticks++;
8aae08d562cc (svn r12134) -Change: count the number of ticks a vehicle was running this day to calculate running cost smatz <smatz@openttd.org> parents: 8554 diff changeset	731
7135 45123abbc930 (svn r10409) -Codechange: replace (Aircraft\|RoadVeh\|Ship\|Train)_Tick with a Tick method in the Vehicle class. rubidium <rubidium@openttd.org> parents: 7134 diff changeset	732 AgeShipCargo(this);
45123abbc930 (svn r10409) -Codechange: replace (Aircraft\|RoadVeh\|Ship\|Train)_Tick with a Tick method in the Vehicle class. rubidium <rubidium@openttd.org> parents: 7134 diff changeset	733 ShipController(this);
11970 2286db6ac0bb (svn r16376) -Codechange: Vehicle::Tick() now returns false if the vehicle was deleted smatz <smatz@openttd.org> parents: 11949 diff changeset	734
2286db6ac0bb (svn r16376) -Codechange: Vehicle::Tick() now returns false if the vehicle was deleted smatz <smatz@openttd.org> parents: 11949 diff changeset	735 return true;
5584 4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	736 }
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	737
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	738 /** Build a ship.
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	739 * @param tile tile of depot where ship is built
6420 080aae477331 (svn r9556) -Documentation: doxygen and comment-style changes. 'R', 'S'.. The end of the preliminary work is near belugas <belugas@openttd.org> parents: 6407 diff changeset	740 * @param flags type of operation
5584 4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	741 * @param p1 ship type being built (engine)
9628 f1d95c5d5553 (svn r13691) -Codechange: make it easier to determine whether a command is ran in the context of autoreplace or not smatz <smatz@openttd.org> parents: 9490 diff changeset	742 * @param p2 unused
5584 4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	743 */
11090 df23c4e04638 (svn r15434) -Codechange: bit of type safety for the DC_xxx flags. rubidium <rubidium@openttd.org> parents: 11085 diff changeset	744 CommandCost CmdBuildShip(TileIndex tile, DoCommandFlag flags, uint32 p1, uint32 p2, const char *text)
5584 4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	745 {
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	746 UnitID unit_num;
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	747
10207 c54d140df948 (svn r14421) -Codechange: rename all player variables/types to company or client so it is immediatelly clear which one you are working with. rubidium <rubidium@openttd.org> parents: 10184 diff changeset	748 if (!IsEngineBuildable(p1, VEH_SHIP, _current_company)) return_cmd_error(STR_SHIP_NOT_AVAILABLE);
5584 4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	749
11922 0a4b63f3f3c3 (svn r16325) -Codechange: replace GetPoolItem(index) by PoolItem::Get(index) smatz <smatz@openttd.org> parents: 11903 diff changeset	750 const Engine *e = Engine::Get(p1);
10927 68230070e59b (svn r15263) -Codechange: added Engine::GetCost() to remove some code duplication. glx <glx@openttd.org> parents: 10875 diff changeset	751 CommandCost value(EXPENSES_NEW_VEHICLES, e->GetCost());
68230070e59b (svn r15263) -Codechange: added Engine::GetCost() to remove some code duplication. glx <glx@openttd.org> parents: 10875 diff changeset	752
11188 9e451d497d94 (svn r15541) -Revert (r15399): 'v->cargo_type' is also used in other places, which cannot accept CT_INVALID. frosch <frosch@openttd.org> parents: 11168 diff changeset	753 /* Engines without valid cargo should not be available */
9e451d497d94 (svn r15541) -Revert (r15399): 'v->cargo_type' is also used in other places, which cannot accept CT_INVALID. frosch <frosch@openttd.org> parents: 11168 diff changeset	754 if (e->GetDefaultCargoType() == CT_INVALID) return CMD_ERROR;
9e451d497d94 (svn r15541) -Revert (r15399): 'v->cargo_type' is also used in other places, which cannot accept CT_INVALID. frosch <frosch@openttd.org> parents: 11168 diff changeset	755
5584 4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	756 if (flags & DC_QUERY_COST) return value;
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	757
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	758 /* The ai_new queries the vehicle cost before building the route,
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	759 * so we must check against cheaters no sooner than now. --pasky */
8961 b33bcd7fa037 (svn r12753) -Codechange: do not use IsDepotTypeTile() where simpler function can be used smatz <smatz@openttd.org> parents: 8954 diff changeset	760 if (!IsShipDepotTile(tile)) return CMD_ERROR;
10207 c54d140df948 (svn r14421) -Codechange: rename all player variables/types to company or client so it is immediatelly clear which one you are working with. rubidium <rubidium@openttd.org> parents: 10184 diff changeset	761 if (!IsTileOwner(tile, _current_company)) return CMD_ERROR;
5584 4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	762
9628 f1d95c5d5553 (svn r13691) -Codechange: make it easier to determine whether a command is ran in the context of autoreplace or not smatz <smatz@openttd.org> parents: 9490 diff changeset	763 unit_num = (flags & DC_AUTOREPLACE) ? 0 : GetFreeUnitNumber(VEH_SHIP);
5584 4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	764
10634 66515fd11ca9 (svn r14933) -Codechange: check the whether a pool item can be constructed instead of trying to make it and check for NULL. rubidium <rubidium@openttd.org> parents: 10577 diff changeset	765 if (!Vehicle::CanAllocateItem() \|\| unit_num > _settings_game.vehicle.max_ships)
11730 a39da1e4c1f5 (svn r16118) -Change/cleanup: remove the hexadecimal 'in TTD the string had this ID' from 'some' strings and replace the string name with something more sensible. rubidium <rubidium@openttd.org> parents: 11368 diff changeset	766 return_cmd_error(STR_ERROR_TOO_MANY_VEHICLES_IN_GAME);
5584 4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	767
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	768 if (flags & DC_EXEC) {
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	769 int x;
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	770 int y;
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	771
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	772 const ShipVehicleInfo *svi = ShipVehInfo(p1);
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	773
11976 7f11f2a71193 (svn r16382) -Codechange: make GetVehicleTrackdir a member function of Vehicle. rubidium <rubidium@openttd.org> parents: 11970 diff changeset	774 Ship *v = new Ship();
5584 4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	775 v->unitnumber = unit_num;
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	776
10207 c54d140df948 (svn r14421) -Codechange: rename all player variables/types to company or client so it is immediatelly clear which one you are working with. rubidium <rubidium@openttd.org> parents: 10184 diff changeset	777 v->owner = _current_company;
5584 4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	778 v->tile = tile;
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	779 x = TileX(tile) * TILE_SIZE + TILE_SIZE / 2;
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	780 y = TileY(tile) * TILE_SIZE + TILE_SIZE / 2;
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	781 v->x_pos = x;
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	782 v->y_pos = y;
6491 696f0e1b046e (svn r9672) -Cleanup: lots of coding style fixes around operands. rubidium <rubidium@openttd.org> parents: 6490 diff changeset	783 v->z_pos = GetSlopeZ(x, y);
5584 4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	784
8556 8aae08d562cc (svn r12134) -Change: count the number of ticks a vehicle was running this day to calculate running cost smatz <smatz@openttd.org> parents: 8554 diff changeset	785 v->running_ticks = 0;
8aae08d562cc (svn r12134) -Change: count the number of ticks a vehicle was running this day to calculate running cost smatz <smatz@openttd.org> parents: 8554 diff changeset	786
6558 2fc024ee8217 (svn r9760) -Codechange: remove the need for saving some vehicle variables. rubidium <rubidium@openttd.org> parents: 6553 diff changeset	787 v->UpdateDeltaXY(v->direction);
5584 4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	788 v->vehstatus = VS_HIDDEN \| VS_STOPPED \| VS_DEFPAL;
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	789
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	790 v->spritenum = svi->image_index;
11188 9e451d497d94 (svn r15541) -Revert (r15399): 'v->cargo_type' is also used in other places, which cannot accept CT_INVALID. frosch <frosch@openttd.org> parents: 11168 diff changeset	791 v->cargo_type = e->GetDefaultCargoType();
5584 4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	792 v->cargo_subtype = 0;
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	793 v->cargo_cap = svi->capacity;
6950 d2846442a133 (svn r10205) -Codechange: refactor returning of cost, so it can be more easily modified. rubidium <rubidium@openttd.org> parents: 6943 diff changeset	794 v->value = value.GetCost();
5584 4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	795
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	796 v->last_station_visited = INVALID_STATION;
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	797 v->max_speed = svi->max_speed;
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	798 v->engine_type = p1;
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	799
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	800 v->reliability = e->reliability;
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	801 v->reliability_spd_dec = e->reliability_spd_dec;
10744 0118ca646690 (svn r15077) -Codechange: enumify DAYS_IN_YEAR and DAYS_IN_LEAP_YEAR smatz <smatz@openttd.org> parents: 10696 diff changeset	802 v->max_age = e->lifelength * DAYS_IN_LEAP_YEAR;
5584 4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	803 _new_vehicle_id = v->index;
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	804
8258 6017c5ebeb7e (svn r11822) -Codechange: Replaced fixed size custom name array. Names are now attached to their object directly and there is peter1138 <peter1138@openttd.org> parents: 8254 diff changeset	805 v->name = NULL;
11976 7f11f2a71193 (svn r16382) -Codechange: make GetVehicleTrackdir a member function of Vehicle. rubidium <rubidium@openttd.org> parents: 11970 diff changeset	806 v->state = TRACK_BIT_DEPOT;
5584 4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	807
9413 512ea64da840 (svn r13325) -Codechange: split the client-side only settings from the settings stored in the savegame so there is no need to have a duplicate copy of it for new games. rubidium <rubidium@openttd.org> parents: 9358 diff changeset	808 v->service_interval = _settings_game.vehicle.servint_ships;
5584 4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	809 v->date_of_last_service = _date;
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	810 v->build_year = _cur_year;
11903 c40e241e65ba (svn r16303) -Codechange: Use the question mark as default sprite when creating vehicles, instead of arbitrary sprites not related to the vehicle. (though that also applies to the question mark) frosch <frosch@openttd.org> parents: 11866 diff changeset	811 v->cur_image = SPR_IMG_QUERY;
5584 4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	812 v->random_bits = VehicleRandomBits();
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	813
6176 863c86137fc1 (svn r8946) -Feature: [NewGRF] Add support for vehicle variables 0xFE and 0xFF bit 10, maedhros <maedhros@openttd.org> parents: 6175 diff changeset	814 v->vehicle_flags = 0;
7931 44ff7a6d801f (svn r11484) -Codechange: Remove the doubled function SetBitT and rename the remaining to fit with the naming style skidd13 <skidd13@openttd.org> parents: 7929 diff changeset	815 if (e->flags & ENGINE_EXCLUSIVE_PREVIEW) SetBit(v->vehicle_flags, VF_BUILT_AS_PROTOTYPE);
6176 863c86137fc1 (svn r8946) -Feature: [NewGRF] Add support for vehicle variables 0xFE and 0xFF bit 10, maedhros <maedhros@openttd.org> parents: 6175 diff changeset	816
6608 68e9e501d4d8 (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 <peter1138@openttd.org> parents: 6595 diff changeset	817 v->cargo_cap = GetVehicleProperty(v, 0x0D, svi->capacity);
68e9e501d4d8 (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 <peter1138@openttd.org> parents: 6595 diff changeset	818
11326 557dd16a7c24 (svn r15676) -Codechange: remove the need for BeginVehicleMove and merge VehiclePositionChanged and EndVehicleMove. rubidium <rubidium@openttd.org> parents: 11192 diff changeset	819 VehicleMove(v, false);
5584 4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	820
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	821 InvalidateWindowData(WC_VEHICLE_DEPOT, v->tile);
9297 add307f2e6ea (svn r13165) -Codechange: replace some RebuildXXXList/ResortXXXList+InvalidateWindowXXX with InvalidateWindowXXXData. rubidium <rubidium@openttd.org> parents: 9234 diff changeset	822 InvalidateWindowClassesData(WC_SHIPS_LIST, 0);
5584 4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	823 InvalidateWindow(WC_COMPANY, v->owner);
10207 c54d140df948 (svn r14421) -Codechange: rename all player variables/types to company or client so it is immediatelly clear which one you are working with. rubidium <rubidium@openttd.org> parents: 10184 diff changeset	824 if (IsLocalCompany())
7425 d2dde99b2258 (svn r10823) -Fix r8610 [FS#1097]: the autoreplace window vehicle count didn't always update correctly) (Matthias) bjarni <bjarni@openttd.org> parents: 7398 diff changeset	825 InvalidateAutoreplaceWindow(v->engine_type, v->group_id); // updates the replace Ship window
5944 ca95cde4d1b4 (svn r8610) -Codechange/Feature: rewrote the list handling in the autoreplace window bjarni <bjarni@openttd.org> parents: 5922 diff changeset	826
11922 0a4b63f3f3c3 (svn r16325) -Codechange: replace GetPoolItem(index) by PoolItem::Get(index) smatz <smatz@openttd.org> parents: 11903 diff changeset	827 Company::Get(_current_company)->num_engines[p1]++;
5584 4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	828 }
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	829
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	830 return value;
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	831 }
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	832
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	833 /** Sell a ship.
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	834 * @param tile unused
6420 080aae477331 (svn r9556) -Documentation: doxygen and comment-style changes. 'R', 'S'.. The end of the preliminary work is near belugas <belugas@openttd.org> parents: 6407 diff changeset	835 * @param flags type of operation
5584 4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	836 * @param p1 vehicle ID to be sold
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	837 * @param p2 unused
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	838 */
11090 df23c4e04638 (svn r15434) -Codechange: bit of type safety for the DC_xxx flags. rubidium <rubidium@openttd.org> parents: 11085 diff changeset	839 CommandCost CmdSellShip(TileIndex tile, DoCommandFlag flags, uint32 p1, uint32 p2, const char *text)
5584 4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	840 {
11949 c89301974eb8 (svn r16352) -Codechange: use PoolItem::GetIfValid() instead of PoolItem::IsValidID() and PoolItem::Get() smatz <smatz@openttd.org> parents: 11924 diff changeset	841 Vehicle *v = Vehicle::GetIfValid(p1);
c89301974eb8 (svn r16352) -Codechange: use PoolItem::GetIfValid() instead of PoolItem::IsValidID() and PoolItem::Get() smatz <smatz@openttd.org> parents: 11924 diff changeset	842 if (v == NULL \|\| v->type != VEH_SHIP \|\| !CheckOwnership(v->owner)) return CMD_ERROR;
5584 4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	843
7695 3d5b53da1837 (svn r11229) -Fix [FS#1307]: one could sell vehicles that were crashed in a depot, which would still yield money. rubidium <rubidium@openttd.org> parents: 7642 diff changeset	844 if (HASBITS(v->vehstatus, VS_CRASHED)) return_cmd_error(STR_CAN_T_SELL_DESTROYED_VEHICLE);
3d5b53da1837 (svn r11229) -Fix [FS#1307]: one could sell vehicles that were crashed in a depot, which would still yield money. rubidium <rubidium@openttd.org> parents: 7642 diff changeset	845
7490 f538c635385c (svn r11001) -Codechange: unify the way to determine whether a vehicle is in a depot. rubidium <rubidium@openttd.org> parents: 7425 diff changeset	846 if (!v->IsStoppedInDepot()) {
11730 a39da1e4c1f5 (svn r16118) -Change/cleanup: remove the hexadecimal 'in TTD the string had this ID' from 'some' strings and replace the string name with something more sensible. rubidium <rubidium@openttd.org> parents: 11368 diff changeset	847 return_cmd_error(STR_ERROR_SHIP_MUST_BE_STOPPED_IN_DEPOT);
5584 4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	848 }
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	849
8230 5b61305fcdd4 (svn r11793) -Codechange: pass the expense type via the CommandCost instead of a global variable. Patch by Noldo (FS#1114). rubidium <rubidium@openttd.org> parents: 8226 diff changeset	850 CommandCost ret(EXPENSES_NEW_VEHICLES, -v->value);
7782 f81103463949 (svn r11332) -Fix: vehicles getting a value of 0 on construction. rubidium <rubidium@openttd.org> parents: 7695 diff changeset	851
5584 4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	852 if (flags & DC_EXEC) {
7398 6324d82f421d (svn r10770) -Codechange: use the pool item class as super class for the vehicle struct. rubidium <rubidium@openttd.org> parents: 7334 diff changeset	853 delete v;
5584 4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	854 }
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	855
7782 f81103463949 (svn r11332) -Fix: vehicles getting a value of 0 on construction. rubidium <rubidium@openttd.org> parents: 7695 diff changeset	856 return ret;
5584 4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	857 }
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	858
8890 b1d45af72e04 (svn r12657) -Codechange: add 'FindClosestDepot' to the vehicle class. rubidium <rubidium@openttd.org> parents: 8862 diff changeset	859 bool Ship::FindClosestDepot(TileIndex location, DestinationID destination, bool *reverse)
b1d45af72e04 (svn r12657) -Codechange: add 'FindClosestDepot' to the vehicle class. rubidium <rubidium@openttd.org> parents: 8862 diff changeset	860 {
b1d45af72e04 (svn r12657) -Codechange: add 'FindClosestDepot' to the vehicle class. rubidium <rubidium@openttd.org> parents: 8862 diff changeset	861 const Depot *depot = FindClosestShipDepot(this);
b1d45af72e04 (svn r12657) -Codechange: add 'FindClosestDepot' to the vehicle class. rubidium <rubidium@openttd.org> parents: 8862 diff changeset	862
b1d45af72e04 (svn r12657) -Codechange: add 'FindClosestDepot' to the vehicle class. rubidium <rubidium@openttd.org> parents: 8862 diff changeset	863 if (depot == NULL) return false;
b1d45af72e04 (svn r12657) -Codechange: add 'FindClosestDepot' to the vehicle class. rubidium <rubidium@openttd.org> parents: 8862 diff changeset	864
b1d45af72e04 (svn r12657) -Codechange: add 'FindClosestDepot' to the vehicle class. rubidium <rubidium@openttd.org> parents: 8862 diff changeset	865 if (location != NULL) *location = depot->xy;
b1d45af72e04 (svn r12657) -Codechange: add 'FindClosestDepot' to the vehicle class. rubidium <rubidium@openttd.org> parents: 8862 diff changeset	866 if (destination != NULL) *destination = depot->index;
b1d45af72e04 (svn r12657) -Codechange: add 'FindClosestDepot' to the vehicle class. rubidium <rubidium@openttd.org> parents: 8862 diff changeset	867
b1d45af72e04 (svn r12657) -Codechange: add 'FindClosestDepot' to the vehicle class. rubidium <rubidium@openttd.org> parents: 8862 diff changeset	868 return true;
b1d45af72e04 (svn r12657) -Codechange: add 'FindClosestDepot' to the vehicle class. rubidium <rubidium@openttd.org> parents: 8862 diff changeset	869 }
b1d45af72e04 (svn r12657) -Codechange: add 'FindClosestDepot' to the vehicle class. rubidium <rubidium@openttd.org> parents: 8862 diff changeset	870
5584 4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	871 /** Send a ship to the depot.
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	872 * @param tile unused
6420 080aae477331 (svn r9556) -Documentation: doxygen and comment-style changes. 'R', 'S'.. The end of the preliminary work is near belugas <belugas@openttd.org> parents: 6407 diff changeset	873 * @param flags type of operation
5584 4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	874 * @param p1 vehicle ID to send to the depot
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	875 * @param p2 various bitmasked elements
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	876 * - p2 bit 0-3 - DEPOT_ flags (see vehicle.h)
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	877 * - p2 bit 8-10 - VLW flag (for mass goto depot)
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	878 */
11090 df23c4e04638 (svn r15434) -Codechange: bit of type safety for the DC_xxx flags. rubidium <rubidium@openttd.org> parents: 11085 diff changeset	879 CommandCost CmdSendShipToDepot(TileIndex tile, DoCommandFlag flags, uint32 p1, uint32 p2, const char *text)
5584 4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	880 {
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	881 if (p2 & DEPOT_MASS_SEND) {
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	882 /* Mass goto depot requested */
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	883 if (!ValidVLWFlags(p2 & VLW_MASK)) return CMD_ERROR;
10207 c54d140df948 (svn r14421) -Codechange: rename all player variables/types to company or client so it is immediatelly clear which one you are working with. rubidium <rubidium@openttd.org> parents: 10184 diff changeset	884 return SendAllVehiclesToDepot(VEH_SHIP, flags, p2 & DEPOT_SERVICE, _current_company, (p2 & VLW_MASK), p1);
5584 4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	885 }
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	886
11949 c89301974eb8 (svn r16352) -Codechange: use PoolItem::GetIfValid() instead of PoolItem::IsValidID() and PoolItem::Get() smatz <smatz@openttd.org> parents: 11924 diff changeset	887 Vehicle *v = Vehicle::GetIfValid(p1);
c89301974eb8 (svn r16352) -Codechange: use PoolItem::GetIfValid() instead of PoolItem::IsValidID() and PoolItem::Get() smatz <smatz@openttd.org> parents: 11924 diff changeset	888 if (v == NULL \|\| v->type != VEH_SHIP) return CMD_ERROR;
5584 4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	889
8891 384f81a7ba31 (svn r12658) -Codechange: unify a vast portion of the CmdSend<VehicleType>ToDepot commands. rubidium <rubidium@openttd.org> parents: 8890 diff changeset	890 return v->SendToDepot(flags, (DepotCommand)(p2 & DEPOT_COMMAND_MASK));
5584 4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	891 }
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	892
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	893
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	894 /** Refits a ship to the specified cargo type.
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	895 * @param tile unused
6420 080aae477331 (svn r9556) -Documentation: doxygen and comment-style changes. 'R', 'S'.. The end of the preliminary work is near belugas <belugas@openttd.org> parents: 6407 diff changeset	896 * @param flags type of operation
5584 4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	897 * @param p1 vehicle ID of the ship to refit
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	898 * @param p2 various bitstuffed elements
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	899 * - p2 = (bit 0-7) - the new cargo type to refit to (p2 & 0xFF)
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	900 * - p2 = (bit 8-15) - the new cargo subtype to refit to
6546 0f78a0fe6568 (svn r9742) -Fix (r9689) [FS#739]: Fix cloning with refit costs again, hopefully for good this time. maedhros <maedhros@openttd.org> parents: 6502 diff changeset	901 * - p2 = (bit 16) - refit only this vehicle (ignored)
0f78a0fe6568 (svn r9742) -Fix (r9689) [FS#739]: Fix cloning with refit costs again, hopefully for good this time. maedhros <maedhros@openttd.org> parents: 6502 diff changeset	902 * @return cost of refit or error
5584 4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	903 */
11090 df23c4e04638 (svn r15434) -Codechange: bit of type safety for the DC_xxx flags. rubidium <rubidium@openttd.org> parents: 11085 diff changeset	904 CommandCost CmdRefitShip(TileIndex tile, DoCommandFlag flags, uint32 p1, uint32 p2, const char *text)
5584 4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	905 {
8230 5b61305fcdd4 (svn r11793) -Codechange: pass the expense type via the CommandCost instead of a global variable. Patch by Noldo (FS#1114). rubidium <rubidium@openttd.org> parents: 8226 diff changeset	906 CommandCost cost(EXPENSES_SHIP_RUN);
11368 82c90cd591ab (svn r15718) -Cleanup: apply some comment coding style on the rest of the sources too rubidium <rubidium@openttd.org> parents: 11361 diff changeset	907 CargoID new_cid = GB(p2, 0, 8); // gets the cargo number
5584 4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	908 byte new_subtype = GB(p2, 8, 8);
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	909 uint16 capacity = CALLBACK_FAILED;
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	910
11949 c89301974eb8 (svn r16352) -Codechange: use PoolItem::GetIfValid() instead of PoolItem::IsValidID() and PoolItem::Get() smatz <smatz@openttd.org> parents: 11924 diff changeset	911 Vehicle *v = Vehicle::GetIfValid(p1);
5584 4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	912
11949 c89301974eb8 (svn r16352) -Codechange: use PoolItem::GetIfValid() instead of PoolItem::IsValidID() and PoolItem::Get() smatz <smatz@openttd.org> parents: 11924 diff changeset	913 if (v == NULL \|\| v->type != VEH_SHIP \|\| !CheckOwnership(v->owner)) return CMD_ERROR;
11730 a39da1e4c1f5 (svn r16118) -Change/cleanup: remove the hexadecimal 'in TTD the string had this ID' from 'some' strings and replace the string name with something more sensible. rubidium <rubidium@openttd.org> parents: 11368 diff changeset	914 if (!v->IsStoppedInDepot()) return_cmd_error(STR_ERROR_SHIP_MUST_BE_STOPPED_IN_DEPOT);
8145 7f916a303303 (svn r11707) -Fix: do not allow refitting flooded (destroyed) vehicles smatz <smatz@openttd.org> parents: 8144 diff changeset	915 if (v->vehstatus & VS_CRASHED) return_cmd_error(STR_CAN_T_REFIT_DESTROYED_VEHICLE);
5584 4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	916
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	917 /* Check cargo */
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	918 if (!ShipVehInfo(v->engine_type)->refittable) return CMD_ERROR;
6316 8ecb7b1dea16 (svn r9259) -Codechange: NUM_CARGO isn't a valid cargo type... peter1138 <peter1138@openttd.org> parents: 6263 diff changeset	919 if (new_cid >= NUM_CARGO \|\| !CanRefitTo(v->engine_type, new_cid)) return CMD_ERROR;
5584 4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	920
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	921 /* Check the refit capacity callback */
7928 4e8dfd103163 (svn r11481) -Codechange: Rename the HASBIT function to fit with the naming style skidd13 <skidd13@openttd.org> parents: 7815 diff changeset	922 if (HasBit(EngInfo(v->engine_type)->callbackmask, CBM_VEHICLE_REFIT_CAPACITY)) {
5584 4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	923 /* Back up the existing cargo type */
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	924 CargoID temp_cid = v->cargo_type;
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	925 byte temp_subtype = v->cargo_subtype;
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	926 v->cargo_type = new_cid;
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	927 v->cargo_subtype = new_subtype;
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	928
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	929 capacity = GetVehicleCallback(CBID_VEHICLE_REFIT_CAPACITY, 0, 0, v->engine_type, v);
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	930
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	931 /* Restore the cargo type */
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	932 v->cargo_type = temp_cid;
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	933 v->cargo_subtype = temp_subtype;
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	934 }
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	935
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	936 if (capacity == CALLBACK_FAILED) {
6608 68e9e501d4d8 (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 <peter1138@openttd.org> parents: 6595 diff changeset	937 capacity = GetVehicleProperty(v, 0x0D, ShipVehInfo(v->engine_type)->capacity);
5584 4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	938 }
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	939 _returned_refit_capacity = capacity;
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	940
10987 d16fbff0d89e (svn r15326) -Fix: Old-ai-ishm when refitting vehicles. frosch <frosch@openttd.org> parents: 10960 diff changeset	941 if (new_cid != v->cargo_type) {
5584 4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	942 cost = GetRefitCost(v->engine_type);
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	943 }
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	944
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	945 if (flags & DC_EXEC) {
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	946 v->cargo_cap = capacity;
7010 f0f87c5a431e (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 <rubidium@openttd.org> parents: 6980 diff changeset	947 v->cargo.Truncate((v->cargo_type == new_cid) ? capacity : 0);
5584 4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	948 v->cargo_type = new_cid;
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	949 v->cargo_subtype = new_subtype;
11085 8da1855e9f14 (svn r15428) -Codechange: consistently use colour instead of having both color and colour. rubidium <rubidium@openttd.org> parents: 10987 diff changeset	950 v->colourmap = PAL_NONE; // invalidate vehicle colour map
5584 4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	951 InvalidateWindow(WC_VEHICLE_DETAILS, v->index);
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	952 InvalidateWindow(WC_VEHICLE_DEPOT, v->tile);
9297 add307f2e6ea (svn r13165) -Codechange: replace some RebuildXXXList/ResortXXXList+InvalidateWindowXXX with InvalidateWindowXXXData. rubidium <rubidium@openttd.org> parents: 9234 diff changeset	953 InvalidateWindowClassesData(WC_SHIPS_LIST, 0);
5584 4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	954 }
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	955
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	956 return cost;
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	957
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	958 }

Mercurial > hg > openttd

annotate src/ship_cmd.cpp @ 12020:e9a4f34044d8 draft