openttd: road_cmd.c annotate

annotate road_cmd.c @ 1035:3edb35954288 draft

(svn r1536) Move GET_TILEHEIGHT, GET_TILETYPE and IS_TILETYPE to map.h, turn them into inline functions and add some asserts

author	tron <tron@openttd.org>
date	Sun, 16 Jan 2005 11:24:58 +0000
parents	81dea216ead6
children	ac8157bbbc79

rev	line source
0 fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	1 #include "stdafx.h"
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	2 #include "ttd.h"
507 9dcc34b8887e (svn r815) Include strings.h only in the files which need it. tron <tron@openttd.org> parents: 497 diff changeset	3 #include "table/strings.h"
679 21e658645b32 (svn r1117) Move map arrays and some related macros into their own files map.c and map.h tron <tron@openttd.org> parents: 541 diff changeset	4 #include "map.h"
0 fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	5 #include "vehicle.h"
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	6 #include "viewport.h"
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	7 #include "command.h"
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	8 #include "player.h"
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	9 #include "town.h"
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	10 #include "gfx.h"
159 a4e15430335b (svn r160) -Codechange: made GetTileTrackStatus more readable (blathijs) truelight <truelight@openttd.org> parents: 149 diff changeset	11 #include "table/directions.h"
337 c88b35750799 (svn r513) Merge revisions 402, 416, 417, 478, 479, 511, 512 from map to trunk tron <tron@openttd.org> parents: 241 diff changeset	12 #include "sound.h"
0 fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	13
22 7a15e52a1c8f (svn r23) -Some omments on the code (blathijs) darkvater <darkvater@openttd.org> parents: 13 diff changeset	14 /* When true, GetTrackStatus for roads will treat roads under reconstruction
7a15e52a1c8f (svn r23) -Some omments on the code (blathijs) darkvater <darkvater@openttd.org> parents: 13 diff changeset	15 * as normal roads instead of impassable. This is used when detecting whether
7a15e52a1c8f (svn r23) -Some omments on the code (blathijs) darkvater <darkvater@openttd.org> parents: 13 diff changeset	16 * a road can be removed. This is of course ugly, but I don't know a better
7a15e52a1c8f (svn r23) -Some omments on the code (blathijs) darkvater <darkvater@openttd.org> parents: 13 diff changeset	17 * solution just like that... */
0 fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	18 static bool _road_special_gettrackstatus;
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	19
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	20 void RoadVehEnterDepot(Vehicle *v);
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	21
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	22
84 784a9e9bb932 (svn r85) -Add: initial commit of new AI (enable in Patch menu) truelight <truelight@openttd.org> parents: 72 diff changeset	23 bool HasTileRoadAt(uint tile, int i)
0 fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	24 {
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	25 int mask;
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	26 byte b;
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	27
1035 3edb35954288 (svn r1536) Move GET_TILEHEIGHT, GET_TILETYPE and IS_TILETYPE to map.h, turn them into inline functions and add some asserts tron <tron@openttd.org> parents: 1005 diff changeset	28 switch (TileType(tile)) {
0 fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	29 case MP_STREET:
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	30 b = _map5[tile];
201 f2b49b0674c6 (svn r202) -Codechange: I missed some files with trailing spaces.. this should be truelight <truelight@openttd.org> parents: 159 diff changeset	31
0 fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	32 if ((b & 0xF0) == 0) {
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	33 } else if ((b & 0xF0) == 0x10) {
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	34 b = (b&8)?5:10;
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	35 } else if ((b & 0xF0) == 0x20) {
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	36 return (~b & 3) == i;
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	37 } else
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	38 return false;
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	39 break;
201 f2b49b0674c6 (svn r202) -Codechange: I missed some files with trailing spaces.. this should be truelight <truelight@openttd.org> parents: 159 diff changeset	40
0 fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	41 case MP_STATION:
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	42 b = _map5[tile];
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	43 if (!IS_BYTE_INSIDE(b, 0x43, 0x43+8))
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	44 return false;
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	45 return ((~(b - 0x43) & 3) == i);
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	46
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	47 case MP_TUNNELBRIDGE:
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	48 mask = GetRoadBitsByTile(tile);
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	49 b = 10; if (mask & 1) break;
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	50 b = 5; if (mask & 2) break;
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	51 return false;
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	52
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	53 default:
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	54 return false;
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	55 }
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	56
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	57 return HASBIT(b, i);
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	58 }
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	59
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	60 static bool CheckAllowRemoveRoad(uint tile, uint br, bool *edge_road)
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	61 {
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	62 int blocks;
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	63 byte owner;
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	64 uint n;
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	65 *edge_road = true;
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	66
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	67 if (_game_mode == GM_EDITOR)
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	68 return true;
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	69
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	70 blocks = GetRoadBitsByTile(tile);
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	71 if (blocks == 0)
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	72 return true;
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	73
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	74 // Only do the special processing for actual players.
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	75 if (_current_player >= MAX_PLAYERS)
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	76 return true;
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	77
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	78 // A railway crossing has the road owner in the map3_lo byte.
1035 3edb35954288 (svn r1536) Move GET_TILEHEIGHT, GET_TILETYPE and IS_TILETYPE to map.h, turn them into inline functions and add some asserts tron <tron@openttd.org> parents: 1005 diff changeset	79 if (IsTileType(tile, MP_STREET) && (_map5[tile] & 0xF0) == 0x10) {
0 fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	80 owner = _map3_lo[tile];
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	81 } else {
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	82 owner = _map_owner[tile];
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	83 }
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	84 // Only do the special processing if the road is owned
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	85 // by a town
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	86 if (owner != OWNER_TOWN) {
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	87 return owner == OWNER_NONE \|\| CheckOwnership(owner);
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	88 }
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	89
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	90 if (_cheats.magic_bulldozer.value)
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	91 return true;
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	92
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	93 // Get a bitmask of which neighbouring roads has a tile
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	94 n = 0;
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	95 if (blocks&0x25 && HasTileRoadAt(TILE_ADDXY(tile,-1, 0), 1)) n \|= 8;
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	96 if (blocks&0x2A && HasTileRoadAt(TILE_ADDXY(tile, 0, 1), 0)) n \|= 4;
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	97 if (blocks&0x19 && HasTileRoadAt(TILE_ADDXY(tile, 1, 0), 3)) n \|= 2;
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	98 if (blocks&0x16 && HasTileRoadAt(TILE_ADDXY(tile, 0,-1), 2)) n \|= 1;
201 f2b49b0674c6 (svn r202) -Codechange: I missed some files with trailing spaces.. this should be truelight <truelight@openttd.org> parents: 159 diff changeset	99
0 fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	100 // If 0 or 1 bits are set in n, or if no bits that match the bits to remove,
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	101 // then allow it
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	102 if ((n & (n-1)) != 0 && (n & br) != 0) {
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	103 Town *t;
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	104 *edge_road = false;
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	105 // you can remove all kind of roads with extra dynamite
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	106 if (_patches.extra_dynamite)
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	107 return true;
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	108
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	109 t = ClosestTownFromTile(tile, (uint)-1);
534 6de858608a45 (svn r901) Small step in the process to clean up the DPARAM mess: tron <tron@openttd.org> parents: 507 diff changeset	110 SetDParam(0, t->index);
0 fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	111 _error_message = STR_2009_LOCAL_AUTHORITY_REFUSES;
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	112 return false;
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	113 }
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	114
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	115 return true;
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	116 }
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	117
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	118 bool IsRoadDepotTile(TileIndex tile)
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	119 {
1035 3edb35954288 (svn r1536) Move GET_TILEHEIGHT, GET_TILETYPE and IS_TILETYPE to map.h, turn them into inline functions and add some asserts tron <tron@openttd.org> parents: 1005 diff changeset	120 return IsTileType(tile, MP_STREET) &&
0 fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	121 (_map5[tile] & 0xF0) == 0x20;
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	122 }
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	123
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	124 uint GetRoadBitsByTile(TileIndex tile)
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	125 {
159 a4e15430335b (svn r160) -Codechange: made GetTileTrackStatus more readable (blathijs) truelight <truelight@openttd.org> parents: 149 diff changeset	126 uint32 r = GetTileTrackStatus(tile, TRANSPORT_ROAD);
0 fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	127 return (byte)(r \| (r >> 8));
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	128 }
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	129
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	130 // cost for removing inner/edge -roads
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	131 static const uint16 _road_remove_cost[2] = {50, 18};
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	132
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	133 /* Delete a piece of road
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	134 * p1 = piece type
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	135 */
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	136 int32 CmdRemoveRoad(int x, int y, uint32 flags, uint32 p1, uint32 p2)
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	137 {
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	138 TileInfo ti;
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	139 int32 cost;
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	140 uint tile;
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	141 Town *t;
201 f2b49b0674c6 (svn r202) -Codechange: I missed some files with trailing spaces.. this should be truelight <truelight@openttd.org> parents: 159 diff changeset	142 /* true if the roadpiece was always removeable,
0 fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	143 false if it was a center piece. Affects town ratings drop
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	144 */
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	145 bool edge_road;
201 f2b49b0674c6 (svn r202) -Codechange: I missed some files with trailing spaces.. this should be truelight <truelight@openttd.org> parents: 159 diff changeset	146
0 fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	147 SET_EXPENSES_TYPE(EXPENSES_CONSTRUCTION);
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	148
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	149 FindLandscapeHeight(&ti, x, y);
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	150 tile = ti.tile;
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	151 t = ClosestTownFromTile(tile, (uint)-1); // needed for town rating penalty
201 f2b49b0674c6 (svn r202) -Codechange: I missed some files with trailing spaces.. this should be truelight <truelight@openttd.org> parents: 159 diff changeset	152
0 fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	153 // allow deleting road under bridge
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	154 if (ti.type != MP_TUNNELBRIDGE && !EnsureNoVehicle(tile))
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	155 return CMD_ERROR;
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	156
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	157 {
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	158 bool b;
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	159 _road_special_gettrackstatus = true;
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	160 b = CheckAllowRemoveRoad(tile, p1, &edge_road);
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	161 _road_special_gettrackstatus = false;
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	162 if (!b)
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	163 return CMD_ERROR;
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	164 }
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	165
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	166 if (ti.type == MP_TUNNELBRIDGE) {
1035 3edb35954288 (svn r1536) Move GET_TILEHEIGHT, GET_TILETYPE and IS_TILETYPE to map.h, turn them into inline functions and add some asserts tron <tron@openttd.org> parents: 1005 diff changeset	167 if (!EnsureNoVehicleZ(tile, TileHeight(tile)))
0 fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	168 return CMD_ERROR;
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	169
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	170 if ((ti.map5 & 0xE9) == 0xE8) {
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	171 if (p1 & 10) goto return_error;
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	172 } else if ((ti.map5 & 0xE9) == 0xE9) {
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	173 if (p1 & 5) goto return_error;
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	174 } else
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	175 goto return_error;
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	176
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	177 cost = _price.remove_road * 2;
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	178
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	179 if (flags & DC_EXEC) {
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	180 _map5[tile] = ti.map5 & 0xC7;
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	181 _map_owner[tile] = OWNER_NONE;
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	182 MarkTileDirtyByTile(tile);
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	183 }
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	184 return cost;
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	185 } else if (ti.type == MP_STREET) {
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	186 if (!(ti.map5 & 0xF0)) {
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	187 uint c = p1, t2;
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	188
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	189 if (ti.tileh != 0 && (ti.map5 == 5 \|\| ti.map5 == 10)) {
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	190 c \|= (c & 0xC) >> 2;
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	191 c \|= (c & 0x3) << 2;
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	192 }
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	193
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	194 // limit the bits to delete to the existing bits.
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	195 if ((c &= ti.map5) == 0) goto return_error;
201 f2b49b0674c6 (svn r202) -Codechange: I missed some files with trailing spaces.. this should be truelight <truelight@openttd.org> parents: 159 diff changeset	196
0 fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	197 // calculate the cost
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	198 t2 = c;
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	199 cost = 0;
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	200 do {
201 f2b49b0674c6 (svn r202) -Codechange: I missed some files with trailing spaces.. this should be truelight <truelight@openttd.org> parents: 159 diff changeset	201 if (t2&1) cost += _price.remove_road;
0 fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	202 } while(t2>>=1);
201 f2b49b0674c6 (svn r202) -Codechange: I missed some files with trailing spaces.. this should be truelight <truelight@openttd.org> parents: 159 diff changeset	203
0 fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	204 // check if you're allowed to remove the street owned by a town
201 f2b49b0674c6 (svn r202) -Codechange: I missed some files with trailing spaces.. this should be truelight <truelight@openttd.org> parents: 159 diff changeset	205 // removal allowance depends on difficulty setting
0 fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	206 if(_map_owner[tile] == OWNER_TOWN && _game_mode != GM_EDITOR) {
201 f2b49b0674c6 (svn r202) -Codechange: I missed some files with trailing spaces.. this should be truelight <truelight@openttd.org> parents: 159 diff changeset	207 if (!CheckforTownRating(tile, flags, t, ROAD_REMOVE))
0 fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	208 return CMD_ERROR;
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	209 }
201 f2b49b0674c6 (svn r202) -Codechange: I missed some files with trailing spaces.. this should be truelight <truelight@openttd.org> parents: 159 diff changeset	210
0 fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	211 if (flags & DC_EXEC) {
201 f2b49b0674c6 (svn r202) -Codechange: I missed some files with trailing spaces.. this should be truelight <truelight@openttd.org> parents: 159 diff changeset	212 // checks if the owner is town than decrease town rating by 50 until you have
0 fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	213 // a "Poor" town rating
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	214 if(_map_owner[tile] == OWNER_TOWN && _game_mode != GM_EDITOR)
1005 81dea216ead6 (svn r1504) enummed town ratings (Jango) celestar <celestar@openttd.org> parents: 959 diff changeset	215 ChangeTownRating(t, -_road_remove_cost[(byte)edge_road], RATING_ROAD_MINIMUM);
0 fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	216
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	217 _map5[tile] ^= c;
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	218 if ((_map5[tile]&0xF) == 0)
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	219 DoClearSquare(tile);
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	220 else
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	221 MarkTileDirtyByTile(tile);
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	222
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	223 }
201 f2b49b0674c6 (svn r202) -Codechange: I missed some files with trailing spaces.. this should be truelight <truelight@openttd.org> parents: 159 diff changeset	224 return cost;
0 fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	225 } else if (!(ti.map5 & 0xE0)) {
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	226 byte c;
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	227
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	228 if (!(ti.map5 & 8)) {
201 f2b49b0674c6 (svn r202) -Codechange: I missed some files with trailing spaces.. this should be truelight <truelight@openttd.org> parents: 159 diff changeset	229 c = 2;
0 fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	230 if (p1 & 5) goto return_error;
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	231 } else {
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	232 c = 1;
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	233 if (p1 & 10) goto return_error;
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	234 }
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	235
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	236 cost = _price.remove_road * 2;
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	237 if (flags & DC_EXEC) {
201 f2b49b0674c6 (svn r202) -Codechange: I missed some files with trailing spaces.. this should be truelight <truelight@openttd.org> parents: 159 diff changeset	238 ModifyTile(tile,
0 fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	239 MP_SETTYPE(MP_RAILWAY) \|
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	240 MP_MAP2_CLEAR \| MP_MAP3LO \| MP_MAP3HI_CLEAR \| MP_MAP5,
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	241 _map3_hi[tile] & 0xF, /* map3_lo */
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	242 c /* map5 */
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	243 );
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	244 }
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	245 return cost;
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	246 } else
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	247 goto return_error;
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	248
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	249 } else {
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	250 return_error:;
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	251 return_cmd_error(INVALID_STRING_ID);
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	252 }
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	253 }
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	254
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	255
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	256 enum {
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	257 ROAD_NW = 1, // NW road track
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	258 ROAD_SW = 2, // SW road track
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	259 ROAD_SE = 4, // SE road track
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	260 ROAD_NE = 8, // NE road track
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	261 ROAD_ALL = (ROAD_NW \| ROAD_SW \| ROAD_SE \| ROAD_NE)
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	262 };
201 f2b49b0674c6 (svn r202) -Codechange: I missed some files with trailing spaces.. this should be truelight <truelight@openttd.org> parents: 159 diff changeset	263
13 c8795721b2d5 (svn r14) Fix: railroad crossings on slopes are now possible dominik <dominik@openttd.org> parents: 0 diff changeset	264 static const byte _valid_tileh_slopes_road[3][15] = {
0 fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	265 // set of normal ones
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	266 {
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	267 ROAD_ALL, 0, 0,
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	268 ROAD_SW \| ROAD_NE, 0, 0, // 3, 4, 5
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	269 ROAD_NW \| ROAD_SE, 0, 0,
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	270 ROAD_NW \| ROAD_SE, 0, 0, // 9, 10, 11
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	271 ROAD_SW \| ROAD_NE, 0, 0
201 f2b49b0674c6 (svn r202) -Codechange: I missed some files with trailing spaces.. this should be truelight <truelight@openttd.org> parents: 159 diff changeset	272 },
0 fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	273 // allowed road for an evenly raised platform
201 f2b49b0674c6 (svn r202) -Codechange: I missed some files with trailing spaces.. this should be truelight <truelight@openttd.org> parents: 159 diff changeset	274 {
0 fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	275 0,
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	276 ROAD_SW \| ROAD_NW,
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	277 ROAD_SW \| ROAD_SE,
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	278 ROAD_NW \| ROAD_SE \| ROAD_SW,
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	279
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	280 ROAD_SE \| ROAD_NE, // 4
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	281 ROAD_ALL,
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	282 ROAD_SW \| ROAD_NE \| ROAD_SE,
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	283 ROAD_ALL,
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	284
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	285 ROAD_NW \| ROAD_NE, // 8
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	286 ROAD_SW \| ROAD_NE \| ROAD_NW,
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	287 ROAD_ALL,
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	288 ROAD_ALL,
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	289
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	290 ROAD_NW \| ROAD_SE \| ROAD_NE, // 12
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	291 ROAD_ALL,
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	292 ROAD_ALL
13 c8795721b2d5 (svn r14) Fix: railroad crossings on slopes are now possible dominik <dominik@openttd.org> parents: 0 diff changeset	293 },
c8795721b2d5 (svn r14) Fix: railroad crossings on slopes are now possible dominik <dominik@openttd.org> parents: 0 diff changeset	294 // valid railway crossings on slopes
c8795721b2d5 (svn r14) Fix: railroad crossings on slopes are now possible dominik <dominik@openttd.org> parents: 0 diff changeset	295 {
c8795721b2d5 (svn r14) Fix: railroad crossings on slopes are now possible dominik <dominik@openttd.org> parents: 0 diff changeset	296 1, 0, 0, // 0, 1, 2
c8795721b2d5 (svn r14) Fix: railroad crossings on slopes are now possible dominik <dominik@openttd.org> parents: 0 diff changeset	297 0, 0, 1, // 3, 4, 5
c8795721b2d5 (svn r14) Fix: railroad crossings on slopes are now possible dominik <dominik@openttd.org> parents: 0 diff changeset	298 0, 1, 0, // 6, 7, 8
c8795721b2d5 (svn r14) Fix: railroad crossings on slopes are now possible dominik <dominik@openttd.org> parents: 0 diff changeset	299 0, 1, 1, // 9, 10, 11
c8795721b2d5 (svn r14) Fix: railroad crossings on slopes are now possible dominik <dominik@openttd.org> parents: 0 diff changeset	300 0, 1, 1, // 12, 13, 14
0 fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	301 }
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	302 };
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	303
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	304
201 f2b49b0674c6 (svn r202) -Codechange: I missed some files with trailing spaces.. this should be truelight <truelight@openttd.org> parents: 159 diff changeset	305 static uint32 CheckRoadSlope(int tileh, byte *pieces, byte existing)
0 fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	306 {
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	307 if (!(tileh & 0x10)) {
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	308 byte road_bits = *pieces \| existing;
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	309
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	310 // no special foundation
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	311 if ((~_valid_tileh_slopes_road[0][tileh] & road_bits) == 0) {
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	312 // force that all bits are set when we have slopes
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	313 if (tileh != 0) *pieces \|= _valid_tileh_slopes_road[0][tileh];
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	314 return 0; // no extra cost
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	315 }
201 f2b49b0674c6 (svn r202) -Codechange: I missed some files with trailing spaces.. this should be truelight <truelight@openttd.org> parents: 159 diff changeset	316
0 fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	317 // foundation is used. Whole tile is leveled up
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	318 if ((~_valid_tileh_slopes_road[1][tileh] & road_bits) == 0) {
201 f2b49b0674c6 (svn r202) -Codechange: I missed some files with trailing spaces.. this should be truelight <truelight@openttd.org> parents: 159 diff changeset	319 return existing ? 0 : _price.terraform;
0 fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	320 }
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	321
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	322 // partly leveled up tile, only if there's no road on that tile
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	323 if ( !existing && (tileh == 1 \|\| tileh == 2 \|\| tileh == 4 \|\| tileh == 8) ) {
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	324 // force full pieces.
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	325 pieces \|= (pieces & 0xC) >> 2;
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	326 pieces \|= (pieces & 0x3) << 2;
72 0ecf460b53fc (svn r73) -Fix: Wrong building of road-slopes for a future AI/Town darkvater <darkvater@openttd.org> parents: 39 diff changeset	327 return (pieces == (ROAD_NE\|ROAD_SW) \|\| pieces == (ROAD_SE\|ROAD_NW)) ? _price.terraform : CMD_ERROR;
0 fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	328 }
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	329 }
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	330 return CMD_ERROR;
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	331 }
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	332
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	333 /* Build a piece of road
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	334 * p1 = piece flags
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	335 */
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	336
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	337 int32 CmdBuildRoad(int x, int y, uint32 flags, uint32 p1, uint32 p2)
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	338 {
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	339 TileInfo ti;
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	340 int32 cost;
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	341 byte pieces = (byte)p1, existing = 0;
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	342 uint tile;
201 f2b49b0674c6 (svn r202) -Codechange: I missed some files with trailing spaces.. this should be truelight <truelight@openttd.org> parents: 159 diff changeset	343
0 fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	344 SET_EXPENSES_TYPE(EXPENSES_CONSTRUCTION);
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	345
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	346 FindLandscapeHeight(&ti, x, y);
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	347 tile = ti.tile;
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	348
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	349 // allow building road under bridge
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	350 if (ti.type != MP_TUNNELBRIDGE && !EnsureNoVehicle(tile))
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	351 return CMD_ERROR;
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	352
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	353 if (ti.type == MP_STREET) {
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	354 if (!(ti.map5 & 0xF0)) {
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	355 if ( ((pieces) & (byte)(ti.map5)) == (pieces))
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	356 return_cmd_error(STR_1007_ALREADY_BUILT);
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	357 existing = ti.map5;
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	358 } else {
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	359 if (!(ti.map5 & 0xE0) && pieces != ((ti.map5 & 8) ? 5 : 10))
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	360 return_cmd_error(STR_1007_ALREADY_BUILT);
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	361 goto do_clear;
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	362 }
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	363 } else if (ti.type == MP_RAILWAY) {
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	364 byte m5;
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	365
13 c8795721b2d5 (svn r14) Fix: railroad crossings on slopes are now possible dominik <dominik@openttd.org> parents: 0 diff changeset	366 if (ti.tileh & 0x10) // very steep tile
c8795721b2d5 (svn r14) Fix: railroad crossings on slopes are now possible dominik <dominik@openttd.org> parents: 0 diff changeset	367 return_cmd_error(STR_1000_LAND_SLOPED_IN_WRONG_DIRECTION);
c8795721b2d5 (svn r14) Fix: railroad crossings on slopes are now possible dominik <dominik@openttd.org> parents: 0 diff changeset	368
c8795721b2d5 (svn r14) Fix: railroad crossings on slopes are now possible dominik <dominik@openttd.org> parents: 0 diff changeset	369 if(!_valid_tileh_slopes_road[2][ti.tileh]) // prevent certain slopes
c8795721b2d5 (svn r14) Fix: railroad crossings on slopes are now possible dominik <dominik@openttd.org> parents: 0 diff changeset	370 return_cmd_error(STR_1000_LAND_SLOPED_IN_WRONG_DIRECTION);
c8795721b2d5 (svn r14) Fix: railroad crossings on slopes are now possible dominik <dominik@openttd.org> parents: 0 diff changeset	371
0 fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	372 if (ti.map5 == 2) {
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	373 if (pieces & 5) goto do_clear;
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	374 m5 = 0x10;
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	375 } else if (ti.map5 == 1) {
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	376 if (pieces & 10) goto do_clear;
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	377 m5 = 0x18;
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	378 } else
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	379 goto do_clear;
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	380
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	381 if (flags & DC_EXEC) {
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	382 ModifyTile(tile,
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	383 MP_SETTYPE(MP_STREET) \|
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	384 MP_MAP2_CLEAR \| MP_MAP3LO \| MP_MAP3HI \| MP_MAP5,
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	385 _current_player, /* map3_lo */
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	386 _map3_lo[tile] & 0xF, /* map3_hi */
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	387 m5 /* map5 */
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	388 );
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	389 }
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	390 return _price.build_road * 2;
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	391 } else if (ti.type == MP_TUNNELBRIDGE) {
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	392
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	393 /* check for flat land */
13 c8795721b2d5 (svn r14) Fix: railroad crossings on slopes are now possible dominik <dominik@openttd.org> parents: 0 diff changeset	394 if (ti.tileh & 0x10) // very steep tile
0 fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	395 return_cmd_error(STR_1000_LAND_SLOPED_IN_WRONG_DIRECTION);
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	396
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	397 /* is this middle part of a bridge? */
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	398 if ((ti.map5 & 0xC0) != 0xC0)
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	399 goto do_clear;
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	400
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	401 /* only allow roads pertendicular to bridge */
959 ca7c19a004cc (svn r1451) Fix some of the signed/unsigned comparison warnings tron <tron@openttd.org> parents: 926 diff changeset	402 if ((pieces & 5U) == (ti.map5 & 0x01U))
0 fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	403 goto do_clear;
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	404
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	405 /* check if clear land under bridge */
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	406 if ((ti.map5 & 0xF8) == 0xE8) /* road under bridge */
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	407 return_cmd_error(STR_1007_ALREADY_BUILT);
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	408 else if ((ti.map5 & 0xE0) == 0xE0) /* other transport route under bridge */
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	409 return_cmd_error(STR_1008_MUST_REMOVE_RAILROAD_TRACK);
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	410 else if ((ti.map5 & 0xF8) == 0xC8) /* water under bridge */
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	411 return_cmd_error(STR_3807_CAN_T_BUILD_ON_WATER);
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	412
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	413 /* all checked, can build road now! */
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	414 cost = _price.build_road * 2;
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	415 if (flags & DC_EXEC) {
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	416 ModifyTile(tile,
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	417 MP_MAPOWNER_CURRENT \| MP_MAP5,
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	418 (ti.map5 & 0xC7) \| 0x28 // map5
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	419 );
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	420 }
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	421 return cost;
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	422 } else {
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	423 do_clear:;
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	424 if (DoCommandByTile(tile, 0, 0, flags & ~DC_EXEC, CMD_LANDSCAPE_CLEAR) == CMD_ERROR)
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	425 return CMD_ERROR;
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	426 }
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	427
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	428 cost = CheckRoadSlope(ti.tileh, &pieces, existing);
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	429 if (cost == CMD_ERROR) return_cmd_error(STR_1800_LAND_SLOPED_IN_WRONG_DIRECTION);
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	430
84 784a9e9bb932 (svn r85) -Add: initial commit of new AI (enable in Patch menu) truelight <truelight@openttd.org> parents: 72 diff changeset	431 if (cost && (!_patches.build_on_slopes \|\| (!_patches.ainew_active && _is_ai_player)))
0 fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	432 return CMD_ERROR;
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	433
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	434 if (!(ti.type == MP_STREET && (ti.map5 & 0xF0) == 0)) {
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	435 cost += DoCommandByTile(tile, 0, 0, flags, CMD_LANDSCAPE_CLEAR);
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	436 } else {
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	437 // Don't put the pieces that already exist
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	438 pieces &= ~ti.map5;
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	439 }
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	440
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	441 {
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	442 byte t = pieces;
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	443 while (t) {
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	444 if (t & 1) cost += _price.build_road;
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	445 t >>= 1;
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	446 }
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	447 }
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	448
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	449 if (flags & DC_EXEC) {
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	450 if (ti.type != MP_STREET) {
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	451 _map_type_and_height[tile] &= 0xF;
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	452 _map_type_and_height[tile] \|= MP_STREET << 4;
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	453 _map5[tile] = 0;
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	454 _map_owner[tile] = _current_player;
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	455 }
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	456
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	457 _map5[tile] \|= (byte)pieces;
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	458
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	459 MarkTileDirtyByTile(tile);
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	460 }
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	461 return cost;
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	462 }
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	463
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	464 int32 DoConvertStreetRail(uint tile, uint totype, bool exec)
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	465 {
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	466 // not a railroad crossing?
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	467 if ((_map5[tile] & 0xF0) != 0x10) return CMD_ERROR;
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	468
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	469 // not owned by me?
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	470 if (!CheckTileOwnership(tile) \|\| !EnsureNoVehicle(tile)) return CMD_ERROR;
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	471
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	472 // tile is already of requested type?
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	473 if ( (uint)(_map3_hi[tile] & 0xF) == totype) return CMD_ERROR;
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	474
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	475 if (exec) {
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	476 // change type.
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	477 _map3_hi[tile] = (_map3_hi[tile] & 0xF0) + totype;
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	478 MarkTileDirtyByTile(tile);
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	479 }
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	480
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	481 return _price.build_rail >> 1;
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	482 }
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	483
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	484
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	485 // Build a long piece of road.
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	486 // x,y = end tile
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	487 // p1 = start tile
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	488 // p2&1 = start tile starts in the 2nd half
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	489 // p2&2 = end tile starts in the 2nd half
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	490 // p2&4 = direction (0 = along x, 1=along y)
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	491 int32 CmdBuildLongRoad(int x, int y, uint32 flags, uint32 p1, uint32 p2)
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	492 {
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	493 uint start_tile, end_tile, tile;
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	494 int mode;
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	495 int32 cost,ret;
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	496
889 8a7301b5aa5b (svn r1375) -Fix: [1050990] Buying trains sometimes accounted for incorrectly. Was the result of the cost getting reset in a recursive call of docommand. That is fixed. In addition all cost-commands are typed explicitely. Please do not forget to do so or your costs will be credited to construction if you are unlucky. darkvater <darkvater@openttd.org> parents: 817 diff changeset	497 SET_EXPENSES_TYPE(EXPENSES_CONSTRUCTION);
8a7301b5aa5b (svn r1375) -Fix: [1050990] Buying trains sometimes accounted for incorrectly. Was the result of the cost getting reset in a recursive call of docommand. That is fixed. In addition all cost-commands are typed explicitely. Please do not forget to do so or your costs will be credited to construction if you are unlucky. darkvater <darkvater@openttd.org> parents: 817 diff changeset	498
0 fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	499 start_tile = p1;
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	500 end_tile = TILE_FROM_XY(x, y);
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	501
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	502 if (start_tile > end_tile \|\| (start_tile == end_tile && (p2&1))) {
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	503 uint t = start_tile; start_tile = end_tile; end_tile = t;
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	504 p2 ^= IS_INT_INSIDE(p2&3, 1, 3) ? 3 : 0;
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	505 }
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	506
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	507 cost = 0;
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	508 tile = start_tile;
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	509 // Start tile is the small number.
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	510 for(;;) {
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	511 mode = (p2&4) ? 5 : 10;
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	512
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	513 if (tile == start_tile && (p2&1))
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	514 mode &= (4+2);
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	515 else if (tile == end_tile && !(p2&2))
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	516 mode &= (1+8);
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	517
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	518 ret = DoCommandByTile(tile, mode, 0, flags, CMD_BUILD_ROAD);
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	519 if (ret == CMD_ERROR) {
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	520 if (_error_message != STR_1007_ALREADY_BUILT)
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	521 return CMD_ERROR;
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	522 } else {
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	523 cost += ret;
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	524 }
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	525
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	526 if (tile == end_tile)
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	527 break;
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	528
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	529 tile += (p2&4)?TILE_XY(0,1):TILE_XY(1,0);
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	530 }
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	531
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	532 // already built?
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	533 if (cost == 0)
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	534 return CMD_ERROR;
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	535
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	536 return cost;
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	537 }
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	538
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	539 // Remove a long piece of road.
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	540 // x,y = end tile
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	541 // p1 = start tile
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	542 // p2&1 = start tile starts in the 2nd half
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	543 // p2&2 = end tile starts in the 2nd half
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	544 // p2&4 = direction (0 = along x, 1=along y)
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	545 int32 CmdRemoveLongRoad(int x, int y, uint32 flags, uint32 p1, uint32 p2)
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	546 {
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	547 uint start_tile, end_tile, tile;
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	548 int32 cost,ret;
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	549
889 8a7301b5aa5b (svn r1375) -Fix: [1050990] Buying trains sometimes accounted for incorrectly. Was the result of the cost getting reset in a recursive call of docommand. That is fixed. In addition all cost-commands are typed explicitely. Please do not forget to do so or your costs will be credited to construction if you are unlucky. darkvater <darkvater@openttd.org> parents: 817 diff changeset	550 SET_EXPENSES_TYPE(EXPENSES_CONSTRUCTION);
8a7301b5aa5b (svn r1375) -Fix: [1050990] Buying trains sometimes accounted for incorrectly. Was the result of the cost getting reset in a recursive call of docommand. That is fixed. In addition all cost-commands are typed explicitely. Please do not forget to do so or your costs will be credited to construction if you are unlucky. darkvater <darkvater@openttd.org> parents: 817 diff changeset	551
0 fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	552 start_tile = p1;
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	553 end_tile = TILE_FROM_XY(x, y);
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	554
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	555 if (start_tile > end_tile \|\| (start_tile == end_tile && (p2&1))) {
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	556 uint t = start_tile; start_tile = end_tile; end_tile = t;
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	557 p2 ^= IS_INT_INSIDE(p2&3, 1, 3) ? 3 : 0;
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	558 }
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	559
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	560 cost = 0;
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	561 tile = start_tile;
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	562 // Start tile is the small number.
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	563 for(;;) {
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	564 uint bits = (p2 & 4) ? ROAD_SE \| ROAD_NW : ROAD_SW \| ROAD_NE;
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	565 if (tile == end_tile && !(p2&2)) bits &= ROAD_NW \| ROAD_NE;
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	566 if (tile == start_tile && (p2&1)) bits &= ROAD_SE \| ROAD_SW;
201 f2b49b0674c6 (svn r202) -Codechange: I missed some files with trailing spaces.. this should be truelight <truelight@openttd.org> parents: 159 diff changeset	567
0 fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	568 // try to remove the halves.
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	569 if (bits) {
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	570 ret = DoCommandByTile(tile, bits, 0, flags, CMD_REMOVE_ROAD);
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	571 if (ret != CMD_ERROR)
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	572 cost += ret;
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	573 }
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	574
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	575 if (tile == end_tile)
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	576 break;
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	577
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	578 tile += (p2&4)?TILE_XY(0,1):TILE_XY(1,0);
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	579 }
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	580
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	581 // already built?
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	582 if (cost == 0)
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	583 return CMD_ERROR;
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	584
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	585 return cost;
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	586 }
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	587
201 f2b49b0674c6 (svn r202) -Codechange: I missed some files with trailing spaces.. this should be truelight <truelight@openttd.org> parents: 159 diff changeset	588 /* Build a road depot
0 fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	589 * p1 - direction (0-3)
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	590 * p2 - unused
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	591 */
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	592
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	593 int32 CmdBuildRoadDepot(int x, int y, uint32 flags, uint32 p1, uint32 p2)
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	594 {
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	595 TileInfo ti;
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	596 int32 cost;
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	597 Depot *dep;
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	598 uint tile;
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	599
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	600 SET_EXPENSES_TYPE(EXPENSES_CONSTRUCTION);
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	601
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	602 FindLandscapeHeight(&ti, x, y);
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	603
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	604 tile = ti.tile;
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	605
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	606 if (!EnsureNoVehicle(tile))
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	607 return CMD_ERROR;
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	608
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	609 if (ti.tileh != 0) {
84 784a9e9bb932 (svn r85) -Add: initial commit of new AI (enable in Patch menu) truelight <truelight@openttd.org> parents: 72 diff changeset	610 if (!_patches.build_on_slopes \|\| (ti.tileh & 0x10 \|\| !((0x4C >> p1) & ti.tileh) ))
0 fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	611 return_cmd_error(STR_0007_FLAT_LAND_REQUIRED);
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	612 }
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	613
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	614 cost = DoCommandByTile(tile, 0, 0, flags, CMD_LANDSCAPE_CLEAR);
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	615 if (cost == CMD_ERROR)
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	616 return CMD_ERROR;
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	617
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	618 dep = AllocateDepot();
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	619 if (dep == NULL)
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	620 return CMD_ERROR;
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	621
201 f2b49b0674c6 (svn r202) -Codechange: I missed some files with trailing spaces.. this should be truelight <truelight@openttd.org> parents: 159 diff changeset	622 if (flags & DC_EXEC) {
0 fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	623 if (_current_player == _local_player)
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	624 _last_built_road_depot_tile = (TileIndex)tile;
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	625
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	626 dep->xy = tile;
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	627 dep->town_index = ClosestTownFromTile(tile, (uint)-1)->index;
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	628
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	629 ModifyTile(tile,
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	630 MP_SETTYPE(MP_STREET) \|
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	631 MP_MAPOWNER_CURRENT \| MP_MAP5,
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	632 (p1 \| 0x20) /* map5 */
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	633 );
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	634
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	635 }
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	636 return cost + _price.build_road_depot;
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	637 }
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	638
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	639 static int32 RemoveRoadDepot(uint tile, uint32 flags)
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	640 {
149 811875caee5f (svn r150) -Fix: [1010833] Turning on the magic bulldozer removes oil rigs darkvater <darkvater@openttd.org> parents: 84 diff changeset	641 if (!CheckTileOwnership(tile) && _current_player != OWNER_WATER)
0 fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	642 return CMD_ERROR;
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	643
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	644 if (!EnsureNoVehicle(tile))
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	645 return CMD_ERROR;
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	646
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	647 if (flags & DC_EXEC) {
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	648 DoDeleteDepot(tile);
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	649 }
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	650
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	651 return _price.remove_road_depot;
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	652 }
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	653
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	654 #define M(x) (1<<(x))
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	655
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	656 static int32 ClearTile_Road(uint tile, byte flags) {
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	657 int32 ret;
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	658 byte m5 = _map5[tile];
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	659
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	660 if ( (m5 & 0xF0) == 0) {
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	661 byte b = m5 & 0xF;
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	662
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	663 if (! ((1 << b) & (M(1)\|M(2)\|M(4)\|M(8))) ) {
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	664 if ( (!(flags & DC_AI_BUILDING) \|\| _map_owner[tile]!=OWNER_TOWN) && flags&DC_AUTO)
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	665 return_cmd_error(STR_1801_MUST_REMOVE_ROAD_FIRST);
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	666 }
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	667 return DoCommandByTile(tile, b, 0, flags, CMD_REMOVE_ROAD);
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	668 } else if ( (m5 & 0xE0) == 0) {
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	669 if (flags & DC_AUTO)
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	670 return_cmd_error(STR_1801_MUST_REMOVE_ROAD_FIRST);
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	671
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	672 ret = DoCommandByTile(tile, (m5&8)?5:10, 0, flags, CMD_REMOVE_ROAD);
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	673 if (ret == CMD_ERROR)
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	674 return CMD_ERROR;
201 f2b49b0674c6 (svn r202) -Codechange: I missed some files with trailing spaces.. this should be truelight <truelight@openttd.org> parents: 159 diff changeset	675
0 fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	676 if (flags & DC_EXEC) {
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	677 DoCommandByTile(tile, 0, 0, flags, CMD_LANDSCAPE_CLEAR);
201 f2b49b0674c6 (svn r202) -Codechange: I missed some files with trailing spaces.. this should be truelight <truelight@openttd.org> parents: 159 diff changeset	678 }
0 fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	679
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	680 return ret;
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	681 } else {
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	682 if (flags & DC_AUTO)
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	683 return_cmd_error(STR_2004_BUILDING_MUST_BE_DEMOLISHED);
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	684 return RemoveRoadDepot(tile,flags);
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	685 }
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	686 }
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	687
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	688
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	689 typedef struct DrawRoadTileStruct {
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	690 uint16 image;
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	691 byte subcoord_x;
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	692 byte subcoord_y;
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	693 } DrawRoadTileStruct;
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	694
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	695 typedef struct DrawRoadSeqStruct {
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	696 uint32 image;
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	697 byte subcoord_x;
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	698 byte subcoord_y;
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	699 byte width;
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	700 byte height;
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	701 } DrawRoadSeqStruct;
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	702
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	703 #include "table/road_land.h"
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	704
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	705
84 784a9e9bb932 (svn r85) -Add: initial commit of new AI (enable in Patch menu) truelight <truelight@openttd.org> parents: 72 diff changeset	706 uint GetRoadFoundation(uint tileh, uint bits) {
0 fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	707 int i;
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	708 // normal level sloped building
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	709 if ((~_valid_tileh_slopes_road[1][tileh] & bits) == 0)
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	710 return tileh;
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	711
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	712 // inclined sloped building
201 f2b49b0674c6 (svn r202) -Codechange: I missed some files with trailing spaces.. this should be truelight <truelight@openttd.org> parents: 159 diff changeset	713 if ( ((i=0, tileh == 1) \|\| (i+=2, tileh == 2) \|\| (i+=2, tileh == 4) \|\| (i+=2, tileh == 8)) &&
0 fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	714 ((bits == (ROAD_SW \| ROAD_NE)) \|\| (i++, bits == (ROAD_NW \| ROAD_SE))))
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	715 return i + 15;
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	716
13 c8795721b2d5 (svn r14) Fix: railroad crossings on slopes are now possible dominik <dominik@openttd.org> parents: 0 diff changeset	717 // rail crossing
c8795721b2d5 (svn r14) Fix: railroad crossings on slopes are now possible dominik <dominik@openttd.org> parents: 0 diff changeset	718 if ((bits & 0x10) && _valid_tileh_slopes_road[2][tileh])
c8795721b2d5 (svn r14) Fix: railroad crossings on slopes are now possible dominik <dominik@openttd.org> parents: 0 diff changeset	719 return tileh;
c8795721b2d5 (svn r14) Fix: railroad crossings on slopes are now possible dominik <dominik@openttd.org> parents: 0 diff changeset	720
0 fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	721 return 0;
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	722 }
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	723
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	724 const byte _road_sloped_sprites[14] = {
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	725 0, 0, 2, 0,
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	726 0, 1, 0, 0,
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	727 3, 0, 0, 0,
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	728 0, 0
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	729 };
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	730
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	731 static void DrawTile_Road(TileInfo *ti)
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	732 {
201 f2b49b0674c6 (svn r202) -Codechange: I missed some files with trailing spaces.. this should be truelight <truelight@openttd.org> parents: 159 diff changeset	733 uint32 image;
817 a3fae649752e (svn r1288) -Codechange: changed _map2 to an uint16. It is still saved and loaded as truelight <truelight@openttd.org> parents: 679 diff changeset	734 uint16 m2;
0 fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	735 const byte *s;
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	736
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	737 if ( (ti->map5 & 0xF0) == 0) { // if it is a road the upper 4 bits are 0
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	738 const DrawRoadTileStruct *drts;
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	739
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	740 if (ti->tileh != 0) {
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	741 int f = GetRoadFoundation(ti->tileh, ti->map5 & 0xF);
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	742 if (f) DrawFoundation(ti, f);
201 f2b49b0674c6 (svn r202) -Codechange: I missed some files with trailing spaces.. this should be truelight <truelight@openttd.org> parents: 159 diff changeset	743
0 fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	744 // default sloped sprites..
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	745 if (ti->tileh != 0) {
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	746 image = _road_sloped_sprites[ti->tileh - 1] + 0x53F;
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	747 } else {
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	748 image = _road_tile_sprites_1[ti->map5 & 0xF];
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	749 }
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	750 } else {
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	751 image = _road_tile_sprites_1[ti->map5 & 0xF];
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	752 }
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	753
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	754 m2 = _map2[ti->tile] & 7;
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	755
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	756 if (m2 == 0) image \|= 0x3178000;
201 f2b49b0674c6 (svn r202) -Codechange: I missed some files with trailing spaces.. this should be truelight <truelight@openttd.org> parents: 159 diff changeset	757
0 fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	758 if (_map3_hi[ti->tile] & 0x80) {
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	759 image += 19;
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	760 } else if (m2 > 1 && m2 != 6) {
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	761 image -= 19; /* pavement along the road? */
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	762 }
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	763
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	764 DrawGroundSprite(image);
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	765
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	766 if (!(_display_opt & DO_FULL_DETAIL) \|\| _cur_dpi->zoom == 2)
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	767 return;
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	768
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	769 if (m2 >= 6) {
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	770 // roadwork
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	771 DrawGroundSprite(0x586 + ((ti->map5&8)!=0 ? 0 : 1));
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	772 return;
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	773 }
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	774
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	775 drts = (const DrawRoadTileStruct*)_road_display_table[m2][ti->map5 & 0xF];
201 f2b49b0674c6 (svn r202) -Codechange: I missed some files with trailing spaces.. this should be truelight <truelight@openttd.org> parents: 159 diff changeset	776
0 fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	777 while ((image = drts->image) != 0) {
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	778 int x = ti->x \| drts->subcoord_x;
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	779 int y = ti->y \| drts->subcoord_y;
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	780 byte z = ti->z;
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	781 if (ti->tileh != 0) z = GetSlopeZ(x, y);
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	782 AddSortableSpriteToDraw(image, x, y, 2, 2, 0x10, z);
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	783 drts++;
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	784 }
13 c8795721b2d5 (svn r14) Fix: railroad crossings on slopes are now possible dominik <dominik@openttd.org> parents: 0 diff changeset	785 } else if ( (ti->map5 & 0xE0) == 0) { // railroad crossing
c8795721b2d5 (svn r14) Fix: railroad crossings on slopes are now possible dominik <dominik@openttd.org> parents: 0 diff changeset	786 int f = GetRoadFoundation(ti->tileh, ti->map5 & 0xF);
c8795721b2d5 (svn r14) Fix: railroad crossings on slopes are now possible dominik <dominik@openttd.org> parents: 0 diff changeset	787 if (f) DrawFoundation(ti, f);
c8795721b2d5 (svn r14) Fix: railroad crossings on slopes are now possible dominik <dominik@openttd.org> parents: 0 diff changeset	788
0 fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	789 image = 0x55B;
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	790
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	791 if ( (ti->map5 & 8) != 0)
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	792 image--;
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	793
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	794 if ( (ti->map5 & 4) != 0)
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	795 image += 2;
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	796
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	797 if ( _map3_hi[ti->tile] & 0x80) {
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	798 image += 8;
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	799 } else {
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	800 m2 = _map2[ti->tile] & 7;
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	801 if (m2 == 0) image \|= 0x3178000;
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	802 if (m2 > 1) image += 4;
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	803 }
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	804
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	805 DrawGroundSprite(image + (_map3_hi[ti->tile] & 0xF) * 12);
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	806 } else {
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	807 uint32 ormod;
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	808 int player;
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	809 const DrawRoadSeqStruct *drss;
201 f2b49b0674c6 (svn r202) -Codechange: I missed some files with trailing spaces.. this should be truelight <truelight@openttd.org> parents: 159 diff changeset	810
0 fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	811 if (ti->tileh != 0) { DrawFoundation(ti, ti->tileh); }
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	812
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	813 ormod = 0x315;
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	814 player = _map_owner[ti->tile];
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	815 if (player < MAX_PLAYERS)
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	816 ormod = PLAYER_SPRITE_COLOR(player);
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	817
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	818 s = _road_display_datas[ti->map5 & 0xF];
201 f2b49b0674c6 (svn r202) -Codechange: I missed some files with trailing spaces.. this should be truelight <truelight@openttd.org> parents: 159 diff changeset	819
222 d1b097f4593b (svn r223) -Fix: Const correctness and miscellaneous fixes. Thank you Tron for your diligent fixing of warnings (and some possibly bugs) (Tron) darkvater <darkvater@openttd.org> parents: 204 diff changeset	820 DrawGroundSprite((const uint32)s);
0 fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	821 s += sizeof(uint32);
222 d1b097f4593b (svn r223) -Fix: Const correctness and miscellaneous fixes. Thank you Tron for your diligent fixing of warnings (and some possibly bugs) (Tron) darkvater <darkvater@openttd.org> parents: 204 diff changeset	822 drss = (const DrawRoadSeqStruct*)s;
0 fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	823
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	824 while ((image=drss->image) != 0) {
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	825 if (image & 0x8000)
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	826 image \|= ormod;
497 5ac8ae8585fa (svn r787) Invert the sense of the DO_TRANS_BUILDINGS flag to be consistent with its own name and all other DO_* flags. tron <tron@openttd.org> parents: 473 diff changeset	827 if (_display_opt & DO_TRANS_BUILDINGS) // show transparent depots
204 6b6352ec7434 (svn r205) -Fix: [1026271] Vehicle depots not transparent with transparent buildings. darkvater <darkvater@openttd.org> parents: 201 diff changeset	828 image = (image & 0x3FFF) \| 0x3224000;
0 fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	829
201 f2b49b0674c6 (svn r202) -Codechange: I missed some files with trailing spaces.. this should be truelight <truelight@openttd.org> parents: 159 diff changeset	830 AddSortableSpriteToDraw(image, ti->x \| drss->subcoord_x,
0 fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	831 ti->y \| drss->subcoord_y, drss->width, drss->height, 0x14, ti->z);
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	832 drss++;
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	833 }
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	834 }
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	835 }
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	836
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	837 void DrawRoadDepotSprite(int x, int y, int image)
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	838 {
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	839 uint32 ormod;
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	840 const DrawRoadSeqStruct *dtss;
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	841 const byte *t;
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	842
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	843 ormod = PLAYER_SPRITE_COLOR(_local_player);
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	844
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	845 t = _road_display_datas[image];
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	846
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	847 x+=33;
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	848 y+=17;
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	849
222 d1b097f4593b (svn r223) -Fix: Const correctness and miscellaneous fixes. Thank you Tron for your diligent fixing of warnings (and some possibly bugs) (Tron) darkvater <darkvater@openttd.org> parents: 204 diff changeset	850 DrawSprite((const uint32)t, x, y);
0 fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	851 t += sizeof(uint32);
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	852
222 d1b097f4593b (svn r223) -Fix: Const correctness and miscellaneous fixes. Thank you Tron for your diligent fixing of warnings (and some possibly bugs) (Tron) darkvater <darkvater@openttd.org> parents: 204 diff changeset	853 for(dtss = (const DrawRoadSeqStruct *)t; dtss->image != 0; dtss++) {
0 fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	854 Point pt = RemapCoords(dtss->subcoord_x, dtss->subcoord_y, 0);
201 f2b49b0674c6 (svn r202) -Codechange: I missed some files with trailing spaces.. this should be truelight <truelight@openttd.org> parents: 159 diff changeset	855
0 fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	856 image = dtss->image;
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	857 if (image & 0x8000)
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	858 image \|= ormod;
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	859
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	860 DrawSprite(image, x + pt.x, y + pt.y);
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	861 }
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	862 }
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	863
410 e165d1275350 (svn r607) -Patch: [ 985102 ] static cleanup tron <tron@openttd.org> parents: 337 diff changeset	864 static uint GetSlopeZ_Road(TileInfo *ti)
0 fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	865 {
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	866 uint z = ti->z;
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	867 int th = ti->tileh;
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	868
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	869 // check if it's a foundation
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	870 if (ti->tileh != 0) {
13 c8795721b2d5 (svn r14) Fix: railroad crossings on slopes are now possible dominik <dominik@openttd.org> parents: 0 diff changeset	871 if ((ti->map5 & 0xE0) == 0) { /* road or crossing */
0 fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	872 uint f = GetRoadFoundation(ti->tileh, ti->map5 & 0x3F);
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	873 if (f != 0) {
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	874 if (f < 15) {
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	875 // leveled foundation
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	876 return z + 8;
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	877 }
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	878 // inclined foundation
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	879 th = _inclined_tileh[f - 15];
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	880 }
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	881 } else if ((ti->map5 & 0xF0) == 0x20) {
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	882 // depot
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	883 return z + 8;
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	884 }
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	885 return GetPartialZ(ti->x&0xF, ti->y&0xF, th) + z;
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	886 }
39 927ba896b4a5 (svn r40) Final slope graphics fix dominik <dominik@openttd.org> parents: 22 diff changeset	887 return z; // normal Z if no slope
927ba896b4a5 (svn r40) Final slope graphics fix dominik <dominik@openttd.org> parents: 22 diff changeset	888 }
927ba896b4a5 (svn r40) Final slope graphics fix dominik <dominik@openttd.org> parents: 22 diff changeset	889
927ba896b4a5 (svn r40) Final slope graphics fix dominik <dominik@openttd.org> parents: 22 diff changeset	890 uint GetSlopeTileh_Road(TileInfo *ti)
927ba896b4a5 (svn r40) Final slope graphics fix dominik <dominik@openttd.org> parents: 22 diff changeset	891 {
927ba896b4a5 (svn r40) Final slope graphics fix dominik <dominik@openttd.org> parents: 22 diff changeset	892 // check if it's a foundation
927ba896b4a5 (svn r40) Final slope graphics fix dominik <dominik@openttd.org> parents: 22 diff changeset	893 if (ti->tileh != 0) {
927ba896b4a5 (svn r40) Final slope graphics fix dominik <dominik@openttd.org> parents: 22 diff changeset	894 if ((ti->map5 & 0xE0) == 0) { /* road or crossing */
927ba896b4a5 (svn r40) Final slope graphics fix dominik <dominik@openttd.org> parents: 22 diff changeset	895 uint f = GetRoadFoundation(ti->tileh, ti->map5 & 0x3F);
927ba896b4a5 (svn r40) Final slope graphics fix dominik <dominik@openttd.org> parents: 22 diff changeset	896 if (f != 0) {
927ba896b4a5 (svn r40) Final slope graphics fix dominik <dominik@openttd.org> parents: 22 diff changeset	897 if (f < 15) {
927ba896b4a5 (svn r40) Final slope graphics fix dominik <dominik@openttd.org> parents: 22 diff changeset	898 // leveled foundation
927ba896b4a5 (svn r40) Final slope graphics fix dominik <dominik@openttd.org> parents: 22 diff changeset	899 return 0;
927ba896b4a5 (svn r40) Final slope graphics fix dominik <dominik@openttd.org> parents: 22 diff changeset	900 }
927ba896b4a5 (svn r40) Final slope graphics fix dominik <dominik@openttd.org> parents: 22 diff changeset	901 // inclined foundation
927ba896b4a5 (svn r40) Final slope graphics fix dominik <dominik@openttd.org> parents: 22 diff changeset	902 return _inclined_tileh[f - 15];
927ba896b4a5 (svn r40) Final slope graphics fix dominik <dominik@openttd.org> parents: 22 diff changeset	903 }
927ba896b4a5 (svn r40) Final slope graphics fix dominik <dominik@openttd.org> parents: 22 diff changeset	904 } else if ((ti->map5 & 0xF0) == 0x20) {
927ba896b4a5 (svn r40) Final slope graphics fix dominik <dominik@openttd.org> parents: 22 diff changeset	905 // depot
927ba896b4a5 (svn r40) Final slope graphics fix dominik <dominik@openttd.org> parents: 22 diff changeset	906 return 0;
927ba896b4a5 (svn r40) Final slope graphics fix dominik <dominik@openttd.org> parents: 22 diff changeset	907 }
927ba896b4a5 (svn r40) Final slope graphics fix dominik <dominik@openttd.org> parents: 22 diff changeset	908 }
927ba896b4a5 (svn r40) Final slope graphics fix dominik <dominik@openttd.org> parents: 22 diff changeset	909 return ti->tileh;
0 fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	910 }
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	911
473 b2908e7209e4 (svn r724) Remove restriction that a tile can only accept 3 cargo types. tron <tron@openttd.org> parents: 410 diff changeset	912 static void GetAcceptedCargo_Road(uint tile, AcceptedCargo ac)
0 fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	913 {
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	914 /* not used */
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	915 }
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	916
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	917 static void AnimateTile_Road(uint tile)
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	918 {
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	919 if ((_map5[tile] & 0xF0) == 0x10) {
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	920 MarkTileDirtyByTile(tile);
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	921 }
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	922 }
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	923
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	924 static const byte _town_road_types[5][2] = {
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	925 {1,1},
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	926 {2,2},
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	927 {2,2},
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	928 {5,5},
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	929 {3,2},
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	930 };
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	931
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	932 static const byte _town_road_types_2[5][2] = {
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	933 {1,1},
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	934 {2,2},
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	935 {3,2},
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	936 {3,2},
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	937 {3,2},
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	938 };
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	939
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	940
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	941 static void TileLoop_Road(uint tile)
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	942 {
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	943 Town *t;
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	944 int grp;
201 f2b49b0674c6 (svn r202) -Codechange: I missed some files with trailing spaces.. this should be truelight <truelight@openttd.org> parents: 159 diff changeset	945
0 fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	946 if (_opt.landscape == LT_HILLY) {
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	947 // Fix snow style if the road is above the snowline
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	948 if ((_map3_hi[tile] & 0x80) != ((GetTileZ(tile) > _opt.snow_line) ? 0x80 : 0x00)) {
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	949 _map3_hi[tile] ^= 0x80;
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	950 MarkTileDirtyByTile(tile);
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	951 }
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	952 } else if (_opt.landscape == LT_DESERT) {
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	953 // Fix desert style
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	954 if (GetMapExtraBits(tile) == 1 && !(_map3_hi[tile] & 0x80)) {
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	955 _map3_hi[tile] \|= 0x80;
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	956 MarkTileDirtyByTile(tile);
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	957 }
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	958 }
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	959
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	960 if (_map5[tile] & 0xE0)
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	961 return;
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	962
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	963 if ((_map2[tile] & 7) < 6) {
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	964 t = ClosestTownFromTile(tile, (uint)-1);
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	965 grp = 0;
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	966 if (t != NULL) {
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	967 // If in the scenario editor, set the owner to a town.
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	968 if (_game_mode == GM_EDITOR) {
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	969 _map_owner[tile] = OWNER_TOWN;
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	970 }
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	971
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	972 grp = GetTownRadiusGroup(t, tile);
201 f2b49b0674c6 (svn r202) -Codechange: I missed some files with trailing spaces.. this should be truelight <truelight@openttd.org> parents: 159 diff changeset	973
0 fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	974 // Show an animation to indicate road work
201 f2b49b0674c6 (svn r202) -Codechange: I missed some files with trailing spaces.. this should be truelight <truelight@openttd.org> parents: 159 diff changeset	975 if (t->road_build_months != 0 &&
0 fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	976 !(GetTileDist(t->xy, tile) >= 8 && grp==0) &&
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	977 (_map5[tile]==5 \|\| _map5[tile]==10)) {
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	978 if (GetTileSlope(tile, NULL) == 0 && EnsureNoVehicle(tile) && CHANCE16(1,20)) {
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	979 _map2[tile] = ((_map2[tile]&7) <= 1) ? 6 : 7;
201 f2b49b0674c6 (svn r202) -Codechange: I missed some files with trailing spaces.. this should be truelight <truelight@openttd.org> parents: 159 diff changeset	980
541 facaef10d233 (svn r925) Use sound enums tron <tron@openttd.org> parents: 534 diff changeset	981 SndPlayTileFx(SND_21_JACKHAMMER, tile);
0 fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	982 CreateEffectVehicleAbove(
926 b1ef952b19f8 (svn r1414) Move TileIndex, TILE_MASK and GET_TILE_[XY] to map.h and turn the latter into inline functions names Tile[XY] tron <tron@openttd.org> parents: 889 diff changeset	983 TileX(tile) * 16 + 7,
b1ef952b19f8 (svn r1414) Move TileIndex, TILE_MASK and GET_TILE_[XY] to map.h and turn the latter into inline functions names Tile[XY] tron <tron@openttd.org> parents: 889 diff changeset	984 TileY(tile) * 16 + 7,
0 fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	985 0,
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	986 EV_ROADWORK);
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	987 MarkTileDirtyByTile(tile);
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	988 return;
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	989 }
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	990 }
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	991 }
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	992
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	993 {
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	994 const byte *p = (_opt.landscape == LT_CANDY) ? _town_road_types_2[grp] : _town_road_types[grp];
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	995 byte b = _map2[tile] & 7;
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	996
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	997 if (b == p[0])
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	998 return;
201 f2b49b0674c6 (svn r202) -Codechange: I missed some files with trailing spaces.. this should be truelight <truelight@openttd.org> parents: 159 diff changeset	999
0 fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	1000 if (b == p[1]) {
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	1001 b = p[0];
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	1002 } else if (b == 0) {
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	1003 b = p[1];
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	1004 } else {
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	1005 b = 0;
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	1006 }
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	1007 _map2[tile] = (_map2[tile] & ~7) \| b;
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	1008 MarkTileDirtyByTile(tile);
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	1009 }
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	1010 } else {
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	1011 // Handle road work
201 f2b49b0674c6 (svn r202) -Codechange: I missed some files with trailing spaces.. this should be truelight <truelight@openttd.org> parents: 159 diff changeset	1012
817 a3fae649752e (svn r1288) -Codechange: changed _map2 to an uint16. It is still saved and loaded as truelight <truelight@openttd.org> parents: 679 diff changeset	1013 uint16 b = _map2[tile];
0 fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	1014 if (b < 0x80) {
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	1015 _map2[tile] = b + 8;
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	1016 return;
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	1017 }
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	1018 _map2[tile] = ((b&7) == 6) ? 1 : 2;
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	1019 MarkTileDirtyByTile(tile);
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	1020 }
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	1021 }
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	1022
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	1023 void ShowRoadDepotWindow(uint tile);
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	1024
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	1025 static void ClickTile_Road(uint tile)
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	1026 {
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	1027 if ((_map5[tile] & 0xF0) == 0x20) {
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	1028 ShowRoadDepotWindow(tile);
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	1029 }
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	1030 }
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	1031
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	1032 static const byte _road_trackbits[16] = {
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	1033 0x0, 0x0, 0x0, 0x10, 0x0, 0x2, 0x8, 0x1A, 0x0, 0x4, 0x1, 0x15, 0x20, 0x26, 0x29, 0x3F,
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	1034 };
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	1035
159 a4e15430335b (svn r160) -Codechange: made GetTileTrackStatus more readable (blathijs) truelight <truelight@openttd.org> parents: 149 diff changeset	1036 static uint32 GetTileTrackStatus_Road(uint tile, TransportType mode) {
a4e15430335b (svn r160) -Codechange: made GetTileTrackStatus more readable (blathijs) truelight <truelight@openttd.org> parents: 149 diff changeset	1037 if (mode == TRANSPORT_RAIL) {
0 fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	1038 if ((_map5[tile] & 0xF0) != 0x10)
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	1039 return 0;
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	1040 return _map5[tile] & 8 ? 0x101 : 0x202;
159 a4e15430335b (svn r160) -Codechange: made GetTileTrackStatus more readable (blathijs) truelight <truelight@openttd.org> parents: 149 diff changeset	1041 } else if (mode == TRANSPORT_ROAD) {
0 fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	1042 byte b = _map5[tile];
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	1043 if ((b & 0xF0) == 0) {
159 a4e15430335b (svn r160) -Codechange: made GetTileTrackStatus more readable (blathijs) truelight <truelight@openttd.org> parents: 149 diff changeset	1044 /* Ordinary road */
0 fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	1045 if (!_road_special_gettrackstatus && (_map2[tile]&7) >= 6)
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	1046 return 0;
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	1047 return _road_trackbits[b&0xF] * 0x101;
159 a4e15430335b (svn r160) -Codechange: made GetTileTrackStatus more readable (blathijs) truelight <truelight@openttd.org> parents: 149 diff changeset	1048 } else if ((b&0xF0) == 0x10) {
a4e15430335b (svn r160) -Codechange: made GetTileTrackStatus more readable (blathijs) truelight <truelight@openttd.org> parents: 149 diff changeset	1049 /* Crossing */
0 fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	1050 uint32 r = 0x101;
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	1051 if (b&8) r <<= 1;
201 f2b49b0674c6 (svn r202) -Codechange: I missed some files with trailing spaces.. this should be truelight <truelight@openttd.org> parents: 159 diff changeset	1052
0 fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	1053 if (b&4) {
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	1054 r *= 0x10001;
201 f2b49b0674c6 (svn r202) -Codechange: I missed some files with trailing spaces.. this should be truelight <truelight@openttd.org> parents: 159 diff changeset	1055 }
0 fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	1056 return r;
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	1057 }
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	1058 }
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	1059 return 0;
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	1060 }
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	1061
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	1062 static const StringID _road_tile_strings[] = {
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	1063 STR_1818_ROAD_RAIL_LEVEL_CROSSING,
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	1064 STR_1817_ROAD_VEHICLE_DEPOT,
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	1065
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	1066 STR_1814_ROAD,
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	1067 STR_1814_ROAD,
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	1068 STR_1814_ROAD,
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	1069 STR_1815_ROAD_WITH_STREETLIGHTS,
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	1070 STR_1814_ROAD,
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	1071 STR_1816_TREE_LINED_ROAD,
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	1072 STR_1814_ROAD,
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	1073 STR_1814_ROAD,
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	1074 };
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	1075
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	1076 static void GetTileDesc_Road(uint tile, TileDesc *td)
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	1077 {
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	1078 int i = (_map5[tile] >> 4);
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	1079 if (i == 0)
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	1080 i = (_map2[tile] & 7) + 3;
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	1081 td->str = _road_tile_strings[i - 1];
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	1082 td->owner = _map_owner[tile];
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	1083 }
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	1084
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	1085 static const byte _roadveh_enter_depot_unk0[4] = {
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	1086 8, 9, 0, 1
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	1087 };
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	1088
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	1089 static uint32 VehicleEnter_Road(Vehicle *v, uint tile, int x, int y)
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	1090 {
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	1091 if ((_map5[tile] & 0xF0) == 0x10) {
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	1092 if (v->type == VEH_Train && (_map5[tile] & 4) == 0) {
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	1093 /* train crossing a road */
541 facaef10d233 (svn r925) Use sound enums tron <tron@openttd.org> parents: 534 diff changeset	1094 SndPlayVehicleFx(SND_0E_LEVEL_CROSSING, v);
0 fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	1095 _map5[tile] \|= 4;
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	1096 MarkTileDirtyByTile(tile);
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	1097 }
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	1098 } else if ((_map5[tile]&0xF0) == 0x20){
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	1099 if (v->type == VEH_Road && v->u.road.frame == 11) {
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	1100 if (_roadveh_enter_depot_unk0[_map5[tile]&3] == v->u.road.state) {
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	1101 RoadVehEnterDepot(v);
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	1102 return 4;
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	1103 }
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	1104 }
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	1105 }
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	1106 return 0;
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	1107 }
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	1108
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	1109 static void VehicleLeave_Road(Vehicle *v, uint tile, int x, int y)
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	1110 {
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	1111 if ((_map5[tile] & 0xF0) == 0x10 && v->type == VEH_Train && v->next == NULL) {
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	1112 _map5[tile] &= ~4;
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	1113 MarkTileDirtyByTile(tile);
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	1114 }
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	1115 }
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	1116
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	1117 static void ChangeTileOwner_Road(uint tile, byte old_player, byte new_player)
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	1118 {
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	1119 byte b;
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	1120
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	1121 // road/rail crossing where the road is owned by the current player?
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	1122 if (old_player == _map3_lo[tile] && (_map5[tile]&0xF0) == 0x10) {
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	1123 _map3_lo[tile] = (new_player == 0xFF) ? OWNER_NONE : new_player;
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	1124 }
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	1125
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	1126 if (_map_owner[tile] != old_player)
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	1127 return;
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	1128
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	1129 if (new_player != 255) {
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	1130 _map_owner[tile] = new_player;
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	1131 } else {
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	1132 b = _map5[tile]&0xF0;
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	1133 if (b == 0) {
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	1134 _map_owner[tile] = OWNER_NONE;
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	1135 } else if (b == 0x10) {
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	1136 _map5[tile] = (_map5[tile]&8) ? 0x5 : 0xA;
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	1137 _map_owner[tile] = _map3_lo[tile];
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	1138 _map3_lo[tile] = 0;
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	1139 _map3_hi[tile] &= 0x80;
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	1140 } else {
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	1141 DoCommandByTile(tile, 0, 0, DC_EXEC, CMD_LANDSCAPE_CLEAR);
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	1142 }
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	1143 }
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	1144 }
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	1145
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	1146 void InitializeRoad()
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	1147 {
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	1148 _last_built_road_depot_tile = 0;
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	1149 }
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	1150
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	1151 const TileTypeProcs _tile_type_road_procs = {
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	1152 DrawTile_Road, /* draw_tile_proc */
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	1153 GetSlopeZ_Road, /* get_slope_z_proc */
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	1154 ClearTile_Road, /* clear_tile_proc */
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	1155 GetAcceptedCargo_Road, /* get_accepted_cargo_proc */
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	1156 GetTileDesc_Road, /* get_tile_desc_proc */
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	1157 GetTileTrackStatus_Road, /* get_tile_track_status_proc */
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	1158 ClickTile_Road, /* click_tile_proc */
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	1159 AnimateTile_Road, /* animate_tile_proc */
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	1160 TileLoop_Road, /* tile_loop_clear */
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	1161 ChangeTileOwner_Road, /* change_tile_owner_clear */
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	1162 NULL, /* get_produced_cargo_proc */
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	1163 VehicleEnter_Road, /* vehicle_enter_tile_proc */
fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	1164 VehicleLeave_Road, /* vehicle_leave_tile_proc */
39 927ba896b4a5 (svn r40) Final slope graphics fix dominik <dominik@openttd.org> parents: 22 diff changeset	1165 GetSlopeTileh_Road, /* get_slope_tileh_proc */
0 fa6ee4d75c8a (svn r1) Import of revision 975 of old (crashed) SVN truelight <truelight@openttd.org> parents: diff changeset	1166 };

Mercurial > hg > openttd

annotate road_cmd.c @ 1035:3edb35954288 draft