openttd: src/road_cmd.cpp annotate

annotate src/road_cmd.cpp @ 6943:fd42cb9816c6 draft

(svn r10197) -Codechange: replace int32 with CommandCost where appropriate.

author	rubidium <rubidium@openttd.org>
date	Mon, 18 Jun 2007 10:48:15 +0000
parents	0005a9ed1903
children	803e29b0584e

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
6393 ffd35446c110 (svn r9523) -Cleanup: doxygen changes. Time to take care of "R" belugas <belugas@openttd.org> parents: 6368 diff changeset	3 /** @file road_cmd.cpp */
ffd35446c110 (svn r9523) -Cleanup: doxygen changes. Time to take care of "R" belugas <belugas@openttd.org> parents: 6368 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 "openttd.h"
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	7 #include "bridge_map.h"
6160 6bb39697173c (svn r8908) -Codechange: declaration of DrawBridgeMiddle does not belong in a map accessors header. rubidium <rubidium@openttd.org> parents: 6134 diff changeset	8 #include "bridge.h"
6134 7f92815712e4 (svn r8876) -Fix tron <tron@openttd.org> parents: 6133 diff changeset	9 #include "cmd_helper.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 "rail_map.h"
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	11 #include "road_map.h"
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	12 #include "sprite.h"
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 "table/sprites.h"
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	14 #include "table/strings.h"
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 "functions.h"
6857 0005a9ed1903 (svn r10097) -Feature: Add support for articulated road vehicles, or callbacks 11 and 17 for maedhros <maedhros@openttd.org> parents: 6814 diff changeset	16 #include "window.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	17 #include "map.h"
6343 f75b72d9fc98 (svn r9371) -Feature: Add support for variable snow lines in the arctic climate, supplied maedhros <maedhros@openttd.org> parents: 6259 diff changeset	18 #include "landscape.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	19 #include "tile.h"
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	20 #include "town_map.h"
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	21 #include "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	22 #include "viewport.h"
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	23 #include "command.h"
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	24 #include "player.h"
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	25 #include "town.h"
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	26 #include "gfx.h"
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	27 #include "sound.h"
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	28 #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	29 #include "depot.h"
6541 b6b454522d0b (svn r9730) -Feature: [NewGRF] Add support for miscellaneous grf feature bit 1 - paved roads on desert tiles. maedhros <maedhros@openttd.org> parents: 6491 diff changeset	30 #include "newgrf.h"
6679 3e58cf5e349d (svn r9910) -Codechange: prepare road building/removing commands for more road types. rubidium <rubidium@openttd.org> parents: 6666 diff changeset	31 #include "station_map.h"
3e58cf5e349d (svn r9910) -Codechange: prepare road building/removing commands for more road types. rubidium <rubidium@openttd.org> parents: 6666 diff changeset	32 #include "tunnel_map.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	33
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	34
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	35 static uint CountRoadBits(RoadBits r)
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 uint count = 0;
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	38
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	39 if (r & ROAD_NW) ++count;
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	40 if (r & ROAD_SW) ++count;
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	41 if (r & ROAD_SE) ++count;
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	42 if (r & ROAD_NE) ++count;
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	43 return count;
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	44 }
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	45
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	46
6661 5850ac8865e8 (svn r9892) -Codechange: lots of ground work for allowing multiple types of "road" with multiple owners on a single tile. rubidium <rubidium@openttd.org> parents: 6626 diff changeset	47 bool CheckAllowRemoveRoad(TileIndex tile, RoadBits remove, Owner owner, bool *edge_road, RoadType rt)
5584 4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	48 {
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	49 RoadBits present;
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	50 RoadBits n;
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	51 *edge_road = true;
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	52
6661 5850ac8865e8 (svn r9892) -Codechange: lots of ground work for allowing multiple types of "road" with multiple owners on a single tile. rubidium <rubidium@openttd.org> parents: 6626 diff changeset	53 if (_game_mode == GM_EDITOR \|\| remove == ROAD_NONE) 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	54
6751 f1e45e71da47 (svn r9986) -Fix (r9934): flooding towns could not remove tram tracks (boekabart). rubidium <rubidium@openttd.org> parents: 6732 diff changeset	55 /* Water can always flood and towns can always remove "normal" road pieces.
f1e45e71da47 (svn r9986) -Fix (r9934): flooding towns could not remove tram tracks (boekabart). rubidium <rubidium@openttd.org> parents: 6732 diff changeset	56 * Towns are not be allowed to remove non "normal" road pieces, like tram
f1e45e71da47 (svn r9986) -Fix (r9934): flooding towns could not remove tram tracks (boekabart). rubidium <rubidium@openttd.org> parents: 6732 diff changeset	57 * tracks as that would result in trams that cannot turn. */
f1e45e71da47 (svn r9986) -Fix (r9934): flooding towns could not remove tram tracks (boekabart). rubidium <rubidium@openttd.org> parents: 6732 diff changeset	58 if (_current_player == OWNER_WATER \|\|
f1e45e71da47 (svn r9986) -Fix (r9934): flooding towns could not remove tram tracks (boekabart). rubidium <rubidium@openttd.org> parents: 6732 diff changeset	59 (rt == ROADTYPE_ROAD && !IsValidPlayer(_current_player))) 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	60
6393 ffd35446c110 (svn r9523) -Cleanup: doxygen changes. Time to take care of "R" belugas <belugas@openttd.org> parents: 6368 diff changeset	61 /* Only do the special processing if the road is owned
ffd35446c110 (svn r9523) -Cleanup: doxygen changes. Time to take care of "R" belugas <belugas@openttd.org> parents: 6368 diff changeset	62 * by a town */
5584 4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	63 if (owner != OWNER_TOWN) return (owner == OWNER_NONE) \|\| CheckOwnership(owner);
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	64
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	65 if (_cheats.magic_bulldozer.value) 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	66
6393 ffd35446c110 (svn r9523) -Cleanup: doxygen changes. Time to take care of "R" belugas <belugas@openttd.org> parents: 6368 diff changeset	67 /* Get a bitmask of which neighbouring roads has a tile */
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	68 n = ROAD_NONE;
6661 5850ac8865e8 (svn r9892) -Codechange: lots of ground work for allowing multiple types of "road" with multiple owners on a single tile. rubidium <rubidium@openttd.org> parents: 6626 diff changeset	69 present = GetAnyRoadBits(tile, rt);
5850ac8865e8 (svn r9892) -Codechange: lots of ground work for allowing multiple types of "road" with multiple owners on a single tile. rubidium <rubidium@openttd.org> parents: 6626 diff changeset	70 if (present & ROAD_NE && GetAnyRoadBits(TILE_ADDXY(tile, -1, 0), rt) & ROAD_SW) n \|= ROAD_NE;
5850ac8865e8 (svn r9892) -Codechange: lots of ground work for allowing multiple types of "road" with multiple owners on a single tile. rubidium <rubidium@openttd.org> parents: 6626 diff changeset	71 if (present & ROAD_SE && GetAnyRoadBits(TILE_ADDXY(tile, 0, 1), rt) & ROAD_NW) n \|= ROAD_SE;
5850ac8865e8 (svn r9892) -Codechange: lots of ground work for allowing multiple types of "road" with multiple owners on a single tile. rubidium <rubidium@openttd.org> parents: 6626 diff changeset	72 if (present & ROAD_SW && GetAnyRoadBits(TILE_ADDXY(tile, 1, 0), rt) & ROAD_NE) n \|= ROAD_SW;
5850ac8865e8 (svn r9892) -Codechange: lots of ground work for allowing multiple types of "road" with multiple owners on a single tile. rubidium <rubidium@openttd.org> parents: 6626 diff changeset	73 if (present & ROAD_NW && GetAnyRoadBits(TILE_ADDXY(tile, 0, -1), rt) & ROAD_SE) n \|= ROAD_NW;
5584 4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	74
6393 ffd35446c110 (svn r9523) -Cleanup: doxygen changes. Time to take care of "R" belugas <belugas@openttd.org> parents: 6368 diff changeset	75 /* If 0 or 1 bits are set in n, or if no bits that match the bits to remove,
ffd35446c110 (svn r9523) -Cleanup: doxygen changes. Time to take care of "R" belugas <belugas@openttd.org> parents: 6368 diff changeset	76 * then allow it */
5584 4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	77 if ((n & (n - 1)) != 0 && (n & remove) != 0) {
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	78 Town *t;
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	79 *edge_road = false;
6393 ffd35446c110 (svn r9523) -Cleanup: doxygen changes. Time to take care of "R" belugas <belugas@openttd.org> parents: 6368 diff changeset	80 /* you can remove all kind of roads with extra dynamite */
5584 4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	81 if (_patches.extra_dynamite) 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	82
6256 f7a3e330a35c (svn r9065) -Fix: possible dereference of NULL pointer. rubidium <rubidium@openttd.org> parents: 6248 diff changeset	83 t = ClosestTownFromTile(tile, (uint)-1);
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
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	85 SetDParam(0, t->index);
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	86 _error_message = STR_2009_LOCAL_AUTHORITY_REFUSES;
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	87 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	88 }
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	89
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	90 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	91 }
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	92
6661 5850ac8865e8 (svn r9892) -Codechange: lots of ground work for allowing multiple types of "road" with multiple owners on a single tile. rubidium <rubidium@openttd.org> parents: 6626 diff changeset	93 static bool CheckAllowRemoveRoad(TileIndex tile, RoadBits remove, bool *edge_road, RoadType rt)
6116 05018fddac7b (svn r8852) -Fix (r8735): make the dynamite tool for drive through road stops as if it were removing a normal road tile (consider the local authority and such). rubidium <rubidium@openttd.org> parents: 5991 diff changeset	94 {
6661 5850ac8865e8 (svn r9892) -Codechange: lots of ground work for allowing multiple types of "road" with multiple owners on a single tile. rubidium <rubidium@openttd.org> parents: 6626 diff changeset	95 return CheckAllowRemoveRoad(tile, remove, GetRoadOwner(tile, rt), edge_road, rt);
6116 05018fddac7b (svn r8852) -Fix (r8735): make the dynamite tool for drive through road stops as if it were removing a normal road tile (consider the local authority and such). rubidium <rubidium@openttd.org> parents: 5991 diff changeset	96 }
5584 4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	97
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	98 /** Delete a piece of road.
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	99 * @param tile tile where to remove road from
6483 f7bd49098924 (svn r9664) -Documentation: Doxygen corrections,errors and omissions belugas <belugas@openttd.org> parents: 6427 diff changeset	100 * @param flags operation to perform
6134 7f92815712e4 (svn r8876) -Fix tron <tron@openttd.org> parents: 6133 diff changeset	101 * @param p1 bit 0..3 road pieces to remove (RoadBits)
6661 5850ac8865e8 (svn r9892) -Codechange: lots of ground work for allowing multiple types of "road" with multiple owners on a single tile. rubidium <rubidium@openttd.org> parents: 6626 diff changeset	102 * bit 4..5 road type
6814 4cc8ebb6279d (svn r10053) -Fix: could not clear a level-crossing tile with tram tracks. rubidium <rubidium@openttd.org> parents: 6768 diff changeset	103 * bit 6 ignore the fact that the tram track has not been removed
4cc8ebb6279d (svn r10053) -Fix: could not clear a level-crossing tile with tram tracks. rubidium <rubidium@openttd.org> parents: 6768 diff changeset	104 * yet when removing the road bits when not actually doing
4cc8ebb6279d (svn r10053) -Fix: could not clear a level-crossing tile with tram tracks. rubidium <rubidium@openttd.org> parents: 6768 diff changeset	105 * it. Makes it possible to test whether the road bits can
4cc8ebb6279d (svn r10053) -Fix: could not clear a level-crossing tile with tram tracks. rubidium <rubidium@openttd.org> parents: 6768 diff changeset	106 * be removed from a level crossing without physically
4cc8ebb6279d (svn r10053) -Fix: could not clear a level-crossing tile with tram tracks. rubidium <rubidium@openttd.org> parents: 6768 diff changeset	107 * removing the tram bits before the test.
5584 4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	108 * @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	109 */
6943 fd42cb9816c6 (svn r10197) -Codechange: replace int32 with CommandCost where appropriate. rubidium <rubidium@openttd.org> parents: 6857 diff changeset	110 CommandCost CmdRemoveRoad(TileIndex tile, uint32 flags, uint32 p1, uint32 p2)
5584 4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	111 {
6393 ffd35446c110 (svn r9523) -Cleanup: doxygen changes. Time to take care of "R" belugas <belugas@openttd.org> parents: 6368 diff changeset	112 /* cost for removing inner/edge -roads */
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 static const uint16 road_remove_cost[2] = {50, 18};
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	114
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	115 Town *t;
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	116 /* true if the roadpiece was always removeable,
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	117 * false if it was a center piece. Affects town ratings drop */
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	118 bool edge_road;
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	119
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	120 SET_EXPENSES_TYPE(EXPENSES_CONSTRUCTION);
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	121
6661 5850ac8865e8 (svn r9892) -Codechange: lots of ground work for allowing multiple types of "road" with multiple owners on a single tile. rubidium <rubidium@openttd.org> parents: 6626 diff changeset	122 RoadType rt = (RoadType)GB(p1, 4, 2);
6679 3e58cf5e349d (svn r9910) -Codechange: prepare road building/removing commands for more road types. rubidium <rubidium@openttd.org> parents: 6666 diff changeset	123 if (!IsValidRoadType(rt)) return CMD_ERROR;
3e58cf5e349d (svn r9910) -Codechange: prepare road building/removing commands for more road types. rubidium <rubidium@openttd.org> parents: 6666 diff changeset	124
3e58cf5e349d (svn r9910) -Codechange: prepare road building/removing commands for more road types. rubidium <rubidium@openttd.org> parents: 6666 diff changeset	125 Owner owner;
3e58cf5e349d (svn r9910) -Codechange: prepare road building/removing commands for more road types. rubidium <rubidium@openttd.org> parents: 6666 diff changeset	126 switch (GetTileType(tile)) {
3e58cf5e349d (svn r9910) -Codechange: prepare road building/removing commands for more road types. rubidium <rubidium@openttd.org> parents: 6666 diff changeset	127 case MP_STREET:
3e58cf5e349d (svn r9910) -Codechange: prepare road building/removing commands for more road types. rubidium <rubidium@openttd.org> parents: 6666 diff changeset	128 owner = GetRoadOwner(tile, rt);
3e58cf5e349d (svn r9910) -Codechange: prepare road building/removing commands for more road types. rubidium <rubidium@openttd.org> parents: 6666 diff changeset	129 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	130
6679 3e58cf5e349d (svn r9910) -Codechange: prepare road building/removing commands for more road types. rubidium <rubidium@openttd.org> parents: 6666 diff changeset	131 case MP_STATION:
3e58cf5e349d (svn r9910) -Codechange: prepare road building/removing commands for more road types. rubidium <rubidium@openttd.org> parents: 6666 diff changeset	132 if (!IsDriveThroughStopTile(tile)) return CMD_ERROR;
3e58cf5e349d (svn r9910) -Codechange: prepare road building/removing commands for more road types. rubidium <rubidium@openttd.org> parents: 6666 diff changeset	133 owner = GetTileOwner(tile);
3e58cf5e349d (svn r9910) -Codechange: prepare road building/removing commands for more road types. rubidium <rubidium@openttd.org> parents: 6666 diff changeset	134 break;
3e58cf5e349d (svn r9910) -Codechange: prepare road building/removing commands for more road types. rubidium <rubidium@openttd.org> parents: 6666 diff changeset	135
3e58cf5e349d (svn r9910) -Codechange: prepare road building/removing commands for more road types. rubidium <rubidium@openttd.org> parents: 6666 diff changeset	136 case MP_TUNNELBRIDGE:
3e58cf5e349d (svn r9910) -Codechange: prepare road building/removing commands for more road types. rubidium <rubidium@openttd.org> parents: 6666 diff changeset	137 if ((IsTunnel(tile) && GetTunnelTransportType(tile) != TRANSPORT_ROAD) \|\|
3e58cf5e349d (svn r9910) -Codechange: prepare road building/removing commands for more road types. rubidium <rubidium@openttd.org> parents: 6666 diff changeset	138 (IsBridge(tile) && GetBridgeTransportType(tile) != TRANSPORT_ROAD)) return CMD_ERROR;
3e58cf5e349d (svn r9910) -Codechange: prepare road building/removing commands for more road types. rubidium <rubidium@openttd.org> parents: 6666 diff changeset	139 owner = GetTileOwner(tile);
3e58cf5e349d (svn r9910) -Codechange: prepare road building/removing commands for more road types. rubidium <rubidium@openttd.org> parents: 6666 diff changeset	140 break;
3e58cf5e349d (svn r9910) -Codechange: prepare road building/removing commands for more road types. rubidium <rubidium@openttd.org> parents: 6666 diff changeset	141
3e58cf5e349d (svn r9910) -Codechange: prepare road building/removing commands for more road types. rubidium <rubidium@openttd.org> parents: 6666 diff changeset	142 default:
3e58cf5e349d (svn r9910) -Codechange: prepare road building/removing commands for more road types. rubidium <rubidium@openttd.org> parents: 6666 diff changeset	143 return CMD_ERROR;
3e58cf5e349d (svn r9910) -Codechange: prepare road building/removing commands for more road types. rubidium <rubidium@openttd.org> parents: 6666 diff changeset	144 }
5584 4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	145
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	146 if (owner == OWNER_TOWN && _game_mode != GM_EDITOR) {
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	147 t = GetTownByTile(tile);
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	148 } else {
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	149 t = NULL;
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	150 }
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	151
6134 7f92815712e4 (svn r8876) -Fix tron <tron@openttd.org> parents: 6133 diff changeset	152 RoadBits pieces = Extract<RoadBits, 0>(p1);
6661 5850ac8865e8 (svn r9892) -Codechange: lots of ground work for allowing multiple types of "road" with multiple owners on a single tile. rubidium <rubidium@openttd.org> parents: 6626 diff changeset	153 RoadTypes rts = GetRoadTypes(tile);
5850ac8865e8 (svn r9892) -Codechange: lots of ground work for allowing multiple types of "road" with multiple owners on a single tile. rubidium <rubidium@openttd.org> parents: 6626 diff changeset	154 /* The tile doesn't have the given road type */
5850ac8865e8 (svn r9892) -Codechange: lots of ground work for allowing multiple types of "road" with multiple owners on a single tile. rubidium <rubidium@openttd.org> parents: 6626 diff changeset	155 if (!HASBIT(rts, rt)) return CMD_ERROR;
6134 7f92815712e4 (svn r8876) -Fix tron <tron@openttd.org> parents: 6133 diff changeset	156
6661 5850ac8865e8 (svn r9892) -Codechange: lots of ground work for allowing multiple types of "road" with multiple owners on a single tile. rubidium <rubidium@openttd.org> parents: 6626 diff changeset	157 if (!CheckAllowRemoveRoad(tile, pieces, &edge_road, rt)) 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	158
6406 ecbbe4b0a9a2 (svn r9542) -Fix(FS# 712): When checking if a vehicle is on a given tile, and you are working on the ground tile, do not take aircrafts into account, as they do not pose any danger for the construction/destruction/conversion itself. Z stuff, in other words belugas <belugas@openttd.org> parents: 6393 diff changeset	159 if (!EnsureNoVehicleOnGround(tile)) 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	160
6393 ffd35446c110 (svn r9523) -Cleanup: doxygen changes. Time to take care of "R" belugas <belugas@openttd.org> parents: 6368 diff changeset	161 /* check if you're allowed to remove the street owned by a town
ffd35446c110 (svn r9523) -Cleanup: doxygen changes. Time to take care of "R" belugas <belugas@openttd.org> parents: 6368 diff changeset	162 * removal allowance depends on difficulty setting */
5584 4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	163 if (!CheckforTownRating(flags, t, ROAD_REMOVE)) return CMD_ERROR;
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	164
6679 3e58cf5e349d (svn r9910) -Codechange: prepare road building/removing commands for more road types. rubidium <rubidium@openttd.org> parents: 6666 diff changeset	165 if (!IsTileType(tile, MP_STREET)) {
3e58cf5e349d (svn r9910) -Codechange: prepare road building/removing commands for more road types. rubidium <rubidium@openttd.org> parents: 6666 diff changeset	166 /* If it's the last roadtype, just clear the whole tile */
3e58cf5e349d (svn r9910) -Codechange: prepare road building/removing commands for more road types. rubidium <rubidium@openttd.org> parents: 6666 diff changeset	167 if (rts == RoadTypeToRoadTypes(rt)) return DoCommand(tile, 0, 0, flags, CMD_LANDSCAPE_CLEAR);
3e58cf5e349d (svn r9910) -Codechange: prepare road building/removing commands for more road types. rubidium <rubidium@openttd.org> parents: 6666 diff changeset	168
6943 fd42cb9816c6 (svn r10197) -Codechange: replace int32 with CommandCost where appropriate. rubidium <rubidium@openttd.org> parents: 6857 diff changeset	169 CommandCost cost;
6679 3e58cf5e349d (svn r9910) -Codechange: prepare road building/removing commands for more road types. rubidium <rubidium@openttd.org> parents: 6666 diff changeset	170 if (IsTileType(tile, MP_TUNNELBRIDGE)) {
3e58cf5e349d (svn r9910) -Codechange: prepare road building/removing commands for more road types. rubidium <rubidium@openttd.org> parents: 6666 diff changeset	171 TileIndex other_end = IsTunnel(tile) ? GetOtherTunnelEnd(tile) : GetOtherBridgeEnd(tile);
3e58cf5e349d (svn r9910) -Codechange: prepare road building/removing commands for more road types. rubidium <rubidium@openttd.org> parents: 6666 diff changeset	172 /* Pay for every tile of the bridge or tunnel */
3e58cf5e349d (svn r9910) -Codechange: prepare road building/removing commands for more road types. rubidium <rubidium@openttd.org> parents: 6666 diff changeset	173 cost = (DistanceManhattan(IsTunnel(tile) ? GetOtherTunnelEnd(tile) : GetOtherBridgeEnd(tile), tile) + 1) * _price.remove_road;
3e58cf5e349d (svn r9910) -Codechange: prepare road building/removing commands for more road types. rubidium <rubidium@openttd.org> parents: 6666 diff changeset	174 if (flags & DC_EXEC) {
3e58cf5e349d (svn r9910) -Codechange: prepare road building/removing commands for more road types. rubidium <rubidium@openttd.org> parents: 6666 diff changeset	175 SetRoadTypes(other_end, GetRoadTypes(other_end) & ~RoadTypeToRoadTypes(rt));
3e58cf5e349d (svn r9910) -Codechange: prepare road building/removing commands for more road types. rubidium <rubidium@openttd.org> parents: 6666 diff changeset	176 SetRoadTypes(tile, GetRoadTypes(tile) & ~RoadTypeToRoadTypes(rt));
3e58cf5e349d (svn r9910) -Codechange: prepare road building/removing commands for more road types. rubidium <rubidium@openttd.org> parents: 6666 diff changeset	177
3e58cf5e349d (svn r9910) -Codechange: prepare road building/removing commands for more road types. rubidium <rubidium@openttd.org> parents: 6666 diff changeset	178 /* Mark tiles diry that have been repaved */
6714 ed8181c3da57 (svn r9946) -Fix: more places that weren't correctly marked dirty... rubidium <rubidium@openttd.org> parents: 6713 diff changeset	179 MarkTileDirtyByTile(tile);
6679 3e58cf5e349d (svn r9910) -Codechange: prepare road building/removing commands for more road types. rubidium <rubidium@openttd.org> parents: 6666 diff changeset	180 MarkTileDirtyByTile(other_end);
3e58cf5e349d (svn r9910) -Codechange: prepare road building/removing commands for more road types. rubidium <rubidium@openttd.org> parents: 6666 diff changeset	181 if (IsBridge(tile)) {
3e58cf5e349d (svn r9910) -Codechange: prepare road building/removing commands for more road types. rubidium <rubidium@openttd.org> parents: 6666 diff changeset	182 TileIndexDiff delta = TileOffsByDiagDir(GetBridgeRampDirection(tile));
3e58cf5e349d (svn r9910) -Codechange: prepare road building/removing commands for more road types. rubidium <rubidium@openttd.org> parents: 6666 diff changeset	183
6713 80ec86a82007 (svn r9945) -Fix: bridges were not properly marked dirty when adding/removing roadtypes. rubidium <rubidium@openttd.org> parents: 6711 diff changeset	184 for (TileIndex t = tile + delta; t != other_end; t += delta) MarkTileDirtyByTile(t);
6679 3e58cf5e349d (svn r9910) -Codechange: prepare road building/removing commands for more road types. rubidium <rubidium@openttd.org> parents: 6666 diff changeset	185 }
3e58cf5e349d (svn r9910) -Codechange: prepare road building/removing commands for more road types. rubidium <rubidium@openttd.org> parents: 6666 diff changeset	186 }
3e58cf5e349d (svn r9910) -Codechange: prepare road building/removing commands for more road types. rubidium <rubidium@openttd.org> parents: 6666 diff changeset	187 } else {
3e58cf5e349d (svn r9910) -Codechange: prepare road building/removing commands for more road types. rubidium <rubidium@openttd.org> parents: 6666 diff changeset	188 cost = _price.remove_road;
3e58cf5e349d (svn r9910) -Codechange: prepare road building/removing commands for more road types. rubidium <rubidium@openttd.org> parents: 6666 diff changeset	189 if (flags & DC_EXEC) {
3e58cf5e349d (svn r9910) -Codechange: prepare road building/removing commands for more road types. rubidium <rubidium@openttd.org> parents: 6666 diff changeset	190 SetRoadTypes(tile, GetRoadTypes(tile) & ~RoadTypeToRoadTypes(rt));
3e58cf5e349d (svn r9910) -Codechange: prepare road building/removing commands for more road types. rubidium <rubidium@openttd.org> parents: 6666 diff changeset	191 MarkTileDirtyByTile(tile);
3e58cf5e349d (svn r9910) -Codechange: prepare road building/removing commands for more road types. rubidium <rubidium@openttd.org> parents: 6666 diff changeset	192 }
3e58cf5e349d (svn r9910) -Codechange: prepare road building/removing commands for more road types. rubidium <rubidium@openttd.org> parents: 6666 diff changeset	193 }
3e58cf5e349d (svn r9910) -Codechange: prepare road building/removing commands for more road types. rubidium <rubidium@openttd.org> parents: 6666 diff changeset	194 return cost;
3e58cf5e349d (svn r9910) -Codechange: prepare road building/removing commands for more road types. rubidium <rubidium@openttd.org> parents: 6666 diff changeset	195 }
3e58cf5e349d (svn r9910) -Codechange: prepare road building/removing commands for more road types. rubidium <rubidium@openttd.org> parents: 6666 diff changeset	196
5584 4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	197 switch (GetRoadTileType(tile)) {
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	198 case ROAD_TILE_NORMAL: {
6661 5850ac8865e8 (svn r9892) -Codechange: lots of ground work for allowing multiple types of "road" with multiple owners on a single tile. rubidium <rubidium@openttd.org> parents: 6626 diff changeset	199 RoadBits present = GetRoadBits(tile, rt);
5584 4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	200 RoadBits c = pieces;
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	201
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	202 if (HasRoadWorks(tile)) return_cmd_error(STR_ROAD_WORKS_IN_PROGRESS);
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 (GetTileSlope(tile, NULL) != SLOPE_FLAT &&
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	205 (present == ROAD_Y \|\| present == ROAD_X)) {
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	206 c \|= (RoadBits)((c & 0xC) >> 2);
c44c070c5032 (svn r8038) -Merge: the cpp branch. Effort of KUDr, Celestar, glx, Smoovius, stillunknown and pv2b. rubidium <rubidium@openttd.org> parents: 5584 diff changeset	207 c \|= (RoadBits)((c & 0x3) << 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	208 }
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	209
6393 ffd35446c110 (svn r9523) -Cleanup: doxygen changes. Time to take care of "R" belugas <belugas@openttd.org> parents: 6368 diff changeset	210 /* limit the bits to delete to the existing 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	211 c &= present;
6662 baa28c8cfe84 (svn r9893) -Fix (r9892): various small bugs that only act up when using something different than plain roads. rubidium <rubidium@openttd.org> parents: 6661 diff changeset	212 if (c == ROAD_NONE) 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	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 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	215 ChangeTownRating(t, -road_remove_cost[(byte)edge_road], RATING_ROAD_MINIMUM);
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	216
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	217 present ^= c;
6662 baa28c8cfe84 (svn r9893) -Fix (r9892): various small bugs that only act up when using something different than plain roads. rubidium <rubidium@openttd.org> parents: 6661 diff changeset	218 if (present == ROAD_NONE) {
6661 5850ac8865e8 (svn r9892) -Codechange: lots of ground work for allowing multiple types of "road" with multiple owners on a single tile. rubidium <rubidium@openttd.org> parents: 6626 diff changeset	219 RoadTypes rts = GetRoadTypes(tile) & ComplementRoadTypes(RoadTypeToRoadTypes(rt));
5850ac8865e8 (svn r9892) -Codechange: lots of ground work for allowing multiple types of "road" with multiple owners on a single tile. rubidium <rubidium@openttd.org> parents: 6626 diff changeset	220 if (rts == ROADTYPES_NONE) {
5850ac8865e8 (svn r9892) -Codechange: lots of ground work for allowing multiple types of "road" with multiple owners on a single tile. rubidium <rubidium@openttd.org> parents: 6626 diff changeset	221 DoClearSquare(tile);
5850ac8865e8 (svn r9892) -Codechange: lots of ground work for allowing multiple types of "road" with multiple owners on a single tile. rubidium <rubidium@openttd.org> parents: 6626 diff changeset	222 } else {
6662 baa28c8cfe84 (svn r9893) -Fix (r9892): various small bugs that only act up when using something different than plain roads. rubidium <rubidium@openttd.org> parents: 6661 diff changeset	223 SetRoadBits(tile, ROAD_NONE, rt);
6661 5850ac8865e8 (svn r9892) -Codechange: lots of ground work for allowing multiple types of "road" with multiple owners on a single tile. rubidium <rubidium@openttd.org> parents: 6626 diff changeset	224 SetRoadTypes(tile, rts);
5850ac8865e8 (svn r9892) -Codechange: lots of ground work for allowing multiple types of "road" with multiple owners on a single tile. rubidium <rubidium@openttd.org> parents: 6626 diff changeset	225 }
5584 4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	226 } else {
6764 6ce333c8fd7e (svn r9999) -Feature: make it possible to disallow busses and lorries to go a specific way on straight pieces of road. rubidium <rubidium@openttd.org> parents: 6761 diff changeset	227 /* When bits are removed, you always end up with something that
6ce333c8fd7e (svn r9999) -Feature: make it possible to disallow busses and lorries to go a specific way on straight pieces of road. rubidium <rubidium@openttd.org> parents: 6761 diff changeset	228 * is not a complete straight road tile. However, trams do not have
6ce333c8fd7e (svn r9999) -Feature: make it possible to disallow busses and lorries to go a specific way on straight pieces of road. rubidium <rubidium@openttd.org> parents: 6761 diff changeset	229 * onewayness, so they cannot remove it either. */
6ce333c8fd7e (svn r9999) -Feature: make it possible to disallow busses and lorries to go a specific way on straight pieces of road. rubidium <rubidium@openttd.org> parents: 6761 diff changeset	230 if (rt != ROADTYPE_TRAM) SetDisallowedRoadDirections(tile, DRD_NONE);
6661 5850ac8865e8 (svn r9892) -Codechange: lots of ground work for allowing multiple types of "road" with multiple owners on a single tile. rubidium <rubidium@openttd.org> parents: 6626 diff changeset	231 SetRoadBits(tile, present, rt);
5584 4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	232 MarkTileDirtyByTile(tile);
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 }
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	235 return CountRoadBits(c) * _price.remove_road;
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
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	238 case ROAD_TILE_CROSSING: {
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	239 if (pieces & ComplementRoadBits(GetCrossingRoadBits(tile))) {
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	240 return CMD_ERROR;
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	241 }
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	242
6697 398474f3706e (svn r9929) -Fix [FS#803]: fix several drawing issues. rubidium <rubidium@openttd.org> parents: 6691 diff changeset	243 /* Don't allow road to be removed from the crossing when there is tram;
398474f3706e (svn r9929) -Fix [FS#803]: fix several drawing issues. rubidium <rubidium@openttd.org> parents: 6691 diff changeset	244 * we can't draw the crossing without trambits ;) */
6814 4cc8ebb6279d (svn r10053) -Fix: could not clear a level-crossing tile with tram tracks. rubidium <rubidium@openttd.org> parents: 6768 diff changeset	245 if (rt == ROADTYPE_ROAD && HASBIT(GetRoadTypes(tile), ROADTYPE_TRAM) && ((flags & DC_EXEC) \|\| !HASBIT(p1, 6))) return CMD_ERROR;
6697 398474f3706e (svn r9929) -Fix [FS#803]: fix several drawing issues. rubidium <rubidium@openttd.org> parents: 6691 diff changeset	246
5584 4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	247 if (flags & DC_EXEC) {
6661 5850ac8865e8 (svn r9892) -Codechange: lots of ground work for allowing multiple types of "road" with multiple owners on a single tile. rubidium <rubidium@openttd.org> parents: 6626 diff changeset	248 if (rt == ROADTYPE_ROAD) {
5850ac8865e8 (svn r9892) -Codechange: lots of ground work for allowing multiple types of "road" with multiple owners on a single tile. rubidium <rubidium@openttd.org> parents: 6626 diff changeset	249 ChangeTownRating(t, -road_remove_cost[(byte)edge_road], RATING_ROAD_MINIMUM);
5850ac8865e8 (svn r9892) -Codechange: lots of ground work for allowing multiple types of "road" with multiple owners on a single tile. rubidium <rubidium@openttd.org> parents: 6626 diff changeset	250 }
5584 4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	251
6661 5850ac8865e8 (svn r9892) -Codechange: lots of ground work for allowing multiple types of "road" with multiple owners on a single tile. rubidium <rubidium@openttd.org> parents: 6626 diff changeset	252 RoadTypes rts = GetRoadTypes(tile) & ComplementRoadTypes(RoadTypeToRoadTypes(rt));
5850ac8865e8 (svn r9892) -Codechange: lots of ground work for allowing multiple types of "road" with multiple owners on a single tile. rubidium <rubidium@openttd.org> parents: 6626 diff changeset	253 if (rts == ROADTYPES_NONE) {
5850ac8865e8 (svn r9892) -Codechange: lots of ground work for allowing multiple types of "road" with multiple owners on a single tile. rubidium <rubidium@openttd.org> parents: 6626 diff changeset	254 MakeRailNormal(tile, GetTileOwner(tile), GetCrossingRailBits(tile), GetRailType(tile));
5850ac8865e8 (svn r9892) -Codechange: lots of ground work for allowing multiple types of "road" with multiple owners on a single tile. rubidium <rubidium@openttd.org> parents: 6626 diff changeset	255 } else {
5850ac8865e8 (svn r9892) -Codechange: lots of ground work for allowing multiple types of "road" with multiple owners on a single tile. rubidium <rubidium@openttd.org> parents: 6626 diff changeset	256 SetRoadTypes(tile, rts);
5850ac8865e8 (svn r9892) -Codechange: lots of ground work for allowing multiple types of "road" with multiple owners on a single tile. rubidium <rubidium@openttd.org> parents: 6626 diff changeset	257 }
5584 4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	258 MarkTileDirtyByTile(tile);
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	259 YapfNotifyTrackLayoutChange(tile, FindFirstTrack(GetTrackBits(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	260 }
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	261 return _price.remove_road * 2;
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	262 }
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	263
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	264 default:
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	265 case ROAD_TILE_DEPOT:
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	266 return CMD_ERROR;
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	267 }
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	268 }
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	269
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	270
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	271 static const RoadBits _valid_tileh_slopes_road[][15] = {
6393 ffd35446c110 (svn r9523) -Cleanup: doxygen changes. Time to take care of "R" belugas <belugas@openttd.org> parents: 6368 diff changeset	272 /* set of normal ones */
5584 4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	273 {
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	274 ROAD_ALL, ROAD_NONE, ROAD_NONE,
c44c070c5032 (svn r8038) -Merge: the cpp branch. Effort of KUDr, Celestar, glx, Smoovius, stillunknown and pv2b. rubidium <rubidium@openttd.org> parents: 5584 diff changeset	275 ROAD_X, ROAD_NONE, ROAD_NONE, // 3, 4, 5
c44c070c5032 (svn r8038) -Merge: the cpp branch. Effort of KUDr, Celestar, glx, Smoovius, stillunknown and pv2b. rubidium <rubidium@openttd.org> parents: 5584 diff changeset	276 ROAD_Y, ROAD_NONE, ROAD_NONE,
c44c070c5032 (svn r8038) -Merge: the cpp branch. Effort of KUDr, Celestar, glx, Smoovius, stillunknown and pv2b. rubidium <rubidium@openttd.org> parents: 5584 diff changeset	277 ROAD_Y, ROAD_NONE, ROAD_NONE, // 9, 10, 11
c44c070c5032 (svn r8038) -Merge: the cpp branch. Effort of KUDr, Celestar, glx, Smoovius, stillunknown and pv2b. rubidium <rubidium@openttd.org> parents: 5584 diff changeset	278 ROAD_X, ROAD_NONE, ROAD_NONE
5584 4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	279 },
6393 ffd35446c110 (svn r9523) -Cleanup: doxygen changes. Time to take care of "R" belugas <belugas@openttd.org> parents: 6368 diff changeset	280 /* allowed road for an evenly raised platform */
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 {
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	282 ROAD_NONE,
5584 4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	283 ROAD_SW \| ROAD_NW,
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	284 ROAD_SW \| ROAD_SE,
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	285 ROAD_Y \| ROAD_SW,
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	286
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	287 ROAD_SE \| ROAD_NE, // 4
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	288 ROAD_ALL,
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	289 ROAD_X \| ROAD_SE,
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	290 ROAD_ALL,
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	291
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	292 ROAD_NW \| ROAD_NE, // 8
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	293 ROAD_X \| ROAD_NW,
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	294 ROAD_ALL,
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	295 ROAD_ALL,
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	296
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	297 ROAD_Y \| ROAD_NE, // 12
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	298 ROAD_ALL,
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	299 ROAD_ALL
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	300 },
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	301 };
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	302
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	303
6943 fd42cb9816c6 (svn r10197) -Codechange: replace int32 with CommandCost where appropriate. rubidium <rubidium@openttd.org> parents: 6857 diff changeset	304 static CommandCost CheckRoadSlope(Slope tileh, RoadBits* pieces, RoadBits existing)
5584 4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	305 {
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	306 RoadBits road_bits;
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	307
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	308 if (IsSteepSlope(tileh)) {
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	309 if (existing == 0) {
6393 ffd35446c110 (svn r9523) -Cleanup: doxygen changes. Time to take care of "R" belugas <belugas@openttd.org> parents: 6368 diff changeset	310 /* force full pieces. */
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	311 pieces \|= (RoadBits)((pieces & 0xC) >> 2);
c44c070c5032 (svn r8038) -Merge: the cpp branch. Effort of KUDr, Celestar, glx, Smoovius, stillunknown and pv2b. rubidium <rubidium@openttd.org> parents: 5584 diff changeset	312 pieces \|= (RoadBits)((pieces & 0x3) << 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	313 if (pieces == ROAD_X \|\| pieces == ROAD_Y) return _price.terraform;
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	314 }
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	315 return CMD_ERROR;
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	316 }
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	317 road_bits = *pieces \| existing;
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	318
6393 ffd35446c110 (svn r9523) -Cleanup: doxygen changes. Time to take care of "R" belugas <belugas@openttd.org> parents: 6368 diff changeset	319 /* no special foundation */
5584 4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	320 if ((~_valid_tileh_slopes_road[0][tileh] & road_bits) == 0) {
6393 ffd35446c110 (svn r9523) -Cleanup: doxygen changes. Time to take care of "R" belugas <belugas@openttd.org> parents: 6368 diff changeset	321 /* force that all bits are set when we have slopes */
5584 4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	322 if (tileh != SLOPE_FLAT) *pieces \|= _valid_tileh_slopes_road[0][tileh];
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	323 return 0; // no extra cost
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
6393 ffd35446c110 (svn r9523) -Cleanup: doxygen changes. Time to take care of "R" belugas <belugas@openttd.org> parents: 6368 diff changeset	326 /* foundation is used. Whole tile is leveled up */
5584 4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	327 if ((~_valid_tileh_slopes_road[1][tileh] & road_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	328 return existing != 0 ? 0 : _price.terraform;
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	329 }
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	330
6393 ffd35446c110 (svn r9523) -Cleanup: doxygen changes. Time to take care of "R" belugas <belugas@openttd.org> parents: 6368 diff changeset	331 /* partly leveled up tile, only if there's no road on that 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	332 if (existing == 0 && (tileh == SLOPE_W \|\| tileh == SLOPE_S \|\| tileh == SLOPE_E \|\| tileh == SLOPE_N)) {
6393 ffd35446c110 (svn r9523) -Cleanup: doxygen changes. Time to take care of "R" belugas <belugas@openttd.org> parents: 6368 diff changeset	333 /* force full pieces. */
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	334 pieces \|= (RoadBits)((pieces & 0xC) >> 2);
c44c070c5032 (svn r8038) -Merge: the cpp branch. Effort of KUDr, Celestar, glx, Smoovius, stillunknown and pv2b. rubidium <rubidium@openttd.org> parents: 5584 diff changeset	335 pieces \|= (RoadBits)((pieces & 0x3) << 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	336 if (pieces == ROAD_X \|\| pieces == ROAD_Y) return _price.terraform;
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 return CMD_ERROR;
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	339 }
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	340
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	341 /** Build a piece of road.
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	342 * @param tile tile where to build road
6483 f7bd49098924 (svn r9664) -Documentation: Doxygen corrections,errors and omissions belugas <belugas@openttd.org> parents: 6427 diff changeset	343 * @param flags operation to perform
6134 7f92815712e4 (svn r8876) -Fix tron <tron@openttd.org> parents: 6133 diff changeset	344 * @param p1 bit 0..3 road pieces to build (RoadBits)
6661 5850ac8865e8 (svn r9892) -Codechange: lots of ground work for allowing multiple types of "road" with multiple owners on a single tile. rubidium <rubidium@openttd.org> parents: 6626 diff changeset	345 * bit 4..5 road type
6764 6ce333c8fd7e (svn r9999) -Feature: make it possible to disallow busses and lorries to go a specific way on straight pieces of road. rubidium <rubidium@openttd.org> parents: 6761 diff changeset	346 * bit 6..7 disallowed directions to toggle
5584 4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	347 * @param p2 the town that is building the road (0 if not applicable)
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	348 */
6943 fd42cb9816c6 (svn r10197) -Codechange: replace int32 with CommandCost where appropriate. rubidium <rubidium@openttd.org> parents: 6857 diff changeset	349 CommandCost CmdBuildRoad(TileIndex tile, uint32 flags, uint32 p1, uint32 p2)
5584 4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	350 {
6943 fd42cb9816c6 (svn r10197) -Codechange: replace int32 with CommandCost where appropriate. rubidium <rubidium@openttd.org> parents: 6857 diff changeset	351 CommandCost cost = 0;
fd42cb9816c6 (svn r10197) -Codechange: replace int32 with CommandCost where appropriate. rubidium <rubidium@openttd.org> parents: 6857 diff changeset	352 CommandCost ret;
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	353 RoadBits existing = ROAD_NONE;
6715 daaf943a1281 (svn r9947) -Fix [FS#807]: don't check whether roadbits may be built when they are already built for another type. rubidium <rubidium@openttd.org> parents: 6714 diff changeset	354 RoadBits all_bits = ROAD_NONE;
5584 4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	355 Slope tileh;
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	356
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	357 SET_EXPENSES_TYPE(EXPENSES_CONSTRUCTION);
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	358
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	359 /* Road pieces are max 4 bitset values (NE, NW, SE, SW) and town can only be non-zero
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	360 * if a non-player is building the road */
6134 7f92815712e4 (svn r8876) -Fix tron <tron@openttd.org> parents: 6133 diff changeset	361 if ((IsValidPlayer(_current_player) && p2 != 0) \|\| (_current_player == OWNER_TOWN && !IsValidTownID(p2))) return CMD_ERROR;
7f92815712e4 (svn r8876) -Fix tron <tron@openttd.org> parents: 6133 diff changeset	362
7f92815712e4 (svn r8876) -Fix tron <tron@openttd.org> parents: 6133 diff changeset	363 RoadBits pieces = Extract<RoadBits, 0>(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	364
6661 5850ac8865e8 (svn r9892) -Codechange: lots of ground work for allowing multiple types of "road" with multiple owners on a single tile. rubidium <rubidium@openttd.org> parents: 6626 diff changeset	365 RoadType rt = (RoadType)GB(p1, 4, 2);
5850ac8865e8 (svn r9892) -Codechange: lots of ground work for allowing multiple types of "road" with multiple owners on a single tile. rubidium <rubidium@openttd.org> parents: 6626 diff changeset	366 if (!IsValidRoadType(rt)) return CMD_ERROR;
5850ac8865e8 (svn r9892) -Codechange: lots of ground work for allowing multiple types of "road" with multiple owners on a single tile. rubidium <rubidium@openttd.org> parents: 6626 diff changeset	367
6764 6ce333c8fd7e (svn r9999) -Feature: make it possible to disallow busses and lorries to go a specific way on straight pieces of road. rubidium <rubidium@openttd.org> parents: 6761 diff changeset	368 DisallowedRoadDirections toggle_drd = (DisallowedRoadDirections)GB(p1, 6, 2);
6ce333c8fd7e (svn r9999) -Feature: make it possible to disallow busses and lorries to go a specific way on straight pieces of road. rubidium <rubidium@openttd.org> parents: 6761 diff changeset	369
5584 4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	370 tileh = GetTileSlope(tile, NULL);
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	371
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	372 switch (GetTileType(tile)) {
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	373 case MP_STREET:
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	374 switch (GetRoadTileType(tile)) {
6764 6ce333c8fd7e (svn r9999) -Feature: make it possible to disallow busses and lorries to go a specific way on straight pieces of road. rubidium <rubidium@openttd.org> parents: 6761 diff changeset	375 case ROAD_TILE_NORMAL: {
5584 4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	376 if (HasRoadWorks(tile)) return_cmd_error(STR_ROAD_WORKS_IN_PROGRESS);
6756 df99458f5c49 (svn r9991) -Fix: one could build road when trams were driving on the tile and vice versa. rubidium <rubidium@openttd.org> parents: 6751 diff changeset	377 if (!EnsureNoVehicleOnGround(tile)) return CMD_ERROR;
df99458f5c49 (svn r9991) -Fix: one could build road when trams were driving on the tile and vice versa. rubidium <rubidium@openttd.org> parents: 6751 diff changeset	378
6719 e745bb9e9727 (svn r9951) -Fix: slope check was incomplete when building road over tram track (and vice-versa) glx <glx@openttd.org> parents: 6717 diff changeset	379 all_bits = GetAllRoadBits(tile);
6662 baa28c8cfe84 (svn r9893) -Fix (r9892): various small bugs that only act up when using something different than plain roads. rubidium <rubidium@openttd.org> parents: 6661 diff changeset	380 if (!HASBIT(GetRoadTypes(tile), rt)) 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	381
6661 5850ac8865e8 (svn r9892) -Codechange: lots of ground work for allowing multiple types of "road" with multiple owners on a single tile. rubidium <rubidium@openttd.org> parents: 6626 diff changeset	382 existing = GetRoadBits(tile, rt);
6764 6ce333c8fd7e (svn r9999) -Feature: make it possible to disallow busses and lorries to go a specific way on straight pieces of road. rubidium <rubidium@openttd.org> parents: 6761 diff changeset	383 RoadBits merged = existing \| pieces;
6768 639a3c6b34ed (svn r10004) -Fix: trams can always intersect/have junctions on one way roads (because they only work for busses and lorries). rubidium <rubidium@openttd.org> parents: 6764 diff changeset	384 bool crossing = (merged != ROAD_X && merged != ROAD_Y);
639a3c6b34ed (svn r10004) -Fix: trams can always intersect/have junctions on one way roads (because they only work for busses and lorries). rubidium <rubidium@openttd.org> parents: 6764 diff changeset	385 if (rt != ROADTYPE_TRAM && (GetDisallowedRoadDirections(tile) != DRD_NONE \|\| toggle_drd != DRD_NONE) && crossing) {
6764 6ce333c8fd7e (svn r9999) -Feature: make it possible to disallow busses and lorries to go a specific way on straight pieces of road. rubidium <rubidium@openttd.org> parents: 6761 diff changeset	386 /* Junctions cannot be one-way */
6ce333c8fd7e (svn r9999) -Feature: make it possible to disallow busses and lorries to go a specific way on straight pieces of road. rubidium <rubidium@openttd.org> parents: 6761 diff changeset	387 return_cmd_error(STR_ERR_ONEWAY_ROADS_CAN_T_HAVE_JUNCTION);
6ce333c8fd7e (svn r9999) -Feature: make it possible to disallow busses and lorries to go a specific way on straight pieces of road. rubidium <rubidium@openttd.org> parents: 6761 diff changeset	388 }
5584 4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	389 if ((existing & pieces) == pieces) {
6764 6ce333c8fd7e (svn r9999) -Feature: make it possible to disallow busses and lorries to go a specific way on straight pieces of road. rubidium <rubidium@openttd.org> parents: 6761 diff changeset	390 /* We only want to set the (dis)allowed road directions */
6ce333c8fd7e (svn r9999) -Feature: make it possible to disallow busses and lorries to go a specific way on straight pieces of road. rubidium <rubidium@openttd.org> parents: 6761 diff changeset	391 if (toggle_drd != DRD_NONE && rt != ROADTYPE_TRAM && GetRoadOwner(tile, ROADTYPE_ROAD) == _current_player) {
6ce333c8fd7e (svn r9999) -Feature: make it possible to disallow busses and lorries to go a specific way on straight pieces of road. rubidium <rubidium@openttd.org> parents: 6761 diff changeset	392 if (crossing) return_cmd_error(STR_ERR_ONEWAY_ROADS_CAN_T_HAVE_JUNCTION);
6ce333c8fd7e (svn r9999) -Feature: make it possible to disallow busses and lorries to go a specific way on straight pieces of road. rubidium <rubidium@openttd.org> parents: 6761 diff changeset	393
6ce333c8fd7e (svn r9999) -Feature: make it possible to disallow busses and lorries to go a specific way on straight pieces of road. rubidium <rubidium@openttd.org> parents: 6761 diff changeset	394 /* Ignore half built tiles */
6ce333c8fd7e (svn r9999) -Feature: make it possible to disallow busses and lorries to go a specific way on straight pieces of road. rubidium <rubidium@openttd.org> parents: 6761 diff changeset	395 if (flags & DC_EXEC && rt != ROADTYPE_TRAM && (existing == ROAD_X \|\| existing == ROAD_Y)) {
6ce333c8fd7e (svn r9999) -Feature: make it possible to disallow busses and lorries to go a specific way on straight pieces of road. rubidium <rubidium@openttd.org> parents: 6761 diff changeset	396 SetDisallowedRoadDirections(tile, GetDisallowedRoadDirections(tile) ^ toggle_drd);
6ce333c8fd7e (svn r9999) -Feature: make it possible to disallow busses and lorries to go a specific way on straight pieces of road. rubidium <rubidium@openttd.org> parents: 6761 diff changeset	397 MarkTileDirtyByTile(tile);
6ce333c8fd7e (svn r9999) -Feature: make it possible to disallow busses and lorries to go a specific way on straight pieces of road. rubidium <rubidium@openttd.org> parents: 6761 diff changeset	398 }
6ce333c8fd7e (svn r9999) -Feature: make it possible to disallow busses and lorries to go a specific way on straight pieces of road. rubidium <rubidium@openttd.org> parents: 6761 diff changeset	399 return 0;
6ce333c8fd7e (svn r9999) -Feature: make it possible to disallow busses and lorries to go a specific way on straight pieces of road. rubidium <rubidium@openttd.org> parents: 6761 diff changeset	400 }
5584 4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	401 return_cmd_error(STR_1007_ALREADY_BUILT);
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	402 }
6764 6ce333c8fd7e (svn r9999) -Feature: make it possible to disallow busses and lorries to go a specific way on straight pieces of road. rubidium <rubidium@openttd.org> parents: 6761 diff changeset	403 } 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	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 case ROAD_TILE_CROSSING:
6661 5850ac8865e8 (svn r9892) -Codechange: lots of ground work for allowing multiple types of "road" with multiple owners on a single tile. rubidium <rubidium@openttd.org> parents: 6626 diff changeset	406 if (HASBIT(GetRoadTypes(tile), rt)) return_cmd_error(STR_1007_ALREADY_BUILT);
6715 daaf943a1281 (svn r9947) -Fix [FS#807]: don't check whether roadbits may be built when they are already built for another type. rubidium <rubidium@openttd.org> parents: 6714 diff changeset	407 all_bits = GetCrossingRoadBits(tile);
daaf943a1281 (svn r9947) -Fix [FS#807]: don't check whether roadbits may be built when they are already built for another type. rubidium <rubidium@openttd.org> parents: 6714 diff changeset	408 if (pieces & ComplementRoadBits(all_bits)) goto do_clear;
6661 5850ac8865e8 (svn r9892) -Codechange: lots of ground work for allowing multiple types of "road" with multiple owners on a single tile. rubidium <rubidium@openttd.org> parents: 6626 diff changeset	409 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	410
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	411 default:
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	412 case ROAD_TILE_DEPOT:
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	413 goto do_clear;
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	414 }
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	415 break;
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 case MP_RAILWAY: {
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	418 Axis roaddir;
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	419
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	420 if (IsSteepSlope(tileh)) {
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	421 return_cmd_error(STR_1000_LAND_SLOPED_IN_WRONG_DIRECTION);
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	422 }
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	423
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	424 #define M(x) (1 << (x))
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	425 /* Level crossings may only be built on these slopes */
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 (!HASBIT(M(SLOPE_SEN) \| M(SLOPE_ENW) \| M(SLOPE_NWS) \| M(SLOPE_NS) \| M(SLOPE_WSE) \| M(SLOPE_EW) \| M(SLOPE_FLAT), tileh)) {
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	427 return_cmd_error(STR_1000_LAND_SLOPED_IN_WRONG_DIRECTION);
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	428 }
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	429 #undef M
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	430
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 (GetRailTileType(tile) != RAIL_TILE_NORMAL) goto do_clear;
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	432 switch (GetTrackBits(tile)) {
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	433 case TRACK_BIT_X:
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	434 if (pieces & ROAD_X) goto do_clear;
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	435 roaddir = AXIS_Y;
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	436 break;
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	437
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	438 case TRACK_BIT_Y:
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 (pieces & ROAD_Y) goto do_clear;
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	440 roaddir = AXIS_X;
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	441 break;
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	442
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	443 default: goto do_clear;
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	444 }
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	445
6406 ecbbe4b0a9a2 (svn r9542) -Fix(FS# 712): When checking if a vehicle is on a given tile, and you are working on the ground tile, do not take aircrafts into account, as they do not pose any danger for the construction/destruction/conversion itself. Z stuff, in other words belugas <belugas@openttd.org> parents: 6393 diff changeset	446 if (!EnsureNoVehicleOnGround(tile)) 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	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 if (flags & DC_EXEC) {
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	449 YapfNotifyTrackLayoutChange(tile, FindFirstTrack(GetTrackBits(tile)));
6697 398474f3706e (svn r9929) -Fix [FS#803]: fix several drawing issues. rubidium <rubidium@openttd.org> parents: 6691 diff changeset	450 /* Always add road to the roadtypes (can't draw without it) */
398474f3706e (svn r9929) -Fix [FS#803]: fix several drawing issues. rubidium <rubidium@openttd.org> parents: 6691 diff changeset	451 MakeRoadCrossing(tile, _current_player, _current_player, _current_player, GetTileOwner(tile), roaddir, GetRailType(tile), RoadTypeToRoadTypes(rt) \| ROADTYPES_ROAD, p2);
5584 4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	452 MarkTileDirtyByTile(tile);
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	453 }
6697 398474f3706e (svn r9929) -Fix [FS#803]: fix several drawing issues. rubidium <rubidium@openttd.org> parents: 6691 diff changeset	454 return _price.build_road * (rt == ROADTYPE_ROAD ? 2 : 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	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
6679 3e58cf5e349d (svn r9910) -Codechange: prepare road building/removing commands for more road types. rubidium <rubidium@openttd.org> parents: 6666 diff changeset	457 case MP_STATION:
3e58cf5e349d (svn r9910) -Codechange: prepare road building/removing commands for more road types. rubidium <rubidium@openttd.org> parents: 6666 diff changeset	458 if (!IsDriveThroughStopTile(tile)) return CMD_ERROR;
3e58cf5e349d (svn r9910) -Codechange: prepare road building/removing commands for more road types. rubidium <rubidium@openttd.org> parents: 6666 diff changeset	459 if (HASBIT(GetRoadTypes(tile), rt)) return_cmd_error(STR_1007_ALREADY_BUILT);
6761 f75a2f332873 (svn r9996) -Fix: be more strict when building/upgrading roads and/or road stops. rubidium <rubidium@openttd.org> parents: 6756 diff changeset	460 /* Don't allow "upgrading" the roadstop when vehicles are already driving on it */
f75a2f332873 (svn r9996) -Fix: be more strict when building/upgrading roads and/or road stops. rubidium <rubidium@openttd.org> parents: 6756 diff changeset	461 if (!EnsureNoVehicleOnGround(tile)) return CMD_ERROR;
6679 3e58cf5e349d (svn r9910) -Codechange: prepare road building/removing commands for more road types. rubidium <rubidium@openttd.org> parents: 6666 diff changeset	462 break;
3e58cf5e349d (svn r9910) -Codechange: prepare road building/removing commands for more road types. rubidium <rubidium@openttd.org> parents: 6666 diff changeset	463
3e58cf5e349d (svn r9910) -Codechange: prepare road building/removing commands for more road types. rubidium <rubidium@openttd.org> parents: 6666 diff changeset	464 case MP_TUNNELBRIDGE:
3e58cf5e349d (svn r9910) -Codechange: prepare road building/removing commands for more road types. rubidium <rubidium@openttd.org> parents: 6666 diff changeset	465 if ((IsTunnel(tile) && GetTunnelTransportType(tile) != TRANSPORT_ROAD) \|\|
3e58cf5e349d (svn r9910) -Codechange: prepare road building/removing commands for more road types. rubidium <rubidium@openttd.org> parents: 6666 diff changeset	466 (IsBridge(tile) && GetBridgeTransportType(tile) != TRANSPORT_ROAD)) return CMD_ERROR;
3e58cf5e349d (svn r9910) -Codechange: prepare road building/removing commands for more road types. rubidium <rubidium@openttd.org> parents: 6666 diff changeset	467 if (HASBIT(GetRoadTypes(tile), rt)) return_cmd_error(STR_1007_ALREADY_BUILT);
6761 f75a2f332873 (svn r9996) -Fix: be more strict when building/upgrading roads and/or road stops. rubidium <rubidium@openttd.org> parents: 6756 diff changeset	468 /* Don't allow "upgrading" the bridge/tunnel when vehicles are already driving on it */
f75a2f332873 (svn r9996) -Fix: be more strict when building/upgrading roads and/or road stops. rubidium <rubidium@openttd.org> parents: 6756 diff changeset	469 if (!EnsureNoVehicleOnGround(tile)) return CMD_ERROR;
6679 3e58cf5e349d (svn r9910) -Codechange: prepare road building/removing commands for more road types. rubidium <rubidium@openttd.org> parents: 6666 diff changeset	470 break;
3e58cf5e349d (svn r9910) -Codechange: prepare road building/removing commands for more road types. rubidium <rubidium@openttd.org> parents: 6666 diff changeset	471
5584 4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	472 default:
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	473 do_clear:;
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	474 ret = DoCommand(tile, 0, 0, flags, CMD_LANDSCAPE_CLEAR);
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	475 if (CmdFailed(ret)) 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	476 cost += ret;
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	477 }
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	478
6716 c4590ed635fa (svn r9948) -Fix (r9947): building illegal roads on slopes. Why do 'fixes' always have the tendancy to backfire? rubidium <rubidium@openttd.org> parents: 6715 diff changeset	479 if (all_bits != pieces) {
6715 daaf943a1281 (svn r9947) -Fix [FS#807]: don't check whether roadbits may be built when they are already built for another type. rubidium <rubidium@openttd.org> parents: 6714 diff changeset	480 /* Check the foundation/slopes when adding road/tram bits */
daaf943a1281 (svn r9947) -Fix [FS#807]: don't check whether roadbits may be built when they are already built for another type. rubidium <rubidium@openttd.org> parents: 6714 diff changeset	481 ret = CheckRoadSlope(tileh, &pieces, all_bits \| existing);
daaf943a1281 (svn r9947) -Fix [FS#807]: don't check whether roadbits may be built when they are already built for another type. rubidium <rubidium@openttd.org> parents: 6714 diff changeset	482 /* Return an error if we need to build a foundation (ret != 0) but the
daaf943a1281 (svn r9947) -Fix [FS#807]: don't check whether roadbits may be built when they are already built for another type. rubidium <rubidium@openttd.org> parents: 6714 diff changeset	483 * current patch-setting is turned off (or stupid AI@work) */
daaf943a1281 (svn r9947) -Fix [FS#807]: don't check whether roadbits may be built when they are already built for another type. rubidium <rubidium@openttd.org> parents: 6714 diff changeset	484 if (CmdFailed(ret) \|\| (ret != 0 && (!_patches.build_on_slopes \|\| _is_old_ai_player))) {
daaf943a1281 (svn r9947) -Fix [FS#807]: don't check whether roadbits may be built when they are already built for another type. rubidium <rubidium@openttd.org> parents: 6714 diff changeset	485 return_cmd_error(STR_1000_LAND_SLOPED_IN_WRONG_DIRECTION);
daaf943a1281 (svn r9947) -Fix [FS#807]: don't check whether roadbits may be built when they are already built for another type. rubidium <rubidium@openttd.org> parents: 6714 diff changeset	486 }
daaf943a1281 (svn r9947) -Fix [FS#807]: don't check whether roadbits may be built when they are already built for another type. rubidium <rubidium@openttd.org> parents: 6714 diff changeset	487 cost += ret;
daaf943a1281 (svn r9947) -Fix [FS#807]: don't check whether roadbits may be built when they are already built for another type. rubidium <rubidium@openttd.org> parents: 6714 diff changeset	488 }
5584 4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	489
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	490 if (IsTileType(tile, MP_STREET)) {
6393 ffd35446c110 (svn r9523) -Cleanup: doxygen changes. Time to take care of "R" belugas <belugas@openttd.org> parents: 6368 diff changeset	491 /* Don't put the pieces that already exist */
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 pieces &= ComplementRoadBits(existing);
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	493 }
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	494
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	495 cost += CountRoadBits(pieces) * _price.build_road;
6679 3e58cf5e349d (svn r9910) -Codechange: prepare road building/removing commands for more road types. rubidium <rubidium@openttd.org> parents: 6666 diff changeset	496 if (IsTileType(tile, MP_TUNNELBRIDGE)) {
3e58cf5e349d (svn r9910) -Codechange: prepare road building/removing commands for more road types. rubidium <rubidium@openttd.org> parents: 6666 diff changeset	497 /* Pay for every tile of the bridge or tunnel */
3e58cf5e349d (svn r9910) -Codechange: prepare road building/removing commands for more road types. rubidium <rubidium@openttd.org> parents: 6666 diff changeset	498 cost *= DistanceManhattan(IsTunnel(tile) ? GetOtherTunnelEnd(tile) : GetOtherBridgeEnd(tile), tile);
3e58cf5e349d (svn r9910) -Codechange: prepare road building/removing commands for more road types. rubidium <rubidium@openttd.org> parents: 6666 diff changeset	499 }
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
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	501 if (flags & DC_EXEC) {
6679 3e58cf5e349d (svn r9910) -Codechange: prepare road building/removing commands for more road types. rubidium <rubidium@openttd.org> parents: 6666 diff changeset	502 switch (GetTileType(tile)) {
3e58cf5e349d (svn r9910) -Codechange: prepare road building/removing commands for more road types. rubidium <rubidium@openttd.org> parents: 6666 diff changeset	503 case MP_STREET: {
3e58cf5e349d (svn r9910) -Codechange: prepare road building/removing commands for more road types. rubidium <rubidium@openttd.org> parents: 6666 diff changeset	504 RoadTileType rtt = GetRoadTileType(tile);
3e58cf5e349d (svn r9910) -Codechange: prepare road building/removing commands for more road types. rubidium <rubidium@openttd.org> parents: 6666 diff changeset	505 if (existing == ROAD_NONE \|\| rtt == ROAD_TILE_CROSSING) {
3e58cf5e349d (svn r9910) -Codechange: prepare road building/removing commands for more road types. rubidium <rubidium@openttd.org> parents: 6666 diff changeset	506 SetRoadTypes(tile, GetRoadTypes(tile) \| RoadTypeToRoadTypes(rt));
3e58cf5e349d (svn r9910) -Codechange: prepare road building/removing commands for more road types. rubidium <rubidium@openttd.org> parents: 6666 diff changeset	507 SetRoadOwner(tile, rt, _current_player);
3e58cf5e349d (svn r9910) -Codechange: prepare road building/removing commands for more road types. rubidium <rubidium@openttd.org> parents: 6666 diff changeset	508 }
3e58cf5e349d (svn r9910) -Codechange: prepare road building/removing commands for more road types. rubidium <rubidium@openttd.org> parents: 6666 diff changeset	509 if (rtt != ROAD_TILE_CROSSING) SetRoadBits(tile, existing \| pieces, rt);
3e58cf5e349d (svn r9910) -Codechange: prepare road building/removing commands for more road types. rubidium <rubidium@openttd.org> parents: 6666 diff changeset	510 } break;
3e58cf5e349d (svn r9910) -Codechange: prepare road building/removing commands for more road types. rubidium <rubidium@openttd.org> parents: 6666 diff changeset	511
3e58cf5e349d (svn r9910) -Codechange: prepare road building/removing commands for more road types. rubidium <rubidium@openttd.org> parents: 6666 diff changeset	512 case MP_TUNNELBRIDGE: {
3e58cf5e349d (svn r9910) -Codechange: prepare road building/removing commands for more road types. rubidium <rubidium@openttd.org> parents: 6666 diff changeset	513 TileIndex other_end = IsTunnel(tile) ? GetOtherTunnelEnd(tile) : GetOtherBridgeEnd(tile);
3e58cf5e349d (svn r9910) -Codechange: prepare road building/removing commands for more road types. rubidium <rubidium@openttd.org> parents: 6666 diff changeset	514
3e58cf5e349d (svn r9910) -Codechange: prepare road building/removing commands for more road types. rubidium <rubidium@openttd.org> parents: 6666 diff changeset	515 SetRoadTypes(other_end, GetRoadTypes(other_end) \| RoadTypeToRoadTypes(rt));
6661 5850ac8865e8 (svn r9892) -Codechange: lots of ground work for allowing multiple types of "road" with multiple owners on a single tile. rubidium <rubidium@openttd.org> parents: 6626 diff changeset	516 SetRoadTypes(tile, GetRoadTypes(tile) \| RoadTypeToRoadTypes(rt));
6679 3e58cf5e349d (svn r9910) -Codechange: prepare road building/removing commands for more road types. rubidium <rubidium@openttd.org> parents: 6666 diff changeset	517
3e58cf5e349d (svn r9910) -Codechange: prepare road building/removing commands for more road types. rubidium <rubidium@openttd.org> parents: 6666 diff changeset	518 /* Mark tiles diry that have been repaved */
3e58cf5e349d (svn r9910) -Codechange: prepare road building/removing commands for more road types. rubidium <rubidium@openttd.org> parents: 6666 diff changeset	519 MarkTileDirtyByTile(other_end);
6714 ed8181c3da57 (svn r9946) -Fix: more places that weren't correctly marked dirty... rubidium <rubidium@openttd.org> parents: 6713 diff changeset	520 MarkTileDirtyByTile(tile);
6679 3e58cf5e349d (svn r9910) -Codechange: prepare road building/removing commands for more road types. rubidium <rubidium@openttd.org> parents: 6666 diff changeset	521 if (IsBridge(tile)) {
3e58cf5e349d (svn r9910) -Codechange: prepare road building/removing commands for more road types. rubidium <rubidium@openttd.org> parents: 6666 diff changeset	522 TileIndexDiff delta = TileOffsByDiagDir(GetBridgeRampDirection(tile));
3e58cf5e349d (svn r9910) -Codechange: prepare road building/removing commands for more road types. rubidium <rubidium@openttd.org> parents: 6666 diff changeset	523
6713 80ec86a82007 (svn r9945) -Fix: bridges were not properly marked dirty when adding/removing roadtypes. rubidium <rubidium@openttd.org> parents: 6711 diff changeset	524 for (TileIndex t = tile + delta; t != other_end; t += delta) MarkTileDirtyByTile(t);
6679 3e58cf5e349d (svn r9910) -Codechange: prepare road building/removing commands for more road types. rubidium <rubidium@openttd.org> parents: 6666 diff changeset	525 }
3e58cf5e349d (svn r9910) -Codechange: prepare road building/removing commands for more road types. rubidium <rubidium@openttd.org> parents: 6666 diff changeset	526 } break;
3e58cf5e349d (svn r9910) -Codechange: prepare road building/removing commands for more road types. rubidium <rubidium@openttd.org> parents: 6666 diff changeset	527
3e58cf5e349d (svn r9910) -Codechange: prepare road building/removing commands for more road types. rubidium <rubidium@openttd.org> parents: 6666 diff changeset	528 case MP_STATION:
3e58cf5e349d (svn r9910) -Codechange: prepare road building/removing commands for more road types. rubidium <rubidium@openttd.org> parents: 6666 diff changeset	529 SetRoadTypes(tile, GetRoadTypes(tile) \| RoadTypeToRoadTypes(rt));
3e58cf5e349d (svn r9910) -Codechange: prepare road building/removing commands for more road types. rubidium <rubidium@openttd.org> parents: 6666 diff changeset	530 break;
3e58cf5e349d (svn r9910) -Codechange: prepare road building/removing commands for more road types. rubidium <rubidium@openttd.org> parents: 6666 diff changeset	531
3e58cf5e349d (svn r9910) -Codechange: prepare road building/removing commands for more road types. rubidium <rubidium@openttd.org> parents: 6666 diff changeset	532 default:
3e58cf5e349d (svn r9910) -Codechange: prepare road building/removing commands for more road types. rubidium <rubidium@openttd.org> parents: 6666 diff changeset	533 MakeRoadNormal(tile, pieces, RoadTypeToRoadTypes(rt), p2, _current_player, _current_player, _current_player);
3e58cf5e349d (svn r9910) -Codechange: prepare road building/removing commands for more road types. rubidium <rubidium@openttd.org> parents: 6666 diff changeset	534 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	535 }
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	536
6764 6ce333c8fd7e (svn r9999) -Feature: make it possible to disallow busses and lorries to go a specific way on straight pieces of road. rubidium <rubidium@openttd.org> parents: 6761 diff changeset	537 if (rt != ROADTYPE_TRAM && IsTileType(tile, MP_STREET) && GetRoadTileType(tile) == ROAD_TILE_NORMAL) {
6ce333c8fd7e (svn r9999) -Feature: make it possible to disallow busses and lorries to go a specific way on straight pieces of road. rubidium <rubidium@openttd.org> parents: 6761 diff changeset	538 existing \|= pieces;
6ce333c8fd7e (svn r9999) -Feature: make it possible to disallow busses and lorries to go a specific way on straight pieces of road. rubidium <rubidium@openttd.org> parents: 6761 diff changeset	539 SetDisallowedRoadDirections(tile, (existing == ROAD_X \|\| existing == ROAD_Y) ?
6ce333c8fd7e (svn r9999) -Feature: make it possible to disallow busses and lorries to go a specific way on straight pieces of road. rubidium <rubidium@openttd.org> parents: 6761 diff changeset	540 GetDisallowedRoadDirections(tile) ^ toggle_drd : DRD_NONE);
6ce333c8fd7e (svn r9999) -Feature: make it possible to disallow busses and lorries to go a specific way on straight pieces of road. rubidium <rubidium@openttd.org> parents: 6761 diff changeset	541 }
6ce333c8fd7e (svn r9999) -Feature: make it possible to disallow busses and lorries to go a specific way on straight pieces of road. rubidium <rubidium@openttd.org> parents: 6761 diff changeset	542
5584 4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	543 MarkTileDirtyByTile(tile);
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 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	546 }
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	547
6368 4e4f7827e7ed (svn r9425) -Codechange/Fix (FS#689): Housekeeping in the convert rail functions: Changed the order of error checks to generate more meaningful error messages, added some doxygen comments and replaced bitshifting by proper mathematical operations celestar <celestar@openttd.org> parents: 6357 diff changeset	548 /**
4e4f7827e7ed (svn r9425) -Codechange/Fix (FS#689): Housekeeping in the convert rail functions: Changed the order of error checks to generate more meaningful error messages, added some doxygen comments and replaced bitshifting by proper mathematical operations celestar <celestar@openttd.org> parents: 6357 diff changeset	549 * Switches the rail type on a level crossing.
4e4f7827e7ed (svn r9425) -Codechange/Fix (FS#689): Housekeeping in the convert rail functions: Changed the order of error checks to generate more meaningful error messages, added some doxygen comments and replaced bitshifting by proper mathematical operations celestar <celestar@openttd.org> parents: 6357 diff changeset	550 * @param tile The tile on which the railtype is to be convert.
4e4f7827e7ed (svn r9425) -Codechange/Fix (FS#689): Housekeeping in the convert rail functions: Changed the order of error checks to generate more meaningful error messages, added some doxygen comments and replaced bitshifting by proper mathematical operations celestar <celestar@openttd.org> parents: 6357 diff changeset	551 * @param totype The railtype we want to convert to
4e4f7827e7ed (svn r9425) -Codechange/Fix (FS#689): Housekeeping in the convert rail functions: Changed the order of error checks to generate more meaningful error messages, added some doxygen comments and replaced bitshifting by proper mathematical operations celestar <celestar@openttd.org> parents: 6357 diff changeset	552 * @param exec Switches between test and execute mode
4e4f7827e7ed (svn r9425) -Codechange/Fix (FS#689): Housekeeping in the convert rail functions: Changed the order of error checks to generate more meaningful error messages, added some doxygen comments and replaced bitshifting by proper mathematical operations celestar <celestar@openttd.org> parents: 6357 diff changeset	553 * @return The cost and state of the operation
4e4f7827e7ed (svn r9425) -Codechange/Fix (FS#689): Housekeeping in the convert rail functions: Changed the order of error checks to generate more meaningful error messages, added some doxygen comments and replaced bitshifting by proper mathematical operations celestar <celestar@openttd.org> parents: 6357 diff changeset	554 * @retval CMD_ERROR An error occured during the operation.
4e4f7827e7ed (svn r9425) -Codechange/Fix (FS#689): Housekeeping in the convert rail functions: Changed the order of error checks to generate more meaningful error messages, added some doxygen comments and replaced bitshifting by proper mathematical operations celestar <celestar@openttd.org> parents: 6357 diff changeset	555 */
6943 fd42cb9816c6 (svn r10197) -Codechange: replace int32 with CommandCost where appropriate. rubidium <rubidium@openttd.org> parents: 6857 diff changeset	556 CommandCost DoConvertStreetRail(TileIndex tile, RailType totype, bool exec)
5584 4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	557 {
6393 ffd35446c110 (svn r9523) -Cleanup: doxygen changes. Time to take care of "R" belugas <belugas@openttd.org> parents: 6368 diff changeset	558 /* not a railroad crossing? */
5584 4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	559 if (!IsLevelCrossing(tile)) return CMD_ERROR;
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	560
6393 ffd35446c110 (svn r9523) -Cleanup: doxygen changes. Time to take care of "R" belugas <belugas@openttd.org> parents: 6368 diff changeset	561 /* not owned by me? */
6406 ecbbe4b0a9a2 (svn r9542) -Fix(FS# 712): When checking if a vehicle is on a given tile, and you are working on the ground tile, do not take aircrafts into account, as they do not pose any danger for the construction/destruction/conversion itself. Z stuff, in other words belugas <belugas@openttd.org> parents: 6393 diff changeset	562 if (!CheckTileOwnership(tile) \|\| !EnsureNoVehicleOnGround(tile)) 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	563
6172 b3b8cbc5e854 (svn r8935) -Codechange: unification of track type between road and rail tiles, unification of ground type between normal rail tiles and depots/waypoints and removing the need for RailTileSubType. rubidium <rubidium@openttd.org> parents: 6160 diff changeset	564 if (GetRailType(tile) == totype) 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	565
6393 ffd35446c110 (svn r9523) -Cleanup: doxygen changes. Time to take care of "R" belugas <belugas@openttd.org> parents: 6368 diff changeset	566 /* 'hidden' elrails can't be downgraded to normal rail when elrails are disabled */
6172 b3b8cbc5e854 (svn r8935) -Codechange: unification of track type between road and rail tiles, unification of ground type between normal rail tiles and depots/waypoints and removing the need for RailTileSubType. rubidium <rubidium@openttd.org> parents: 6160 diff changeset	567 if (_patches.disable_elrails && totype == RAILTYPE_RAIL && GetRailType(tile) == RAILTYPE_ELECTRIC) 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	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 if (exec) {
6172 b3b8cbc5e854 (svn r8935) -Codechange: unification of track type between road and rail tiles, unification of ground type between normal rail tiles and depots/waypoints and removing the need for RailTileSubType. rubidium <rubidium@openttd.org> parents: 6160 diff changeset	570 SetRailType(tile, totype);
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 MarkTileDirtyByTile(tile);
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	572 YapfNotifyTrackLayoutChange(tile, FindFirstTrack(GetCrossingRailBits(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	573 }
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	574
6368 4e4f7827e7ed (svn r9425) -Codechange/Fix (FS#689): Housekeeping in the convert rail functions: Changed the order of error checks to generate more meaningful error messages, added some doxygen comments and replaced bitshifting by proper mathematical operations celestar <celestar@openttd.org> parents: 6357 diff changeset	575 return _price.build_rail / 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	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
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	578
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	579 /** Build a long piece of road.
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	580 * @param end_tile end tile of drag
6483 f7bd49098924 (svn r9664) -Documentation: Doxygen corrections,errors and omissions belugas <belugas@openttd.org> parents: 6427 diff changeset	581 * @param flags operation to perform
5584 4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	582 * @param p1 start tile of drag
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	583 * @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	584 * - p2 = (bit 0) - start tile starts in the 2nd half of tile (p2 & 1)
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	585 * - p2 = (bit 1) - end tile starts in the 2nd half of tile (p2 & 2)
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	586 * - p2 = (bit 2) - direction: 0 = along x-axis, 1 = along y-axis (p2 & 4)
6662 baa28c8cfe84 (svn r9893) -Fix (r9892): various small bugs that only act up when using something different than plain roads. rubidium <rubidium@openttd.org> parents: 6661 diff changeset	587 * - p2 = (bit 3 + 4) - road type
6764 6ce333c8fd7e (svn r9999) -Feature: make it possible to disallow busses and lorries to go a specific way on straight pieces of road. rubidium <rubidium@openttd.org> parents: 6761 diff changeset	588 * - p2 = (bit 5) - set road 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	589 */
6943 fd42cb9816c6 (svn r10197) -Codechange: replace int32 with CommandCost where appropriate. rubidium <rubidium@openttd.org> parents: 6857 diff changeset	590 CommandCost CmdBuildLongRoad(TileIndex end_tile, uint32 flags, uint32 p1, uint32 p2)
5584 4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	591 {
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	592 TileIndex start_tile, tile;
6943 fd42cb9816c6 (svn r10197) -Codechange: replace int32 with CommandCost where appropriate. rubidium <rubidium@openttd.org> parents: 6857 diff changeset	593 CommandCost cost, ret;
6710 967edc35a015 (svn r9942) -Fix [FS#804]: crash when upgrading both ends of a bridge. rubidium <rubidium@openttd.org> parents: 6702 diff changeset	594 bool had_bridge = false;
6764 6ce333c8fd7e (svn r9999) -Feature: make it possible to disallow busses and lorries to go a specific way on straight pieces of road. rubidium <rubidium@openttd.org> parents: 6761 diff changeset	595 bool had_success = false;
6ce333c8fd7e (svn r9999) -Feature: make it possible to disallow busses and lorries to go a specific way on straight pieces of road. rubidium <rubidium@openttd.org> parents: 6761 diff changeset	596 DisallowedRoadDirections drd = DRD_NORTHBOUND;
5584 4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	597
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	598 SET_EXPENSES_TYPE(EXPENSES_CONSTRUCTION);
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	599
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	600 if (p1 >= MapSize()) return CMD_ERROR;
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	601
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	602 start_tile = p1;
6662 baa28c8cfe84 (svn r9893) -Fix (r9892): various small bugs that only act up when using something different than plain roads. rubidium <rubidium@openttd.org> parents: 6661 diff changeset	603 RoadType rt = (RoadType)GB(p2, 3, 2);
baa28c8cfe84 (svn r9893) -Fix (r9892): various small bugs that only act up when using something different than plain roads. rubidium <rubidium@openttd.org> parents: 6661 diff changeset	604 if (!IsValidRoadType(rt)) 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	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 /* Only drag in X or Y direction dictated by the direction variable */
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	607 if (!HASBIT(p2, 2) && TileY(start_tile) != TileY(end_tile)) return CMD_ERROR; // x-axis
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	608 if (HASBIT(p2, 2) && TileX(start_tile) != TileX(end_tile)) return CMD_ERROR; // y-axis
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	609
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	610 /* Swap start and ending tile, also the half-tile drag var (bit 0 and 1) */
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	611 if (start_tile > end_tile \|\| (start_tile == end_tile && HASBIT(p2, 0))) {
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	612 TileIndex t = start_tile;
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	613 start_tile = end_tile;
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	614 end_tile = t;
6491 696f0e1b046e (svn r9672) -Cleanup: lots of coding style fixes around operands. rubidium <rubidium@openttd.org> parents: 6483 diff changeset	615 p2 ^= IS_INT_INSIDE(p2 & 3, 1, 3) ? 3 : 0;
6764 6ce333c8fd7e (svn r9999) -Feature: make it possible to disallow busses and lorries to go a specific way on straight pieces of road. rubidium <rubidium@openttd.org> parents: 6761 diff changeset	616 drd = DRD_SOUTHBOUND;
5584 4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	617 }
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	618
6764 6ce333c8fd7e (svn r9999) -Feature: make it possible to disallow busses and lorries to go a specific way on straight pieces of road. rubidium <rubidium@openttd.org> parents: 6761 diff changeset	619 /* On the X-axis, we have to swap the initial bits, so they
6ce333c8fd7e (svn r9999) -Feature: make it possible to disallow busses and lorries to go a specific way on straight pieces of road. rubidium <rubidium@openttd.org> parents: 6761 diff changeset	620 * will be interpreted correctly in the GTTS. Futhermore
6ce333c8fd7e (svn r9999) -Feature: make it possible to disallow busses and lorries to go a specific way on straight pieces of road. rubidium <rubidium@openttd.org> parents: 6761 diff changeset	621 * when you just 'click' on one tile to build them. */
6ce333c8fd7e (svn r9999) -Feature: make it possible to disallow busses and lorries to go a specific way on straight pieces of road. rubidium <rubidium@openttd.org> parents: 6761 diff changeset	622 if (HASBIT(p2, 2) == (start_tile == end_tile)) drd ^= DRD_BOTH;
6ce333c8fd7e (svn r9999) -Feature: make it possible to disallow busses and lorries to go a specific way on straight pieces of road. rubidium <rubidium@openttd.org> parents: 6761 diff changeset	623 /* No disallowed direction bits have to be toggled */
6ce333c8fd7e (svn r9999) -Feature: make it possible to disallow busses and lorries to go a specific way on straight pieces of road. rubidium <rubidium@openttd.org> parents: 6761 diff changeset	624 if (!HASBIT(p2, 5)) drd = DRD_NONE;
6ce333c8fd7e (svn r9999) -Feature: make it possible to disallow busses and lorries to go a specific way on straight pieces of road. rubidium <rubidium@openttd.org> parents: 6761 diff changeset	625
5584 4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	626 cost = 0;
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	627 tile = start_tile;
6393 ffd35446c110 (svn r9523) -Cleanup: doxygen changes. Time to take care of "R" belugas <belugas@openttd.org> parents: 6368 diff changeset	628 /* Start tile is the small 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	629 for (;;) {
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	630 RoadBits bits = HASBIT(p2, 2) ? ROAD_Y : ROAD_X;
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	631
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	632 if (tile == end_tile && !HASBIT(p2, 1)) bits &= ROAD_NW \| ROAD_NE;
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	633 if (tile == start_tile && HASBIT(p2, 0)) bits &= ROAD_SE \| ROAD_SW;
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	634
6764 6ce333c8fd7e (svn r9999) -Feature: make it possible to disallow busses and lorries to go a specific way on straight pieces of road. rubidium <rubidium@openttd.org> parents: 6761 diff changeset	635 ret = DoCommand(tile, drd << 6 \| rt << 4 \| bits, 0, flags, CMD_BUILD_ROAD);
5584 4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	636 if (CmdFailed(ret)) {
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	637 if (_error_message != STR_1007_ALREADY_BUILT) return CMD_ERROR;
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	638 _error_message = INVALID_STRING_ID;
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	639 } else {
6764 6ce333c8fd7e (svn r9999) -Feature: make it possible to disallow busses and lorries to go a specific way on straight pieces of road. rubidium <rubidium@openttd.org> parents: 6761 diff changeset	640 had_success = true;
6710 967edc35a015 (svn r9942) -Fix [FS#804]: crash when upgrading both ends of a bridge. rubidium <rubidium@openttd.org> parents: 6702 diff changeset	641 /* Only pay for the upgrade on one side of the bridge */
967edc35a015 (svn r9942) -Fix [FS#804]: crash when upgrading both ends of a bridge. rubidium <rubidium@openttd.org> parents: 6702 diff changeset	642 if (IsBridgeTile(tile)) {
967edc35a015 (svn r9942) -Fix [FS#804]: crash when upgrading both ends of a bridge. rubidium <rubidium@openttd.org> parents: 6702 diff changeset	643 if ((!had_bridge \|\| GetBridgeRampDirection(tile) == DIAGDIR_SE \|\| GetBridgeRampDirection(tile) == DIAGDIR_SW)) {
967edc35a015 (svn r9942) -Fix [FS#804]: crash when upgrading both ends of a bridge. rubidium <rubidium@openttd.org> parents: 6702 diff changeset	644 cost += ret;
967edc35a015 (svn r9942) -Fix [FS#804]: crash when upgrading both ends of a bridge. rubidium <rubidium@openttd.org> parents: 6702 diff changeset	645 }
967edc35a015 (svn r9942) -Fix [FS#804]: crash when upgrading both ends of a bridge. rubidium <rubidium@openttd.org> parents: 6702 diff changeset	646 had_bridge = true;
967edc35a015 (svn r9942) -Fix [FS#804]: crash when upgrading both ends of a bridge. rubidium <rubidium@openttd.org> parents: 6702 diff changeset	647 } else {
967edc35a015 (svn r9942) -Fix [FS#804]: crash when upgrading both ends of a bridge. rubidium <rubidium@openttd.org> parents: 6702 diff changeset	648 cost += ret;
967edc35a015 (svn r9942) -Fix [FS#804]: crash when upgrading both ends of a bridge. rubidium <rubidium@openttd.org> parents: 6702 diff changeset	649 }
5584 4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	650 }
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	651
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	652 if (tile == end_tile) break;
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	653
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	654 tile += HASBIT(p2, 2) ? TileDiffXY(0, 1) : TileDiffXY(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	655 }
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	656
6764 6ce333c8fd7e (svn r9999) -Feature: make it possible to disallow busses and lorries to go a specific way on straight pieces of road. rubidium <rubidium@openttd.org> parents: 6761 diff changeset	657 return !had_success ? CMD_ERROR : 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	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 /** Remove a long piece of road.
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	661 * @param end_tile end tile of drag
6483 f7bd49098924 (svn r9664) -Documentation: Doxygen corrections,errors and omissions belugas <belugas@openttd.org> parents: 6427 diff changeset	662 * @param flags operation to perform
5584 4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	663 * @param p1 start tile of drag
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	664 * @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	665 * - p2 = (bit 0) - start tile starts in the 2nd half of tile (p2 & 1)
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	666 * - p2 = (bit 1) - end tile starts in the 2nd half of tile (p2 & 2)
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	667 * - p2 = (bit 2) - direction: 0 = along x-axis, 1 = along y-axis (p2 & 4)
6662 baa28c8cfe84 (svn r9893) -Fix (r9892): various small bugs that only act up when using something different than plain roads. rubidium <rubidium@openttd.org> parents: 6661 diff changeset	668 * - p2 = (bit 3 + 4) - road 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	669 */
6943 fd42cb9816c6 (svn r10197) -Codechange: replace int32 with CommandCost where appropriate. rubidium <rubidium@openttd.org> parents: 6857 diff changeset	670 CommandCost CmdRemoveLongRoad(TileIndex end_tile, uint32 flags, uint32 p1, uint32 p2)
5584 4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	671 {
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	672 TileIndex start_tile, tile;
6943 fd42cb9816c6 (svn r10197) -Codechange: replace int32 with CommandCost where appropriate. rubidium <rubidium@openttd.org> parents: 6857 diff changeset	673 CommandCost cost, 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	674
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	675 SET_EXPENSES_TYPE(EXPENSES_CONSTRUCTION);
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	676
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	677 if (p1 >= MapSize()) return CMD_ERROR;
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	678
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	679 start_tile = p1;
6662 baa28c8cfe84 (svn r9893) -Fix (r9892): various small bugs that only act up when using something different than plain roads. rubidium <rubidium@openttd.org> parents: 6661 diff changeset	680 RoadType rt = (RoadType)GB(p2, 3, 2);
baa28c8cfe84 (svn r9893) -Fix (r9892): various small bugs that only act up when using something different than plain roads. rubidium <rubidium@openttd.org> parents: 6661 diff changeset	681 if (!IsValidRoadType(rt)) 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	682
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	683 /* Only drag in X or Y direction dictated by the direction variable */
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	684 if (!HASBIT(p2, 2) && TileY(start_tile) != TileY(end_tile)) return CMD_ERROR; // x-axis
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	685 if (HASBIT(p2, 2) && TileX(start_tile) != TileX(end_tile)) return CMD_ERROR; // y-axis
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	686
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	687 /* Swap start and ending tile, also the half-tile drag var (bit 0 and 1) */
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	688 if (start_tile > end_tile \|\| (start_tile == end_tile && HASBIT(p2, 0))) {
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	689 TileIndex t = start_tile;
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	690 start_tile = end_tile;
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	691 end_tile = t;
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	692 p2 ^= IS_INT_INSIDE(p2 & 3, 1, 3) ? 3 : 0;
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
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	695 cost = 0;
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	696 tile = start_tile;
6393 ffd35446c110 (svn r9523) -Cleanup: doxygen changes. Time to take care of "R" belugas <belugas@openttd.org> parents: 6368 diff changeset	697 /* Start tile is the small 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	698 for (;;) {
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	699 RoadBits bits = HASBIT(p2, 2) ? ROAD_Y : ROAD_X;
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	700
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	701 if (tile == end_tile && !HASBIT(p2, 1)) bits &= ROAD_NW \| ROAD_NE;
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	702 if (tile == start_tile && HASBIT(p2, 0)) bits &= ROAD_SE \| ROAD_SW;
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	703
6393 ffd35446c110 (svn r9523) -Cleanup: doxygen changes. Time to take care of "R" belugas <belugas@openttd.org> parents: 6368 diff changeset	704 /* try to remove the halves. */
5584 4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	705 if (bits != 0) {
6661 5850ac8865e8 (svn r9892) -Codechange: lots of ground work for allowing multiple types of "road" with multiple owners on a single tile. rubidium <rubidium@openttd.org> parents: 6626 diff changeset	706 ret = DoCommand(tile, rt << 4 \| bits, 0, flags, CMD_REMOVE_ROAD);
5584 4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	707 if (!CmdFailed(ret)) cost += ret;
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	708 }
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 if (tile == end_tile) break;
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	711
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	712 tile += HASBIT(p2, 2) ? TileDiffXY(0, 1) : TileDiffXY(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	713 }
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	714
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	715 return (cost == 0) ? CMD_ERROR : cost;
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	716 }
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	717
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	718 /** Build a road depot.
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	719 * @param tile tile where to build the depot
6483 f7bd49098924 (svn r9664) -Documentation: Doxygen corrections,errors and omissions belugas <belugas@openttd.org> parents: 6427 diff changeset	720 * @param flags operation to perform
6134 7f92815712e4 (svn r8876) -Fix tron <tron@openttd.org> parents: 6133 diff changeset	721 * @param p1 bit 0..1 entrance direction (DiagDirection)
6662 baa28c8cfe84 (svn r9893) -Fix (r9892): various small bugs that only act up when using something different than plain roads. rubidium <rubidium@openttd.org> parents: 6661 diff changeset	722 * bit 2..3 road 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	723 * @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	724 *
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	725 * @todo When checking for the tile slope,
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	726 * distingush between "Flat land required" and "land sloped in wrong direction"
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	727 */
6943 fd42cb9816c6 (svn r10197) -Codechange: replace int32 with CommandCost where appropriate. rubidium <rubidium@openttd.org> parents: 6857 diff changeset	728 CommandCost CmdBuildRoadDepot(TileIndex tile, uint32 flags, uint32 p1, uint32 p2)
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 {
6943 fd42cb9816c6 (svn r10197) -Codechange: replace int32 with CommandCost where appropriate. rubidium <rubidium@openttd.org> parents: 6857 diff changeset	730 CommandCost 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	731 Depot *dep;
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	732 Slope tileh;
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	733
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	734 SET_EXPENSES_TYPE(EXPENSES_CONSTRUCTION);
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	735
6134 7f92815712e4 (svn r8876) -Fix tron <tron@openttd.org> parents: 6133 diff changeset	736 DiagDirection dir = Extract<DiagDirection, 0>(p1);
6662 baa28c8cfe84 (svn r9893) -Fix (r9892): various small bugs that only act up when using something different than plain roads. rubidium <rubidium@openttd.org> parents: 6661 diff changeset	737 RoadType rt = (RoadType)GB(p1, 2, 2);
baa28c8cfe84 (svn r9893) -Fix (r9892): various small bugs that only act up when using something different than plain roads. rubidium <rubidium@openttd.org> parents: 6661 diff changeset	738
baa28c8cfe84 (svn r9893) -Fix (r9892): various small bugs that only act up when using something different than plain roads. rubidium <rubidium@openttd.org> parents: 6661 diff changeset	739 if (!IsValidRoadType(rt)) 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	740
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	741 tileh = GetTileSlope(tile, NULL);
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	742 if (tileh != SLOPE_FLAT && (
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	743 !_patches.build_on_slopes \|\|
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	744 IsSteepSlope(tileh) \|\|
6134 7f92815712e4 (svn r8876) -Fix tron <tron@openttd.org> parents: 6133 diff changeset	745 !CanBuildDepotByTileh(dir, tileh)
5584 4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	746 )) {
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	747 return_cmd_error(STR_0007_FLAT_LAND_REQUIRED);
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	748 }
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	749
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	750 cost = DoCommand(tile, 0, 0, flags, CMD_LANDSCAPE_CLEAR);
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	751 if (CmdFailed(cost)) return CMD_ERROR;
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	752
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	753 if (MayHaveBridgeAbove(tile) && IsBridgeAbove(tile)) return_cmd_error(STR_5007_MUST_DEMOLISH_BRIDGE_FIRST);
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	754
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	755 dep = AllocateDepot();
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 (dep == NULL) return CMD_ERROR;
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 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	759 dep->xy = tile;
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	760 dep->town_index = ClosestTownFromTile(tile, (uint)-1)->index;
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	761
6661 5850ac8865e8 (svn r9892) -Codechange: lots of ground work for allowing multiple types of "road" with multiple owners on a single tile. rubidium <rubidium@openttd.org> parents: 6626 diff changeset	762 MakeRoadDepot(tile, _current_player, dir, rt);
5584 4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	763 MarkTileDirtyByTile(tile);
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	764 }
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	765 return cost + _price.build_road_depot;
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	766 }
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	767
6943 fd42cb9816c6 (svn r10197) -Codechange: replace int32 with CommandCost where appropriate. rubidium <rubidium@openttd.org> parents: 6857 diff changeset	768 static CommandCost RemoveRoadDepot(TileIndex tile, uint32 flags)
5584 4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	769 {
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	770 if (!CheckTileOwnership(tile) && _current_player != OWNER_WATER)
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	771 return CMD_ERROR;
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	772
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	773 if (!EnsureNoVehicle(tile)) return CMD_ERROR;
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	774
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	775 if (flags & DC_EXEC) DeleteDepot(GetDepotByTile(tile));
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	776
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	777 return _price.remove_road_depot;
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	778 }
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	779
6943 fd42cb9816c6 (svn r10197) -Codechange: replace int32 with CommandCost where appropriate. rubidium <rubidium@openttd.org> parents: 6857 diff changeset	780 static CommandCost ClearTile_Road(TileIndex tile, byte flags)
5584 4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	781 {
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	782 switch (GetRoadTileType(tile)) {
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	783 case ROAD_TILE_NORMAL: {
6661 5850ac8865e8 (svn r9892) -Codechange: lots of ground work for allowing multiple types of "road" with multiple owners on a single tile. rubidium <rubidium@openttd.org> parents: 6626 diff changeset	784 RoadBits b = GetAllRoadBits(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	785
5637 2ea5b88a8a32 (svn r8096) -Codechange: Invert the check if you are allowed to clear a road tile so there are not so many negations (too confusing) and added some comments to further clarify what happens. Darkvater <Darkvater@openttd.org> parents: 5587 diff changeset	786 #define M(x) (1 << (x))
2ea5b88a8a32 (svn r8096) -Codechange: Invert the check if you are allowed to clear a road tile so there are not so many negations (too confusing) and added some comments to further clarify what happens. Darkvater <Darkvater@openttd.org> parents: 5587 diff changeset	787 /* Clear the road if only one piece is on the tile OR the AI tries
2ea5b88a8a32 (svn r8096) -Codechange: Invert the check if you are allowed to clear a road tile so there are not so many negations (too confusing) and added some comments to further clarify what happens. Darkvater <Darkvater@openttd.org> parents: 5587 diff changeset	788 * to clear town road OR we are not using the DC_AUTO flag */
2ea5b88a8a32 (svn r8096) -Codechange: Invert the check if you are allowed to clear a road tile so there are not so many negations (too confusing) and added some comments to further clarify what happens. Darkvater <Darkvater@openttd.org> parents: 5587 diff changeset	789 if ((M(b) & (M(ROAD_NW) \| M(ROAD_SW) \| M(ROAD_SE) \| M(ROAD_NE))) \|\|
2ea5b88a8a32 (svn r8096) -Codechange: Invert the check if you are allowed to clear a road tile so there are not so many negations (too confusing) and added some comments to further clarify what happens. Darkvater <Darkvater@openttd.org> parents: 5587 diff changeset	790 ((flags & DC_AI_BUILDING) && IsTileOwner(tile, OWNER_TOWN)) \|\|
2ea5b88a8a32 (svn r8096) -Codechange: Invert the check if you are allowed to clear a road tile so there are not so many negations (too confusing) and added some comments to further clarify what happens. Darkvater <Darkvater@openttd.org> parents: 5587 diff changeset	791 !(flags & DC_AUTO)
2ea5b88a8a32 (svn r8096) -Codechange: Invert the check if you are allowed to clear a road tile so there are not so many negations (too confusing) and added some comments to further clarify what happens. Darkvater <Darkvater@openttd.org> parents: 5587 diff changeset	792 ) {
6679 3e58cf5e349d (svn r9910) -Codechange: prepare road building/removing commands for more road types. rubidium <rubidium@openttd.org> parents: 6666 diff changeset	793 RoadTypes rts = GetRoadTypes(tile);
6943 fd42cb9816c6 (svn r10197) -Codechange: replace int32 with CommandCost where appropriate. rubidium <rubidium@openttd.org> parents: 6857 diff changeset	794 CommandCost ret = 0;
6679 3e58cf5e349d (svn r9910) -Codechange: prepare road building/removing commands for more road types. rubidium <rubidium@openttd.org> parents: 6666 diff changeset	795 for (RoadType rt = ROADTYPE_ROAD; rt < ROADTYPE_END; rt++) {
3e58cf5e349d (svn r9910) -Codechange: prepare road building/removing commands for more road types. rubidium <rubidium@openttd.org> parents: 6666 diff changeset	796 if (HASBIT(rts, rt)) {
6943 fd42cb9816c6 (svn r10197) -Codechange: replace int32 with CommandCost where appropriate. rubidium <rubidium@openttd.org> parents: 6857 diff changeset	797 CommandCost tmp_ret = DoCommand(tile, rt << 4 \| GetRoadBits(tile, rt), 0, flags, CMD_REMOVE_ROAD);
6679 3e58cf5e349d (svn r9910) -Codechange: prepare road building/removing commands for more road types. rubidium <rubidium@openttd.org> parents: 6666 diff changeset	798 if (CmdFailed(tmp_ret)) return tmp_ret;
6732 74029c52b5ae (svn r9964) -Fix: removing of road should not be free of charge. rubidium <rubidium@openttd.org> parents: 6723 diff changeset	799 ret += tmp_ret;
6679 3e58cf5e349d (svn r9910) -Codechange: prepare road building/removing commands for more road types. rubidium <rubidium@openttd.org> parents: 6666 diff changeset	800 }
3e58cf5e349d (svn r9910) -Codechange: prepare road building/removing commands for more road types. rubidium <rubidium@openttd.org> parents: 6666 diff changeset	801 }
3e58cf5e349d (svn r9910) -Codechange: prepare road building/removing commands for more road types. rubidium <rubidium@openttd.org> parents: 6666 diff changeset	802 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	803 }
5637 2ea5b88a8a32 (svn r8096) -Codechange: Invert the check if you are allowed to clear a road tile so there are not so many negations (too confusing) and added some comments to further clarify what happens. Darkvater <Darkvater@openttd.org> parents: 5587 diff changeset	804 return_cmd_error(STR_1801_MUST_REMOVE_ROAD_FIRST);
5643 00155b55016f (svn r8102) -Cleanup: Remove unreachable code (r8096), useless cast Darkvater <Darkvater@openttd.org> parents: 5637 diff changeset	805 }
5637 2ea5b88a8a32 (svn r8096) -Codechange: Invert the check if you are allowed to clear a road tile so there are not so many negations (too confusing) and added some comments to further clarify what happens. Darkvater <Darkvater@openttd.org> parents: 5587 diff changeset	806 #undef M
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
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	808 case ROAD_TILE_CROSSING: {
6814 4cc8ebb6279d (svn r10053) -Fix: could not clear a level-crossing tile with tram tracks. rubidium <rubidium@openttd.org> parents: 6768 diff changeset	809 RoadTypes rts = GetRoadTypes(tile);
6943 fd42cb9816c6 (svn r10197) -Codechange: replace int32 with CommandCost where appropriate. rubidium <rubidium@openttd.org> parents: 6857 diff changeset	810 CommandCost ret = 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	811
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	812 if (flags & DC_AUTO) return_cmd_error(STR_1801_MUST_REMOVE_ROAD_FIRST);
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	813
6814 4cc8ebb6279d (svn r10053) -Fix: could not clear a level-crossing tile with tram tracks. rubidium <rubidium@openttd.org> parents: 6768 diff changeset	814 /* Must iterate over the roadtypes in a reverse manner because
4cc8ebb6279d (svn r10053) -Fix: could not clear a level-crossing tile with tram tracks. rubidium <rubidium@openttd.org> parents: 6768 diff changeset	815 * tram tracks must be removed before the road bits. */
4cc8ebb6279d (svn r10053) -Fix: could not clear a level-crossing tile with tram tracks. rubidium <rubidium@openttd.org> parents: 6768 diff changeset	816 for (RoadType rt = ROADTYPE_HWAY; rt >= ROADTYPE_ROAD; rt--) {
4cc8ebb6279d (svn r10053) -Fix: could not clear a level-crossing tile with tram tracks. rubidium <rubidium@openttd.org> parents: 6768 diff changeset	817 if (HASBIT(rts, rt)) {
6943 fd42cb9816c6 (svn r10197) -Codechange: replace int32 with CommandCost where appropriate. rubidium <rubidium@openttd.org> parents: 6857 diff changeset	818 CommandCost tmp_ret = DoCommand(tile, 1 << 6 \| rt << 4 \| GetCrossingRoadBits(tile), 0, flags, CMD_REMOVE_ROAD);
6814 4cc8ebb6279d (svn r10053) -Fix: could not clear a level-crossing tile with tram tracks. rubidium <rubidium@openttd.org> parents: 6768 diff changeset	819 if (CmdFailed(tmp_ret)) return tmp_ret;
4cc8ebb6279d (svn r10053) -Fix: could not clear a level-crossing tile with tram tracks. rubidium <rubidium@openttd.org> parents: 6768 diff changeset	820 ret += tmp_ret;
4cc8ebb6279d (svn r10053) -Fix: could not clear a level-crossing tile with tram tracks. rubidium <rubidium@openttd.org> parents: 6768 diff changeset	821 }
4cc8ebb6279d (svn r10053) -Fix: could not clear a level-crossing tile with tram tracks. rubidium <rubidium@openttd.org> parents: 6768 diff changeset	822 }
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
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	824 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	825 DoCommand(tile, 0, 0, flags, CMD_LANDSCAPE_CLEAR);
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	826 }
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	827 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	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 default:
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	831 case ROAD_TILE_DEPOT:
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	832 if (flags & DC_AUTO) {
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	833 return_cmd_error(STR_2004_BUILDING_MUST_BE_DEMOLISHED);
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	834 }
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	835 return RemoveRoadDepot(tile, flags);
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	836 }
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	837 }
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	838
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	839
6248 0789677a15a0 (svn r9051) -Codechange: typedef [enum\|struct] Y {} X; -> [enum\|struct] X {}; rubidium <rubidium@openttd.org> parents: 6172 diff changeset	840 struct DrawRoadTileStruct {
5584 4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	841 uint16 image;
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	842 byte subcoord_x;
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	843 byte subcoord_y;
6248 0789677a15a0 (svn r9051) -Codechange: typedef [enum\|struct] Y {} X; -> [enum\|struct] X {}; rubidium <rubidium@openttd.org> parents: 6172 diff changeset	844 };
5584 4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	845
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	846 #include "table/road_land.h"
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	847
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 uint GetRoadFoundation(Slope tileh, RoadBits bits)
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	850 {
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	851 uint i;
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	852
6393 ffd35446c110 (svn r9523) -Cleanup: doxygen changes. Time to take care of "R" belugas <belugas@openttd.org> parents: 6368 diff changeset	853 /* normal level sloped building */
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 if (!IsSteepSlope(tileh) &&
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	855 (~_valid_tileh_slopes_road[1][tileh] & 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	856 return tileh;
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
6393 ffd35446c110 (svn r9523) -Cleanup: doxygen changes. Time to take care of "R" belugas <belugas@openttd.org> parents: 6368 diff changeset	859 /* inclined sloped building */
5584 4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	860 switch (bits) {
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	861 case ROAD_X: i = 0; break;
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	862 case ROAD_Y: i = 1; break;
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	863 default: return 0;
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	864 }
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	865 switch (tileh) {
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	866 case SLOPE_W:
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	867 case SLOPE_STEEP_W: i += 0; break;
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	868 case SLOPE_S:
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	869 case SLOPE_STEEP_S: i += 2; break;
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	870 case SLOPE_E:
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	871 case SLOPE_STEEP_E: i += 4; break;
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	872 case SLOPE_N:
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	873 case SLOPE_STEEP_N: i += 6; break;
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	874 default: return 0;
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	875 }
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	876 return i + 15;
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	877 }
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	878
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	879 const byte _road_sloped_sprites[14] = {
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	880 0, 0, 2, 0,
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	881 0, 1, 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	882 3, 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	883 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	884 };
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 /**
6541 b6b454522d0b (svn r9730) -Feature: [NewGRF] Add support for miscellaneous grf feature bit 1 - paved roads on desert tiles. maedhros <maedhros@openttd.org> parents: 6491 diff changeset	887 * Whether to draw unpaved roads regardless of the town zone.
b6b454522d0b (svn r9730) -Feature: [NewGRF] Add support for miscellaneous grf feature bit 1 - paved roads on desert tiles. maedhros <maedhros@openttd.org> parents: 6491 diff changeset	888 * By default, OpenTTD always draws roads as unpaved if they are on a desert
b6b454522d0b (svn r9730) -Feature: [NewGRF] Add support for miscellaneous grf feature bit 1 - paved roads on desert tiles. maedhros <maedhros@openttd.org> parents: 6491 diff changeset	889 * tile or above the snowline. Newgrf files, however, can set a bit that allows
b6b454522d0b (svn r9730) -Feature: [NewGRF] Add support for miscellaneous grf feature bit 1 - paved roads on desert tiles. maedhros <maedhros@openttd.org> parents: 6491 diff changeset	890 * paved roads to be built on desert tiles as they would be on grassy tiles.
b6b454522d0b (svn r9730) -Feature: [NewGRF] Add support for miscellaneous grf feature bit 1 - paved roads on desert tiles. maedhros <maedhros@openttd.org> parents: 6491 diff changeset	891 *
b6b454522d0b (svn r9730) -Feature: [NewGRF] Add support for miscellaneous grf feature bit 1 - paved roads on desert tiles. maedhros <maedhros@openttd.org> parents: 6491 diff changeset	892 * @param tile The tile the road is on
b6b454522d0b (svn r9730) -Feature: [NewGRF] Add support for miscellaneous grf feature bit 1 - paved roads on desert tiles. maedhros <maedhros@openttd.org> parents: 6491 diff changeset	893 * @param roadside What sort of road this is
b6b454522d0b (svn r9730) -Feature: [NewGRF] Add support for miscellaneous grf feature bit 1 - paved roads on desert tiles. maedhros <maedhros@openttd.org> parents: 6491 diff changeset	894 * @return True if the road should be drawn unpaved regardless of the roadside.
b6b454522d0b (svn r9730) -Feature: [NewGRF] Add support for miscellaneous grf feature bit 1 - paved roads on desert tiles. maedhros <maedhros@openttd.org> parents: 6491 diff changeset	895 */
b6b454522d0b (svn r9730) -Feature: [NewGRF] Add support for miscellaneous grf feature bit 1 - paved roads on desert tiles. maedhros <maedhros@openttd.org> parents: 6491 diff changeset	896 static bool AlwaysDrawUnpavedRoads(TileIndex tile, Roadside roadside)
b6b454522d0b (svn r9730) -Feature: [NewGRF] Add support for miscellaneous grf feature bit 1 - paved roads on desert tiles. maedhros <maedhros@openttd.org> parents: 6491 diff changeset	897 {
b6b454522d0b (svn r9730) -Feature: [NewGRF] Add support for miscellaneous grf feature bit 1 - paved roads on desert tiles. maedhros <maedhros@openttd.org> parents: 6491 diff changeset	898 return (IsOnSnow(tile) &&
b6b454522d0b (svn r9730) -Feature: [NewGRF] Add support for miscellaneous grf feature bit 1 - paved roads on desert tiles. maedhros <maedhros@openttd.org> parents: 6491 diff changeset	899 !(_opt.landscape == LT_TROPIC && HasGrfMiscBit(GMB_DESERT_PAVED_ROADS) &&
b6b454522d0b (svn r9730) -Feature: [NewGRF] Add support for miscellaneous grf feature bit 1 - paved roads on desert tiles. maedhros <maedhros@openttd.org> parents: 6491 diff changeset	900 roadside != ROADSIDE_BARREN && roadside != ROADSIDE_GRASS && roadside != ROADSIDE_GRASS_ROAD_WORKS));
b6b454522d0b (svn r9730) -Feature: [NewGRF] Add support for miscellaneous grf feature bit 1 - paved roads on desert tiles. maedhros <maedhros@openttd.org> parents: 6491 diff changeset	901 }
b6b454522d0b (svn r9730) -Feature: [NewGRF] Add support for miscellaneous grf feature bit 1 - paved roads on desert tiles. maedhros <maedhros@openttd.org> parents: 6491 diff changeset	902
b6b454522d0b (svn r9730) -Feature: [NewGRF] Add support for miscellaneous grf feature bit 1 - paved roads on desert tiles. maedhros <maedhros@openttd.org> parents: 6491 diff changeset	903 /**
6691 d2fb32d942f7 (svn r9923) -Add: support for Action 0 Road vehicles, property 1C, bit 0. rubidium <rubidium@openttd.org> parents: 6689 diff changeset	904 * Draws the catenary for the given tile
d2fb32d942f7 (svn r9923) -Add: support for Action 0 Road vehicles, property 1C, bit 0. rubidium <rubidium@openttd.org> parents: 6689 diff changeset	905 * @param ti information about the tile (slopes, height etc)
d2fb32d942f7 (svn r9923) -Add: support for Action 0 Road vehicles, property 1C, bit 0. rubidium <rubidium@openttd.org> parents: 6689 diff changeset	906 * @param tram the roadbits for the tram
d2fb32d942f7 (svn r9923) -Add: support for Action 0 Road vehicles, property 1C, bit 0. rubidium <rubidium@openttd.org> parents: 6689 diff changeset	907 */
d2fb32d942f7 (svn r9923) -Add: support for Action 0 Road vehicles, property 1C, bit 0. rubidium <rubidium@openttd.org> parents: 6689 diff changeset	908 void DrawTramCatenary(TileInfo *ti, RoadBits tram)
d2fb32d942f7 (svn r9923) -Add: support for Action 0 Road vehicles, property 1C, bit 0. rubidium <rubidium@openttd.org> parents: 6689 diff changeset	909 {
d2fb32d942f7 (svn r9923) -Add: support for Action 0 Road vehicles, property 1C, bit 0. rubidium <rubidium@openttd.org> parents: 6689 diff changeset	910 /* Don't draw the catenary under a low bridge */
d2fb32d942f7 (svn r9923) -Add: support for Action 0 Road vehicles, property 1C, bit 0. rubidium <rubidium@openttd.org> parents: 6689 diff changeset	911 if (MayHaveBridgeAbove(ti->tile) && IsBridgeAbove(ti->tile) && !HASBIT(_transparent_opt, TO_BUILDINGS)) {
d2fb32d942f7 (svn r9923) -Add: support for Action 0 Road vehicles, property 1C, bit 0. rubidium <rubidium@openttd.org> parents: 6689 diff changeset	912 uint height = GetBridgeHeight(GetNorthernBridgeEnd(ti->tile));
d2fb32d942f7 (svn r9923) -Add: support for Action 0 Road vehicles, property 1C, bit 0. rubidium <rubidium@openttd.org> parents: 6689 diff changeset	913
6699 323f494a7076 (svn r9931) -Fix: some glitches with catenary and bridges. rubidium <rubidium@openttd.org> parents: 6697 diff changeset	914 if (height <= GetTileMaxZ(ti->tile) + TILE_HEIGHT) return;
6691 d2fb32d942f7 (svn r9923) -Add: support for Action 0 Road vehicles, property 1C, bit 0. rubidium <rubidium@openttd.org> parents: 6689 diff changeset	915 }
d2fb32d942f7 (svn r9923) -Add: support for Action 0 Road vehicles, property 1C, bit 0. rubidium <rubidium@openttd.org> parents: 6689 diff changeset	916
d2fb32d942f7 (svn r9923) -Add: support for Action 0 Road vehicles, property 1C, bit 0. rubidium <rubidium@openttd.org> parents: 6689 diff changeset	917 SpriteID front;
d2fb32d942f7 (svn r9923) -Add: support for Action 0 Road vehicles, property 1C, bit 0. rubidium <rubidium@openttd.org> parents: 6689 diff changeset	918 SpriteID back;
d2fb32d942f7 (svn r9923) -Add: support for Action 0 Road vehicles, property 1C, bit 0. rubidium <rubidium@openttd.org> parents: 6689 diff changeset	919
d2fb32d942f7 (svn r9923) -Add: support for Action 0 Road vehicles, property 1C, bit 0. rubidium <rubidium@openttd.org> parents: 6689 diff changeset	920 if (ti->tileh != SLOPE_FLAT) {
d2fb32d942f7 (svn r9923) -Add: support for Action 0 Road vehicles, property 1C, bit 0. rubidium <rubidium@openttd.org> parents: 6689 diff changeset	921 back = SPR_TRAMWAY_BACK_WIRES_SLOPED + _road_sloped_sprites[ti->tileh - 1];
d2fb32d942f7 (svn r9923) -Add: support for Action 0 Road vehicles, property 1C, bit 0. rubidium <rubidium@openttd.org> parents: 6689 diff changeset	922 front = SPR_TRAMWAY_FRONT_WIRES_SLOPED + _road_sloped_sprites[ti->tileh - 1];
d2fb32d942f7 (svn r9923) -Add: support for Action 0 Road vehicles, property 1C, bit 0. rubidium <rubidium@openttd.org> parents: 6689 diff changeset	923 } else {
d2fb32d942f7 (svn r9923) -Add: support for Action 0 Road vehicles, property 1C, bit 0. rubidium <rubidium@openttd.org> parents: 6689 diff changeset	924 back = SPR_TRAMWAY_BASE + _road_backpole_sprites_1[tram];
d2fb32d942f7 (svn r9923) -Add: support for Action 0 Road vehicles, property 1C, bit 0. rubidium <rubidium@openttd.org> parents: 6689 diff changeset	925 front = SPR_TRAMWAY_BASE + _road_frontwire_sprites_1[tram];
d2fb32d942f7 (svn r9923) -Add: support for Action 0 Road vehicles, property 1C, bit 0. rubidium <rubidium@openttd.org> parents: 6689 diff changeset	926 }
d2fb32d942f7 (svn r9923) -Add: support for Action 0 Road vehicles, property 1C, bit 0. rubidium <rubidium@openttd.org> parents: 6689 diff changeset	927
d2fb32d942f7 (svn r9923) -Add: support for Action 0 Road vehicles, property 1C, bit 0. rubidium <rubidium@openttd.org> parents: 6689 diff changeset	928 SpriteID pal = PAL_NONE;
d2fb32d942f7 (svn r9923) -Add: support for Action 0 Road vehicles, property 1C, bit 0. rubidium <rubidium@openttd.org> parents: 6689 diff changeset	929 if (HASBIT(_transparent_opt, TO_BUILDINGS)) {
d2fb32d942f7 (svn r9923) -Add: support for Action 0 Road vehicles, property 1C, bit 0. rubidium <rubidium@openttd.org> parents: 6689 diff changeset	930 SETBIT(front, PALETTE_MODIFIER_TRANSPARENT);
d2fb32d942f7 (svn r9923) -Add: support for Action 0 Road vehicles, property 1C, bit 0. rubidium <rubidium@openttd.org> parents: 6689 diff changeset	931 SETBIT(back, PALETTE_MODIFIER_TRANSPARENT);
d2fb32d942f7 (svn r9923) -Add: support for Action 0 Road vehicles, property 1C, bit 0. rubidium <rubidium@openttd.org> parents: 6689 diff changeset	932 pal = PALETTE_TO_TRANSPARENT;
d2fb32d942f7 (svn r9923) -Add: support for Action 0 Road vehicles, property 1C, bit 0. rubidium <rubidium@openttd.org> parents: 6689 diff changeset	933 }
d2fb32d942f7 (svn r9923) -Add: support for Action 0 Road vehicles, property 1C, bit 0. rubidium <rubidium@openttd.org> parents: 6689 diff changeset	934
6699 323f494a7076 (svn r9931) -Fix: some glitches with catenary and bridges. rubidium <rubidium@openttd.org> parents: 6697 diff changeset	935 AddSortableSpriteToDraw(back, pal, ti->x, ti->y, 16, 16, 0x1F, ti->z);
323f494a7076 (svn r9931) -Fix: some glitches with catenary and bridges. rubidium <rubidium@openttd.org> parents: 6697 diff changeset	936 AddSortableSpriteToDraw(front, pal, ti->x, ti->y, 16, 16, 0x1F, ti->z);
6691 d2fb32d942f7 (svn r9923) -Add: support for Action 0 Road vehicles, property 1C, bit 0. rubidium <rubidium@openttd.org> parents: 6689 diff changeset	937 }
d2fb32d942f7 (svn r9923) -Add: support for Action 0 Road vehicles, property 1C, bit 0. rubidium <rubidium@openttd.org> parents: 6689 diff changeset	938
d2fb32d942f7 (svn r9923) -Add: support for Action 0 Road vehicles, property 1C, bit 0. rubidium <rubidium@openttd.org> parents: 6689 diff changeset	939 /**
6764 6ce333c8fd7e (svn r9999) -Feature: make it possible to disallow busses and lorries to go a specific way on straight pieces of road. rubidium <rubidium@openttd.org> parents: 6761 diff changeset	940 * Draws details on/around the road
6ce333c8fd7e (svn r9999) -Feature: make it possible to disallow busses and lorries to go a specific way on straight pieces of road. rubidium <rubidium@openttd.org> parents: 6761 diff changeset	941 * @param img the sprite to draw
6ce333c8fd7e (svn r9999) -Feature: make it possible to disallow busses and lorries to go a specific way on straight pieces of road. rubidium <rubidium@openttd.org> parents: 6761 diff changeset	942 * @param ti the tile to draw on
6ce333c8fd7e (svn r9999) -Feature: make it possible to disallow busses and lorries to go a specific way on straight pieces of road. rubidium <rubidium@openttd.org> parents: 6761 diff changeset	943 * @param dx the offset from the top of the BB of the tile
6ce333c8fd7e (svn r9999) -Feature: make it possible to disallow busses and lorries to go a specific way on straight pieces of road. rubidium <rubidium@openttd.org> parents: 6761 diff changeset	944 * @param dy the offset from the top of the BB of the tile
6ce333c8fd7e (svn r9999) -Feature: make it possible to disallow busses and lorries to go a specific way on straight pieces of road. rubidium <rubidium@openttd.org> parents: 6761 diff changeset	945 * @param h the height of the sprite to draw
6ce333c8fd7e (svn r9999) -Feature: make it possible to disallow busses and lorries to go a specific way on straight pieces of road. rubidium <rubidium@openttd.org> parents: 6761 diff changeset	946 */
6ce333c8fd7e (svn r9999) -Feature: make it possible to disallow busses and lorries to go a specific way on straight pieces of road. rubidium <rubidium@openttd.org> parents: 6761 diff changeset	947 static void DrawRoadDetail(SpriteID img, TileInfo *ti, int dx, int dy, int h)
6ce333c8fd7e (svn r9999) -Feature: make it possible to disallow busses and lorries to go a specific way on straight pieces of road. rubidium <rubidium@openttd.org> parents: 6761 diff changeset	948 {
6ce333c8fd7e (svn r9999) -Feature: make it possible to disallow busses and lorries to go a specific way on straight pieces of road. rubidium <rubidium@openttd.org> parents: 6761 diff changeset	949 int x = ti->x \| dx;
6ce333c8fd7e (svn r9999) -Feature: make it possible to disallow busses and lorries to go a specific way on straight pieces of road. rubidium <rubidium@openttd.org> parents: 6761 diff changeset	950 int y = ti->y \| dy;
6ce333c8fd7e (svn r9999) -Feature: make it possible to disallow busses and lorries to go a specific way on straight pieces of road. rubidium <rubidium@openttd.org> parents: 6761 diff changeset	951 byte z = ti->z;
6ce333c8fd7e (svn r9999) -Feature: make it possible to disallow busses and lorries to go a specific way on straight pieces of road. rubidium <rubidium@openttd.org> parents: 6761 diff changeset	952 if (ti->tileh != SLOPE_FLAT) z = GetSlopeZ(x, y);
6ce333c8fd7e (svn r9999) -Feature: make it possible to disallow busses and lorries to go a specific way on straight pieces of road. rubidium <rubidium@openttd.org> parents: 6761 diff changeset	953 AddSortableSpriteToDraw(img, PAL_NONE, x, y, 2, 2, h, z);
6ce333c8fd7e (svn r9999) -Feature: make it possible to disallow busses and lorries to go a specific way on straight pieces of road. rubidium <rubidium@openttd.org> parents: 6761 diff changeset	954 }
6ce333c8fd7e (svn r9999) -Feature: make it possible to disallow busses and lorries to go a specific way on straight pieces of road. rubidium <rubidium@openttd.org> parents: 6761 diff changeset	955
6ce333c8fd7e (svn r9999) -Feature: make it possible to disallow busses and lorries to go a specific way on straight pieces of road. rubidium <rubidium@openttd.org> parents: 6761 diff changeset	956 /**
5584 4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	957 * Draw ground sprite and road pieces
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	958 * @param ti TileInfo
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	959 */
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	960 static void DrawRoadBits(TileInfo* ti)
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	961 {
6661 5850ac8865e8 (svn r9892) -Codechange: lots of ground work for allowing multiple types of "road" with multiple owners on a single tile. rubidium <rubidium@openttd.org> parents: 6626 diff changeset	962 RoadBits road = GetRoadBits(ti->tile, ROADTYPE_ROAD);
6691 d2fb32d942f7 (svn r9923) -Add: support for Action 0 Road vehicles, property 1C, bit 0. rubidium <rubidium@openttd.org> parents: 6689 diff changeset	963 RoadBits tram = GetRoadBits(ti->tile, ROADTYPE_TRAM);
d2fb32d942f7 (svn r9923) -Add: support for Action 0 Road vehicles, property 1C, bit 0. rubidium <rubidium@openttd.org> parents: 6689 diff changeset	964
5584 4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	965 const DrawRoadTileStruct *drts;
5668 3d6d9bff3dd8 (svn r8128) -Codechange: Split sprite and palette remap into separate 32 bit values. peter1138 <peter1138@openttd.org> parents: 5643 diff changeset	966 SpriteID image = 0;
3d6d9bff3dd8 (svn r8128) -Codechange: Split sprite and palette remap into separate 32 bit values. peter1138 <peter1138@openttd.org> parents: 5643 diff changeset	967 SpriteID pal = PAL_NONE;
5584 4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	968 Roadside roadside;
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	969
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	970 if (ti->tileh != SLOPE_FLAT) {
6691 d2fb32d942f7 (svn r9923) -Add: support for Action 0 Road vehicles, property 1C, bit 0. rubidium <rubidium@openttd.org> parents: 6689 diff changeset	971 int foundation = GetRoadFoundation(ti->tileh, road \| tram);
5584 4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	972
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	973 if (foundation != 0) DrawFoundation(ti, foundation);
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	974
6393 ffd35446c110 (svn r9523) -Cleanup: doxygen changes. Time to take care of "R" belugas <belugas@openttd.org> parents: 6368 diff changeset	975 /* DrawFoundation() modifies ti.
ffd35446c110 (svn r9523) -Cleanup: doxygen changes. Time to take care of "R" belugas <belugas@openttd.org> parents: 6368 diff changeset	976 * Default sloped sprites.. */
5584 4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	977 if (ti->tileh != SLOPE_FLAT) image = _road_sloped_sprites[ti->tileh - 1] + 0x53F;
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	978 }
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	979
6691 d2fb32d942f7 (svn r9923) -Add: support for Action 0 Road vehicles, property 1C, bit 0. rubidium <rubidium@openttd.org> parents: 6689 diff changeset	980 if (image == 0) image = _road_tile_sprites_1[road != ROAD_NONE ? road : tram];
5584 4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	981
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	982 roadside = GetRoadside(ti->tile);
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	983
6541 b6b454522d0b (svn r9730) -Feature: [NewGRF] Add support for miscellaneous grf feature bit 1 - paved roads on desert tiles. maedhros <maedhros@openttd.org> parents: 6491 diff changeset	984 if (AlwaysDrawUnpavedRoads(ti->tile, roadside)) {
5584 4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	985 image += 19;
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	986 } else {
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	987 switch (roadside) {
5668 3d6d9bff3dd8 (svn r8128) -Codechange: Split sprite and palette remap into separate 32 bit values. peter1138 <peter1138@openttd.org> parents: 5643 diff changeset	988 case ROADSIDE_BARREN: pal = PALETTE_TO_BARE_LAND; 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	989 case ROADSIDE_GRASS: break;
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	990 case ROADSIDE_GRASS_ROAD_WORKS: break;
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	991 default: image -= 19; break; // Paved
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	992 }
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	993 }
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	994
5668 3d6d9bff3dd8 (svn r8128) -Codechange: Split sprite and palette remap into separate 32 bit values. peter1138 <peter1138@openttd.org> parents: 5643 diff changeset	995 DrawGroundSprite(image, pal);
5584 4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	996
6764 6ce333c8fd7e (svn r9999) -Feature: make it possible to disallow busses and lorries to go a specific way on straight pieces of road. rubidium <rubidium@openttd.org> parents: 6761 diff changeset	997 if (road != ROAD_NONE) {
6ce333c8fd7e (svn r9999) -Feature: make it possible to disallow busses and lorries to go a specific way on straight pieces of road. rubidium <rubidium@openttd.org> parents: 6761 diff changeset	998 DisallowedRoadDirections drd = GetDisallowedRoadDirections(ti->tile);
6ce333c8fd7e (svn r9999) -Feature: make it possible to disallow busses and lorries to go a specific way on straight pieces of road. rubidium <rubidium@openttd.org> parents: 6761 diff changeset	999 if (drd != DRD_NONE) {
6ce333c8fd7e (svn r9999) -Feature: make it possible to disallow busses and lorries to go a specific way on straight pieces of road. rubidium <rubidium@openttd.org> parents: 6761 diff changeset	1000 DrawRoadDetail(SPR_ONEWAY_BASE + drd - 1 + ((road == ROAD_X) ? 0 : 3), ti, 8, 8, 0);
6ce333c8fd7e (svn r9999) -Feature: make it possible to disallow busses and lorries to go a specific way on straight pieces of road. rubidium <rubidium@openttd.org> parents: 6761 diff changeset	1001 }
6ce333c8fd7e (svn r9999) -Feature: make it possible to disallow busses and lorries to go a specific way on straight pieces of road. rubidium <rubidium@openttd.org> parents: 6761 diff changeset	1002 }
6ce333c8fd7e (svn r9999) -Feature: make it possible to disallow busses and lorries to go a specific way on straight pieces of road. rubidium <rubidium@openttd.org> parents: 6761 diff changeset	1003
6691 d2fb32d942f7 (svn r9923) -Add: support for Action 0 Road vehicles, property 1C, bit 0. rubidium <rubidium@openttd.org> parents: 6689 diff changeset	1004 /* For tram we overlay the road graphics with either tram tracks only
d2fb32d942f7 (svn r9923) -Add: support for Action 0 Road vehicles, property 1C, bit 0. rubidium <rubidium@openttd.org> parents: 6689 diff changeset	1005 * (when there is actual road beneath the trams) or with tram tracks
d2fb32d942f7 (svn r9923) -Add: support for Action 0 Road vehicles, property 1C, bit 0. rubidium <rubidium@openttd.org> parents: 6689 diff changeset	1006 * and some dirts which hides the road graphics */
d2fb32d942f7 (svn r9923) -Add: support for Action 0 Road vehicles, property 1C, bit 0. rubidium <rubidium@openttd.org> parents: 6689 diff changeset	1007 if (tram != ROAD_NONE) {
d2fb32d942f7 (svn r9923) -Add: support for Action 0 Road vehicles, property 1C, bit 0. rubidium <rubidium@openttd.org> parents: 6689 diff changeset	1008 if (ti->tileh != SLOPE_FLAT) {
d2fb32d942f7 (svn r9923) -Add: support for Action 0 Road vehicles, property 1C, bit 0. rubidium <rubidium@openttd.org> parents: 6689 diff changeset	1009 image = _road_sloped_sprites[ti->tileh - 1] + SPR_TRAMWAY_SLOPED_OFFSET;
d2fb32d942f7 (svn r9923) -Add: support for Action 0 Road vehicles, property 1C, bit 0. rubidium <rubidium@openttd.org> parents: 6689 diff changeset	1010 } else {
d2fb32d942f7 (svn r9923) -Add: support for Action 0 Road vehicles, property 1C, bit 0. rubidium <rubidium@openttd.org> parents: 6689 diff changeset	1011 image = _road_tile_sprites_1[tram] - SPR_ROAD_Y;
d2fb32d942f7 (svn r9923) -Add: support for Action 0 Road vehicles, property 1C, bit 0. rubidium <rubidium@openttd.org> parents: 6689 diff changeset	1012 }
d2fb32d942f7 (svn r9923) -Add: support for Action 0 Road vehicles, property 1C, bit 0. rubidium <rubidium@openttd.org> parents: 6689 diff changeset	1013 image += (road == ROAD_NONE) ? SPR_TRAMWAY_TRAM : SPR_TRAMWAY_OVERLAY;
d2fb32d942f7 (svn r9923) -Add: support for Action 0 Road vehicles, property 1C, bit 0. rubidium <rubidium@openttd.org> parents: 6689 diff changeset	1014 DrawGroundSprite(image, pal);
d2fb32d942f7 (svn r9923) -Add: support for Action 0 Road vehicles, property 1C, bit 0. rubidium <rubidium@openttd.org> parents: 6689 diff changeset	1015 }
d2fb32d942f7 (svn r9923) -Add: support for Action 0 Road vehicles, property 1C, bit 0. rubidium <rubidium@openttd.org> parents: 6689 diff changeset	1016
5584 4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	1017 if (HasRoadWorks(ti->tile)) {
6393 ffd35446c110 (svn r9523) -Cleanup: doxygen changes. Time to take care of "R" belugas <belugas@openttd.org> parents: 6368 diff changeset	1018 /* Road works */
6691 d2fb32d942f7 (svn r9923) -Add: support for Action 0 Road vehicles, property 1C, bit 0. rubidium <rubidium@openttd.org> parents: 6689 diff changeset	1019 DrawGroundSprite((road \| tram) & ROAD_X ? SPR_EXCAVATION_X : SPR_EXCAVATION_Y, PAL_NONE);
5584 4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	1020 return;
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	1021 }
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	1022
6691 d2fb32d942f7 (svn r9923) -Add: support for Action 0 Road vehicles, property 1C, bit 0. rubidium <rubidium@openttd.org> parents: 6689 diff changeset	1023 if (tram != ROAD_NONE) DrawTramCatenary(ti, tram);
d2fb32d942f7 (svn r9923) -Add: support for Action 0 Road vehicles, property 1C, bit 0. rubidium <rubidium@openttd.org> parents: 6689 diff changeset	1024
6393 ffd35446c110 (svn r9523) -Cleanup: doxygen changes. Time to take care of "R" belugas <belugas@openttd.org> parents: 6368 diff changeset	1025 /* Return if full detail is disabled, or we are zoomed fully out. */
6626 f940341a80f0 (svn r9846) -Codechange: introduced ZOOM_LVL_MIN and ZOOM_LVL_MAX for the obvious reasons truelight <truelight@openttd.org> parents: 6624 diff changeset	1026 if (!HASBIT(_display_opt, DO_FULL_DETAIL) \|\| _cur_dpi->zoom > ZOOM_LVL_DETAIL) 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	1027
6393 ffd35446c110 (svn r9523) -Cleanup: doxygen changes. Time to take care of "R" belugas <belugas@openttd.org> parents: 6368 diff changeset	1028 /* Draw extra details. */
5584 4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	1029 for (drts = _road_display_table[roadside][road]; drts->image != 0; drts++) {
6764 6ce333c8fd7e (svn r9999) -Feature: make it possible to disallow busses and lorries to go a specific way on straight pieces of road. rubidium <rubidium@openttd.org> parents: 6761 diff changeset	1030 DrawRoadDetail(drts->image, ti, drts->subcoord_x, drts->subcoord_y, 0x10);
5584 4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	1031 }
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	1032 }
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	1033
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	1034 static void DrawTile_Road(TileInfo *ti)
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	1035 {
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	1036 switch (GetRoadTileType(ti->tile)) {
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	1037 case ROAD_TILE_NORMAL:
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	1038 DrawRoadBits(ti);
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	1039 break;
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	1040
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	1041 case ROAD_TILE_CROSSING: {
5668 3d6d9bff3dd8 (svn r8128) -Codechange: Split sprite and palette remap into separate 32 bit values. peter1138 <peter1138@openttd.org> parents: 5643 diff changeset	1042 SpriteID image;
3d6d9bff3dd8 (svn r8128) -Codechange: Split sprite and palette remap into separate 32 bit values. peter1138 <peter1138@openttd.org> parents: 5643 diff changeset	1043 SpriteID pal = PAL_NONE;
6541 b6b454522d0b (svn r9730) -Feature: [NewGRF] Add support for miscellaneous grf feature bit 1 - paved roads on desert tiles. maedhros <maedhros@openttd.org> parents: 6491 diff changeset	1044 Roadside roadside = GetRoadside(ti->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	1045
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	1046 if (ti->tileh != SLOPE_FLAT) DrawFoundation(ti, ti->tileh);
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	1047
6172 b3b8cbc5e854 (svn r8935) -Codechange: unification of track type between road and rail tiles, unification of ground type between normal rail tiles and depots/waypoints and removing the need for RailTileSubType. rubidium <rubidium@openttd.org> parents: 6160 diff changeset	1048 image = GetRailTypeInfo(GetRailType(ti->tile))->base_sprites.crossing;
5584 4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	1049
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	1050 if (GetCrossingRoadAxis(ti->tile) == AXIS_X) image++;
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	1051 if (IsCrossingBarred(ti->tile)) image += 2;
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	1052
6541 b6b454522d0b (svn r9730) -Feature: [NewGRF] Add support for miscellaneous grf feature bit 1 - paved roads on desert tiles. maedhros <maedhros@openttd.org> parents: 6491 diff changeset	1053 if (AlwaysDrawUnpavedRoads(ti->tile, roadside)) {
5584 4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	1054 image += 8;
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	1055 } else {
6541 b6b454522d0b (svn r9730) -Feature: [NewGRF] Add support for miscellaneous grf feature bit 1 - paved roads on desert tiles. maedhros <maedhros@openttd.org> parents: 6491 diff changeset	1056 switch (roadside) {
5668 3d6d9bff3dd8 (svn r8128) -Codechange: Split sprite and palette remap into separate 32 bit values. peter1138 <peter1138@openttd.org> parents: 5643 diff changeset	1057 case ROADSIDE_BARREN: pal = PALETTE_TO_BARE_LAND; 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	1058 case ROADSIDE_GRASS: break;
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	1059 default: image += 4; break; // Paved
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	1060 }
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	1061 }
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	1062
5668 3d6d9bff3dd8 (svn r8128) -Codechange: Split sprite and palette remap into separate 32 bit values. peter1138 <peter1138@openttd.org> parents: 5643 diff changeset	1063 DrawGroundSprite(image, pal);
6697 398474f3706e (svn r9929) -Fix [FS#803]: fix several drawing issues. rubidium <rubidium@openttd.org> parents: 6691 diff changeset	1064 if (HASBIT(GetRoadTypes(ti->tile), ROADTYPE_TRAM)) {
398474f3706e (svn r9929) -Fix [FS#803]: fix several drawing issues. rubidium <rubidium@openttd.org> parents: 6691 diff changeset	1065 DrawGroundSprite(SPR_TRAMWAY_OVERLAY + (GetCrossingRoadAxis(ti->tile) ^ 1), pal);
398474f3706e (svn r9929) -Fix [FS#803]: fix several drawing issues. rubidium <rubidium@openttd.org> parents: 6691 diff changeset	1066 DrawTramCatenary(ti, GetCrossingRoadBits(ti->tile));
398474f3706e (svn r9929) -Fix [FS#803]: fix several drawing issues. rubidium <rubidium@openttd.org> parents: 6691 diff changeset	1067 }
6172 b3b8cbc5e854 (svn r8935) -Codechange: unification of track type between road and rail tiles, unification of ground type between normal rail tiles and depots/waypoints and removing the need for RailTileSubType. rubidium <rubidium@openttd.org> parents: 6160 diff changeset	1068 if (GetRailType(ti->tile) == RAILTYPE_ELECTRIC) DrawCatenary(ti);
5584 4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	1069 break;
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	1070 }
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	1071
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	1072 default:
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	1073 case ROAD_TILE_DEPOT: {
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	1074 const DrawTileSprites* dts;
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	1075 const DrawTileSeqStruct* dtss;
5668 3d6d9bff3dd8 (svn r8128) -Codechange: Split sprite and palette remap into separate 32 bit values. peter1138 <peter1138@openttd.org> parents: 5643 diff changeset	1076 SpriteID palette;
5584 4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	1077
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	1078 if (ti->tileh != SLOPE_FLAT) DrawFoundation(ti, ti->tileh);
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	1079
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	1080 palette = PLAYER_SPRITE_COLOR(GetTileOwner(ti->tile));
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	1081
6691 d2fb32d942f7 (svn r9923) -Add: support for Action 0 Road vehicles, property 1C, bit 0. rubidium <rubidium@openttd.org> parents: 6689 diff changeset	1082 if (HASBIT(GetRoadTypes(ti->tile), ROADTYPE_TRAM)) {
d2fb32d942f7 (svn r9923) -Add: support for Action 0 Road vehicles, property 1C, bit 0. rubidium <rubidium@openttd.org> parents: 6689 diff changeset	1083 dts = &_tram_depot[GetRoadDepotDirection(ti->tile)];
d2fb32d942f7 (svn r9923) -Add: support for Action 0 Road vehicles, property 1C, bit 0. rubidium <rubidium@openttd.org> parents: 6689 diff changeset	1084 } else {
d2fb32d942f7 (svn r9923) -Add: support for Action 0 Road vehicles, property 1C, bit 0. rubidium <rubidium@openttd.org> parents: 6689 diff changeset	1085 dts = &_road_depot[GetRoadDepotDirection(ti->tile)];
d2fb32d942f7 (svn r9923) -Add: support for Action 0 Road vehicles, property 1C, bit 0. rubidium <rubidium@openttd.org> parents: 6689 diff changeset	1086 }
d2fb32d942f7 (svn r9923) -Add: support for Action 0 Road vehicles, property 1C, bit 0. rubidium <rubidium@openttd.org> parents: 6689 diff changeset	1087
5668 3d6d9bff3dd8 (svn r8128) -Codechange: Split sprite and palette remap into separate 32 bit values. peter1138 <peter1138@openttd.org> parents: 5643 diff changeset	1088 DrawGroundSprite(dts->ground_sprite, PAL_NONE);
5584 4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	1089
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	1090 for (dtss = dts->seq; dtss->image != 0; dtss++) {
5668 3d6d9bff3dd8 (svn r8128) -Codechange: Split sprite and palette remap into separate 32 bit values. peter1138 <peter1138@openttd.org> parents: 5643 diff changeset	1091 SpriteID image = dtss->image;
3d6d9bff3dd8 (svn r8128) -Codechange: Split sprite and palette remap into separate 32 bit values. peter1138 <peter1138@openttd.org> parents: 5643 diff changeset	1092 SpriteID pal;
5584 4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	1093
6427 2437ed7b277c (svn r9563) -Feature: Add more finer control to transparency options, including a new toolbar, accessible from the map menu or Ctrl X. Patch by Wolf01. peter1138 <peter1138@openttd.org> parents: 6406 diff changeset	1094 if (HASBIT(_transparent_opt, TO_BUILDINGS)) {
5668 3d6d9bff3dd8 (svn r8128) -Codechange: Split sprite and palette remap into separate 32 bit values. peter1138 <peter1138@openttd.org> parents: 5643 diff changeset	1095 SETBIT(image, PALETTE_MODIFIER_TRANSPARENT);
3d6d9bff3dd8 (svn r8128) -Codechange: Split sprite and palette remap into separate 32 bit values. peter1138 <peter1138@openttd.org> parents: 5643 diff changeset	1096 pal = PALETTE_TO_TRANSPARENT;
3d6d9bff3dd8 (svn r8128) -Codechange: Split sprite and palette remap into separate 32 bit values. peter1138 <peter1138@openttd.org> parents: 5643 diff changeset	1097 } else if (HASBIT(image, PALETTE_MODIFIER_COLOR)) {
3d6d9bff3dd8 (svn r8128) -Codechange: Split sprite and palette remap into separate 32 bit values. peter1138 <peter1138@openttd.org> parents: 5643 diff changeset	1098 pal = palette;
3d6d9bff3dd8 (svn r8128) -Codechange: Split sprite and palette remap into separate 32 bit values. peter1138 <peter1138@openttd.org> parents: 5643 diff changeset	1099 } else {
3d6d9bff3dd8 (svn r8128) -Codechange: Split sprite and palette remap into separate 32 bit values. peter1138 <peter1138@openttd.org> parents: 5643 diff changeset	1100 pal = PAL_NONE;
5584 4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	1101 }
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	1102
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	1103 AddSortableSpriteToDraw(
5668 3d6d9bff3dd8 (svn r8128) -Codechange: Split sprite and palette remap into separate 32 bit values. peter1138 <peter1138@openttd.org> parents: 5643 diff changeset	1104 image, pal,
5584 4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	1105 ti->x + dtss->delta_x, ti->y + dtss->delta_y,
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	1106 dtss->size_x, dtss->size_y,
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	1107 dtss->size_z, ti->z
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	1108 );
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	1109 }
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	1110 break;
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	1111 }
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	1112 }
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	1113 DrawBridgeMiddle(ti);
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	1114 }
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	1115
6666 61e17c4bac25 (svn r9897) -Codechange: prepare the toolbar for more road types. rubidium <rubidium@openttd.org> parents: 6662 diff changeset	1116 void DrawRoadDepotSprite(int x, int y, DiagDirection dir, RoadType rt)
5584 4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	1117 {
5668 3d6d9bff3dd8 (svn r8128) -Codechange: Split sprite and palette remap into separate 32 bit values. peter1138 <peter1138@openttd.org> parents: 5643 diff changeset	1118 SpriteID palette = PLAYER_SPRITE_COLOR(_local_player);
6691 d2fb32d942f7 (svn r9923) -Add: support for Action 0 Road vehicles, property 1C, bit 0. rubidium <rubidium@openttd.org> parents: 6689 diff changeset	1119 const DrawTileSprites* dts = (rt == ROADTYPE_TRAM) ? &_tram_depot[dir] : &_road_depot[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	1120 const DrawTileSeqStruct* dtss;
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	1121
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	1122 x += 33;
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	1123 y += 17;
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	1124
5668 3d6d9bff3dd8 (svn r8128) -Codechange: Split sprite and palette remap into separate 32 bit values. peter1138 <peter1138@openttd.org> parents: 5643 diff changeset	1125 DrawSprite(dts->ground_sprite, PAL_NONE, 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	1126
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	1127 for (dtss = dts->seq; dtss->image != 0; dtss++) {
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	1128 Point pt = RemapCoords(dtss->delta_x, dtss->delta_y, dtss->delta_z);
5668 3d6d9bff3dd8 (svn r8128) -Codechange: Split sprite and palette remap into separate 32 bit values. peter1138 <peter1138@openttd.org> parents: 5643 diff changeset	1129 SpriteID image = dtss->image;
5584 4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	1130
5668 3d6d9bff3dd8 (svn r8128) -Codechange: Split sprite and palette remap into separate 32 bit values. peter1138 <peter1138@openttd.org> parents: 5643 diff changeset	1131 DrawSprite(image, HASBIT(image, PALETTE_MODIFIER_COLOR) ? palette : PAL_NONE, x + pt.x, y + pt.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	1132 }
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	1133 }
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	1134
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	1135 static uint GetSlopeZ_Road(TileIndex tile, uint x, uint y)
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	1136 {
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	1137 uint z;
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	1138 Slope tileh = GetTileSlope(tile, &z);
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	1139
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	1140 if (tileh == SLOPE_FLAT) return z;
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	1141 if (GetRoadTileType(tile) == ROAD_TILE_NORMAL) {
6661 5850ac8865e8 (svn r9892) -Codechange: lots of ground work for allowing multiple types of "road" with multiple owners on a single tile. rubidium <rubidium@openttd.org> parents: 6626 diff changeset	1142 uint f = GetRoadFoundation(tileh, GetAllRoadBits(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	1143
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	1144 if (f != 0) {
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	1145 if (IsSteepSlope(tileh)) {
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	1146 z += TILE_HEIGHT;
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	1147 } else if (f < 15) {
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	1148 return z + TILE_HEIGHT; // leveled foundation
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	1149 }
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	1150 tileh = _inclined_tileh[f - 15]; // inclined foundation
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	1151 }
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	1152 return z + GetPartialZ(x & 0xF, y & 0xF, tileh);
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	1153 } else {
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	1154 return z + TILE_HEIGHT;
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	1155 }
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	1156 }
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	1157
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	1158 static Slope GetSlopeTileh_Road(TileIndex tile, Slope tileh)
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	1159 {
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	1160 if (tileh == SLOPE_FLAT) return SLOPE_FLAT;
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	1161 if (GetRoadTileType(tile) == ROAD_TILE_NORMAL) {
6661 5850ac8865e8 (svn r9892) -Codechange: lots of ground work for allowing multiple types of "road" with multiple owners on a single tile. rubidium <rubidium@openttd.org> parents: 6626 diff changeset	1162 uint f = GetRoadFoundation(tileh, GetAllRoadBits(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	1163
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	1164 if (f == 0) return tileh;
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	1165 if (f < 15) return SLOPE_FLAT; // leveled foundation
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	1166 return _inclined_tileh[f - 15]; // inclined foundation
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	1167 } else {
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	1168 return SLOPE_FLAT;
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	1169 }
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	1170 }
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	1171
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	1172 static void GetAcceptedCargo_Road(TileIndex tile, AcceptedCargo ac)
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	1173 {
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	1174 /* not used */
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	1175 }
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	1176
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	1177 static void AnimateTile_Road(TileIndex tile)
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	1178 {
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	1179 if (IsLevelCrossing(tile)) MarkTileDirtyByTile(tile);
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	1180 }
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	1181
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	1182
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	1183 static const Roadside _town_road_types[][2] = {
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	1184 { ROADSIDE_GRASS, ROADSIDE_GRASS },
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	1185 { ROADSIDE_PAVED, ROADSIDE_PAVED },
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	1186 { ROADSIDE_PAVED, ROADSIDE_PAVED },
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	1187 { ROADSIDE_TREES, ROADSIDE_TREES },
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	1188 { ROADSIDE_STREET_LIGHTS, ROADSIDE_PAVED }
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	1189 };
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	1190
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	1191 static const Roadside _town_road_types_2[][2] = {
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	1192 { ROADSIDE_GRASS, ROADSIDE_GRASS },
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	1193 { ROADSIDE_PAVED, ROADSIDE_PAVED },
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	1194 { ROADSIDE_STREET_LIGHTS, ROADSIDE_PAVED },
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	1195 { ROADSIDE_STREET_LIGHTS, ROADSIDE_PAVED },
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	1196 { ROADSIDE_STREET_LIGHTS, ROADSIDE_PAVED }
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	1197 };
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	1198
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	1199
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	1200 static void TileLoop_Road(TileIndex tile)
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	1201 {
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	1202 switch (_opt.landscape) {
6357 96b1652c6011 (svn r9400) -Codechange: Use some more representative enum names for landscape types. belugas <belugas@openttd.org> parents: 6343 diff changeset	1203 case LT_ARCTIC:
6343 f75b72d9fc98 (svn r9371) -Feature: Add support for variable snow lines in the arctic climate, supplied maedhros <maedhros@openttd.org> parents: 6259 diff changeset	1204 if (IsOnSnow(tile) != (GetTileZ(tile) > GetSnowLine())) {
5584 4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	1205 ToggleSnow(tile);
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	1206 MarkTileDirtyByTile(tile);
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	1207 }
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	1208 break;
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	1209
6357 96b1652c6011 (svn r9400) -Codechange: Use some more representative enum names for landscape types. belugas <belugas@openttd.org> parents: 6343 diff changeset	1210 case LT_TROPIC:
5584 4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	1211 if (GetTropicZone(tile) == TROPICZONE_DESERT && !IsOnDesert(tile)) {
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	1212 ToggleDesert(tile);
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	1213 MarkTileDirtyByTile(tile);
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	1214 }
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	1215 break;
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	1216 }
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	1217
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	1218 if (GetRoadTileType(tile) == ROAD_TILE_DEPOT) return;
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	1219
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	1220 if (!HasRoadWorks(tile)) {
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	1221 const Town* t = ClosestTownFromTile(tile, (uint)-1);
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	1222 int grp = 0;
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	1223
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	1224 if (t != NULL) {
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	1225 grp = GetTownRadiusGroup(t, tile);
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	1226
6393 ffd35446c110 (svn r9523) -Cleanup: doxygen changes. Time to take care of "R" belugas <belugas@openttd.org> parents: 6368 diff changeset	1227 /* Show an animation to indicate road work */
5584 4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	1228 if (t->road_build_months != 0 &&
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	1229 (DistanceManhattan(t->xy, tile) < 8 \|\| grp != 0) &&
6661 5850ac8865e8 (svn r9892) -Codechange: lots of ground work for allowing multiple types of "road" with multiple owners on a single tile. rubidium <rubidium@openttd.org> parents: 6626 diff changeset	1230 GetRoadTileType(tile) == ROAD_TILE_NORMAL && (GetAllRoadBits(tile) == ROAD_X \|\| GetAllRoadBits(tile) == ROAD_Y)) {
6406 ecbbe4b0a9a2 (svn r9542) -Fix(FS# 712): When checking if a vehicle is on a given tile, and you are working on the ground tile, do not take aircrafts into account, as they do not pose any danger for the construction/destruction/conversion itself. Z stuff, in other words belugas <belugas@openttd.org> parents: 6393 diff changeset	1231 if (GetTileSlope(tile, NULL) == SLOPE_FLAT && EnsureNoVehicleOnGround(tile) && CHANCE16(1, 20)) {
5584 4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	1232 StartRoadWorks(tile);
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	1233
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	1234 SndPlayTileFx(SND_21_JACKHAMMER, tile);
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	1235 CreateEffectVehicleAbove(
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	1236 TileX(tile) * TILE_SIZE + 7,
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	1237 TileY(tile) * TILE_SIZE + 7,
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	1238 0,
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	1239 EV_BULLDOZER);
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	1240 MarkTileDirtyByTile(tile);
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	1241 return;
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	1242 }
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	1243 }
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	1244 }
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	1245
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	1246 {
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	1247 /* Adjust road ground type depending on 'grp' (grp is the distance to the center) */
6357 96b1652c6011 (svn r9400) -Codechange: Use some more representative enum names for landscape types. belugas <belugas@openttd.org> parents: 6343 diff changeset	1248 const Roadside* new_rs = (_opt.landscape == LT_TOYLAND) ? _town_road_types_2[grp] : _town_road_types[grp];
5584 4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	1249 Roadside cur_rs = GetRoadside(tile);
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	1250
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	1251 /* We have our desired type, do nothing */
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	1252 if (cur_rs == new_rs[0]) return;
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	1253
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	1254 /* We have the pre-type of the desired type, switch to the desired type */
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	1255 if (cur_rs == new_rs[1]) {
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	1256 cur_rs = new_rs[0];
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	1257 /* We have barren land, install the pre-type */
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	1258 } else if (cur_rs == ROADSIDE_BARREN) {
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	1259 cur_rs = new_rs[1];
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	1260 /* We're totally off limits, remove any installation and make barren land */
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	1261 } else {
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	1262 cur_rs = ROADSIDE_BARREN;
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	1263 }
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	1264 SetRoadside(tile, cur_rs);
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	1265 MarkTileDirtyByTile(tile);
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	1266 }
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	1267 } else if (IncreaseRoadWorksCounter(tile)) {
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	1268 TerminateRoadWorks(tile);
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	1269 MarkTileDirtyByTile(tile);
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	1270 }
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	1271 }
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	1272
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	1273 static void ClickTile_Road(TileIndex tile)
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	1274 {
6259 4a39d6291d58 (svn r9068) -Codechange: capitalize the VEH_Train etc. enums to match the coding style (and rest of the code). rubidium <rubidium@openttd.org> parents: 6256 diff changeset	1275 if (GetRoadTileType(tile) == ROAD_TILE_DEPOT) ShowDepotWindow(tile, VEH_ROAD);
5584 4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	1276 }
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	1277
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	1278 static const byte _road_trackbits[16] = {
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	1279 0x0, 0x0, 0x0, 0x10, 0x0, 0x2, 0x8, 0x1A, 0x0, 0x4, 0x1, 0x15, 0x20, 0x26, 0x29, 0x3F,
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	1280 };
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	1281
6683 6984c0dbbb07 (svn r9914) -Codechange: prepare GTTS and the pathfinders to handle multiple road types on a single tile. rubidium <rubidium@openttd.org> parents: 6679 diff changeset	1282 static uint32 GetTileTrackStatus_Road(TileIndex tile, TransportType mode, uint sub_mode)
5584 4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	1283 {
6661 5850ac8865e8 (svn r9892) -Codechange: lots of ground work for allowing multiple types of "road" with multiple owners on a single tile. rubidium <rubidium@openttd.org> parents: 6626 diff changeset	1284
5584 4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	1285 switch (mode) {
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	1286 case TRANSPORT_RAIL:
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	1287 if (!IsLevelCrossing(tile)) return 0;
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	1288 return GetCrossingRailBits(tile) * 0x101;
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	1289
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	1290 case TRANSPORT_ROAD:
6683 6984c0dbbb07 (svn r9914) -Codechange: prepare GTTS and the pathfinders to handle multiple road types on a single tile. rubidium <rubidium@openttd.org> parents: 6679 diff changeset	1291 if ((GetRoadTypes(tile) & sub_mode) == 0) 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	1292 switch (GetRoadTileType(tile)) {
6683 6984c0dbbb07 (svn r9914) -Codechange: prepare GTTS and the pathfinders to handle multiple road types on a single tile. rubidium <rubidium@openttd.org> parents: 6679 diff changeset	1293 case ROAD_TILE_NORMAL: {
6984c0dbbb07 (svn r9914) -Codechange: prepare GTTS and the pathfinders to handle multiple road types on a single tile. rubidium <rubidium@openttd.org> parents: 6679 diff changeset	1294 RoadType rt = (RoadType)FindFirstBit(sub_mode);
6764 6ce333c8fd7e (svn r9999) -Feature: make it possible to disallow busses and lorries to go a specific way on straight pieces of road. rubidium <rubidium@openttd.org> parents: 6761 diff changeset	1295 const uint drd_to_multiplier[DRD_END] = { 0x101, 0x100, 0x1, 0x0 };
6ce333c8fd7e (svn r9999) -Feature: make it possible to disallow busses and lorries to go a specific way on straight pieces of road. rubidium <rubidium@openttd.org> parents: 6761 diff changeset	1296 uint multiplier = drd_to_multiplier[rt == ROADTYPE_TRAM ? DRD_NONE : GetDisallowedRoadDirections(tile)];
6ce333c8fd7e (svn r9999) -Feature: make it possible to disallow busses and lorries to go a specific way on straight pieces of road. rubidium <rubidium@openttd.org> parents: 6761 diff changeset	1297 return HasRoadWorks(tile) ? 0 : _road_trackbits[GetRoadBits(tile, rt)] * multiplier;
6683 6984c0dbbb07 (svn r9914) -Codechange: prepare GTTS and the pathfinders to handle multiple road types on a single tile. rubidium <rubidium@openttd.org> parents: 6679 diff changeset	1298 }
5584 4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	1299
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	1300 case ROAD_TILE_CROSSING: {
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	1301 uint32 r = AxisToTrackBits(GetCrossingRoadAxis(tile)) * 0x101;
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	1302
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	1303 if (IsCrossingBarred(tile)) r *= 0x10001;
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	1304 return r;
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	1305 }
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	1306
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	1307 default:
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	1308 case ROAD_TILE_DEPOT:
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	1309 return AxisToTrackBits(DiagDirToAxis(GetRoadDepotDirection(tile))) * 0x101;
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	1310 }
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	1311 break;
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	1312
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	1313 default: break;
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	1314 }
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	1315 return 0;
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	1316 }
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	1317
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	1318 static const StringID _road_tile_strings[] = {
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	1319 STR_1814_ROAD,
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	1320 STR_1814_ROAD,
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	1321 STR_1814_ROAD,
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	1322 STR_1815_ROAD_WITH_STREETLIGHTS,
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	1323 STR_1814_ROAD,
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	1324 STR_1816_TREE_LINED_ROAD,
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	1325 STR_1814_ROAD,
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	1326 STR_1814_ROAD,
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	1327 };
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	1328
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	1329 static void GetTileDesc_Road(TileIndex tile, TileDesc *td)
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	1330 {
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	1331 td->owner = GetTileOwner(tile);
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	1332 switch (GetRoadTileType(tile)) {
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	1333 case ROAD_TILE_CROSSING: td->str = STR_1818_ROAD_RAIL_LEVEL_CROSSING; break;
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	1334 case ROAD_TILE_DEPOT: td->str = STR_1817_ROAD_VEHICLE_DEPOT; break;
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	1335 default: td->str = _road_tile_strings[GetRoadside(tile)]; break;
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	1336 }
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	1337 }
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	1338
6723 331e72ee78e5 (svn r9955) -Codechange: Make _roadveh_enter_depot_unk0 slightly less mysterious. maedhros <maedhros@openttd.org> parents: 6719 diff changeset	1339 /**
331e72ee78e5 (svn r9955) -Codechange: Make _roadveh_enter_depot_unk0 slightly less mysterious. maedhros <maedhros@openttd.org> parents: 6719 diff changeset	1340 * Given the direction the road depot is pointing, this is the direction the
331e72ee78e5 (svn r9955) -Codechange: Make _roadveh_enter_depot_unk0 slightly less mysterious. maedhros <maedhros@openttd.org> parents: 6719 diff changeset	1341 * vehicle should be travelling in in order to enter the depot.
331e72ee78e5 (svn r9955) -Codechange: Make _roadveh_enter_depot_unk0 slightly less mysterious. maedhros <maedhros@openttd.org> parents: 6719 diff changeset	1342 */
331e72ee78e5 (svn r9955) -Codechange: Make _roadveh_enter_depot_unk0 slightly less mysterious. maedhros <maedhros@openttd.org> parents: 6719 diff changeset	1343 static const byte _roadveh_enter_depot_dir[4] = {
331e72ee78e5 (svn r9955) -Codechange: Make _roadveh_enter_depot_unk0 slightly less mysterious. maedhros <maedhros@openttd.org> parents: 6719 diff changeset	1344 TRACKDIR_X_SW, TRACKDIR_Y_NW, TRACKDIR_X_NE, TRACKDIR_Y_SE
5584 4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	1345 };
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	1346
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	1347 static uint32 VehicleEnter_Road(Vehicle *v, TileIndex tile, int x, 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	1348 {
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	1349 switch (GetRoadTileType(tile)) {
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	1350 case ROAD_TILE_CROSSING:
6259 4a39d6291d58 (svn r9068) -Codechange: capitalize the VEH_Train etc. enums to match the coding style (and rest of the code). rubidium <rubidium@openttd.org> parents: 6256 diff changeset	1351 if (v->type == VEH_TRAIN && !IsCrossingBarred(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	1352 /* train crossing a road */
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	1353 SndPlayVehicleFx(SND_0E_LEVEL_CROSSING, v);
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	1354 BarCrossing(tile);
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	1355 MarkTileDirtyByTile(tile);
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	1356 }
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	1357 break;
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	1358
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	1359 case ROAD_TILE_DEPOT:
6259 4a39d6291d58 (svn r9068) -Codechange: capitalize the VEH_Train etc. enums to match the coding style (and rest of the code). rubidium <rubidium@openttd.org> parents: 6256 diff changeset	1360 if (v->type == VEH_ROAD &&
5584 4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	1361 v->u.road.frame == 11 &&
6723 331e72ee78e5 (svn r9955) -Codechange: Make _roadveh_enter_depot_unk0 slightly less mysterious. maedhros <maedhros@openttd.org> parents: 6719 diff changeset	1362 _roadveh_enter_depot_dir[GetRoadDepotDirection(tile)] == v->u.road.state) {
6857 0005a9ed1903 (svn r10097) -Feature: Add support for articulated road vehicles, or callbacks 11 and 17 for maedhros <maedhros@openttd.org> parents: 6814 diff changeset	1363 v->u.road.state = RVSB_IN_DEPOT;
0005a9ed1903 (svn r10097) -Feature: Add support for articulated road vehicles, or callbacks 11 and 17 for maedhros <maedhros@openttd.org> parents: 6814 diff changeset	1364 v->vehstatus \|= VS_HIDDEN;
0005a9ed1903 (svn r10097) -Feature: Add support for articulated road vehicles, or callbacks 11 and 17 for maedhros <maedhros@openttd.org> parents: 6814 diff changeset	1365 v->direction = ReverseDir(v->direction);
0005a9ed1903 (svn r10097) -Feature: Add support for articulated road vehicles, or callbacks 11 and 17 for maedhros <maedhros@openttd.org> parents: 6814 diff changeset	1366 if (v->next == NULL) VehicleEnterDepot(v);
0005a9ed1903 (svn r10097) -Feature: Add support for articulated road vehicles, or callbacks 11 and 17 for maedhros <maedhros@openttd.org> parents: 6814 diff changeset	1367 v->tile = tile;
0005a9ed1903 (svn r10097) -Feature: Add support for articulated road vehicles, or callbacks 11 and 17 for maedhros <maedhros@openttd.org> parents: 6814 diff changeset	1368
0005a9ed1903 (svn r10097) -Feature: Add support for articulated road vehicles, or callbacks 11 and 17 for maedhros <maedhros@openttd.org> parents: 6814 diff changeset	1369 InvalidateWindowData(WC_VEHICLE_DEPOT, v->tile);
5991 1b793d99b5ba (svn r8698) -Codechange: enumify the returns of VehicleEnterTile rubidium <rubidium@openttd.org> parents: 5942 diff changeset	1370 return VETSB_ENTERED_WORMHOLE;
5584 4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	1371 }
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	1372 break;
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	1373
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	1374 default: break;
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	1375 }
5991 1b793d99b5ba (svn r8698) -Codechange: enumify the returns of VehicleEnterTile rubidium <rubidium@openttd.org> parents: 5942 diff changeset	1376 return VETSB_CONTINUE;
5584 4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	1377 }
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	1378
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	1379
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	1380 static void ChangeTileOwner_Road(TileIndex tile, PlayerID old_player, PlayerID new_player)
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	1381 {
6661 5850ac8865e8 (svn r9892) -Codechange: lots of ground work for allowing multiple types of "road" with multiple owners on a single tile. rubidium <rubidium@openttd.org> parents: 6626 diff changeset	1382 if (GetRoadTileType(tile) == ROAD_TILE_DEPOT) {
6717 754723a35f2b (svn r9949) -Fix: (road) depots got deowned on bankrupts. rubidium <rubidium@openttd.org> parents: 6716 diff changeset	1383 if (GetTileOwner(tile) == old_player) {
754723a35f2b (svn r9949) -Fix: (road) depots got deowned on bankrupts. rubidium <rubidium@openttd.org> parents: 6716 diff changeset	1384 if (new_player == PLAYER_SPECTATOR) {
754723a35f2b (svn r9949) -Fix: (road) depots got deowned on bankrupts. rubidium <rubidium@openttd.org> parents: 6716 diff changeset	1385 DoCommand(tile, 0, 0, DC_EXEC, CMD_LANDSCAPE_CLEAR);
754723a35f2b (svn r9949) -Fix: (road) depots got deowned on bankrupts. rubidium <rubidium@openttd.org> parents: 6716 diff changeset	1386 } else {
754723a35f2b (svn r9949) -Fix: (road) depots got deowned on bankrupts. rubidium <rubidium@openttd.org> parents: 6716 diff changeset	1387 SetTileOwner(tile, new_player);
754723a35f2b (svn r9949) -Fix: (road) depots got deowned on bankrupts. rubidium <rubidium@openttd.org> parents: 6716 diff changeset	1388 }
6689 c8daf1a1ec28 (svn r9921) -Fix (r9892): ownership wasn't properly propagated on owner changes. rubidium <rubidium@openttd.org> parents: 6683 diff changeset	1389 }
6661 5850ac8865e8 (svn r9892) -Codechange: lots of ground work for allowing multiple types of "road" with multiple owners on a single tile. rubidium <rubidium@openttd.org> parents: 6626 diff changeset	1390 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	1391 }
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	1392
6661 5850ac8865e8 (svn r9892) -Codechange: lots of ground work for allowing multiple types of "road" with multiple owners on a single tile. rubidium <rubidium@openttd.org> parents: 6626 diff changeset	1393 for (RoadType rt = ROADTYPE_ROAD; rt < ROADTYPE_END; rt++) {
5850ac8865e8 (svn r9892) -Codechange: lots of ground work for allowing multiple types of "road" with multiple owners on a single tile. rubidium <rubidium@openttd.org> parents: 6626 diff changeset	1394 if (!HASBIT(GetRoadTypes(tile), rt)) continue;
5584 4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	1395
6661 5850ac8865e8 (svn r9892) -Codechange: lots of ground work for allowing multiple types of "road" with multiple owners on a single tile. rubidium <rubidium@openttd.org> parents: 6626 diff changeset	1396 if (GetRoadOwner(tile, rt) == old_player) {
5850ac8865e8 (svn r9892) -Codechange: lots of ground work for allowing multiple types of "road" with multiple owners on a single tile. rubidium <rubidium@openttd.org> parents: 6626 diff changeset	1397 SetRoadOwner(tile, rt, new_player == PLAYER_SPECTATOR ? OWNER_NONE : new_player);
5850ac8865e8 (svn r9892) -Codechange: lots of ground work for allowing multiple types of "road" with multiple owners on a single tile. rubidium <rubidium@openttd.org> parents: 6626 diff changeset	1398 }
5850ac8865e8 (svn r9892) -Codechange: lots of ground work for allowing multiple types of "road" with multiple owners on a single tile. rubidium <rubidium@openttd.org> parents: 6626 diff changeset	1399 }
5584 4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	1400
6661 5850ac8865e8 (svn r9892) -Codechange: lots of ground work for allowing multiple types of "road" with multiple owners on a single tile. rubidium <rubidium@openttd.org> parents: 6626 diff changeset	1401 if (IsLevelCrossing(tile)) {
6689 c8daf1a1ec28 (svn r9921) -Fix (r9892): ownership wasn't properly propagated on owner changes. rubidium <rubidium@openttd.org> parents: 6683 diff changeset	1402 if (GetTileOwner(tile) == old_player) {
c8daf1a1ec28 (svn r9921) -Fix (r9892): ownership wasn't properly propagated on owner changes. rubidium <rubidium@openttd.org> parents: 6683 diff changeset	1403 if (new_player == PLAYER_SPECTATOR) {
c8daf1a1ec28 (svn r9921) -Fix (r9892): ownership wasn't properly propagated on owner changes. rubidium <rubidium@openttd.org> parents: 6683 diff changeset	1404 MakeRoadNormal(tile, GetCrossingRoadBits(tile), GetRoadTypes(tile), GetTownIndex(tile), GetRoadOwner(tile, ROADTYPE_ROAD), GetRoadOwner(tile, ROADTYPE_TRAM), GetRoadOwner(tile, ROADTYPE_HWAY));
c8daf1a1ec28 (svn r9921) -Fix (r9892): ownership wasn't properly propagated on owner changes. rubidium <rubidium@openttd.org> parents: 6683 diff changeset	1405 } else {
c8daf1a1ec28 (svn r9921) -Fix (r9892): ownership wasn't properly propagated on owner changes. rubidium <rubidium@openttd.org> parents: 6683 diff changeset	1406 SetTileOwner(tile, new_player);
c8daf1a1ec28 (svn r9921) -Fix (r9892): ownership wasn't properly propagated on owner changes. rubidium <rubidium@openttd.org> parents: 6683 diff changeset	1407 }
c8daf1a1ec28 (svn r9921) -Fix (r9892): ownership wasn't properly propagated on owner changes. rubidium <rubidium@openttd.org> parents: 6683 diff changeset	1408 }
5584 4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	1409 }
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	1410 }
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	1411
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	1412
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	1413 extern const TileTypeProcs _tile_type_road_procs = {
5584 4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	1414 DrawTile_Road, /* draw_tile_proc */
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	1415 GetSlopeZ_Road, /* get_slope_z_proc */
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	1416 ClearTile_Road, /* clear_tile_proc */
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	1417 GetAcceptedCargo_Road, /* get_accepted_cargo_proc */
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	1418 GetTileDesc_Road, /* get_tile_desc_proc */
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	1419 GetTileTrackStatus_Road, /* get_tile_track_status_proc */
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	1420 ClickTile_Road, /* click_tile_proc */
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	1421 AnimateTile_Road, /* animate_tile_proc */
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	1422 TileLoop_Road, /* tile_loop_clear */
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	1423 ChangeTileOwner_Road, /* change_tile_owner_clear */
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	1424 NULL, /* get_produced_cargo_proc */
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	1425 VehicleEnter_Road, /* vehicle_enter_tile_proc */
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	1426 GetSlopeTileh_Road, /* get_slope_tileh_proc */
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	1427 };

Mercurial > hg > openttd

annotate src/road_cmd.cpp @ 6943:fd42cb9816c6 draft