openttd-ottdgrfs: rail_cmd.c@69c91cec07c5 (annotated)

0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1	#include "stdafx.h"
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	2	#include "ttd.h"
1363 01d3de5d8039 (svn r1867) Include tables/sprites.h only in files which need it tron parents: 1330 diff changeset	3	#include "table/sprites.h"
507 8aa8100b0b22 (svn r815) Include strings.h only in the files which need it. tron parents: 497 diff changeset	4	#include "table/strings.h"
1009 a7ccb8e39cbc (svn r1508) Remove duplicate declarations and include proper headers where necessary tron parents: 926 diff changeset	5	#include "gfx.h"
679 e959706a3e4d (svn r1117) Move map arrays and some related macros into their own files map.c and map.h tron parents: 555 diff changeset	6	#include "map.h"
1209 a1ac96655b79 (svn r1713) Split off several functions which query/set information about a single tile from map.h and put them into a seperate file tile.h tron parents: 1123 diff changeset	7	#include "tile.h"
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	8	#include "vehicle.h"
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	9	#include "viewport.h"
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	10	#include "command.h"
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	11	#include "pathfind.h"
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	12	#include "town.h"
337 66647f97e7c0 (svn r513) Merge revisions 402, 416, 417, 478, 479, 511, 512 from map to trunk tron parents: 283 diff changeset	13	#include "sound.h"
389 2d394eeba5e5 (svn r581) -newgrf: Basic support for new stations - only waypoints supported now and only celestar parents: 337 diff changeset	14	#include "station.h"
405 6830ae7a0d5d (svn r602) -newgrf: Move DrawTileSeqStruct & co and struct SpriteGroup to sprite.h (pasky) darkvater parents: 403 diff changeset	15	#include "sprite.h"
1313 bba6afb8a995 (svn r1817) -Codechange: Moved depot-functions to depot.c truelight parents: 1247 diff changeset	16	#include "depot.h"
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	17
415 423de36034b8 (svn r612) [newgrf] Fix: custom waypoints on monorail/maglev are displayed correctly dominik parents: 413 diff changeset	18	extern uint16 _custom_sprites_base;
423de36034b8 (svn r612) [newgrf] Fix: custom waypoints on monorail/maglev are displayed correctly dominik parents: 413 diff changeset	19
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	20	void ShowTrainDepotWindow(uint tile);
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	21
22 fe6f35cc987b (svn r23) -Some omments on the code (blathijs) darkvater parents: 13 diff changeset	22	enum { /* These values are bitmasks for the map5 byte */
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	23	RAIL_TYPE_NORMAL = 0,
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	24	RAIL_TYPE_SIGNALS = 0x40,
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	25	RAIL_TYPE_SPECIAL = 0x80, // If this bit is set, then it's not a regular track.
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	26	RAIL_TYPE_DEPOT = 0xC0,
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	27	RAIL_TYPE_MASK = 0xC0,
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	28
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	29	RAIL_BIT_DIAG1 = 1, // 0
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	30	RAIL_BIT_DIAG2 = 2, // 1
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	31	RAIL_BIT_UPPER = 4, // 2
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	32	RAIL_BIT_LOWER = 8, // 3
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	33	RAIL_BIT_LEFT = 16, // 4
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	34	RAIL_BIT_RIGHT = 32, // 5
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	35	RAIL_BIT_MASK = 0x3F,
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	36
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	37	RAIL_DEPOT_TRACK_MASK = 1,
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	38	RAIL_DEPOT_DIR = 3,
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	39
395 4c990f33dab7 (svn r587) -newgrf: Rename all /Checkpoint/i tokens to 'Waypoint's. The name actually makes some sense and is also compatible with TTDPatch (pasky). darkvater parents: 393 diff changeset	40	RAIL_TYPE_WAYPOINT = 0xC4,
4c990f33dab7 (svn r587) -newgrf: Rename all /Checkpoint/i tokens to 'Waypoint's. The name actually makes some sense and is also compatible with TTDPatch (pasky). darkvater parents: 393 diff changeset	41	RAIL_WAYPOINT_TRACK_MASK = 1,
1534 2f7388d38291 (svn r2038) -Fix: A player only received the money for one rail when clearing a tile with 2 rails and signals tron parents: 1518 diff changeset	42
2f7388d38291 (svn r2038) -Fix: A player only received the money for one rail when clearing a tile with 2 rails and signals tron parents: 1518 diff changeset	43	RAIL_SUBTYPE_MASK = 0x3C,
2f7388d38291 (svn r2038) -Fix: A player only received the money for one rail when clearing a tile with 2 rails and signals tron parents: 1518 diff changeset	44	RAIL_SUBTYPE_DEPOT = 0x00,
2f7388d38291 (svn r2038) -Fix: A player only received the money for one rail when clearing a tile with 2 rails and signals tron parents: 1518 diff changeset	45	RAIL_SUBTYPE_WAYPOINT = 0x04
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	46	};
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	47
1535 a5f686a20d2c (svn r2039) IS_RAIL_DEPOT -> IsRailDepot, IS_RAIL_WAYPOINT -> IsRailWaypoint tron parents: 1534 diff changeset	48	static inline bool IsRailDepot(byte m5)
a5f686a20d2c (svn r2039) IS_RAIL_DEPOT -> IsRailDepot, IS_RAIL_WAYPOINT -> IsRailWaypoint tron parents: 1534 diff changeset	49	{
a5f686a20d2c (svn r2039) IS_RAIL_DEPOT -> IsRailDepot, IS_RAIL_WAYPOINT -> IsRailWaypoint tron parents: 1534 diff changeset	50	return
a5f686a20d2c (svn r2039) IS_RAIL_DEPOT -> IsRailDepot, IS_RAIL_WAYPOINT -> IsRailWaypoint tron parents: 1534 diff changeset	51	(m5 & RAIL_TYPE_MASK) == RAIL_TYPE_DEPOT &&
a5f686a20d2c (svn r2039) IS_RAIL_DEPOT -> IsRailDepot, IS_RAIL_WAYPOINT -> IsRailWaypoint tron parents: 1534 diff changeset	52	(m5 & RAIL_SUBTYPE_MASK) == RAIL_SUBTYPE_DEPOT;
a5f686a20d2c (svn r2039) IS_RAIL_DEPOT -> IsRailDepot, IS_RAIL_WAYPOINT -> IsRailWaypoint tron parents: 1534 diff changeset	53	}
a5f686a20d2c (svn r2039) IS_RAIL_DEPOT -> IsRailDepot, IS_RAIL_WAYPOINT -> IsRailWaypoint tron parents: 1534 diff changeset	54
a5f686a20d2c (svn r2039) IS_RAIL_DEPOT -> IsRailDepot, IS_RAIL_WAYPOINT -> IsRailWaypoint tron parents: 1534 diff changeset	55	static inline bool IsRailWaypoint(byte m5)
a5f686a20d2c (svn r2039) IS_RAIL_DEPOT -> IsRailDepot, IS_RAIL_WAYPOINT -> IsRailWaypoint tron parents: 1534 diff changeset	56	{
a5f686a20d2c (svn r2039) IS_RAIL_DEPOT -> IsRailDepot, IS_RAIL_WAYPOINT -> IsRailWaypoint tron parents: 1534 diff changeset	57	return
a5f686a20d2c (svn r2039) IS_RAIL_DEPOT -> IsRailDepot, IS_RAIL_WAYPOINT -> IsRailWaypoint tron parents: 1534 diff changeset	58	(m5 & RAIL_TYPE_MASK) == RAIL_TYPE_DEPOT &&
a5f686a20d2c (svn r2039) IS_RAIL_DEPOT -> IsRailDepot, IS_RAIL_WAYPOINT -> IsRailWaypoint tron parents: 1534 diff changeset	59	(m5 & RAIL_SUBTYPE_MASK) == RAIL_SUBTYPE_WAYPOINT;
a5f686a20d2c (svn r2039) IS_RAIL_DEPOT -> IsRailDepot, IS_RAIL_WAYPOINT -> IsRailWaypoint tron parents: 1534 diff changeset	60	}
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	61
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	62	/* Format of rail map5 byte.
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	63	* 00 abcdef => Normal rail
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	64	* 01 abcdef => Rail with signals
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	65	* 10 ?????? => Unused
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	66	* 11 ????dd => Depot
22 fe6f35cc987b (svn r23) -Some omments on the code (blathijs) darkvater parents: 13 diff changeset	67	*
fe6f35cc987b (svn r23) -Some omments on the code (blathijs) darkvater parents: 13 diff changeset	68	* abcdef is a bitmask, which contains ones for all present tracks. Below the
201 c40d343115f8 (svn r202) -Codechange: I missed some files with trailing spaces.. this should be truelight parents: 159 diff changeset	69	* value for each track is given.
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	70	*/
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	71
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	72	/* 4
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	73	* ---------
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	74	* \|\ /\|
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	75	* \| \ 1/ \|
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	76	* \| \ / \|
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	77	* \| \ / \|
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	78	* 16\| \ \|32
201 c40d343115f8 (svn r202) -Codechange: I missed some files with trailing spaces.. this should be truelight parents: 159 diff changeset	79	* \| / \2 \|
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	80	* \| / \ \|
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	81	* \| / \ \|
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	82	* \|/ \\|
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	83	* ---------
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	84	* 8
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	85	*/
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	86
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	87
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	88	// Constants for lower part of Map2 byte.
201 c40d343115f8 (svn r202) -Codechange: I missed some files with trailing spaces.. this should be truelight parents: 159 diff changeset	89	enum RailMap2Lower4 {
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	90	RAIL_MAP2LO_GROUND_MASK = 0xF,
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	91	RAIL_GROUND_BROWN = 0,
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	92	RAIL_GROUND_GREEN = 1,
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	93	RAIL_GROUND_FENCE_NW = 2,
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	94	RAIL_GROUND_FENCE_SE = 3,
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	95	RAIL_GROUND_FENCE_SENW = 4,
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	96	RAIL_GROUND_FENCE_NE = 5,
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	97	RAIL_GROUND_FENCE_SW = 6,
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	98	RAIL_GROUND_FENCE_NESW = 7,
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	99	RAIL_GROUND_FENCE_VERT1 = 8,
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	100	RAIL_GROUND_FENCE_VERT2 = 9,
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	101	RAIL_GROUND_FENCE_HORIZ1 = 10,
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	102	RAIL_GROUND_FENCE_HORIZ2 = 11,
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	103	RAIL_GROUND_ICE_DESERT = 12,
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	104	};
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	105
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	106
22 fe6f35cc987b (svn r23) -Some omments on the code (blathijs) darkvater parents: 13 diff changeset	107	/* MAP2 byte: abcd???? => Signal On? Same coding as map3lo
201 c40d343115f8 (svn r202) -Codechange: I missed some files with trailing spaces.. this should be truelight parents: 159 diff changeset	108	* MAP3LO byte: abcd???? => Signal Exists?
22 fe6f35cc987b (svn r23) -Some omments on the code (blathijs) darkvater parents: 13 diff changeset	109	* a and b are for diagonals, upper and left,
fe6f35cc987b (svn r23) -Some omments on the code (blathijs) darkvater parents: 13 diff changeset	110	* one for each direction. (ie a == NE->SW, b ==
fe6f35cc987b (svn r23) -Some omments on the code (blathijs) darkvater parents: 13 diff changeset	111	* SW->NE, or v.v., I don't know. b and c are
fe6f35cc987b (svn r23) -Some omments on the code (blathijs) darkvater parents: 13 diff changeset	112	* similar for lower and right.
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	113	* MAP2 byte: ????abcd => Type of ground.
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	114	* MAP3LO byte: ????abcd => Type of rail.
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	115	* MAP5: 00abcdef => rail
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	116	* 01abcdef => rail w/ signals
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	117	* 10uuuuuu => unused
201 c40d343115f8 (svn r202) -Codechange: I missed some files with trailing spaces.. this should be truelight parents: 159 diff changeset	118	* 11uuuudd => rail depot
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	119	*/
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	120
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	121	static bool CheckTrackCombination(byte map5, byte trackbits, byte flags)
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	122	{
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	123	_error_message = STR_1001_IMPOSSIBLE_TRACK_COMBINATION;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	124
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	125	if ((map5&RAIL_TYPE_MASK) == RAIL_TYPE_SIGNALS) {
201 c40d343115f8 (svn r202) -Codechange: I missed some files with trailing spaces.. this should be truelight parents: 159 diff changeset	126
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	127	if (map5 & trackbits) {
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	128	_error_message = STR_1007_ALREADY_BUILT;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	129	return false;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	130	}
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	131
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	132	map5 \|= trackbits;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	133	return (map5 == (RAIL_TYPE_SIGNALS\|RAIL_BIT_UPPER\|RAIL_BIT_LOWER) \|\| map5 == (RAIL_TYPE_SIGNALS\|RAIL_BIT_LEFT\|RAIL_BIT_RIGHT));
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	134
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	135	} else if ((map5&RAIL_TYPE_MASK) == RAIL_TYPE_NORMAL) {
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	136	_error_message = STR_1007_ALREADY_BUILT;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	137	if (map5 & trackbits)
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	138	return false;
201 c40d343115f8 (svn r202) -Codechange: I missed some files with trailing spaces.. this should be truelight parents: 159 diff changeset	139
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	140	// Computer players are not allowed to intersect pieces of rail.
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	141	if (!(flags&DC_NO_RAIL_OVERLAP))
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	142	return true;
201 c40d343115f8 (svn r202) -Codechange: I missed some files with trailing spaces.. this should be truelight parents: 159 diff changeset	143
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	144	map5 \|= trackbits;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	145	return (map5 == (RAIL_BIT_UPPER\|RAIL_BIT_LOWER) \|\| map5 == (RAIL_BIT_LEFT\|RAIL_BIT_RIGHT));
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	146	} else {
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	147	return false;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	148	}
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	149	}
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	150
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	151
13 3e7c1f74a996 (svn r14) Fix: railroad crossings on slopes are now possible dominik parents: 0 diff changeset	152	static const byte _valid_tileh_slopes[4][15] = {
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	153
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	154	// set of normal ones
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	155	{
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	156	RAIL_BIT_DIAG1\|RAIL_BIT_DIAG2\|RAIL_BIT_UPPER\|RAIL_BIT_LOWER\|RAIL_BIT_LEFT\|RAIL_BIT_RIGHT,
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	157	RAIL_BIT_RIGHT,
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	158	RAIL_BIT_UPPER,
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	159	RAIL_BIT_DIAG1,
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	160
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	161	RAIL_BIT_LEFT,
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	162	0,
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	163	RAIL_BIT_DIAG2,
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	164	RAIL_BIT_LOWER,
201 c40d343115f8 (svn r202) -Codechange: I missed some files with trailing spaces.. this should be truelight parents: 159 diff changeset	165
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	166	RAIL_BIT_LOWER,
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	167	RAIL_BIT_DIAG2,
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	168	0,
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	169	RAIL_BIT_LEFT,
201 c40d343115f8 (svn r202) -Codechange: I missed some files with trailing spaces.. this should be truelight parents: 159 diff changeset	170
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	171	RAIL_BIT_DIAG1,
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	172	RAIL_BIT_UPPER,
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	173	RAIL_BIT_RIGHT,
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	174	},
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	175
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	176	// allowed rail for an evenly raised platform
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	177	{
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	178	0,
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	179	RAIL_BIT_LEFT,
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	180	RAIL_BIT_LOWER,
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	181	RAIL_BIT_DIAG2 \| RAIL_BIT_LOWER \| RAIL_BIT_LEFT,
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	182
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	183	RAIL_BIT_RIGHT,
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	184	RAIL_BIT_DIAG1\|RAIL_BIT_DIAG2\|RAIL_BIT_UPPER\|RAIL_BIT_LOWER\|RAIL_BIT_LEFT\|RAIL_BIT_RIGHT,
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	185	RAIL_BIT_DIAG1 \| RAIL_BIT_LOWER \| RAIL_BIT_RIGHT,
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	186	RAIL_BIT_DIAG1\|RAIL_BIT_DIAG2\|RAIL_BIT_UPPER\|RAIL_BIT_LOWER\|RAIL_BIT_LEFT\|RAIL_BIT_RIGHT,
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	187
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	188	RAIL_BIT_UPPER,
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	189	RAIL_BIT_DIAG1 \| RAIL_BIT_UPPER \| RAIL_BIT_LEFT,
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	190	RAIL_BIT_DIAG1\|RAIL_BIT_DIAG2\|RAIL_BIT_UPPER\|RAIL_BIT_LOWER\|RAIL_BIT_LEFT\|RAIL_BIT_RIGHT,
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	191	RAIL_BIT_DIAG1\|RAIL_BIT_DIAG2\|RAIL_BIT_UPPER\|RAIL_BIT_LOWER\|RAIL_BIT_LEFT\|RAIL_BIT_RIGHT,
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	192
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	193	RAIL_BIT_DIAG2 \| RAIL_BIT_UPPER \| RAIL_BIT_RIGHT,
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	194	RAIL_BIT_DIAG1\|RAIL_BIT_DIAG2\|RAIL_BIT_UPPER\|RAIL_BIT_LOWER\|RAIL_BIT_LEFT\|RAIL_BIT_RIGHT,
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	195	RAIL_BIT_DIAG1\|RAIL_BIT_DIAG2\|RAIL_BIT_UPPER\|RAIL_BIT_LOWER\|RAIL_BIT_LEFT\|RAIL_BIT_RIGHT,
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	196	},
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	197
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	198	// allowed rail on coast tile
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	199	{
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	200	0,
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	201	RAIL_BIT_LEFT,
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	202	RAIL_BIT_LOWER,
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	203	RAIL_BIT_DIAG2\|RAIL_BIT_LEFT\|RAIL_BIT_LOWER,
201 c40d343115f8 (svn r202) -Codechange: I missed some files with trailing spaces.. this should be truelight parents: 159 diff changeset	204
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	205	RAIL_BIT_RIGHT,
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	206	RAIL_BIT_DIAG1\|RAIL_BIT_DIAG2\|RAIL_BIT_UPPER\|RAIL_BIT_LOWER\|RAIL_BIT_LEFT\|RAIL_BIT_RIGHT,
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	207	RAIL_BIT_DIAG1\|RAIL_BIT_RIGHT\|RAIL_BIT_LOWER,
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	208	RAIL_BIT_DIAG1\|RAIL_BIT_DIAG2\|RAIL_BIT_UPPER\|RAIL_BIT_LOWER\|RAIL_BIT_LEFT\|RAIL_BIT_RIGHT,
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	209
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	210	RAIL_BIT_UPPER,
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	211	RAIL_BIT_DIAG1\|RAIL_BIT_LEFT\|RAIL_BIT_UPPER,
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	212	RAIL_BIT_DIAG1\|RAIL_BIT_DIAG2\|RAIL_BIT_UPPER\|RAIL_BIT_LOWER\|RAIL_BIT_LEFT\|RAIL_BIT_RIGHT,
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	213	RAIL_BIT_DIAG1\|RAIL_BIT_DIAG2\|RAIL_BIT_UPPER\|RAIL_BIT_LOWER\|RAIL_BIT_LEFT\|RAIL_BIT_RIGHT,
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	214
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	215	RAIL_BIT_DIAG2\|RAIL_BIT_RIGHT\|RAIL_BIT_UPPER,
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	216	RAIL_BIT_DIAG1\|RAIL_BIT_DIAG2\|RAIL_BIT_UPPER\|RAIL_BIT_LOWER\|RAIL_BIT_LEFT\|RAIL_BIT_RIGHT,
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	217	RAIL_BIT_DIAG1\|RAIL_BIT_DIAG2\|RAIL_BIT_UPPER\|RAIL_BIT_LOWER\|RAIL_BIT_LEFT\|RAIL_BIT_RIGHT,
13 3e7c1f74a996 (svn r14) Fix: railroad crossings on slopes are now possible dominik parents: 0 diff changeset	218	},
3e7c1f74a996 (svn r14) Fix: railroad crossings on slopes are now possible dominik parents: 0 diff changeset	219
3e7c1f74a996 (svn r14) Fix: railroad crossings on slopes are now possible dominik parents: 0 diff changeset	220	// valid railway crossings on slopes
3e7c1f74a996 (svn r14) Fix: railroad crossings on slopes are now possible dominik parents: 0 diff changeset	221	{
3e7c1f74a996 (svn r14) Fix: railroad crossings on slopes are now possible dominik parents: 0 diff changeset	222	1, 0, 0, // 0, 1, 2
3e7c1f74a996 (svn r14) Fix: railroad crossings on slopes are now possible dominik parents: 0 diff changeset	223	0, 0, 1, // 3, 4, 5
3e7c1f74a996 (svn r14) Fix: railroad crossings on slopes are now possible dominik parents: 0 diff changeset	224	0, 1, 0, // 6, 7, 8
3e7c1f74a996 (svn r14) Fix: railroad crossings on slopes are now possible dominik parents: 0 diff changeset	225	0, 1, 1, // 9, 10, 11
3e7c1f74a996 (svn r14) Fix: railroad crossings on slopes are now possible dominik parents: 0 diff changeset	226	0, 1, 1, // 12, 13, 14
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	227	}
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	228	};
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	229
84 1e0721c29bad (svn r85) -Add: initial commit of new AI (enable in Patch menu) truelight parents: 59 diff changeset	230	uint GetRailFoundation(uint tileh, uint bits)
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	231	{
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	232	int i;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	233
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	234	if ((~_valid_tileh_slopes[0][tileh] & bits) == 0)
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	235	return 0;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	236
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	237	if ((~_valid_tileh_slopes[1][tileh] & bits) == 0)
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	238	return tileh;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	239
201 c40d343115f8 (svn r202) -Codechange: I missed some files with trailing spaces.. this should be truelight parents: 159 diff changeset	240	if ( ((i=0, tileh == 1) \|\| (i+=2, tileh == 2) \|\| (i+=2, tileh == 4) \|\| (i+=2, tileh == 8)) && (bits == RAIL_BIT_DIAG1 \|\| (i++, bits == RAIL_BIT_DIAG2)))
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	241	return i + 15;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	242
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	243	return 0;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	244	}
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	245
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	246	//
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	247	static uint32 CheckRailSlope(int tileh, uint rail_bits, uint existing, uint tile)
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	248	{
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	249	// never allow building on top of steep tiles
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	250	if (!(tileh & 0x10)) {
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	251	rail_bits \|= existing;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	252
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	253	// don't allow building on the lower side of a coast
1035 0a170deb6e33 (svn r1536) Move GET_TILEHEIGHT, GET_TILETYPE and IS_TILETYPE to map.h, turn them into inline functions and add some asserts tron parents: 1024 diff changeset	254	if (IsTileType(tile, MP_WATER) && ~_valid_tileh_slopes[2][tileh] & rail_bits) {
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	255	return_cmd_error(STR_3807_CAN_T_BUILD_ON_WATER);
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	256	}
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	257
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	258	// no special foundation
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	259	if ((~_valid_tileh_slopes[0][tileh] & rail_bits) == 0)
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	260	return 0;
201 c40d343115f8 (svn r202) -Codechange: I missed some files with trailing spaces.. this should be truelight parents: 159 diff changeset	261
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	262	if (((~_valid_tileh_slopes[1][tileh] & rail_bits) == 0) \|\| // whole tile is leveled up
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	263	((rail_bits == RAIL_BIT_DIAG1 \|\| rail_bits == RAIL_BIT_DIAG2) && (tileh == 1 \|\| tileh == 2 \|\| tileh == 4 \|\| tileh == 8))) { // partly up
201 c40d343115f8 (svn r202) -Codechange: I missed some files with trailing spaces.. this should be truelight parents: 159 diff changeset	264	return existing ? 0 : _price.terraform;
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	265	}
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	266	}
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	267	return_cmd_error(STR_1000_LAND_SLOPED_IN_WRONG_DIRECTION);
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	268	}
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	269
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	270	/* Build a single track.
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	271	* p1 - railroad type normal/maglev
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	272	* p2 - tile direction
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	273	*/
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	274
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	275	int32 CmdBuildSingleRail(int x, int y, uint32 flags, uint32 p1, uint32 p2)
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	276	{
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	277	TileInfo ti;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	278	int32 ret, cost = 0;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	279	byte rail_bit = 1 << p2;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	280	byte rail_type = (byte)(p1 & 0xF);
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	281	uint tile;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	282	byte existing = 0;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	283	bool need_clear = false;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	284
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	285	SET_EXPENSES_TYPE(EXPENSES_CONSTRUCTION);
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	286
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	287	_error_message = STR_1007_ALREADY_BUILT;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	288
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	289	FindLandscapeHeight(&ti, x, y);
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	290	tile = ti.tile;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	291
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	292	// allow building rail under bridge
201 c40d343115f8 (svn r202) -Codechange: I missed some files with trailing spaces.. this should be truelight parents: 159 diff changeset	293	if (ti.type != MP_TUNNELBRIDGE && !EnsureNoVehicle(tile))
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	294	return CMD_ERROR;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	295
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	296	if (ti.type == MP_TUNNELBRIDGE) {
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	297	/* BUILD ON BRIDGE CODE */
1041 be151b7bc909 (svn r1542) Rename TileHeight to TilePixelHeight, because this is what it actually returns tron parents: 1035 diff changeset	298	if (!EnsureNoVehicleZ(tile, TilePixelHeight(tile)))
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	299	return CMD_ERROR;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	300
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	301	if ((ti.map5 & 0xF8) == 0xC0) {
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	302	if (ti.tileh & 0x10 \|\| rail_bit != (byte)((ti.map5 & 1) ? 1 : 2)) goto need_clear;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	303
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	304	if (!(flags & DC_EXEC))
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	305	return _price.build_rail;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	306
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	307	_map5[tile] = (ti.map5 & 0xC7) \| 0x20;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	308	goto set_ownership;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	309	} else if ((ti.map5 & 0xF8) == 0xE0) {
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	310	if ((_map3_lo[tile] & 0xF) != (int)p1) goto need_clear;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	311	if (rail_bit != (byte)((ti.map5 & 1) ? 1 : 2)) goto need_clear;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	312	return CMD_ERROR;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	313	} else
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	314	goto need_clear;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	315	} else if (ti.type == MP_STREET) {
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	316	byte m5;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	317	/* BUILD ON STREET CODE */
13 3e7c1f74a996 (svn r14) Fix: railroad crossings on slopes are now possible dominik parents: 0 diff changeset	318	if (ti.tileh & 0x10) // very steep tile
3e7c1f74a996 (svn r14) Fix: railroad crossings on slopes are now possible dominik parents: 0 diff changeset	319	return_cmd_error(STR_1000_LAND_SLOPED_IN_WRONG_DIRECTION);
3e7c1f74a996 (svn r14) Fix: railroad crossings on slopes are now possible dominik parents: 0 diff changeset	320
3e7c1f74a996 (svn r14) Fix: railroad crossings on slopes are now possible dominik parents: 0 diff changeset	321	if (!_valid_tileh_slopes[3][ti.tileh]) // prevent certain slopes
3e7c1f74a996 (svn r14) Fix: railroad crossings on slopes are now possible dominik parents: 0 diff changeset	322	return_cmd_error(STR_1000_LAND_SLOPED_IN_WRONG_DIRECTION);
3e7c1f74a996 (svn r14) Fix: railroad crossings on slopes are now possible dominik parents: 0 diff changeset	323
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	324	if (!(ti.map5 & 0xF0)) {
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	325	if ((ti.map5 & 0x0F) == 0xA) {
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	326	if (rail_bit != 2) goto need_clear;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	327	m5 = 0x10;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	328	} else if ((ti.map5 & 0x0F) == 0x5) {
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	329	if (rail_bit != 1) goto need_clear;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	330	m5 = 0x18;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	331	} else
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	332	goto need_clear;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	333
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	334	if (!(flags & DC_EXEC))
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	335	return _price.build_rail;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	336
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	337	ModifyTile(tile,
201 c40d343115f8 (svn r202) -Codechange: I missed some files with trailing spaces.. this should be truelight parents: 159 diff changeset	338	MP_SETTYPE(MP_STREET) \|
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	339	MP_MAP3LO \| MP_MAP3HI \| MP_MAPOWNER_CURRENT \| MP_MAP5,
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	340	_map_owner[tile], /* map3_lo */
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	341	p1, /* map3_hi */
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	342	m5 /* map5 */
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	343	);
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	344	goto fix_signals;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	345	} else if (!(ti.map5 & 0xE0)) {
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	346	if (rail_bit != (byte)((ti.map5 & 8) ? 1 : 2)) goto need_clear;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	347	return CMD_ERROR;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	348	} else
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	349	goto need_clear;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	350	} else if (ti.type == MP_RAILWAY) {
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	351
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	352	/* BUILD ON RAILWAY CODE */
201 c40d343115f8 (svn r202) -Codechange: I missed some files with trailing spaces.. this should be truelight parents: 159 diff changeset	353	if (_map_owner[tile] != _current_player \|\| (byte)(_map3_lo[tile]&0xF) != rail_type)
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	354	goto need_clear;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	355	if (!CheckTrackCombination(ti.map5, rail_bit, (byte)flags))
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	356	return CMD_ERROR;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	357
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	358	existing = ti.map5 & 0x3F;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	359	} else {
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	360
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	361	/* DEFAULT BUILD ON CODE */
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	362	need_clear:;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	363	/* isnot_railway */
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	364	if (!(flags & DC_EXEC)) {
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	365	ret = DoCommandByTile(tile, 0, 0, flags, CMD_LANDSCAPE_CLEAR);
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	366	if (ret == CMD_ERROR) return CMD_ERROR;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	367	cost += ret;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	368	}
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	369	need_clear = true;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	370	}
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	371
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	372	ret = CheckRailSlope(ti.tileh, rail_bit, existing, tile);
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	373	if (ret & 0x80000000)
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	374	return ret;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	375	cost += ret;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	376
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	377	// the AI is not allowed to used foundationed tiles.
84 1e0721c29bad (svn r85) -Add: initial commit of new AI (enable in Patch menu) truelight parents: 59 diff changeset	378	if (ret && (!_patches.build_on_slopes \|\| (!_patches.ainew_active && _is_ai_player)))
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	379	return_cmd_error(STR_1000_LAND_SLOPED_IN_WRONG_DIRECTION);
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	380
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	381	if (flags & DC_EXEC && need_clear) {
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	382	ret = DoCommandByTile(tile, 0, 0, flags, CMD_LANDSCAPE_CLEAR);
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	383	if (ret == CMD_ERROR) return CMD_ERROR;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	384	cost += ret;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	385	}
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	386
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	387	if (flags & DC_EXEC) {
1059 c28c6be74291 (svn r1560) Introduce SetTileType() and SetTileHeight() tron parents: 1041 diff changeset	388	SetTileType(tile, MP_RAILWAY);
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	389	_map5[tile] \|= rail_bit;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	390	_map2[tile] &= ~RAIL_MAP2LO_GROUND_MASK;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	391
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	392	// In case it's a tile without signals, clear the signal bits. Why?
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	393	if ((_map5[tile] & RAIL_TYPE_MASK) != RAIL_TYPE_SIGNALS)
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	394	_map2[tile] &= ~0xF0;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	395
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	396	set_ownership:
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	397	_map_owner[tile] = _current_player;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	398
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	399	_map3_lo[tile] &= ~0xF;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	400	_map3_lo[tile] \|= rail_type;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	401
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	402	MarkTileDirtyByTile(tile);
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	403
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	404	fix_signals:
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	405	SetSignalsOnBothDir(tile, (byte)p2);
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	406	}
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	407
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	408	return cost + _price.build_rail;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	409	}
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	410
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	411	static const byte _signals_table[] = {
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	412	0x40, 0x40, 0x40, 0x10, 0x80, 0x20, 0, 0, // direction 1
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	413	0x80, 0x80, 0x80, 0x20, 0x40, 0x10, 0, 0 // direction 2
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	414	};
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	415
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	416	static const byte _signals_table_other[] = {
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	417	0x80, 0x80, 0x80, 0x20, 0x40, 0x10, 0, 0, // direction 1
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	418	0x40, 0x40, 0x40, 0x10, 0x80, 0x20, 0, 0 // direction 2
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	419	};
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	420
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	421	static const byte _signals_table_both[] = {
201 c40d343115f8 (svn r202) -Codechange: I missed some files with trailing spaces.. this should be truelight parents: 159 diff changeset	422	0xC0, 0xC0, 0xC0, 0x30, 0xC0, 0x30, 0, 0, // both directions combined
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	423	0xC0, 0xC0, 0xC0, 0x30, 0xC0, 0x30, 0, 0
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	424	};
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	425
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	426
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	427	/* Remove a single track.
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	428	* p1 - unused
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	429	* p2 - tile direction
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	430	*/
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	431
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	432	int32 CmdRemoveSingleRail(int x, int y, uint32 flags, uint32 p1, uint32 p2)
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	433	{
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	434	TileInfo ti;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	435	byte rail_bit = 1 << p2;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	436	byte m5;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	437	uint tile;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	438
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	439	SET_EXPENSES_TYPE(EXPENSES_CONSTRUCTION);
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	440
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	441	FindLandscapeHeight(&ti, x, y);
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	442
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	443	tile = ti.tile;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	444
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	445	if (!((1<<ti.type) & ((1<<MP_TUNNELBRIDGE)\|(1<<MP_STREET)\|(1<<MP_RAILWAY))))
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	446	return CMD_ERROR;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	447
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	448	if (_current_player != OWNER_WATER && !CheckTileOwnership(tile))
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	449	return CMD_ERROR;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	450
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	451	// allow building rail under bridge
201 c40d343115f8 (svn r202) -Codechange: I missed some files with trailing spaces.. this should be truelight parents: 159 diff changeset	452	if (ti.type != MP_TUNNELBRIDGE && !EnsureNoVehicle(tile))
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	453	return CMD_ERROR;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	454
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	455	if (ti.type == MP_TUNNELBRIDGE) {
1041 be151b7bc909 (svn r1542) Rename TileHeight to TilePixelHeight, because this is what it actually returns tron parents: 1035 diff changeset	456	if (!EnsureNoVehicleZ(tile, TilePixelHeight(tile)))
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	457	return CMD_ERROR;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	458
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	459	if ((ti.map5 & 0xF8) != 0xE0)
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	460	return CMD_ERROR;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	461
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	462	if ( ((ti.map5 & 1) ? 1 : 2) != rail_bit )
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	463	return CMD_ERROR;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	464
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	465	if (!(flags & DC_EXEC))
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	466	return _price.remove_rail;
201 c40d343115f8 (svn r202) -Codechange: I missed some files with trailing spaces.. this should be truelight parents: 159 diff changeset	467
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	468	_map_owner[tile] = OWNER_NONE;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	469	_map5[tile] = ti.map5 & 0xC7;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	470	} else if (ti.type == MP_STREET) {
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	471	if (!(ti.map5 & 0xF0))
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	472	return CMD_ERROR;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	473
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	474	if (ti.map5 & 0xE0)
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	475	return CMD_ERROR;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	476
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	477	if (ti.map5 & 8) {
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	478	m5 = 5;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	479	if (rail_bit != 1)
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	480	return CMD_ERROR;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	481	} else {
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	482	m5 = 10;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	483	if (rail_bit != 2)
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	484	return CMD_ERROR;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	485	}
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	486
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	487	if (!(flags & DC_EXEC))
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	488	return _price.remove_rail;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	489
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	490	_map5[tile] = m5;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	491	_map_owner[tile] = _map3_lo[tile];
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	492	_map2[tile] = 0;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	493	} else {
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	494	assert(ti.type == MP_RAILWAY);
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	495
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	496	if (ti.map5 & RAIL_TYPE_SPECIAL)
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	497	return CMD_ERROR;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	498
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	499	if (!(ti.map5 & rail_bit))
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	500	return CMD_ERROR;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	501
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	502	// don't allow remove if there are signals on the track
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	503	if (ti.map5 & RAIL_TYPE_SIGNALS) {
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	504	if (_map3_lo[tile] & _signals_table_both[p2])
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	505	return CMD_ERROR;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	506	}
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	507
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	508	if (!(flags & DC_EXEC))
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	509	return _price.remove_rail;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	510
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	511	if ( (_map5[tile] ^= rail_bit) == 0) {
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	512	DoClearSquare(tile);
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	513	goto skip_mark_dirty;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	514	}
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	515	}
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	516
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	517	/* mark_dirty */
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	518	MarkTileDirtyByTile(tile);
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	519
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	520	skip_mark_dirty:;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	521
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	522	SetSignalsOnBothDir(tile, (byte)p2);
201 c40d343115f8 (svn r202) -Codechange: I missed some files with trailing spaces.. this should be truelight parents: 159 diff changeset	523
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	524	return _price.remove_rail;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	525	}
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	526
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	527	static const struct {
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	528	int8 xinc[16];
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	529	int8 yinc[16];
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	530	} _railbit = {{
1227 3552f20fcfcb (svn r1731) - Fix: [ 1106930 ] BugFix: placing signals with 2x1 drags workaround is completely rewritten. Also features checks for hacked/modified clients. Thanks a lot Hackykid! darkvater parents: 1209 diff changeset	531	// 0 1 2 3 4 5
3552f20fcfcb (svn r1731) - Fix: [ 1106930 ] BugFix: placing signals with 2x1 drags workaround is completely rewritten. Also features checks for hacked/modified clients. Thanks a lot Hackykid! darkvater parents: 1209 diff changeset	532	-16, 0,-16, 0, 16, 0, 0, 0,
3552f20fcfcb (svn r1731) - Fix: [ 1106930 ] BugFix: placing signals with 2x1 drags workaround is completely rewritten. Also features checks for hacked/modified clients. Thanks a lot Hackykid! darkvater parents: 1209 diff changeset	533	16, 0, 0, 16, 0,-16, 0, 0,
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	534	},{
1227 3552f20fcfcb (svn r1731) - Fix: [ 1106930 ] BugFix: placing signals with 2x1 drags workaround is completely rewritten. Also features checks for hacked/modified clients. Thanks a lot Hackykid! darkvater parents: 1209 diff changeset	535	0, 16, 0, 16, 0, 16, 0, 0,
3552f20fcfcb (svn r1731) - Fix: [ 1106930 ] BugFix: placing signals with 2x1 drags workaround is completely rewritten. Also features checks for hacked/modified clients. Thanks a lot Hackykid! darkvater parents: 1209 diff changeset	536	0,-16,-16, 0,-16, 0, 0, 0,
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	537	}};
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	538
1227 3552f20fcfcb (svn r1731) - Fix: [ 1106930 ] BugFix: placing signals with 2x1 drags workaround is completely rewritten. Also features checks for hacked/modified clients. Thanks a lot Hackykid! darkvater parents: 1209 diff changeset	539	static int32 ValidateAutoDrag(int *railbit, int x, int y, int ex, int ey)
3552f20fcfcb (svn r1731) - Fix: [ 1106930 ] BugFix: placing signals with 2x1 drags workaround is completely rewritten. Also features checks for hacked/modified clients. Thanks a lot Hackykid! darkvater parents: 1209 diff changeset	540	{
3552f20fcfcb (svn r1731) - Fix: [ 1106930 ] BugFix: placing signals with 2x1 drags workaround is completely rewritten. Also features checks for hacked/modified clients. Thanks a lot Hackykid! darkvater parents: 1209 diff changeset	541	int dx, dy, trdx, trdy;
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	542
1227 3552f20fcfcb (svn r1731) - Fix: [ 1106930 ] BugFix: placing signals with 2x1 drags workaround is completely rewritten. Also features checks for hacked/modified clients. Thanks a lot Hackykid! darkvater parents: 1209 diff changeset	543	if (*railbit > 5) return CMD_ERROR; // only 6 possible track-combinations
3552f20fcfcb (svn r1731) - Fix: [ 1106930 ] BugFix: placing signals with 2x1 drags workaround is completely rewritten. Also features checks for hacked/modified clients. Thanks a lot Hackykid! darkvater parents: 1209 diff changeset	544
3552f20fcfcb (svn r1731) - Fix: [ 1106930 ] BugFix: placing signals with 2x1 drags workaround is completely rewritten. Also features checks for hacked/modified clients. Thanks a lot Hackykid! darkvater parents: 1209 diff changeset	545	// calculate delta x,y from start to end tile
3552f20fcfcb (svn r1731) - Fix: [ 1106930 ] BugFix: placing signals with 2x1 drags workaround is completely rewritten. Also features checks for hacked/modified clients. Thanks a lot Hackykid! darkvater parents: 1209 diff changeset	546	dx = ex - x;
3552f20fcfcb (svn r1731) - Fix: [ 1106930 ] BugFix: placing signals with 2x1 drags workaround is completely rewritten. Also features checks for hacked/modified clients. Thanks a lot Hackykid! darkvater parents: 1209 diff changeset	547	dy = ey - y;
3552f20fcfcb (svn r1731) - Fix: [ 1106930 ] BugFix: placing signals with 2x1 drags workaround is completely rewritten. Also features checks for hacked/modified clients. Thanks a lot Hackykid! darkvater parents: 1209 diff changeset	548
3552f20fcfcb (svn r1731) - Fix: [ 1106930 ] BugFix: placing signals with 2x1 drags workaround is completely rewritten. Also features checks for hacked/modified clients. Thanks a lot Hackykid! darkvater parents: 1209 diff changeset	549	// calculate delta x,y for the first direction
3552f20fcfcb (svn r1731) - Fix: [ 1106930 ] BugFix: placing signals with 2x1 drags workaround is completely rewritten. Also features checks for hacked/modified clients. Thanks a lot Hackykid! darkvater parents: 1209 diff changeset	550	trdx = _railbit.xinc[*railbit];
3552f20fcfcb (svn r1731) - Fix: [ 1106930 ] BugFix: placing signals with 2x1 drags workaround is completely rewritten. Also features checks for hacked/modified clients. Thanks a lot Hackykid! darkvater parents: 1209 diff changeset	551	trdy = _railbit.yinc[*railbit];
3552f20fcfcb (svn r1731) - Fix: [ 1106930 ] BugFix: placing signals with 2x1 drags workaround is completely rewritten. Also features checks for hacked/modified clients. Thanks a lot Hackykid! darkvater parents: 1209 diff changeset	552
3552f20fcfcb (svn r1731) - Fix: [ 1106930 ] BugFix: placing signals with 2x1 drags workaround is completely rewritten. Also features checks for hacked/modified clients. Thanks a lot Hackykid! darkvater parents: 1209 diff changeset	553	if (*railbit & 0x6) {
3552f20fcfcb (svn r1731) - Fix: [ 1106930 ] BugFix: placing signals with 2x1 drags workaround is completely rewritten. Also features checks for hacked/modified clients. Thanks a lot Hackykid! darkvater parents: 1209 diff changeset	554	trdx += _railbit.xinc[*railbit ^ 1];
3552f20fcfcb (svn r1731) - Fix: [ 1106930 ] BugFix: placing signals with 2x1 drags workaround is completely rewritten. Also features checks for hacked/modified clients. Thanks a lot Hackykid! darkvater parents: 1209 diff changeset	555	trdy += _railbit.yinc[*railbit ^ 1];
3552f20fcfcb (svn r1731) - Fix: [ 1106930 ] BugFix: placing signals with 2x1 drags workaround is completely rewritten. Also features checks for hacked/modified clients. Thanks a lot Hackykid! darkvater parents: 1209 diff changeset	556	}
3552f20fcfcb (svn r1731) - Fix: [ 1106930 ] BugFix: placing signals with 2x1 drags workaround is completely rewritten. Also features checks for hacked/modified clients. Thanks a lot Hackykid! darkvater parents: 1209 diff changeset	557
3552f20fcfcb (svn r1731) - Fix: [ 1106930 ] BugFix: placing signals with 2x1 drags workaround is completely rewritten. Also features checks for hacked/modified clients. Thanks a lot Hackykid! darkvater parents: 1209 diff changeset	558	// validate the direction
3552f20fcfcb (svn r1731) - Fix: [ 1106930 ] BugFix: placing signals with 2x1 drags workaround is completely rewritten. Also features checks for hacked/modified clients. Thanks a lot Hackykid! darkvater parents: 1209 diff changeset	559	while (((trdx <= 0) && (dx > 0)) \|\| ((trdx >= 0) && (dx < 0)) \|\|
3552f20fcfcb (svn r1731) - Fix: [ 1106930 ] BugFix: placing signals with 2x1 drags workaround is completely rewritten. Also features checks for hacked/modified clients. Thanks a lot Hackykid! darkvater parents: 1209 diff changeset	560	((trdy <= 0) && (dy > 0)) \|\| ((trdy >= 0) && (dy < 0))) {
3552f20fcfcb (svn r1731) - Fix: [ 1106930 ] BugFix: placing signals with 2x1 drags workaround is completely rewritten. Also features checks for hacked/modified clients. Thanks a lot Hackykid! darkvater parents: 1209 diff changeset	561	if (*railbit < 8) { // first direction is invalid, try the other
3552f20fcfcb (svn r1731) - Fix: [ 1106930 ] BugFix: placing signals with 2x1 drags workaround is completely rewritten. Also features checks for hacked/modified clients. Thanks a lot Hackykid! darkvater parents: 1209 diff changeset	562	SETBIT(*railbit, 3);
3552f20fcfcb (svn r1731) - Fix: [ 1106930 ] BugFix: placing signals with 2x1 drags workaround is completely rewritten. Also features checks for hacked/modified clients. Thanks a lot Hackykid! darkvater parents: 1209 diff changeset	563	trdx = -trdx;
3552f20fcfcb (svn r1731) - Fix: [ 1106930 ] BugFix: placing signals with 2x1 drags workaround is completely rewritten. Also features checks for hacked/modified clients. Thanks a lot Hackykid! darkvater parents: 1209 diff changeset	564	trdy = -trdy;
3552f20fcfcb (svn r1731) - Fix: [ 1106930 ] BugFix: placing signals with 2x1 drags workaround is completely rewritten. Also features checks for hacked/modified clients. Thanks a lot Hackykid! darkvater parents: 1209 diff changeset	565	} else // other direction is invalid too, invalid drag
3552f20fcfcb (svn r1731) - Fix: [ 1106930 ] BugFix: placing signals with 2x1 drags workaround is completely rewritten. Also features checks for hacked/modified clients. Thanks a lot Hackykid! darkvater parents: 1209 diff changeset	566	return CMD_ERROR;
3552f20fcfcb (svn r1731) - Fix: [ 1106930 ] BugFix: placing signals with 2x1 drags workaround is completely rewritten. Also features checks for hacked/modified clients. Thanks a lot Hackykid! darkvater parents: 1209 diff changeset	567	}
3552f20fcfcb (svn r1731) - Fix: [ 1106930 ] BugFix: placing signals with 2x1 drags workaround is completely rewritten. Also features checks for hacked/modified clients. Thanks a lot Hackykid! darkvater parents: 1209 diff changeset	568
3552f20fcfcb (svn r1731) - Fix: [ 1106930 ] BugFix: placing signals with 2x1 drags workaround is completely rewritten. Also features checks for hacked/modified clients. Thanks a lot Hackykid! darkvater parents: 1209 diff changeset	569	// (for diagonal tracks, this is already made sure of by above test), but:
3552f20fcfcb (svn r1731) - Fix: [ 1106930 ] BugFix: placing signals with 2x1 drags workaround is completely rewritten. Also features checks for hacked/modified clients. Thanks a lot Hackykid! darkvater parents: 1209 diff changeset	570	// for non-diagonal tracks, check if the start and end tile are on 1 line
3552f20fcfcb (svn r1731) - Fix: [ 1106930 ] BugFix: placing signals with 2x1 drags workaround is completely rewritten. Also features checks for hacked/modified clients. Thanks a lot Hackykid! darkvater parents: 1209 diff changeset	571	if (*railbit & 0x6) {
3552f20fcfcb (svn r1731) - Fix: [ 1106930 ] BugFix: placing signals with 2x1 drags workaround is completely rewritten. Also features checks for hacked/modified clients. Thanks a lot Hackykid! darkvater parents: 1209 diff changeset	572	trdx = _railbit.xinc[*railbit];
3552f20fcfcb (svn r1731) - Fix: [ 1106930 ] BugFix: placing signals with 2x1 drags workaround is completely rewritten. Also features checks for hacked/modified clients. Thanks a lot Hackykid! darkvater parents: 1209 diff changeset	573	trdy = _railbit.yinc[*railbit];
3552f20fcfcb (svn r1731) - Fix: [ 1106930 ] BugFix: placing signals with 2x1 drags workaround is completely rewritten. Also features checks for hacked/modified clients. Thanks a lot Hackykid! darkvater parents: 1209 diff changeset	574	if ((abs(dx) != abs(dy)) && (abs(dx) + abs(trdy) != abs(dy) + abs(trdx)))
3552f20fcfcb (svn r1731) - Fix: [ 1106930 ] BugFix: placing signals with 2x1 drags workaround is completely rewritten. Also features checks for hacked/modified clients. Thanks a lot Hackykid! darkvater parents: 1209 diff changeset	575	return CMD_ERROR;
3552f20fcfcb (svn r1731) - Fix: [ 1106930 ] BugFix: placing signals with 2x1 drags workaround is completely rewritten. Also features checks for hacked/modified clients. Thanks a lot Hackykid! darkvater parents: 1209 diff changeset	576	}
3552f20fcfcb (svn r1731) - Fix: [ 1106930 ] BugFix: placing signals with 2x1 drags workaround is completely rewritten. Also features checks for hacked/modified clients. Thanks a lot Hackykid! darkvater parents: 1209 diff changeset	577
3552f20fcfcb (svn r1731) - Fix: [ 1106930 ] BugFix: placing signals with 2x1 drags workaround is completely rewritten. Also features checks for hacked/modified clients. Thanks a lot Hackykid! darkvater parents: 1209 diff changeset	578	return 0;
3552f20fcfcb (svn r1731) - Fix: [ 1106930 ] BugFix: placing signals with 2x1 drags workaround is completely rewritten. Also features checks for hacked/modified clients. Thanks a lot Hackykid! darkvater parents: 1209 diff changeset	579	}
3552f20fcfcb (svn r1731) - Fix: [ 1106930 ] BugFix: placing signals with 2x1 drags workaround is completely rewritten. Also features checks for hacked/modified clients. Thanks a lot Hackykid! darkvater parents: 1209 diff changeset	580
3552f20fcfcb (svn r1731) - Fix: [ 1106930 ] BugFix: placing signals with 2x1 drags workaround is completely rewritten. Also features checks for hacked/modified clients. Thanks a lot Hackykid! darkvater parents: 1209 diff changeset	581	/* Build a stretch of railroad tracks.
3552f20fcfcb (svn r1731) - Fix: [ 1106930 ] BugFix: placing signals with 2x1 drags workaround is completely rewritten. Also features checks for hacked/modified clients. Thanks a lot Hackykid! darkvater parents: 1209 diff changeset	582	* x,y= start tile
3552f20fcfcb (svn r1731) - Fix: [ 1106930 ] BugFix: placing signals with 2x1 drags workaround is completely rewritten. Also features checks for hacked/modified clients. Thanks a lot Hackykid! darkvater parents: 1209 diff changeset	583	* p1 = end tile
3552f20fcfcb (svn r1731) - Fix: [ 1106930 ] BugFix: placing signals with 2x1 drags workaround is completely rewritten. Also features checks for hacked/modified clients. Thanks a lot Hackykid! darkvater parents: 1209 diff changeset	584	* p2 = (bit 0-3) - railroad type normal/maglev
3552f20fcfcb (svn r1731) - Fix: [ 1106930 ] BugFix: placing signals with 2x1 drags workaround is completely rewritten. Also features checks for hacked/modified clients. Thanks a lot Hackykid! darkvater parents: 1209 diff changeset	585	* p2 = (bit 4-6) - track-orientation, valid values: 0-5
3552f20fcfcb (svn r1731) - Fix: [ 1106930 ] BugFix: placing signals with 2x1 drags workaround is completely rewritten. Also features checks for hacked/modified clients. Thanks a lot Hackykid! darkvater parents: 1209 diff changeset	586	* p2 = (bit 7) - 0 = build, 1 = remove tracks
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	587	*/
1227 3552f20fcfcb (svn r1731) - Fix: [ 1106930 ] BugFix: placing signals with 2x1 drags workaround is completely rewritten. Also features checks for hacked/modified clients. Thanks a lot Hackykid! darkvater parents: 1209 diff changeset	588	static int32 CmdRailTrackHelper(int x, int y, uint32 flags, uint32 p1, uint32 p2)
3552f20fcfcb (svn r1731) - Fix: [ 1106930 ] BugFix: placing signals with 2x1 drags workaround is completely rewritten. Also features checks for hacked/modified clients. Thanks a lot Hackykid! darkvater parents: 1209 diff changeset	589	{
3552f20fcfcb (svn r1731) - Fix: [ 1106930 ] BugFix: placing signals with 2x1 drags workaround is completely rewritten. Also features checks for hacked/modified clients. Thanks a lot Hackykid! darkvater parents: 1209 diff changeset	590	int ex, ey;
3552f20fcfcb (svn r1731) - Fix: [ 1106930 ] BugFix: placing signals with 2x1 drags workaround is completely rewritten. Also features checks for hacked/modified clients. Thanks a lot Hackykid! darkvater parents: 1209 diff changeset	591	int32 ret, total_cost = 0;
3552f20fcfcb (svn r1731) - Fix: [ 1106930 ] BugFix: placing signals with 2x1 drags workaround is completely rewritten. Also features checks for hacked/modified clients. Thanks a lot Hackykid! darkvater parents: 1209 diff changeset	592	int railbit = (p2 >> 4) & 7;
3552f20fcfcb (svn r1731) - Fix: [ 1106930 ] BugFix: placing signals with 2x1 drags workaround is completely rewritten. Also features checks for hacked/modified clients. Thanks a lot Hackykid! darkvater parents: 1209 diff changeset	593	byte mode = HASBIT(p2, 7);
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	594
1227 3552f20fcfcb (svn r1731) - Fix: [ 1106930 ] BugFix: placing signals with 2x1 drags workaround is completely rewritten. Also features checks for hacked/modified clients. Thanks a lot Hackykid! darkvater parents: 1209 diff changeset	595	/* unpack end point */
3552f20fcfcb (svn r1731) - Fix: [ 1106930 ] BugFix: placing signals with 2x1 drags workaround is completely rewritten. Also features checks for hacked/modified clients. Thanks a lot Hackykid! darkvater parents: 1209 diff changeset	596	ex = TileX(p1) * 16;
3552f20fcfcb (svn r1731) - Fix: [ 1106930 ] BugFix: placing signals with 2x1 drags workaround is completely rewritten. Also features checks for hacked/modified clients. Thanks a lot Hackykid! darkvater parents: 1209 diff changeset	597	ey = TileY(p1) * 16;
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	598
889 7f8630bfea41 (svn r1375) -Fix: [1050990] Buying trains sometimes accounted for incorrectly. Was the result of the cost getting reset in a recursive call of docommand. That is fixed. In addition all cost-commands are typed explicitely. Please do not forget to do so or your costs will be credited to construction if you are unlucky. darkvater parents: 826 diff changeset	599	SET_EXPENSES_TYPE(EXPENSES_CONSTRUCTION);
7f8630bfea41 (svn r1375) -Fix: [1050990] Buying trains sometimes accounted for incorrectly. Was the result of the cost getting reset in a recursive call of docommand. That is fixed. In addition all cost-commands are typed explicitely. Please do not forget to do so or your costs will be credited to construction if you are unlucky. darkvater parents: 826 diff changeset	600
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	601	if (flags & DC_EXEC)
541 e1cd34389f79 (svn r925) Use sound enums tron parents: 507 diff changeset	602	SndPlayTileFx(SND_20_SPLAT_2, TILE_FROM_XY(x,y));
201 c40d343115f8 (svn r202) -Codechange: I missed some files with trailing spaces.. this should be truelight parents: 159 diff changeset	603
1227 3552f20fcfcb (svn r1731) - Fix: [ 1106930 ] BugFix: placing signals with 2x1 drags workaround is completely rewritten. Also features checks for hacked/modified clients. Thanks a lot Hackykid! darkvater parents: 1209 diff changeset	604	if (ValidateAutoDrag(&railbit, x, y, ex, ey) == CMD_ERROR)
3552f20fcfcb (svn r1731) - Fix: [ 1106930 ] BugFix: placing signals with 2x1 drags workaround is completely rewritten. Also features checks for hacked/modified clients. Thanks a lot Hackykid! darkvater parents: 1209 diff changeset	605	return CMD_ERROR;
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	606
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	607	for(;;) {
1227 3552f20fcfcb (svn r1731) - Fix: [ 1106930 ] BugFix: placing signals with 2x1 drags workaround is completely rewritten. Also features checks for hacked/modified clients. Thanks a lot Hackykid! darkvater parents: 1209 diff changeset	608	ret = DoCommand(x, y, p2&0x3, railbit&7, flags, (mode == 0) ? CMD_BUILD_SINGLE_RAIL : CMD_REMOVE_SINGLE_RAIL);
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	609
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	610	if (ret == CMD_ERROR) {
1227 3552f20fcfcb (svn r1731) - Fix: [ 1106930 ] BugFix: placing signals with 2x1 drags workaround is completely rewritten. Also features checks for hacked/modified clients. Thanks a lot Hackykid! darkvater parents: 1209 diff changeset	611	if ((_error_message != STR_1007_ALREADY_BUILT) && (mode == 0))
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	612	break;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	613	} else
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	614	total_cost += ret;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	615
1227 3552f20fcfcb (svn r1731) - Fix: [ 1106930 ] BugFix: placing signals with 2x1 drags workaround is completely rewritten. Also features checks for hacked/modified clients. Thanks a lot Hackykid! darkvater parents: 1209 diff changeset	616	if (x == ex && y == ey)
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	617	break;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	618
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	619	x += _railbit.xinc[railbit];
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	620	y += _railbit.yinc[railbit];
201 c40d343115f8 (svn r202) -Codechange: I missed some files with trailing spaces.. this should be truelight parents: 159 diff changeset	621
1227 3552f20fcfcb (svn r1731) - Fix: [ 1106930 ] BugFix: placing signals with 2x1 drags workaround is completely rewritten. Also features checks for hacked/modified clients. Thanks a lot Hackykid! darkvater parents: 1209 diff changeset	622	// toggle railbit for the non-diagonal tracks
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	623	if (railbit & 0x6) railbit ^= 1;
201 c40d343115f8 (svn r202) -Codechange: I missed some files with trailing spaces.. this should be truelight parents: 159 diff changeset	624	}
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	625
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	626	if (total_cost == 0)
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	627	return CMD_ERROR;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	628
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	629	return total_cost;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	630	}
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	631
1227 3552f20fcfcb (svn r1731) - Fix: [ 1106930 ] BugFix: placing signals with 2x1 drags workaround is completely rewritten. Also features checks for hacked/modified clients. Thanks a lot Hackykid! darkvater parents: 1209 diff changeset	632	int32 CmdBuildRailroadTrack(int x, int y, uint32 flags, uint32 p1, uint32 p2)
3552f20fcfcb (svn r1731) - Fix: [ 1106930 ] BugFix: placing signals with 2x1 drags workaround is completely rewritten. Also features checks for hacked/modified clients. Thanks a lot Hackykid! darkvater parents: 1209 diff changeset	633	{
3552f20fcfcb (svn r1731) - Fix: [ 1106930 ] BugFix: placing signals with 2x1 drags workaround is completely rewritten. Also features checks for hacked/modified clients. Thanks a lot Hackykid! darkvater parents: 1209 diff changeset	634	return CmdRailTrackHelper(x, y, flags, p1, p2);
3552f20fcfcb (svn r1731) - Fix: [ 1106930 ] BugFix: placing signals with 2x1 drags workaround is completely rewritten. Also features checks for hacked/modified clients. Thanks a lot Hackykid! darkvater parents: 1209 diff changeset	635	}
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	636
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	637	int32 CmdRemoveRailroadTrack(int x, int y, uint32 flags, uint32 p1, uint32 p2)
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	638	{
1227 3552f20fcfcb (svn r1731) - Fix: [ 1106930 ] BugFix: placing signals with 2x1 drags workaround is completely rewritten. Also features checks for hacked/modified clients. Thanks a lot Hackykid! darkvater parents: 1209 diff changeset	639	return CmdRailTrackHelper(x, y, flags, p1, SETBIT(p2, 7));
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	640	}
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	641
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	642	/* Build a train depot
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	643	* p1 = rail type
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	644	* p2 = depot direction
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	645	*/
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	646	int32 CmdBuildTrainDepot(int x, int y, uint32 flags, uint32 p1, uint32 p2)
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	647	{
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	648	uint tile = TILE_FROM_XY(x,y);
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	649	int32 cost, ret;
1313 bba6afb8a995 (svn r1817) -Codechange: Moved depot-functions to depot.c truelight parents: 1247 diff changeset	650	Depot *depot;
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	651	uint tileh;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	652
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	653	SET_EXPENSES_TYPE(EXPENSES_CONSTRUCTION);
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	654
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	655	if (!EnsureNoVehicle(tile)) return CMD_ERROR;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	656
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	657	tileh = GetTileSlope(tile, NULL);
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	658	if (tileh != 0) {
84 1e0721c29bad (svn r85) -Add: initial commit of new AI (enable in Patch menu) truelight parents: 59 diff changeset	659	if ((!_patches.ainew_active && _is_ai_player) \|\| !_patches.build_on_slopes \|\| (tileh & 0x10 \|\| !((0x4C >> p2) & tileh) ))
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	660	return_cmd_error(STR_0007_FLAT_LAND_REQUIRED);
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	661	}
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	662
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	663	ret = DoCommandByTile(tile, 0, 0, flags, CMD_LANDSCAPE_CLEAR);
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	664	if (ret == CMD_ERROR) return CMD_ERROR;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	665	cost = ret;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	666
1313 bba6afb8a995 (svn r1817) -Codechange: Moved depot-functions to depot.c truelight parents: 1247 diff changeset	667	depot = AllocateDepot();
bba6afb8a995 (svn r1817) -Codechange: Moved depot-functions to depot.c truelight parents: 1247 diff changeset	668	if (depot == NULL)
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	669	return CMD_ERROR;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	670
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	671	if (flags & DC_EXEC) {
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	672	if (_current_player == _local_player)
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	673	_last_built_train_depot_tile = (TileIndex)tile;
201 c40d343115f8 (svn r202) -Codechange: I missed some files with trailing spaces.. this should be truelight parents: 159 diff changeset	674
c40d343115f8 (svn r202) -Codechange: I missed some files with trailing spaces.. this should be truelight parents: 159 diff changeset	675	ModifyTile(tile,
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	676	MP_SETTYPE(MP_RAILWAY) \|
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	677	MP_MAP3LO \| MP_MAPOWNER_CURRENT \| MP_MAP5,
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	678	p1, /* map3_lo */
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	679	p2 \| RAIL_TYPE_DEPOT /* map5 */
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	680	);
201 c40d343115f8 (svn r202) -Codechange: I missed some files with trailing spaces.. this should be truelight parents: 159 diff changeset	681
1313 bba6afb8a995 (svn r1817) -Codechange: Moved depot-functions to depot.c truelight parents: 1247 diff changeset	682	depot->xy = tile;
bba6afb8a995 (svn r1817) -Codechange: Moved depot-functions to depot.c truelight parents: 1247 diff changeset	683	depot->town_index = ClosestTownFromTile(tile, (uint)-1)->index;
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	684
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	685	SetSignalsOnBothDir(tile, (p2&1) ? 2 : 1);
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	686
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	687	}
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	688
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	689	return cost + _price.build_train_depot;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	690	}
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	691
395 4c990f33dab7 (svn r587) -newgrf: Rename all /Checkpoint/i tokens to 'Waypoint's. The name actually makes some sense and is also compatible with TTDPatch (pasky). darkvater parents: 393 diff changeset	692	static void MakeDefaultWaypointName(Waypoint *cp)
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	693	{
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	694	int townidx = ClosestTownFromTile(cp->xy, (uint)-1)->index;
395 4c990f33dab7 (svn r587) -newgrf: Rename all /Checkpoint/i tokens to 'Waypoint's. The name actually makes some sense and is also compatible with TTDPatch (pasky). darkvater parents: 393 diff changeset	695	Waypoint *cc;
4c990f33dab7 (svn r587) -newgrf: Rename all /Checkpoint/i tokens to 'Waypoint's. The name actually makes some sense and is also compatible with TTDPatch (pasky). darkvater parents: 393 diff changeset	696	bool used_waypoint[64];
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	697	int i;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	698
395 4c990f33dab7 (svn r587) -newgrf: Rename all /Checkpoint/i tokens to 'Waypoint's. The name actually makes some sense and is also compatible with TTDPatch (pasky). darkvater parents: 393 diff changeset	699	memset(used_waypoint, 0, sizeof(used_waypoint));
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	700
395 4c990f33dab7 (svn r587) -newgrf: Rename all /Checkpoint/i tokens to 'Waypoint's. The name actually makes some sense and is also compatible with TTDPatch (pasky). darkvater parents: 393 diff changeset	701	// find an unused waypoint number belonging to this town
4c990f33dab7 (svn r587) -newgrf: Rename all /Checkpoint/i tokens to 'Waypoint's. The name actually makes some sense and is also compatible with TTDPatch (pasky). darkvater parents: 393 diff changeset	702	for(cc = _waypoints; cc != endof(_waypoints); cc++) {
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	703	if (cc->xy && cc->town_or_string & 0xC000 && (cc->town_or_string & 0xFF) == townidx)
395 4c990f33dab7 (svn r587) -newgrf: Rename all /Checkpoint/i tokens to 'Waypoint's. The name actually makes some sense and is also compatible with TTDPatch (pasky). darkvater parents: 393 diff changeset	704	used_waypoint[(cc->town_or_string >> 8) & 0x3F] = true;
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	705	}
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	706
395 4c990f33dab7 (svn r587) -newgrf: Rename all /Checkpoint/i tokens to 'Waypoint's. The name actually makes some sense and is also compatible with TTDPatch (pasky). darkvater parents: 393 diff changeset	707	for(i=0; used_waypoint[i] && i!=lengthof(used_waypoint)-1; i++) {}
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	708	cp->town_or_string = 0xC000 + (i << 8) + townidx;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	709	}
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	710
395 4c990f33dab7 (svn r587) -newgrf: Rename all /Checkpoint/i tokens to 'Waypoint's. The name actually makes some sense and is also compatible with TTDPatch (pasky). darkvater parents: 393 diff changeset	711	// find a deleted waypoint close to a tile.
4c990f33dab7 (svn r587) -newgrf: Rename all /Checkpoint/i tokens to 'Waypoint's. The name actually makes some sense and is also compatible with TTDPatch (pasky). darkvater parents: 393 diff changeset	712	static Waypoint *FindDeletedWaypointCloseTo(uint tile)
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	713	{
395 4c990f33dab7 (svn r587) -newgrf: Rename all /Checkpoint/i tokens to 'Waypoint's. The name actually makes some sense and is also compatible with TTDPatch (pasky). darkvater parents: 393 diff changeset	714	Waypoint cp,best = NULL;
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	715	uint thres = 8, cur_dist;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	716
395 4c990f33dab7 (svn r587) -newgrf: Rename all /Checkpoint/i tokens to 'Waypoint's. The name actually makes some sense and is also compatible with TTDPatch (pasky). darkvater parents: 393 diff changeset	717	for(cp = _waypoints; cp != endof(_waypoints); cp++) {
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	718	if (cp->deleted && cp->xy) {
1245 768d9bc95aaa (svn r1749) Move the functions which calculate distances to map.[ch] and give the more meaningful names tron parents: 1229 diff changeset	719	cur_dist = DistanceManhattan(tile, cp->xy);
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	720	if (cur_dist < thres) {
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	721	thres = cur_dist;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	722	best = cp;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	723	}
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	724	}
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	725	}
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	726	return best;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	727	}
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	728
395 4c990f33dab7 (svn r587) -newgrf: Rename all /Checkpoint/i tokens to 'Waypoint's. The name actually makes some sense and is also compatible with TTDPatch (pasky). darkvater parents: 393 diff changeset	729	/* Convert existing rail to waypoint */
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	730
395 4c990f33dab7 (svn r587) -newgrf: Rename all /Checkpoint/i tokens to 'Waypoint's. The name actually makes some sense and is also compatible with TTDPatch (pasky). darkvater parents: 393 diff changeset	731	int32 CmdBuildTrainWaypoint(int x, int y, uint32 flags, uint32 p1, uint32 p2)
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	732	{
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	733	uint tile = TILE_FROM_XY(x,y);
395 4c990f33dab7 (svn r587) -newgrf: Rename all /Checkpoint/i tokens to 'Waypoint's. The name actually makes some sense and is also compatible with TTDPatch (pasky). darkvater parents: 393 diff changeset	734	Waypoint *cp;
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	735	uint tileh;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	736	uint dir;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	737
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	738	SET_EXPENSES_TYPE(EXPENSES_CONSTRUCTION);
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	739
1035 0a170deb6e33 (svn r1536) Move GET_TILEHEIGHT, GET_TILETYPE and IS_TILETYPE to map.h, turn them into inline functions and add some asserts tron parents: 1024 diff changeset	740	if (!IsTileType(tile, MP_RAILWAY) \|\| ((dir = 0, _map5[tile] != 1) && (dir = 1, _map5[tile] != 2)))
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	741	return_cmd_error(STR_1005_NO_SUITABLE_RAILROAD_TRACK);
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	742
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	743	if (!CheckTileOwnership(tile))
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	744	return CMD_ERROR;
201 c40d343115f8 (svn r202) -Codechange: I missed some files with trailing spaces.. this should be truelight parents: 159 diff changeset	745
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	746	if (!EnsureNoVehicle(tile)) return CMD_ERROR;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	747
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	748	tileh = GetTileSlope(tile, NULL);
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	749	if (tileh != 0) {
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	750	if (!_patches.build_on_slopes \|\| tileh & 0x10 \|\| !(tileh & (0x3 << dir)) \|\| !(tileh & ~(0x3 << dir)))
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	751	return_cmd_error(STR_0007_FLAT_LAND_REQUIRED);
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	752	}
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	753
395 4c990f33dab7 (svn r587) -newgrf: Rename all /Checkpoint/i tokens to 'Waypoint's. The name actually makes some sense and is also compatible with TTDPatch (pasky). darkvater parents: 393 diff changeset	754	// check if there is an already existing, deleted, waypoint close to us that we can reuse.
4c990f33dab7 (svn r587) -newgrf: Rename all /Checkpoint/i tokens to 'Waypoint's. The name actually makes some sense and is also compatible with TTDPatch (pasky). darkvater parents: 393 diff changeset	755	cp = FindDeletedWaypointCloseTo(tile);
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	756	if (cp == NULL) {
395 4c990f33dab7 (svn r587) -newgrf: Rename all /Checkpoint/i tokens to 'Waypoint's. The name actually makes some sense and is also compatible with TTDPatch (pasky). darkvater parents: 393 diff changeset	757	cp = AllocateWaypoint();
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	758	if (cp == NULL) return CMD_ERROR;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	759	cp->town_or_string = 0;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	760	}
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	761
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	762	if (flags & DC_EXEC) {
395 4c990f33dab7 (svn r587) -newgrf: Rename all /Checkpoint/i tokens to 'Waypoint's. The name actually makes some sense and is also compatible with TTDPatch (pasky). darkvater parents: 393 diff changeset	763	ModifyTile(tile, MP_MAP5, RAIL_TYPE_WAYPOINT \| dir);
412 f0573bfb67a9 (svn r609) Fixed choose waypoints dialogs, it works without assertion failures and with custom waypoint #0 selectable now. (pasky) dominik parents: 411 diff changeset	764	if (--p1 & 0x100) { // waypoint type 0 uses default graphics
389 2d394eeba5e5 (svn r581) -newgrf: Basic support for new stations - only waypoints supported now and only celestar parents: 337 diff changeset	765	// custom graphics
2d394eeba5e5 (svn r581) -newgrf: Basic support for new stations - only waypoints supported now and only celestar parents: 337 diff changeset	766	_map3_lo[tile] \|= 16;
2d394eeba5e5 (svn r581) -newgrf: Basic support for new stations - only waypoints supported now and only celestar parents: 337 diff changeset	767	_map3_hi[tile] = p1 & 0xff;
2d394eeba5e5 (svn r581) -newgrf: Basic support for new stations - only waypoints supported now and only celestar parents: 337 diff changeset	768	}
201 c40d343115f8 (svn r202) -Codechange: I missed some files with trailing spaces.. this should be truelight parents: 159 diff changeset	769
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	770	cp->deleted = 0;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	771	cp->xy = tile;
413 36afcda97345 (svn r610) -newgrf: Support for some basic deterministical spritegroups regarding stations. Waypoints look changes based on year now :^) (pasky). darkvater parents: 412 diff changeset	772	cp->build_date = _date;
201 c40d343115f8 (svn r202) -Codechange: I missed some files with trailing spaces.. this should be truelight parents: 159 diff changeset	773
395 4c990f33dab7 (svn r587) -newgrf: Rename all /Checkpoint/i tokens to 'Waypoint's. The name actually makes some sense and is also compatible with TTDPatch (pasky). darkvater parents: 393 diff changeset	774	if (cp->town_or_string == 0) MakeDefaultWaypointName(cp); else RedrawWaypointSign(cp);
4c990f33dab7 (svn r587) -newgrf: Rename all /Checkpoint/i tokens to 'Waypoint's. The name actually makes some sense and is also compatible with TTDPatch (pasky). darkvater parents: 393 diff changeset	775	UpdateWaypointSign(cp);
4c990f33dab7 (svn r587) -newgrf: Rename all /Checkpoint/i tokens to 'Waypoint's. The name actually makes some sense and is also compatible with TTDPatch (pasky). darkvater parents: 393 diff changeset	776	RedrawWaypointSign(cp);
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	777	SetSignalsOnBothDir(tile, dir ? 2 : 1);
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	778	}
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	779
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	780	return _price.build_train_depot;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	781	}
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	782
395 4c990f33dab7 (svn r587) -newgrf: Rename all /Checkpoint/i tokens to 'Waypoint's. The name actually makes some sense and is also compatible with TTDPatch (pasky). darkvater parents: 393 diff changeset	783	static void DoDeleteWaypoint(Waypoint *cp)
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	784	{
555 eec6c0294435 (svn r955) Replace uint16 for orders with struct Order tron parents: 543 diff changeset	785	Order order;
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	786	cp->xy = 0;
1024 9b06b01490a4 (svn r1525) -Codechange: rewrote the _order_array, now it can be made dynamic. truelight parents: 1009 diff changeset	787
555 eec6c0294435 (svn r955) Replace uint16 for orders with struct Order tron parents: 543 diff changeset	788	order.type = OT_GOTO_WAYPOINT;
eec6c0294435 (svn r955) Replace uint16 for orders with struct Order tron parents: 543 diff changeset	789	order.station = cp - _waypoints;
1024 9b06b01490a4 (svn r1525) -Codechange: rewrote the _order_array, now it can be made dynamic. truelight parents: 1009 diff changeset	790	DeleteDestinationFromVehicleOrder(order);
9b06b01490a4 (svn r1525) -Codechange: rewrote the _order_array, now it can be made dynamic. truelight parents: 1009 diff changeset	791
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	792	if (~cp->town_or_string & 0xC000) DeleteName(cp->town_or_string);
395 4c990f33dab7 (svn r587) -newgrf: Rename all /Checkpoint/i tokens to 'Waypoint's. The name actually makes some sense and is also compatible with TTDPatch (pasky). darkvater parents: 393 diff changeset	793	RedrawWaypointSign(cp);
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	794	}
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	795
395 4c990f33dab7 (svn r587) -newgrf: Rename all /Checkpoint/i tokens to 'Waypoint's. The name actually makes some sense and is also compatible with TTDPatch (pasky). darkvater parents: 393 diff changeset	796	// delete waypoints after a while
1093 e8d26c7dc42f (svn r1594) Convert all undefined parameter lists to (void) and add the appropriate warning flags in the Makefile tron parents: 1084 diff changeset	797	void WaypointsDailyLoop(void)
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	798	{
395 4c990f33dab7 (svn r587) -newgrf: Rename all /Checkpoint/i tokens to 'Waypoint's. The name actually makes some sense and is also compatible with TTDPatch (pasky). darkvater parents: 393 diff changeset	799	Waypoint *cp;
4c990f33dab7 (svn r587) -newgrf: Rename all /Checkpoint/i tokens to 'Waypoint's. The name actually makes some sense and is also compatible with TTDPatch (pasky). darkvater parents: 393 diff changeset	800	for(cp = _waypoints; cp != endof(_waypoints); cp++) {
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	801	if (cp->deleted && !--cp->deleted) {
395 4c990f33dab7 (svn r587) -newgrf: Rename all /Checkpoint/i tokens to 'Waypoint's. The name actually makes some sense and is also compatible with TTDPatch (pasky). darkvater parents: 393 diff changeset	802	DoDeleteWaypoint(cp);
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	803	}
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	804	}
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	805	}
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	806
395 4c990f33dab7 (svn r587) -newgrf: Rename all /Checkpoint/i tokens to 'Waypoint's. The name actually makes some sense and is also compatible with TTDPatch (pasky). darkvater parents: 393 diff changeset	807	static int32 RemoveTrainWaypoint(uint tile, uint32 flags, bool justremove)
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	808	{
395 4c990f33dab7 (svn r587) -newgrf: Rename all /Checkpoint/i tokens to 'Waypoint's. The name actually makes some sense and is also compatible with TTDPatch (pasky). darkvater parents: 393 diff changeset	809	Waypoint *cp;
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	810
395 4c990f33dab7 (svn r587) -newgrf: Rename all /Checkpoint/i tokens to 'Waypoint's. The name actually makes some sense and is also compatible with TTDPatch (pasky). darkvater parents: 393 diff changeset	811	// make sure it's a waypoint
1535 a5f686a20d2c (svn r2039) IS_RAIL_DEPOT -> IsRailDepot, IS_RAIL_WAYPOINT -> IsRailWaypoint tron parents: 1534 diff changeset	812	if (!IsTileType(tile, MP_RAILWAY) \|\| !IsRailWaypoint(_map5[tile]))
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	813	return CMD_ERROR;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	814
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	815	if (!CheckTileOwnership(tile) && !(_current_player==17))
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	816	return CMD_ERROR;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	817
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	818	if (!EnsureNoVehicle(tile))
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	819	return CMD_ERROR;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	820
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	821	if (flags & DC_EXEC) {
395 4c990f33dab7 (svn r587) -newgrf: Rename all /Checkpoint/i tokens to 'Waypoint's. The name actually makes some sense and is also compatible with TTDPatch (pasky). darkvater parents: 393 diff changeset	822	int direction = _map5[tile] & RAIL_WAYPOINT_TRACK_MASK;
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	823
395 4c990f33dab7 (svn r587) -newgrf: Rename all /Checkpoint/i tokens to 'Waypoint's. The name actually makes some sense and is also compatible with TTDPatch (pasky). darkvater parents: 393 diff changeset	824	// mark the waypoint deleted
4c990f33dab7 (svn r587) -newgrf: Rename all /Checkpoint/i tokens to 'Waypoint's. The name actually makes some sense and is also compatible with TTDPatch (pasky). darkvater parents: 393 diff changeset	825	for(cp=_waypoints; cp->xy != (TileIndex)tile; cp++) {}
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	826	cp->deleted = 30; // let it live for this many days before we do the actual deletion.
395 4c990f33dab7 (svn r587) -newgrf: Rename all /Checkpoint/i tokens to 'Waypoint's. The name actually makes some sense and is also compatible with TTDPatch (pasky). darkvater parents: 393 diff changeset	827	RedrawWaypointSign(cp);
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	828
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	829	if (justremove) {
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	830	ModifyTile(tile, MP_MAP5, 1<<direction);
389 2d394eeba5e5 (svn r581) -newgrf: Basic support for new stations - only waypoints supported now and only celestar parents: 337 diff changeset	831	_map3_lo[tile] &= ~16;
2d394eeba5e5 (svn r581) -newgrf: Basic support for new stations - only waypoints supported now and only celestar parents: 337 diff changeset	832	_map3_hi[tile] = 0;
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	833	} else {
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	834	DoClearSquare(tile);
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	835	SetSignalsOnBothDir(tile, direction);
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	836	}
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	837	}
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	838
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	839	return _price.remove_train_depot;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	840	}
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	841
395 4c990f33dab7 (svn r587) -newgrf: Rename all /Checkpoint/i tokens to 'Waypoint's. The name actually makes some sense and is also compatible with TTDPatch (pasky). darkvater parents: 393 diff changeset	842	int32 CmdRemoveTrainWaypoint(int x, int y, uint32 flags, uint32 p1, uint32 p2)
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	843	{
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	844	uint tile = TILE_FROM_XY(x,y);
889 7f8630bfea41 (svn r1375) -Fix: [1050990] Buying trains sometimes accounted for incorrectly. Was the result of the cost getting reset in a recursive call of docommand. That is fixed. In addition all cost-commands are typed explicitely. Please do not forget to do so or your costs will be credited to construction if you are unlucky. darkvater parents: 826 diff changeset	845	SET_EXPENSES_TYPE(EXPENSES_CONSTRUCTION);
395 4c990f33dab7 (svn r587) -newgrf: Rename all /Checkpoint/i tokens to 'Waypoint's. The name actually makes some sense and is also compatible with TTDPatch (pasky). darkvater parents: 393 diff changeset	846	return RemoveTrainWaypoint(tile, flags, true);
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	847	}
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	848
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	849
395 4c990f33dab7 (svn r587) -newgrf: Rename all /Checkpoint/i tokens to 'Waypoint's. The name actually makes some sense and is also compatible with TTDPatch (pasky). darkvater parents: 393 diff changeset	850	// p1 = id of waypoint
4c990f33dab7 (svn r587) -newgrf: Rename all /Checkpoint/i tokens to 'Waypoint's. The name actually makes some sense and is also compatible with TTDPatch (pasky). darkvater parents: 393 diff changeset	851	int32 CmdRenameWaypoint(int x, int y, uint32 flags, uint32 p1, uint32 p2)
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	852	{
395 4c990f33dab7 (svn r587) -newgrf: Rename all /Checkpoint/i tokens to 'Waypoint's. The name actually makes some sense and is also compatible with TTDPatch (pasky). darkvater parents: 393 diff changeset	853	Waypoint *cp;
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	854	StringID str;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	855
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	856	if (_decode_parameters[0] != 0) {
1328 e069d2db0e4c (svn r1832) Next byte -> char iteration: custom names tron parents: 1313 diff changeset	857	str = AllocateNameUnique((const char*)_decode_parameters, 0);
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	858	if (str == 0) return CMD_ERROR;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	859
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	860	if (flags & DC_EXEC) {
395 4c990f33dab7 (svn r587) -newgrf: Rename all /Checkpoint/i tokens to 'Waypoint's. The name actually makes some sense and is also compatible with TTDPatch (pasky). darkvater parents: 393 diff changeset	861	cp = &_waypoints[p1];
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	862	if (~cp->town_or_string & 0xC000) DeleteName(cp->town_or_string);
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	863	cp->town_or_string = str;
395 4c990f33dab7 (svn r587) -newgrf: Rename all /Checkpoint/i tokens to 'Waypoint's. The name actually makes some sense and is also compatible with TTDPatch (pasky). darkvater parents: 393 diff changeset	864	UpdateWaypointSign(cp);
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	865	MarkWholeScreenDirty();
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	866	} else {
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	867	DeleteName(str);
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	868	}
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	869	} else {
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	870	if (flags & DC_EXEC) {
395 4c990f33dab7 (svn r587) -newgrf: Rename all /Checkpoint/i tokens to 'Waypoint's. The name actually makes some sense and is also compatible with TTDPatch (pasky). darkvater parents: 393 diff changeset	871	cp = &_waypoints[p1];
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	872	if (~cp->town_or_string & 0xC000) DeleteName(cp->town_or_string);
395 4c990f33dab7 (svn r587) -newgrf: Rename all /Checkpoint/i tokens to 'Waypoint's. The name actually makes some sense and is also compatible with TTDPatch (pasky). darkvater parents: 393 diff changeset	873	MakeDefaultWaypointName(cp);
4c990f33dab7 (svn r587) -newgrf: Rename all /Checkpoint/i tokens to 'Waypoint's. The name actually makes some sense and is also compatible with TTDPatch (pasky). darkvater parents: 393 diff changeset	874	UpdateWaypointSign(cp);
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	875	MarkWholeScreenDirty();
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	876	}
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	877	}
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	878	return 0;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	879	}
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	880
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	881
1084 16db2b52597e (svn r1585) Rewrite CmdBuildSignals() tron parents: 1066 diff changeset	882	/* build signals, alternate between double/single, signal/semaphore,
16db2b52597e (svn r1585) Rewrite CmdBuildSignals() tron parents: 1066 diff changeset	883	* pre/exit/combo-signals
16db2b52597e (svn r1585) Rewrite CmdBuildSignals() tron parents: 1066 diff changeset	884	* p1 bits 0-2 - track-orientation, valid values: 0-5
16db2b52597e (svn r1585) Rewrite CmdBuildSignals() tron parents: 1066 diff changeset	885	* p1 bit 3 - choose semaphores/signals or cycle normal/pre/exit/combo
16db2b52597e (svn r1585) Rewrite CmdBuildSignals() tron parents: 1066 diff changeset	886	* depending on context
16db2b52597e (svn r1585) Rewrite CmdBuildSignals() tron parents: 1066 diff changeset	887	* p2 = used for CmdBuildManySignals() to copy style of first signal
58 b9fdcc9b5c90 (svn r59) -Feature: Added Autosignals, just like Autorail. Can copy signal style, convert signal<->semaphore, etc. Big thanks to betatesters Dribbel and Testman57 (Darkvater) darkvater parents: 39 diff changeset	888	*/
1227 3552f20fcfcb (svn r1731) - Fix: [ 1106930 ] BugFix: placing signals with 2x1 drags workaround is completely rewritten. Also features checks for hacked/modified clients. Thanks a lot Hackykid! darkvater parents: 1209 diff changeset	889	int32 CmdBuildSingleSignal(int x, int y, uint32 flags, uint32 p1, uint32 p2)
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	890	{
1084 16db2b52597e (svn r1585) Rewrite CmdBuildSignals() tron parents: 1066 diff changeset	891	TileIndex tile = TILE_FROM_XY(x, y);
16db2b52597e (svn r1585) Rewrite CmdBuildSignals() tron parents: 1066 diff changeset	892	bool semaphore;
16db2b52597e (svn r1585) Rewrite CmdBuildSignals() tron parents: 1066 diff changeset	893	bool pre_signal;
16db2b52597e (svn r1585) Rewrite CmdBuildSignals() tron parents: 1066 diff changeset	894	uint track = p1 & 0x7;
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	895	byte m5;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	896	int32 cost;
201 c40d343115f8 (svn r202) -Codechange: I missed some files with trailing spaces.. this should be truelight parents: 159 diff changeset	897
1084 16db2b52597e (svn r1585) Rewrite CmdBuildSignals() tron parents: 1066 diff changeset	898	if (!(track < 6) \|\| // only 6 possible track-combinations
16db2b52597e (svn r1585) Rewrite CmdBuildSignals() tron parents: 1066 diff changeset	899	!IsTileType(tile, MP_RAILWAY) \|\|
16db2b52597e (svn r1585) Rewrite CmdBuildSignals() tron parents: 1066 diff changeset	900	!EnsureNoVehicle(tile))
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	901	return CMD_ERROR;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	902
1084 16db2b52597e (svn r1585) Rewrite CmdBuildSignals() tron parents: 1066 diff changeset	903	// Protect against invalid signal copying
16db2b52597e (svn r1585) Rewrite CmdBuildSignals() tron parents: 1066 diff changeset	904	if (p2 != 0 && (p2 & _signals_table_both[track]) == 0)
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	905	return CMD_ERROR;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	906
1084 16db2b52597e (svn r1585) Rewrite CmdBuildSignals() tron parents: 1066 diff changeset	907	m5 = _map5[tile];
16db2b52597e (svn r1585) Rewrite CmdBuildSignals() tron parents: 1066 diff changeset	908
16db2b52597e (svn r1585) Rewrite CmdBuildSignals() tron parents: 1066 diff changeset	909	if (m5 & 0x80 \|\| // mustn't be a depot
16db2b52597e (svn r1585) Rewrite CmdBuildSignals() tron parents: 1066 diff changeset	910	!HASBIT(m5, track)) // track must exist
16db2b52597e (svn r1585) Rewrite CmdBuildSignals() tron parents: 1066 diff changeset	911	return CMD_ERROR;
16db2b52597e (svn r1585) Rewrite CmdBuildSignals() tron parents: 1066 diff changeset	912
16db2b52597e (svn r1585) Rewrite CmdBuildSignals() tron parents: 1066 diff changeset	913	if (!CheckTileOwnership(tile)) return CMD_ERROR;
16db2b52597e (svn r1585) Rewrite CmdBuildSignals() tron parents: 1066 diff changeset	914
58 b9fdcc9b5c90 (svn r59) -Feature: Added Autosignals, just like Autorail. Can copy signal style, convert signal<->semaphore, etc. Big thanks to betatesters Dribbel and Testman57 (Darkvater) darkvater parents: 39 diff changeset	915	_error_message = STR_1005_NO_SUITABLE_RAILROAD_TRACK;
b9fdcc9b5c90 (svn r59) -Feature: Added Autosignals, just like Autorail. Can copy signal style, convert signal<->semaphore, etc. Big thanks to betatesters Dribbel and Testman57 (Darkvater) darkvater parents: 39 diff changeset	916
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	917	{
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	918	byte m = m5 & RAIL_BIT_MASK;
1084 16db2b52597e (svn r1585) Rewrite CmdBuildSignals() tron parents: 1066 diff changeset	919	if (m != RAIL_BIT_DIAG1 &&
16db2b52597e (svn r1585) Rewrite CmdBuildSignals() tron parents: 1066 diff changeset	920	m != RAIL_BIT_DIAG2 &&
16db2b52597e (svn r1585) Rewrite CmdBuildSignals() tron parents: 1066 diff changeset	921	m != RAIL_BIT_UPPER &&
16db2b52597e (svn r1585) Rewrite CmdBuildSignals() tron parents: 1066 diff changeset	922	m != RAIL_BIT_LOWER &&
16db2b52597e (svn r1585) Rewrite CmdBuildSignals() tron parents: 1066 diff changeset	923	m != RAIL_BIT_LEFT &&
16db2b52597e (svn r1585) Rewrite CmdBuildSignals() tron parents: 1066 diff changeset	924	m != RAIL_BIT_RIGHT &&
16db2b52597e (svn r1585) Rewrite CmdBuildSignals() tron parents: 1066 diff changeset	925	m != (RAIL_BIT_UPPER \| RAIL_BIT_LOWER) &&
16db2b52597e (svn r1585) Rewrite CmdBuildSignals() tron parents: 1066 diff changeset	926	m != (RAIL_BIT_LEFT \| RAIL_BIT_RIGHT))
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	927	return CMD_ERROR;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	928	}
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	929
1084 16db2b52597e (svn r1585) Rewrite CmdBuildSignals() tron parents: 1066 diff changeset	930	SET_EXPENSES_TYPE(EXPENSES_CONSTRUCTION);
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	931
1084 16db2b52597e (svn r1585) Rewrite CmdBuildSignals() tron parents: 1066 diff changeset	932	// Same bit, used in different contexts
16db2b52597e (svn r1585) Rewrite CmdBuildSignals() tron parents: 1066 diff changeset	933	semaphore = pre_signal = HASBIT(p1, 3);
1066 aad3c6ad147f (svn r1567) -Fix: [110452] On horizontal/vertical tracks you are also charged for building/removing signals on the parallel track on the same tile. Signal updating is also correct. (Hackykid) darkvater parents: 1059 diff changeset	934
1084 16db2b52597e (svn r1585) Rewrite CmdBuildSignals() tron parents: 1066 diff changeset	935	if ((_map3_lo[tile] & _signals_table_both[track]) == 0) {
16db2b52597e (svn r1585) Rewrite CmdBuildSignals() tron parents: 1066 diff changeset	936	// build new signals
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	937	cost = _price.build_signals;
1066 aad3c6ad147f (svn r1567) -Fix: [110452] On horizontal/vertical tracks you are also charged for building/removing signals on the parallel track on the same tile. Signal updating is also correct. (Hackykid) darkvater parents: 1059 diff changeset	938	} else {
1084 16db2b52597e (svn r1585) Rewrite CmdBuildSignals() tron parents: 1066 diff changeset	939	if (p2 != 0 &&
16db2b52597e (svn r1585) Rewrite CmdBuildSignals() tron parents: 1066 diff changeset	940	((semaphore && !HASBIT(_map3_hi[tile], 2)) \|\|
16db2b52597e (svn r1585) Rewrite CmdBuildSignals() tron parents: 1066 diff changeset	941	(!semaphore && HASBIT(_map3_hi[tile], 2)))) {
16db2b52597e (svn r1585) Rewrite CmdBuildSignals() tron parents: 1066 diff changeset	942	// convert signals <-> semaphores
16db2b52597e (svn r1585) Rewrite CmdBuildSignals() tron parents: 1066 diff changeset	943	cost = _price.build_signals + _price.remove_signals;
16db2b52597e (svn r1585) Rewrite CmdBuildSignals() tron parents: 1066 diff changeset	944	} else {
16db2b52597e (svn r1585) Rewrite CmdBuildSignals() tron parents: 1066 diff changeset	945	// it is free to change orientation/pre-exit-combo signals
16db2b52597e (svn r1585) Rewrite CmdBuildSignals() tron parents: 1066 diff changeset	946	cost = 0;
16db2b52597e (svn r1585) Rewrite CmdBuildSignals() tron parents: 1066 diff changeset	947	}
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	948	}
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	949
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	950	if (flags & DC_EXEC) {
1084 16db2b52597e (svn r1585) Rewrite CmdBuildSignals() tron parents: 1066 diff changeset	951	if (!(m5 & RAIL_TYPE_SIGNALS)) {
16db2b52597e (svn r1585) Rewrite CmdBuildSignals() tron parents: 1066 diff changeset	952	// there are no signals at all on this tile yet
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	953	_map5[tile] \|= RAIL_TYPE_SIGNALS; // change into signals
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	954	_map2[tile] \|= 0xF0; // all signals are on
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	955	_map3_lo[tile] &= ~0xF0; // no signals built by default
1084 16db2b52597e (svn r1585) Rewrite CmdBuildSignals() tron parents: 1066 diff changeset	956	_map3_hi[tile] = semaphore ? 4 : 0;
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	957	}
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	958
1084 16db2b52597e (svn r1585) Rewrite CmdBuildSignals() tron parents: 1066 diff changeset	959	if (p2 == 0) {
16db2b52597e (svn r1585) Rewrite CmdBuildSignals() tron parents: 1066 diff changeset	960	if ((_map3_lo[tile] & _signals_table_both[track]) == 0) {
16db2b52597e (svn r1585) Rewrite CmdBuildSignals() tron parents: 1066 diff changeset	961	// build new signals
16db2b52597e (svn r1585) Rewrite CmdBuildSignals() tron parents: 1066 diff changeset	962	_map3_lo[tile] \|= _signals_table_both[track];
16db2b52597e (svn r1585) Rewrite CmdBuildSignals() tron parents: 1066 diff changeset	963	} else {
16db2b52597e (svn r1585) Rewrite CmdBuildSignals() tron parents: 1066 diff changeset	964	if (pre_signal) {
16db2b52597e (svn r1585) Rewrite CmdBuildSignals() tron parents: 1066 diff changeset	965	// cycle between normal -> pre -> exit -> combo -> ...
16db2b52597e (svn r1585) Rewrite CmdBuildSignals() tron parents: 1066 diff changeset	966	byte type = (_map3_hi[tile] + 1) & 0x03;
16db2b52597e (svn r1585) Rewrite CmdBuildSignals() tron parents: 1066 diff changeset	967	_map3_hi[tile] &= ~0x03;
16db2b52597e (svn r1585) Rewrite CmdBuildSignals() tron parents: 1066 diff changeset	968	_map3_hi[tile] \|= type;
16db2b52597e (svn r1585) Rewrite CmdBuildSignals() tron parents: 1066 diff changeset	969	} else {
16db2b52597e (svn r1585) Rewrite CmdBuildSignals() tron parents: 1066 diff changeset	970	// cycle between two-way -> one-way -> one-way -> ...
16db2b52597e (svn r1585) Rewrite CmdBuildSignals() tron parents: 1066 diff changeset	971	switch (track) {
16db2b52597e (svn r1585) Rewrite CmdBuildSignals() tron parents: 1066 diff changeset	972	case 3:
16db2b52597e (svn r1585) Rewrite CmdBuildSignals() tron parents: 1066 diff changeset	973	case 5: {
16db2b52597e (svn r1585) Rewrite CmdBuildSignals() tron parents: 1066 diff changeset	974	byte signal = (_map3_lo[tile] - 0x10) & 0x30;
16db2b52597e (svn r1585) Rewrite CmdBuildSignals() tron parents: 1066 diff changeset	975	if (signal == 0) signal = 0x30;
16db2b52597e (svn r1585) Rewrite CmdBuildSignals() tron parents: 1066 diff changeset	976	_map3_lo[tile] &= ~0x30;
16db2b52597e (svn r1585) Rewrite CmdBuildSignals() tron parents: 1066 diff changeset	977	_map3_lo[tile] \|= signal;
16db2b52597e (svn r1585) Rewrite CmdBuildSignals() tron parents: 1066 diff changeset	978	break;
16db2b52597e (svn r1585) Rewrite CmdBuildSignals() tron parents: 1066 diff changeset	979	}
58 b9fdcc9b5c90 (svn r59) -Feature: Added Autosignals, just like Autorail. Can copy signal style, convert signal<->semaphore, etc. Big thanks to betatesters Dribbel and Testman57 (Darkvater) darkvater parents: 39 diff changeset	980
1084 16db2b52597e (svn r1585) Rewrite CmdBuildSignals() tron parents: 1066 diff changeset	981	default: {
16db2b52597e (svn r1585) Rewrite CmdBuildSignals() tron parents: 1066 diff changeset	982	byte signal = (_map3_lo[tile] - 0x40) & 0xC0;
16db2b52597e (svn r1585) Rewrite CmdBuildSignals() tron parents: 1066 diff changeset	983	if (signal == 0) signal = 0xC0;
16db2b52597e (svn r1585) Rewrite CmdBuildSignals() tron parents: 1066 diff changeset	984	_map3_lo[tile] &= ~0xC0;
16db2b52597e (svn r1585) Rewrite CmdBuildSignals() tron parents: 1066 diff changeset	985	_map3_lo[tile] \|= signal;
16db2b52597e (svn r1585) Rewrite CmdBuildSignals() tron parents: 1066 diff changeset	986	break;
16db2b52597e (svn r1585) Rewrite CmdBuildSignals() tron parents: 1066 diff changeset	987	}
16db2b52597e (svn r1585) Rewrite CmdBuildSignals() tron parents: 1066 diff changeset	988	}
16db2b52597e (svn r1585) Rewrite CmdBuildSignals() tron parents: 1066 diff changeset	989	}
16db2b52597e (svn r1585) Rewrite CmdBuildSignals() tron parents: 1066 diff changeset	990	}
58 b9fdcc9b5c90 (svn r59) -Feature: Added Autosignals, just like Autorail. Can copy signal style, convert signal<->semaphore, etc. Big thanks to betatesters Dribbel and Testman57 (Darkvater) darkvater parents: 39 diff changeset	991	} else {
1084 16db2b52597e (svn r1585) Rewrite CmdBuildSignals() tron parents: 1066 diff changeset	992	/* If CmdBuildManySignals is called with copying signals, just copy the
16db2b52597e (svn r1585) Rewrite CmdBuildSignals() tron parents: 1066 diff changeset	993	* style of the first signal given as parameter by CmdBuildManySignals */
16db2b52597e (svn r1585) Rewrite CmdBuildSignals() tron parents: 1066 diff changeset	994	_map3_lo[tile] &= ~_signals_table_both[track];
16db2b52597e (svn r1585) Rewrite CmdBuildSignals() tron parents: 1066 diff changeset	995	_map3_lo[tile] \|= p2 & _signals_table_both[track];
58 b9fdcc9b5c90 (svn r59) -Feature: Added Autosignals, just like Autorail. Can copy signal style, convert signal<->semaphore, etc. Big thanks to betatesters Dribbel and Testman57 (Darkvater) darkvater parents: 39 diff changeset	996	// convert between signal<->semaphores when dragging
1084 16db2b52597e (svn r1585) Rewrite CmdBuildSignals() tron parents: 1066 diff changeset	997	if (semaphore)
16db2b52597e (svn r1585) Rewrite CmdBuildSignals() tron parents: 1066 diff changeset	998	SETBIT(_map3_hi[tile], 2);
16db2b52597e (svn r1585) Rewrite CmdBuildSignals() tron parents: 1066 diff changeset	999	else
16db2b52597e (svn r1585) Rewrite CmdBuildSignals() tron parents: 1066 diff changeset	1000	CLRBIT(_map3_hi[tile], 2);
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1001	}
201 c40d343115f8 (svn r202) -Codechange: I missed some files with trailing spaces.. this should be truelight parents: 159 diff changeset	1002
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1003	MarkTileDirtyByTile(tile);
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1004	SetSignalsOnBothDir(tile, track);
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1005	}
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1006
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1007	return cost;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1008	}
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1009
58 b9fdcc9b5c90 (svn r59) -Feature: Added Autosignals, just like Autorail. Can copy signal style, convert signal<->semaphore, etc. Big thanks to betatesters Dribbel and Testman57 (Darkvater) darkvater parents: 39 diff changeset	1010	/* Build many signals by dragging: AutoSignals
1227 3552f20fcfcb (svn r1731) - Fix: [ 1106930 ] BugFix: placing signals with 2x1 drags workaround is completely rewritten. Also features checks for hacked/modified clients. Thanks a lot Hackykid! darkvater parents: 1209 diff changeset	1011	* x,y = start tile
3552f20fcfcb (svn r1731) - Fix: [ 1106930 ] BugFix: placing signals with 2x1 drags workaround is completely rewritten. Also features checks for hacked/modified clients. Thanks a lot Hackykid! darkvater parents: 1209 diff changeset	1012	* p1 = end tile
3552f20fcfcb (svn r1731) - Fix: [ 1106930 ] BugFix: placing signals with 2x1 drags workaround is completely rewritten. Also features checks for hacked/modified clients. Thanks a lot Hackykid! darkvater parents: 1209 diff changeset	1013	* p2 = (bit 0) - 0 = build, 1 = remove signals
3552f20fcfcb (svn r1731) - Fix: [ 1106930 ] BugFix: placing signals with 2x1 drags workaround is completely rewritten. Also features checks for hacked/modified clients. Thanks a lot Hackykid! darkvater parents: 1209 diff changeset	1014	* p2 = (bit 3) - 0 = signals, 1 = semaphores
3552f20fcfcb (svn r1731) - Fix: [ 1106930 ] BugFix: placing signals with 2x1 drags workaround is completely rewritten. Also features checks for hacked/modified clients. Thanks a lot Hackykid! darkvater parents: 1209 diff changeset	1015	* p2 = (bit 4-6) - track-orientation, valid values: 0-5
3552f20fcfcb (svn r1731) - Fix: [ 1106930 ] BugFix: placing signals with 2x1 drags workaround is completely rewritten. Also features checks for hacked/modified clients. Thanks a lot Hackykid! darkvater parents: 1209 diff changeset	1016	* p2 = (bit 24-31) - user defined signals_density
58 b9fdcc9b5c90 (svn r59) -Feature: Added Autosignals, just like Autorail. Can copy signal style, convert signal<->semaphore, etc. Big thanks to betatesters Dribbel and Testman57 (Darkvater) darkvater parents: 39 diff changeset	1017	*/
1227 3552f20fcfcb (svn r1731) - Fix: [ 1106930 ] BugFix: placing signals with 2x1 drags workaround is completely rewritten. Also features checks for hacked/modified clients. Thanks a lot Hackykid! darkvater parents: 1209 diff changeset	1018	static int32 CmdSignalTrackHelper(int x, int y, uint32 flags, uint32 p1, uint32 p2)
58 b9fdcc9b5c90 (svn r59) -Feature: Added Autosignals, just like Autorail. Can copy signal style, convert signal<->semaphore, etc. Big thanks to betatesters Dribbel and Testman57 (Darkvater) darkvater parents: 39 diff changeset	1019	{
1227 3552f20fcfcb (svn r1731) - Fix: [ 1106930 ] BugFix: placing signals with 2x1 drags workaround is completely rewritten. Also features checks for hacked/modified clients. Thanks a lot Hackykid! darkvater parents: 1209 diff changeset	1020	int ex, ey;
3552f20fcfcb (svn r1731) - Fix: [ 1106930 ] BugFix: placing signals with 2x1 drags workaround is completely rewritten. Also features checks for hacked/modified clients. Thanks a lot Hackykid! darkvater parents: 1209 diff changeset	1021	int railbit = (p2 >> 4) & 7;
58 b9fdcc9b5c90 (svn r59) -Feature: Added Autosignals, just like Autorail. Can copy signal style, convert signal<->semaphore, etc. Big thanks to betatesters Dribbel and Testman57 (Darkvater) darkvater parents: 39 diff changeset	1022	bool error = true;
b9fdcc9b5c90 (svn r59) -Feature: Added Autosignals, just like Autorail. Can copy signal style, convert signal<->semaphore, etc. Big thanks to betatesters Dribbel and Testman57 (Darkvater) darkvater parents: 39 diff changeset	1023	TileIndex tile = TILE_FROM_XY(x, y);
b9fdcc9b5c90 (svn r59) -Feature: Added Autosignals, just like Autorail. Can copy signal style, convert signal<->semaphore, etc. Big thanks to betatesters Dribbel and Testman57 (Darkvater) darkvater parents: 39 diff changeset	1024	int32 ret, total_cost, signal_ctr;
b9fdcc9b5c90 (svn r59) -Feature: Added Autosignals, just like Autorail. Can copy signal style, convert signal<->semaphore, etc. Big thanks to betatesters Dribbel and Testman57 (Darkvater) darkvater parents: 39 diff changeset	1025	byte m5, semaphores = (HASBIT(p2, 3)) ? 8 : 0;
1227 3552f20fcfcb (svn r1731) - Fix: [ 1106930 ] BugFix: placing signals with 2x1 drags workaround is completely rewritten. Also features checks for hacked/modified clients. Thanks a lot Hackykid! darkvater parents: 1209 diff changeset	1026	int mode = p2 & 0x1;
58 b9fdcc9b5c90 (svn r59) -Feature: Added Autosignals, just like Autorail. Can copy signal style, convert signal<->semaphore, etc. Big thanks to betatesters Dribbel and Testman57 (Darkvater) darkvater parents: 39 diff changeset	1027	// for vertical/horizontal tracks, double the given signals density
b9fdcc9b5c90 (svn r59) -Feature: Added Autosignals, just like Autorail. Can copy signal style, convert signal<->semaphore, etc. Big thanks to betatesters Dribbel and Testman57 (Darkvater) darkvater parents: 39 diff changeset	1028	// since the original amount will be too dense (shorter tracks)
1227 3552f20fcfcb (svn r1731) - Fix: [ 1106930 ] BugFix: placing signals with 2x1 drags workaround is completely rewritten. Also features checks for hacked/modified clients. Thanks a lot Hackykid! darkvater parents: 1209 diff changeset	1029	byte signal_density = (railbit & 0x6) ? (p2 >> 24) * 2: (p2 >> 24);
3552f20fcfcb (svn r1731) - Fix: [ 1106930 ] BugFix: placing signals with 2x1 drags workaround is completely rewritten. Also features checks for hacked/modified clients. Thanks a lot Hackykid! darkvater parents: 1209 diff changeset	1030	byte signals;
58 b9fdcc9b5c90 (svn r59) -Feature: Added Autosignals, just like Autorail. Can copy signal style, convert signal<->semaphore, etc. Big thanks to betatesters Dribbel and Testman57 (Darkvater) darkvater parents: 39 diff changeset	1031
889 7f8630bfea41 (svn r1375) -Fix: [1050990] Buying trains sometimes accounted for incorrectly. Was the result of the cost getting reset in a recursive call of docommand. That is fixed. In addition all cost-commands are typed explicitely. Please do not forget to do so or your costs will be credited to construction if you are unlucky. darkvater parents: 826 diff changeset	1032	SET_EXPENSES_TYPE(EXPENSES_CONSTRUCTION);
7f8630bfea41 (svn r1375) -Fix: [1050990] Buying trains sometimes accounted for incorrectly. Was the result of the cost getting reset in a recursive call of docommand. That is fixed. In addition all cost-commands are typed explicitely. Please do not forget to do so or your costs will be credited to construction if you are unlucky. darkvater parents: 826 diff changeset	1033
1227 3552f20fcfcb (svn r1731) - Fix: [ 1106930 ] BugFix: placing signals with 2x1 drags workaround is completely rewritten. Also features checks for hacked/modified clients. Thanks a lot Hackykid! darkvater parents: 1209 diff changeset	1034	// unpack end tile
926 bd4312619522 (svn r1414) Move TileIndex, TILE_MASK and GET_TILE_[XY] to map.h and turn the latter into inline functions names Tile[XY] tron parents: 919 diff changeset	1035	ex = TileX(p1) * 16;
bd4312619522 (svn r1414) Move TileIndex, TILE_MASK and GET_TILE_[XY] to map.h and turn the latter into inline functions names Tile[XY] tron parents: 919 diff changeset	1036	ey = TileY(p1) * 16;
58 b9fdcc9b5c90 (svn r59) -Feature: Added Autosignals, just like Autorail. Can copy signal style, convert signal<->semaphore, etc. Big thanks to betatesters Dribbel and Testman57 (Darkvater) darkvater parents: 39 diff changeset	1037
1227 3552f20fcfcb (svn r1731) - Fix: [ 1106930 ] BugFix: placing signals with 2x1 drags workaround is completely rewritten. Also features checks for hacked/modified clients. Thanks a lot Hackykid! darkvater parents: 1209 diff changeset	1038	if (ValidateAutoDrag(&railbit, x, y, ex, ey) == CMD_ERROR)
3552f20fcfcb (svn r1731) - Fix: [ 1106930 ] BugFix: placing signals with 2x1 drags workaround is completely rewritten. Also features checks for hacked/modified clients. Thanks a lot Hackykid! darkvater parents: 1209 diff changeset	1039	return CMD_ERROR;
58 b9fdcc9b5c90 (svn r59) -Feature: Added Autosignals, just like Autorail. Can copy signal style, convert signal<->semaphore, etc. Big thanks to betatesters Dribbel and Testman57 (Darkvater) darkvater parents: 39 diff changeset	1040
b9fdcc9b5c90 (svn r59) -Feature: Added Autosignals, just like Autorail. Can copy signal style, convert signal<->semaphore, etc. Big thanks to betatesters Dribbel and Testman57 (Darkvater) darkvater parents: 39 diff changeset	1041	// copy the signal-style of the first rail-piece if existing
b9fdcc9b5c90 (svn r59) -Feature: Added Autosignals, just like Autorail. Can copy signal style, convert signal<->semaphore, etc. Big thanks to betatesters Dribbel and Testman57 (Darkvater) darkvater parents: 39 diff changeset	1042	m5 = _map5[tile];
b9fdcc9b5c90 (svn r59) -Feature: Added Autosignals, just like Autorail. Can copy signal style, convert signal<->semaphore, etc. Big thanks to betatesters Dribbel and Testman57 (Darkvater) darkvater parents: 39 diff changeset	1043	if (!(m5 & RAIL_TYPE_SPECIAL) && (m5 & RAIL_BIT_MASK) && (m5 & RAIL_TYPE_SIGNALS)) {
1227 3552f20fcfcb (svn r1731) - Fix: [ 1106930 ] BugFix: placing signals with 2x1 drags workaround is completely rewritten. Also features checks for hacked/modified clients. Thanks a lot Hackykid! darkvater parents: 1209 diff changeset	1044	signals = _map3_lo[tile] & _signals_table_both[railbit];
3552f20fcfcb (svn r1731) - Fix: [ 1106930 ] BugFix: placing signals with 2x1 drags workaround is completely rewritten. Also features checks for hacked/modified clients. Thanks a lot Hackykid! darkvater parents: 1209 diff changeset	1045	if (signals == 0) signals = _signals_table_both[railbit];
58 b9fdcc9b5c90 (svn r59) -Feature: Added Autosignals, just like Autorail. Can copy signal style, convert signal<->semaphore, etc. Big thanks to betatesters Dribbel and Testman57 (Darkvater) darkvater parents: 39 diff changeset	1046
b9fdcc9b5c90 (svn r59) -Feature: Added Autosignals, just like Autorail. Can copy signal style, convert signal<->semaphore, etc. Big thanks to betatesters Dribbel and Testman57 (Darkvater) darkvater parents: 39 diff changeset	1047	semaphores = (_map3_hi[tile] & ~3) ? 8 : 0; // copy signal/semaphores style (independent of CTRL)
b9fdcc9b5c90 (svn r59) -Feature: Added Autosignals, just like Autorail. Can copy signal style, convert signal<->semaphore, etc. Big thanks to betatesters Dribbel and Testman57 (Darkvater) darkvater parents: 39 diff changeset	1048	} else { // no signals exist, drag a two-way signal stretch
1227 3552f20fcfcb (svn r1731) - Fix: [ 1106930 ] BugFix: placing signals with 2x1 drags workaround is completely rewritten. Also features checks for hacked/modified clients. Thanks a lot Hackykid! darkvater parents: 1209 diff changeset	1049	signals = _signals_table_both[railbit];
58 b9fdcc9b5c90 (svn r59) -Feature: Added Autosignals, just like Autorail. Can copy signal style, convert signal<->semaphore, etc. Big thanks to betatesters Dribbel and Testman57 (Darkvater) darkvater parents: 39 diff changeset	1050	}
b9fdcc9b5c90 (svn r59) -Feature: Added Autosignals, just like Autorail. Can copy signal style, convert signal<->semaphore, etc. Big thanks to betatesters Dribbel and Testman57 (Darkvater) darkvater parents: 39 diff changeset	1051
b9fdcc9b5c90 (svn r59) -Feature: Added Autosignals, just like Autorail. Can copy signal style, convert signal<->semaphore, etc. Big thanks to betatesters Dribbel and Testman57 (Darkvater) darkvater parents: 39 diff changeset	1052	/* signal_density_ctr - amount of tiles already processed
b9fdcc9b5c90 (svn r59) -Feature: Added Autosignals, just like Autorail. Can copy signal style, convert signal<->semaphore, etc. Big thanks to betatesters Dribbel and Testman57 (Darkvater) darkvater parents: 39 diff changeset	1053	* signals_density - patch setting to put signal on every Nth tile (double space on \|, -- tracks)
b9fdcc9b5c90 (svn r59) -Feature: Added Autosignals, just like Autorail. Can copy signal style, convert signal<->semaphore, etc. Big thanks to betatesters Dribbel and Testman57 (Darkvater) darkvater parents: 39 diff changeset	1054	**********
b9fdcc9b5c90 (svn r59) -Feature: Added Autosignals, just like Autorail. Can copy signal style, convert signal<->semaphore, etc. Big thanks to betatesters Dribbel and Testman57 (Darkvater) darkvater parents: 39 diff changeset	1055	* railbit - direction of autorail
b9fdcc9b5c90 (svn r59) -Feature: Added Autosignals, just like Autorail. Can copy signal style, convert signal<->semaphore, etc. Big thanks to betatesters Dribbel and Testman57 (Darkvater) darkvater parents: 39 diff changeset	1056	* semaphores - semaphores or signals
201 c40d343115f8 (svn r202) -Codechange: I missed some files with trailing spaces.. this should be truelight parents: 159 diff changeset	1057	* signals - is there a signal/semaphore on the first tile, copy its style (two-way/single-way)
58 b9fdcc9b5c90 (svn r59) -Feature: Added Autosignals, just like Autorail. Can copy signal style, convert signal<->semaphore, etc. Big thanks to betatesters Dribbel and Testman57 (Darkvater) darkvater parents: 39 diff changeset	1058	and convert all others to semaphore/signal
b9fdcc9b5c90 (svn r59) -Feature: Added Autosignals, just like Autorail. Can copy signal style, convert signal<->semaphore, etc. Big thanks to betatesters Dribbel and Testman57 (Darkvater) darkvater parents: 39 diff changeset	1059	* mode - 1 remove signals, 0 build signals */
b9fdcc9b5c90 (svn r59) -Feature: Added Autosignals, just like Autorail. Can copy signal style, convert signal<->semaphore, etc. Big thanks to betatesters Dribbel and Testman57 (Darkvater) darkvater parents: 39 diff changeset	1060	signal_ctr = total_cost = 0;
b9fdcc9b5c90 (svn r59) -Feature: Added Autosignals, just like Autorail. Can copy signal style, convert signal<->semaphore, etc. Big thanks to betatesters Dribbel and Testman57 (Darkvater) darkvater parents: 39 diff changeset	1061	for(;;) {
b9fdcc9b5c90 (svn r59) -Feature: Added Autosignals, just like Autorail. Can copy signal style, convert signal<->semaphore, etc. Big thanks to betatesters Dribbel and Testman57 (Darkvater) darkvater parents: 39 diff changeset	1062	// only build/remove signals with the specified density
b9fdcc9b5c90 (svn r59) -Feature: Added Autosignals, just like Autorail. Can copy signal style, convert signal<->semaphore, etc. Big thanks to betatesters Dribbel and Testman57 (Darkvater) darkvater parents: 39 diff changeset	1063	if ((signal_ctr % signal_density) == 0 ) {
b9fdcc9b5c90 (svn r59) -Feature: Added Autosignals, just like Autorail. Can copy signal style, convert signal<->semaphore, etc. Big thanks to betatesters Dribbel and Testman57 (Darkvater) darkvater parents: 39 diff changeset	1064	ret = DoCommand(x, y, (railbit & 7) \| semaphores, signals, flags, (mode == 1) ? CMD_REMOVE_SIGNALS : CMD_BUILD_SIGNALS);
b9fdcc9b5c90 (svn r59) -Feature: Added Autosignals, just like Autorail. Can copy signal style, convert signal<->semaphore, etc. Big thanks to betatesters Dribbel and Testman57 (Darkvater) darkvater parents: 39 diff changeset	1065
826 0e2b569b737b (svn r1297) Language fixes in the source.. (ln-) miham parents: 817 diff changeset	1066	/* Abort placement for any other error than NOT_SUITABLE_TRACK
58 b9fdcc9b5c90 (svn r59) -Feature: Added Autosignals, just like Autorail. Can copy signal style, convert signal<->semaphore, etc. Big thanks to betatesters Dribbel and Testman57 (Darkvater) darkvater parents: 39 diff changeset	1067	* This includes vehicles on track, competitor's tracks, etc. */
b9fdcc9b5c90 (svn r59) -Feature: Added Autosignals, just like Autorail. Can copy signal style, convert signal<->semaphore, etc. Big thanks to betatesters Dribbel and Testman57 (Darkvater) darkvater parents: 39 diff changeset	1068	if (ret == CMD_ERROR) {
b9fdcc9b5c90 (svn r59) -Feature: Added Autosignals, just like Autorail. Can copy signal style, convert signal<->semaphore, etc. Big thanks to betatesters Dribbel and Testman57 (Darkvater) darkvater parents: 39 diff changeset	1069	if (_error_message != STR_1005_NO_SUITABLE_RAILROAD_TRACK && mode != 1) {
b9fdcc9b5c90 (svn r59) -Feature: Added Autosignals, just like Autorail. Can copy signal style, convert signal<->semaphore, etc. Big thanks to betatesters Dribbel and Testman57 (Darkvater) darkvater parents: 39 diff changeset	1070	return CMD_ERROR;
b9fdcc9b5c90 (svn r59) -Feature: Added Autosignals, just like Autorail. Can copy signal style, convert signal<->semaphore, etc. Big thanks to betatesters Dribbel and Testman57 (Darkvater) darkvater parents: 39 diff changeset	1071	}
b9fdcc9b5c90 (svn r59) -Feature: Added Autosignals, just like Autorail. Can copy signal style, convert signal<->semaphore, etc. Big thanks to betatesters Dribbel and Testman57 (Darkvater) darkvater parents: 39 diff changeset	1072	} else {
b9fdcc9b5c90 (svn r59) -Feature: Added Autosignals, just like Autorail. Can copy signal style, convert signal<->semaphore, etc. Big thanks to betatesters Dribbel and Testman57 (Darkvater) darkvater parents: 39 diff changeset	1073	error = false;
b9fdcc9b5c90 (svn r59) -Feature: Added Autosignals, just like Autorail. Can copy signal style, convert signal<->semaphore, etc. Big thanks to betatesters Dribbel and Testman57 (Darkvater) darkvater parents: 39 diff changeset	1074	total_cost += ret;
b9fdcc9b5c90 (svn r59) -Feature: Added Autosignals, just like Autorail. Can copy signal style, convert signal<->semaphore, etc. Big thanks to betatesters Dribbel and Testman57 (Darkvater) darkvater parents: 39 diff changeset	1075	}
b9fdcc9b5c90 (svn r59) -Feature: Added Autosignals, just like Autorail. Can copy signal style, convert signal<->semaphore, etc. Big thanks to betatesters Dribbel and Testman57 (Darkvater) darkvater parents: 39 diff changeset	1076	}
b9fdcc9b5c90 (svn r59) -Feature: Added Autosignals, just like Autorail. Can copy signal style, convert signal<->semaphore, etc. Big thanks to betatesters Dribbel and Testman57 (Darkvater) darkvater parents: 39 diff changeset	1077
b9fdcc9b5c90 (svn r59) -Feature: Added Autosignals, just like Autorail. Can copy signal style, convert signal<->semaphore, etc. Big thanks to betatesters Dribbel and Testman57 (Darkvater) darkvater parents: 39 diff changeset	1078	if (ex == x && ey == y) // reached end of drag
b9fdcc9b5c90 (svn r59) -Feature: Added Autosignals, just like Autorail. Can copy signal style, convert signal<->semaphore, etc. Big thanks to betatesters Dribbel and Testman57 (Darkvater) darkvater parents: 39 diff changeset	1079	break;
b9fdcc9b5c90 (svn r59) -Feature: Added Autosignals, just like Autorail. Can copy signal style, convert signal<->semaphore, etc. Big thanks to betatesters Dribbel and Testman57 (Darkvater) darkvater parents: 39 diff changeset	1080
b9fdcc9b5c90 (svn r59) -Feature: Added Autosignals, just like Autorail. Can copy signal style, convert signal<->semaphore, etc. Big thanks to betatesters Dribbel and Testman57 (Darkvater) darkvater parents: 39 diff changeset	1081	x += _railbit.xinc[railbit];
201 c40d343115f8 (svn r202) -Codechange: I missed some files with trailing spaces.. this should be truelight parents: 159 diff changeset	1082	y += _railbit.yinc[railbit];
58 b9fdcc9b5c90 (svn r59) -Feature: Added Autosignals, just like Autorail. Can copy signal style, convert signal<->semaphore, etc. Big thanks to betatesters Dribbel and Testman57 (Darkvater) darkvater parents: 39 diff changeset	1083	signal_ctr++;
201 c40d343115f8 (svn r202) -Codechange: I missed some files with trailing spaces.. this should be truelight parents: 159 diff changeset	1084
1227 3552f20fcfcb (svn r1731) - Fix: [ 1106930 ] BugFix: placing signals with 2x1 drags workaround is completely rewritten. Also features checks for hacked/modified clients. Thanks a lot Hackykid! darkvater parents: 1209 diff changeset	1085	// toggle railbit for the non-diagonal tracks (\|, -- tracks)
58 b9fdcc9b5c90 (svn r59) -Feature: Added Autosignals, just like Autorail. Can copy signal style, convert signal<->semaphore, etc. Big thanks to betatesters Dribbel and Testman57 (Darkvater) darkvater parents: 39 diff changeset	1086	if (railbit & 0x6) railbit ^= 1;
b9fdcc9b5c90 (svn r59) -Feature: Added Autosignals, just like Autorail. Can copy signal style, convert signal<->semaphore, etc. Big thanks to betatesters Dribbel and Testman57 (Darkvater) darkvater parents: 39 diff changeset	1087	}
b9fdcc9b5c90 (svn r59) -Feature: Added Autosignals, just like Autorail. Can copy signal style, convert signal<->semaphore, etc. Big thanks to betatesters Dribbel and Testman57 (Darkvater) darkvater parents: 39 diff changeset	1088
b9fdcc9b5c90 (svn r59) -Feature: Added Autosignals, just like Autorail. Can copy signal style, convert signal<->semaphore, etc. Big thanks to betatesters Dribbel and Testman57 (Darkvater) darkvater parents: 39 diff changeset	1089	return (error) ? CMD_ERROR : total_cost;
b9fdcc9b5c90 (svn r59) -Feature: Added Autosignals, just like Autorail. Can copy signal style, convert signal<->semaphore, etc. Big thanks to betatesters Dribbel and Testman57 (Darkvater) darkvater parents: 39 diff changeset	1090	}
b9fdcc9b5c90 (svn r59) -Feature: Added Autosignals, just like Autorail. Can copy signal style, convert signal<->semaphore, etc. Big thanks to betatesters Dribbel and Testman57 (Darkvater) darkvater parents: 39 diff changeset	1091
1227 3552f20fcfcb (svn r1731) - Fix: [ 1106930 ] BugFix: placing signals with 2x1 drags workaround is completely rewritten. Also features checks for hacked/modified clients. Thanks a lot Hackykid! darkvater parents: 1209 diff changeset	1092	/* Stub for the unified Signal builder/remover */
3552f20fcfcb (svn r1731) - Fix: [ 1106930 ] BugFix: placing signals with 2x1 drags workaround is completely rewritten. Also features checks for hacked/modified clients. Thanks a lot Hackykid! darkvater parents: 1209 diff changeset	1093	int32 CmdBuildSignalTrack(int x, int y, uint32 flags, uint32 p1, uint32 p2)
3552f20fcfcb (svn r1731) - Fix: [ 1106930 ] BugFix: placing signals with 2x1 drags workaround is completely rewritten. Also features checks for hacked/modified clients. Thanks a lot Hackykid! darkvater parents: 1209 diff changeset	1094	{
3552f20fcfcb (svn r1731) - Fix: [ 1106930 ] BugFix: placing signals with 2x1 drags workaround is completely rewritten. Also features checks for hacked/modified clients. Thanks a lot Hackykid! darkvater parents: 1209 diff changeset	1095	return CmdSignalTrackHelper(x, y, flags, p1, p2);
3552f20fcfcb (svn r1731) - Fix: [ 1106930 ] BugFix: placing signals with 2x1 drags workaround is completely rewritten. Also features checks for hacked/modified clients. Thanks a lot Hackykid! darkvater parents: 1209 diff changeset	1096	}
3552f20fcfcb (svn r1731) - Fix: [ 1106930 ] BugFix: placing signals with 2x1 drags workaround is completely rewritten. Also features checks for hacked/modified clients. Thanks a lot Hackykid! darkvater parents: 1209 diff changeset	1097
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1098	/* Remove signals
1518 ade7a74ac31a (svn r2022) Revise CmdRemoveSingleSignal: Check parameters for validity and simplify the function tron parents: 1477 diff changeset	1099	* p1 bits 0-2 = track, valid values: 0-5
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1100	* p2 = unused
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1101	*/
1227 3552f20fcfcb (svn r1731) - Fix: [ 1106930 ] BugFix: placing signals with 2x1 drags workaround is completely rewritten. Also features checks for hacked/modified clients. Thanks a lot Hackykid! darkvater parents: 1209 diff changeset	1102	int32 CmdRemoveSingleSignal(int x, int y, uint32 flags, uint32 p1, uint32 p2)
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1103	{
1518 ade7a74ac31a (svn r2022) Revise CmdRemoveSingleSignal: Check parameters for validity and simplify the function tron parents: 1477 diff changeset	1104	TileIndex tile = TILE_FROM_XY(x, y);
ade7a74ac31a (svn r2022) Revise CmdRemoveSingleSignal: Check parameters for validity and simplify the function tron parents: 1477 diff changeset	1105	uint track = p1 & 0x7;
ade7a74ac31a (svn r2022) Revise CmdRemoveSingleSignal: Check parameters for validity and simplify the function tron parents: 1477 diff changeset	1106
ade7a74ac31a (svn r2022) Revise CmdRemoveSingleSignal: Check parameters for validity and simplify the function tron parents: 1477 diff changeset	1107	if (!(track < 6) \|\| // only 6 possible track-combinations
ade7a74ac31a (svn r2022) Revise CmdRemoveSingleSignal: Check parameters for validity and simplify the function tron parents: 1477 diff changeset	1108	!IsTileType(tile, MP_RAILWAY) \|\|
ade7a74ac31a (svn r2022) Revise CmdRemoveSingleSignal: Check parameters for validity and simplify the function tron parents: 1477 diff changeset	1109	!EnsureNoVehicle(tile))
ade7a74ac31a (svn r2022) Revise CmdRemoveSingleSignal: Check parameters for validity and simplify the function tron parents: 1477 diff changeset	1110	return CMD_ERROR;
ade7a74ac31a (svn r2022) Revise CmdRemoveSingleSignal: Check parameters for validity and simplify the function tron parents: 1477 diff changeset	1111
ade7a74ac31a (svn r2022) Revise CmdRemoveSingleSignal: Check parameters for validity and simplify the function tron parents: 1477 diff changeset	1112	if ((_map5[tile] & RAIL_TYPE_MASK) != RAIL_TYPE_SIGNALS \|\|
ade7a74ac31a (svn r2022) Revise CmdRemoveSingleSignal: Check parameters for validity and simplify the function tron parents: 1477 diff changeset	1113	(_map3_lo[tile] & _signals_table_both[track]) == 0) // signals on track?
ade7a74ac31a (svn r2022) Revise CmdRemoveSingleSignal: Check parameters for validity and simplify the function tron parents: 1477 diff changeset	1114	return CMD_ERROR;
ade7a74ac31a (svn r2022) Revise CmdRemoveSingleSignal: Check parameters for validity and simplify the function tron parents: 1477 diff changeset	1115
1536 69c91cec07c5 (svn r2040) Readd check that got accidently removed in r2022 tron parents: 1535 diff changeset	1116	if (_current_player != OWNER_WATER && !CheckTileOwnership(tile))
69c91cec07c5 (svn r2040) Readd check that got accidently removed in r2022 tron parents: 1535 diff changeset	1117	return CMD_ERROR;
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1118
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1119	SET_EXPENSES_TYPE(EXPENSES_CONSTRUCTION);
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1120
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1121	/* Do it? */
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1122	if (flags & DC_EXEC) {
1518 ade7a74ac31a (svn r2022) Revise CmdRemoveSingleSignal: Check parameters for validity and simplify the function tron parents: 1477 diff changeset	1123	_map3_lo[tile] &= ~_signals_table_both[track];
201 c40d343115f8 (svn r202) -Codechange: I missed some files with trailing spaces.. this should be truelight parents: 159 diff changeset	1124
1066 aad3c6ad147f (svn r1567) -Fix: [110452] On horizontal/vertical tracks you are also charged for building/removing signals on the parallel track on the same tile. Signal updating is also correct. (Hackykid) darkvater parents: 1059 diff changeset	1125	/* removed last signal from tile? */
aad3c6ad147f (svn r1567) -Fix: [110452] On horizontal/vertical tracks you are also charged for building/removing signals on the parallel track on the same tile. Signal updating is also correct. (Hackykid) darkvater parents: 1059 diff changeset	1126	if ((_map3_lo[tile] & 0xF0) == 0) {
aad3c6ad147f (svn r1567) -Fix: [110452] On horizontal/vertical tracks you are also charged for building/removing signals on the parallel track on the same tile. Signal updating is also correct. (Hackykid) darkvater parents: 1059 diff changeset	1127	_map5[tile] &= ~RAIL_TYPE_SIGNALS;
aad3c6ad147f (svn r1567) -Fix: [110452] On horizontal/vertical tracks you are also charged for building/removing signals on the parallel track on the same tile. Signal updating is also correct. (Hackykid) darkvater parents: 1059 diff changeset	1128	_map2[tile] &= ~0xF0;
aad3c6ad147f (svn r1567) -Fix: [110452] On horizontal/vertical tracks you are also charged for building/removing signals on the parallel track on the same tile. Signal updating is also correct. (Hackykid) darkvater parents: 1059 diff changeset	1129	CLRBIT(_map3_hi[tile], 2); // remove any possible semaphores
aad3c6ad147f (svn r1567) -Fix: [110452] On horizontal/vertical tracks you are also charged for building/removing signals on the parallel track on the same tile. Signal updating is also correct. (Hackykid) darkvater parents: 1059 diff changeset	1130	}
1109 1bab892228cd (svn r1610) Remove trailing whitespace (last time ever, i hope) tron parents: 1095 diff changeset	1131
1066 aad3c6ad147f (svn r1567) -Fix: [110452] On horizontal/vertical tracks you are also charged for building/removing signals on the parallel track on the same tile. Signal updating is also correct. (Hackykid) darkvater parents: 1059 diff changeset	1132	SetSignalsOnBothDir(tile, track);
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1133
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1134	MarkTileDirtyByTile(tile);
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1135	}
201 c40d343115f8 (svn r202) -Codechange: I missed some files with trailing spaces.. this should be truelight parents: 159 diff changeset	1136
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1137	return _price.remove_signals;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1138	}
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1139
1227 3552f20fcfcb (svn r1731) - Fix: [ 1106930 ] BugFix: placing signals with 2x1 drags workaround is completely rewritten. Also features checks for hacked/modified clients. Thanks a lot Hackykid! darkvater parents: 1209 diff changeset	1140	/* Stub for the unified Signal builder/remover */
3552f20fcfcb (svn r1731) - Fix: [ 1106930 ] BugFix: placing signals with 2x1 drags workaround is completely rewritten. Also features checks for hacked/modified clients. Thanks a lot Hackykid! darkvater parents: 1209 diff changeset	1141	int32 CmdRemoveSignalTrack(int x, int y, uint32 flags, uint32 p1, uint32 p2)
3552f20fcfcb (svn r1731) - Fix: [ 1106930 ] BugFix: placing signals with 2x1 drags workaround is completely rewritten. Also features checks for hacked/modified clients. Thanks a lot Hackykid! darkvater parents: 1209 diff changeset	1142	{
1229 4c965ad79a0b (svn r1733) - Fix: oops "\| 1" is SETBIT(x, 0), not 1 :(. Now you can remove signals again darkvater parents: 1227 diff changeset	1143	return CmdSignalTrackHelper(x, y, flags, p1, SETBIT(p2, 0));
1227 3552f20fcfcb (svn r1731) - Fix: [ 1106930 ] BugFix: placing signals with 2x1 drags workaround is completely rewritten. Also features checks for hacked/modified clients. Thanks a lot Hackykid! darkvater parents: 1209 diff changeset	1144	}
3552f20fcfcb (svn r1731) - Fix: [ 1106930 ] BugFix: placing signals with 2x1 drags workaround is completely rewritten. Also features checks for hacked/modified clients. Thanks a lot Hackykid! darkvater parents: 1209 diff changeset	1145
201 c40d343115f8 (svn r202) -Codechange: I missed some files with trailing spaces.. this should be truelight parents: 159 diff changeset	1146	typedef int32 DoConvertRailProc(uint tile, uint totype, bool exec);
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1147
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1148	static int32 DoConvertRail(uint tile, uint totype, bool exec)
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1149	{
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1150	if (!CheckTileOwnership(tile) \|\| !EnsureNoVehicle(tile))
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1151	return CMD_ERROR;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1152
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1153	// tile is already of requested type?
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1154	if ( (uint)(_map3_lo[tile] & 0xF) == totype)
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1155	return CMD_ERROR;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1156
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1157	// change type.
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1158	if (exec) {
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1159	_map3_lo[tile] = (_map3_lo[tile] & 0xF0) + totype;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1160	MarkTileDirtyByTile(tile);
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1161	}
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1162
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1163	return _price.build_rail >> 1;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1164	}
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1165
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1166	extern int32 DoConvertStationRail(uint tile, uint totype, bool exec);
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1167	extern int32 DoConvertStreetRail(uint tile, uint totype, bool exec);
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1168	extern int32 DoConvertTunnelBridgeRail(uint tile, uint totype, bool exec);
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1169
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1170	// p1 = start tile
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1171	// p2 = new railtype
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1172	int32 CmdConvertRail(int ex, int ey, uint32 flags, uint32 p1, uint32 p2)
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1173	{
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1174	int32 ret, cost, money;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1175	int sx,sy,x,y;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1176
889 7f8630bfea41 (svn r1375) -Fix: [1050990] Buying trains sometimes accounted for incorrectly. Was the result of the cost getting reset in a recursive call of docommand. That is fixed. In addition all cost-commands are typed explicitely. Please do not forget to do so or your costs will be credited to construction if you are unlucky. darkvater parents: 826 diff changeset	1177	SET_EXPENSES_TYPE(EXPENSES_CONSTRUCTION);
7f8630bfea41 (svn r1375) -Fix: [1050990] Buying trains sometimes accounted for incorrectly. Was the result of the cost getting reset in a recursive call of docommand. That is fixed. In addition all cost-commands are typed explicitely. Please do not forget to do so or your costs will be credited to construction if you are unlucky. darkvater parents: 826 diff changeset	1178
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1179	// make sure sx,sy are smaller than ex,ey
926 bd4312619522 (svn r1414) Move TileIndex, TILE_MASK and GET_TILE_[XY] to map.h and turn the latter into inline functions names Tile[XY] tron parents: 919 diff changeset	1180	sx = TileX(p1) * 16;
bd4312619522 (svn r1414) Move TileIndex, TILE_MASK and GET_TILE_[XY] to map.h and turn the latter into inline functions names Tile[XY] tron parents: 919 diff changeset	1181	sy = TileY(p1) * 16;
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1182	if (ex < sx) intswap(ex, sx);
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1183	if (ey < sy) intswap(ey, sy);
201 c40d343115f8 (svn r202) -Codechange: I missed some files with trailing spaces.. this should be truelight parents: 159 diff changeset	1184
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1185	money = GetAvailableMoneyForCommand();
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1186	ret = false;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1187	cost = 0;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1188	for(x=sx; x<=ex; x+=16) {
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1189	for(y=sy; y<=ey; y+=16) {
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1190	uint tile = TILE_FROM_XY(x,y);
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1191	DoConvertRailProc *p;
201 c40d343115f8 (svn r202) -Codechange: I missed some files with trailing spaces.. this should be truelight parents: 159 diff changeset	1192
1035 0a170deb6e33 (svn r1536) Move GET_TILEHEIGHT, GET_TILETYPE and IS_TILETYPE to map.h, turn them into inline functions and add some asserts tron parents: 1024 diff changeset	1193	if (IsTileType(tile, MP_RAILWAY)) p = DoConvertRail;
0a170deb6e33 (svn r1536) Move GET_TILEHEIGHT, GET_TILETYPE and IS_TILETYPE to map.h, turn them into inline functions and add some asserts tron parents: 1024 diff changeset	1194	else if (IsTileType(tile, MP_STATION)) p = DoConvertStationRail;
0a170deb6e33 (svn r1536) Move GET_TILEHEIGHT, GET_TILETYPE and IS_TILETYPE to map.h, turn them into inline functions and add some asserts tron parents: 1024 diff changeset	1195	else if (IsTileType(tile, MP_STREET)) p = DoConvertStreetRail;
0a170deb6e33 (svn r1536) Move GET_TILEHEIGHT, GET_TILETYPE and IS_TILETYPE to map.h, turn them into inline functions and add some asserts tron parents: 1024 diff changeset	1196	else if (IsTileType(tile, MP_TUNNELBRIDGE)) p = DoConvertTunnelBridgeRail;
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1197	else continue;
201 c40d343115f8 (svn r202) -Codechange: I missed some files with trailing spaces.. this should be truelight parents: 159 diff changeset	1198
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1199	ret = p(tile, p2, false);
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1200	if (ret == CMD_ERROR) continue;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1201	cost += ret;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1202
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1203	if (flags & DC_EXEC) {
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1204	if ( (money -= ret) < 0) { _additional_cash_required = ret; return cost - ret; }
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1205	p(tile, p2, true);
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1206	}
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1207	}
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1208	}
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1209	if (cost == 0) cost = CMD_ERROR;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1210	return cost;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1211	}
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1212
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1213	static int32 RemoveTrainDepot(uint tile, uint32 flags)
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1214	{
149 5f7d4b21df01 (svn r150) -Fix: [1010833] Turning on the magic bulldozer removes oil rigs darkvater parents: 84 diff changeset	1215	if (!CheckTileOwnership(tile) && _current_player != OWNER_WATER)
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1216	return CMD_ERROR;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1217
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1218	if (!EnsureNoVehicle(tile))
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1219	return CMD_ERROR;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1220
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1221	if (flags & DC_EXEC) {
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1222	int track = _map5[tile] & RAIL_DEPOT_TRACK_MASK;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1223
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1224	DoDeleteDepot(tile);
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1225	SetSignalsOnBothDir(tile, track);
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1226	}
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1227
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1228	return _price.remove_train_depot;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1229	}
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1230
1534 2f7388d38291 (svn r2038) -Fix: A player only received the money for one rail when clearing a tile with 2 rails and signals tron parents: 1518 diff changeset	1231	static int32 ClearTile_Track(TileIndex tile, byte flags)
2f7388d38291 (svn r2038) -Fix: A player only received the money for one rail when clearing a tile with 2 rails and signals tron parents: 1518 diff changeset	1232	{
2f7388d38291 (svn r2038) -Fix: A player only received the money for one rail when clearing a tile with 2 rails and signals tron parents: 1518 diff changeset	1233	int32 cost;
2f7388d38291 (svn r2038) -Fix: A player only received the money for one rail when clearing a tile with 2 rails and signals tron parents: 1518 diff changeset	1234	int32 ret;
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1235	byte m5;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1236
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1237	m5 = _map5[tile];
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1238
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1239	if (flags & DC_AUTO) {
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1240	if (m5 & RAIL_TYPE_SPECIAL)
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1241	return_cmd_error(STR_2004_BUILDING_MUST_BE_DEMOLISHED);
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1242
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1243	if (_map_owner[tile] != _current_player)
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1244	return_cmd_error(STR_1024_AREA_IS_OWNED_BY_ANOTHER);
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1245
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1246	return_cmd_error(STR_1008_MUST_REMOVE_RAILROAD_TRACK);
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1247	}
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1248
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1249	cost = 0;
201 c40d343115f8 (svn r202) -Codechange: I missed some files with trailing spaces.. this should be truelight parents: 159 diff changeset	1250
1534 2f7388d38291 (svn r2038) -Fix: A player only received the money for one rail when clearing a tile with 2 rails and signals tron parents: 1518 diff changeset	1251	switch (m5 & RAIL_TYPE_MASK) {
2f7388d38291 (svn r2038) -Fix: A player only received the money for one rail when clearing a tile with 2 rails and signals tron parents: 1518 diff changeset	1252	case RAIL_TYPE_SIGNALS:
2f7388d38291 (svn r2038) -Fix: A player only received the money for one rail when clearing a tile with 2 rails and signals tron parents: 1518 diff changeset	1253	if (_map3_lo[tile] & _signals_table_both[0]) {
2f7388d38291 (svn r2038) -Fix: A player only received the money for one rail when clearing a tile with 2 rails and signals tron parents: 1518 diff changeset	1254	ret = DoCommandByTile(tile, 0, 0, flags, CMD_REMOVE_SIGNALS);
2f7388d38291 (svn r2038) -Fix: A player only received the money for one rail when clearing a tile with 2 rails and signals tron parents: 1518 diff changeset	1255	if (ret == CMD_ERROR) return CMD_ERROR;
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1256	cost += ret;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1257	}
1534 2f7388d38291 (svn r2038) -Fix: A player only received the money for one rail when clearing a tile with 2 rails and signals tron parents: 1518 diff changeset	1258	if (_map3_lo[tile] & _signals_table_both[3]) {
2f7388d38291 (svn r2038) -Fix: A player only received the money for one rail when clearing a tile with 2 rails and signals tron parents: 1518 diff changeset	1259	ret = DoCommandByTile(tile, 3, 0, flags, CMD_REMOVE_SIGNALS);
2f7388d38291 (svn r2038) -Fix: A player only received the money for one rail when clearing a tile with 2 rails and signals tron parents: 1518 diff changeset	1260	if (ret == CMD_ERROR) return CMD_ERROR;
2f7388d38291 (svn r2038) -Fix: A player only received the money for one rail when clearing a tile with 2 rails and signals tron parents: 1518 diff changeset	1261	cost += ret;
2f7388d38291 (svn r2038) -Fix: A player only received the money for one rail when clearing a tile with 2 rails and signals tron parents: 1518 diff changeset	1262	}
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1263
1534 2f7388d38291 (svn r2038) -Fix: A player only received the money for one rail when clearing a tile with 2 rails and signals tron parents: 1518 diff changeset	1264	m5 &= RAIL_BIT_MASK;
2f7388d38291 (svn r2038) -Fix: A player only received the money for one rail when clearing a tile with 2 rails and signals tron parents: 1518 diff changeset	1265	/* FALLTHROUGH */
1109 1bab892228cd (svn r1610) Remove trailing whitespace (last time ever, i hope) tron parents: 1095 diff changeset	1266
1534 2f7388d38291 (svn r2038) -Fix: A player only received the money for one rail when clearing a tile with 2 rails and signals tron parents: 1518 diff changeset	1267	case RAIL_TYPE_NORMAL: {
2f7388d38291 (svn r2038) -Fix: A player only received the money for one rail when clearing a tile with 2 rails and signals tron parents: 1518 diff changeset	1268	uint i;
2f7388d38291 (svn r2038) -Fix: A player only received the money for one rail when clearing a tile with 2 rails and signals tron parents: 1518 diff changeset	1269
2f7388d38291 (svn r2038) -Fix: A player only received the money for one rail when clearing a tile with 2 rails and signals tron parents: 1518 diff changeset	1270	for (i = 0; m5 != 0; i++, m5 >>= 1) {
2f7388d38291 (svn r2038) -Fix: A player only received the money for one rail when clearing a tile with 2 rails and signals tron parents: 1518 diff changeset	1271	if (m5 & 1) {
2f7388d38291 (svn r2038) -Fix: A player only received the money for one rail when clearing a tile with 2 rails and signals tron parents: 1518 diff changeset	1272	if (flags & DC_EXEC) {
2f7388d38291 (svn r2038) -Fix: A player only received the money for one rail when clearing a tile with 2 rails and signals tron parents: 1518 diff changeset	1273	ret = DoCommandByTile(tile, 0, i, flags, CMD_REMOVE_SINGLE_RAIL);
2f7388d38291 (svn r2038) -Fix: A player only received the money for one rail when clearing a tile with 2 rails and signals tron parents: 1518 diff changeset	1274	if (ret == CMD_ERROR) return CMD_ERROR;
2f7388d38291 (svn r2038) -Fix: A player only received the money for one rail when clearing a tile with 2 rails and signals tron parents: 1518 diff changeset	1275	} else {
2f7388d38291 (svn r2038) -Fix: A player only received the money for one rail when clearing a tile with 2 rails and signals tron parents: 1518 diff changeset	1276	ret = _price.remove_rail;
2f7388d38291 (svn r2038) -Fix: A player only received the money for one rail when clearing a tile with 2 rails and signals tron parents: 1518 diff changeset	1277	}
2f7388d38291 (svn r2038) -Fix: A player only received the money for one rail when clearing a tile with 2 rails and signals tron parents: 1518 diff changeset	1278	cost += ret;
2f7388d38291 (svn r2038) -Fix: A player only received the money for one rail when clearing a tile with 2 rails and signals tron parents: 1518 diff changeset	1279	}
2f7388d38291 (svn r2038) -Fix: A player only received the money for one rail when clearing a tile with 2 rails and signals tron parents: 1518 diff changeset	1280	}
2f7388d38291 (svn r2038) -Fix: A player only received the money for one rail when clearing a tile with 2 rails and signals tron parents: 1518 diff changeset	1281	return cost;
2f7388d38291 (svn r2038) -Fix: A player only received the money for one rail when clearing a tile with 2 rails and signals tron parents: 1518 diff changeset	1282	}
2f7388d38291 (svn r2038) -Fix: A player only received the money for one rail when clearing a tile with 2 rails and signals tron parents: 1518 diff changeset	1283
2f7388d38291 (svn r2038) -Fix: A player only received the money for one rail when clearing a tile with 2 rails and signals tron parents: 1518 diff changeset	1284	case RAIL_TYPE_DEPOT:
2f7388d38291 (svn r2038) -Fix: A player only received the money for one rail when clearing a tile with 2 rails and signals tron parents: 1518 diff changeset	1285	switch (m5 & RAIL_SUBTYPE_MASK) {
2f7388d38291 (svn r2038) -Fix: A player only received the money for one rail when clearing a tile with 2 rails and signals tron parents: 1518 diff changeset	1286	case RAIL_SUBTYPE_DEPOT:
2f7388d38291 (svn r2038) -Fix: A player only received the money for one rail when clearing a tile with 2 rails and signals tron parents: 1518 diff changeset	1287	return RemoveTrainDepot(tile, flags);
2f7388d38291 (svn r2038) -Fix: A player only received the money for one rail when clearing a tile with 2 rails and signals tron parents: 1518 diff changeset	1288
2f7388d38291 (svn r2038) -Fix: A player only received the money for one rail when clearing a tile with 2 rails and signals tron parents: 1518 diff changeset	1289	case RAIL_SUBTYPE_WAYPOINT:
2f7388d38291 (svn r2038) -Fix: A player only received the money for one rail when clearing a tile with 2 rails and signals tron parents: 1518 diff changeset	1290	return RemoveTrainWaypoint(tile, flags, false);
2f7388d38291 (svn r2038) -Fix: A player only received the money for one rail when clearing a tile with 2 rails and signals tron parents: 1518 diff changeset	1291
2f7388d38291 (svn r2038) -Fix: A player only received the money for one rail when clearing a tile with 2 rails and signals tron parents: 1518 diff changeset	1292	default:
2f7388d38291 (svn r2038) -Fix: A player only received the money for one rail when clearing a tile with 2 rails and signals tron parents: 1518 diff changeset	1293	return CMD_ERROR;
2f7388d38291 (svn r2038) -Fix: A player only received the money for one rail when clearing a tile with 2 rails and signals tron parents: 1518 diff changeset	1294	}
2f7388d38291 (svn r2038) -Fix: A player only received the money for one rail when clearing a tile with 2 rails and signals tron parents: 1518 diff changeset	1295
2f7388d38291 (svn r2038) -Fix: A player only received the money for one rail when clearing a tile with 2 rails and signals tron parents: 1518 diff changeset	1296	default:
2f7388d38291 (svn r2038) -Fix: A player only received the money for one rail when clearing a tile with 2 rails and signals tron parents: 1518 diff changeset	1297	return CMD_ERROR;
2f7388d38291 (svn r2038) -Fix: A player only received the money for one rail when clearing a tile with 2 rails and signals tron parents: 1518 diff changeset	1298	}
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1299	}
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1300
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1301
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1302
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1303	typedef struct DrawTrackSeqStruct {
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1304	uint16 image;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1305	byte subcoord_x;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1306	byte subcoord_y;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1307	byte width;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1308	byte height;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1309	} DrawTrackSeqStruct;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1310
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1311	#include "table/track_land.h"
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1312
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1313	// used for presignals
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1314	static const SpriteID _signal_base_sprites[16] = {
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1315	0x4FB,
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1316	0x1323,
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1317	0x1333,
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1318	0x1343,
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1319
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1320	// use semaphores instead of signals?
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1321	0x1353,
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1322	0x1363,
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1323	0x1373,
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1324	0x1383,
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1325
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1326	// mirrored versions
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1327	0x4FB,
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1328	0x1323,
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1329	0x1333,
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1330	0x1343,
201 c40d343115f8 (svn r202) -Codechange: I missed some files with trailing spaces.. this should be truelight parents: 159 diff changeset	1331
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1332	0x13C6,
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1333	0x13D6,
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1334	0x13E6,
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1335	0x13F6,
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1336	};
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1337
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1338	// used to determine the side of the road for the signal
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1339	static const byte _signal_position[24] = {
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1340	/* original: left side position */
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1341	0x58,0x1E,0xE1,0xB9,0x01,0xA3,0x4B,0xEE,0x3B,0xD4,0x43,0xBD,
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1342	/* patch: ride side position */
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1343	0x1E,0xAC,0x64,0xE1,0x4A,0x10,0xEE,0xC5,0xDB,0x34,0x4D,0xB3
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1344	};
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1345
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1346	static void DrawSignalHelper(TileInfo *ti, byte condition, uint32 image_and_pos)
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1347	{
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1348	bool otherside = _opt.road_side & _patches.signal_side;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1349
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1350	uint v = _signal_position[(image_and_pos & 0xF) + (otherside ? 12 : 0)];
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1351	uint x = ti->x \| (v&0xF);
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1352	uint y = ti->y \| (v>>4);
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1353	uint sprite = _signal_base_sprites[(_map3_hi[ti->tile] & 7) + (otherside ? 8 : 0)] + (image_and_pos>>4) + ((condition != 0) ? 1 : 0);
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1354	AddSortableSpriteToDraw(sprite, x, y, 1, 1, 10, GetSlopeZ(x,y));
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1355	}
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1356
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1357	static uint32 _drawtile_track_palette;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1358
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1359
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1360	static void DrawTrackFence_NW(TileInfo *ti)
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1361	{
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1362	uint32 image = 0x515;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1363	if (ti->tileh != 0) {
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1364	image = 0x519;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1365	if (!(ti->tileh & 2)) {
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1366	image = 0x51B;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1367	}
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1368	}
201 c40d343115f8 (svn r202) -Codechange: I missed some files with trailing spaces.. this should be truelight parents: 159 diff changeset	1369	AddSortableSpriteToDraw(image \| _drawtile_track_palette,
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1370	ti->x, ti->y+1, 16, 1, 4, ti->z);
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1371	}
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1372
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1373	static void DrawTrackFence_SE(TileInfo *ti)
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1374	{
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1375	uint32 image = 0x515;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1376	if (ti->tileh != 0) {
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1377	image = 0x519;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1378	if (!(ti->tileh & 2)) {
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1379	image = 0x51B;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1380	}
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1381	}
201 c40d343115f8 (svn r202) -Codechange: I missed some files with trailing spaces.. this should be truelight parents: 159 diff changeset	1382	AddSortableSpriteToDraw(image \| _drawtile_track_palette,
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1383	ti->x, ti->y+15, 16, 1, 4, ti->z);
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1384	}
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1385
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1386	static void DrawTrackFence_NW_SE(TileInfo *ti)
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1387	{
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1388	DrawTrackFence_NW(ti);
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1389	DrawTrackFence_SE(ti);
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1390	}
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1391
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1392	static void DrawTrackFence_NE(TileInfo *ti)
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1393	{
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1394	uint32 image = 0x516;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1395	if (ti->tileh != 0) {
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1396	image = 0x51A;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1397	if (!(ti->tileh & 2)) {
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1398	image = 0x51C;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1399	}
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1400	}
201 c40d343115f8 (svn r202) -Codechange: I missed some files with trailing spaces.. this should be truelight parents: 159 diff changeset	1401	AddSortableSpriteToDraw(image \| _drawtile_track_palette,
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1402	ti->x+1, ti->y, 1, 16, 4, ti->z);
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1403	}
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1404
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1405	static void DrawTrackFence_SW(TileInfo *ti)
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1406	{
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1407	uint32 image = 0x516;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1408	if (ti->tileh != 0) {
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1409	image = 0x51A;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1410	if (!(ti->tileh & 2)) {
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1411	image = 0x51C;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1412	}
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1413	}
201 c40d343115f8 (svn r202) -Codechange: I missed some files with trailing spaces.. this should be truelight parents: 159 diff changeset	1414	AddSortableSpriteToDraw(image \| _drawtile_track_palette,
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1415	ti->x+15, ti->y, 1, 16, 4, ti->z);
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1416	}
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1417
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1418	static void DrawTrackFence_NE_SW(TileInfo *ti)
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1419	{
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1420	DrawTrackFence_NE(ti);
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1421	DrawTrackFence_SW(ti);
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1422	}
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1423
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1424	static void DrawTrackFence_NS_1(TileInfo *ti)
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1425	{
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1426	int z = ti->z;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1427	if (ti->tileh & 1)
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1428	z += 8;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1429	AddSortableSpriteToDraw(0x517 \| _drawtile_track_palette,
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1430	ti->x + 8, ti->y + 8, 1, 1, 4, z);
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1431	}
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1432
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1433	static void DrawTrackFence_NS_2(TileInfo *ti)
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1434	{
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1435	int z = ti->z;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1436	if (ti->tileh & 4)
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1437	z += 8;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1438	AddSortableSpriteToDraw(0x517 \| _drawtile_track_palette,
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1439	ti->x + 8, ti->y + 8, 1, 1, 4, z);
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1440	}
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1441
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1442	static void DrawTrackFence_WE_1(TileInfo *ti)
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1443	{
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1444	int z = ti->z;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1445	if (ti->tileh & 8)
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1446	z += 8;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1447	AddSortableSpriteToDraw(0x518 \| _drawtile_track_palette,
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1448	ti->x + 8, ti->y + 8, 1, 1, 4, z);
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1449	}
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1450
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1451	static void DrawTrackFence_WE_2(TileInfo *ti)
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1452	{
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1453	int z = ti->z;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1454	if (ti->tileh & 2)
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1455	z += 8;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1456	AddSortableSpriteToDraw(0x518 \| _drawtile_track_palette,
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1457	ti->x + 8, ti->y + 8, 1, 1, 4, z);
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1458	}
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1459
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1460	static void DetTrackDrawProc_Null(TileInfo *ti)
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1461	{
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1462	/* nothing should be here */
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1463	}
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1464
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1465	typedef void DetailedTrackProc(TileInfo *ti);
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1466	DetailedTrackProc * const _detailed_track_proc[16] = {
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1467	DetTrackDrawProc_Null,
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1468	DetTrackDrawProc_Null,
201 c40d343115f8 (svn r202) -Codechange: I missed some files with trailing spaces.. this should be truelight parents: 159 diff changeset	1469
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1470	DrawTrackFence_NW,
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1471	DrawTrackFence_SE,
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1472	DrawTrackFence_NW_SE,
201 c40d343115f8 (svn r202) -Codechange: I missed some files with trailing spaces.. this should be truelight parents: 159 diff changeset	1473
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1474	DrawTrackFence_NE,
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1475	DrawTrackFence_SW,
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1476	DrawTrackFence_NE_SW,
201 c40d343115f8 (svn r202) -Codechange: I missed some files with trailing spaces.. this should be truelight parents: 159 diff changeset	1477
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1478	DrawTrackFence_NS_1,
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1479	DrawTrackFence_NS_2,
201 c40d343115f8 (svn r202) -Codechange: I missed some files with trailing spaces.. this should be truelight parents: 159 diff changeset	1480
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1481	DrawTrackFence_WE_1,
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1482	DrawTrackFence_WE_2,
201 c40d343115f8 (svn r202) -Codechange: I missed some files with trailing spaces.. this should be truelight parents: 159 diff changeset	1483
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1484	DetTrackDrawProc_Null,
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1485	DetTrackDrawProc_Null,
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1486	DetTrackDrawProc_Null,
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1487	DetTrackDrawProc_Null,
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1488	};
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1489
389 2d394eeba5e5 (svn r581) -newgrf: Basic support for new stations - only waypoints supported now and only celestar parents: 337 diff changeset	1490	static void DrawSpecialBuilding(uint32 image, uint32 tracktype_offs,
2d394eeba5e5 (svn r581) -newgrf: Basic support for new stations - only waypoints supported now and only celestar parents: 337 diff changeset	1491	TileInfo *ti,
2d394eeba5e5 (svn r581) -newgrf: Basic support for new stations - only waypoints supported now and only celestar parents: 337 diff changeset	1492	byte x, byte y, byte z,
2d394eeba5e5 (svn r581) -newgrf: Basic support for new stations - only waypoints supported now and only celestar parents: 337 diff changeset	1493	byte xsize, byte ysize, byte zsize)
2d394eeba5e5 (svn r581) -newgrf: Basic support for new stations - only waypoints supported now and only celestar parents: 337 diff changeset	1494	{
2d394eeba5e5 (svn r581) -newgrf: Basic support for new stations - only waypoints supported now and only celestar parents: 337 diff changeset	1495	if (image & 0x8000)
2d394eeba5e5 (svn r581) -newgrf: Basic support for new stations - only waypoints supported now and only celestar parents: 337 diff changeset	1496	image \|= _drawtile_track_palette;
2d394eeba5e5 (svn r581) -newgrf: Basic support for new stations - only waypoints supported now and only celestar parents: 337 diff changeset	1497	image += tracktype_offs;
497 2d6d31173813 (svn r787) Invert the sense of the DO_TRANS_BUILDINGS flag to be consistent with its own name and all other DO_* flags. tron parents: 473 diff changeset	1498	if (_display_opt & DO_TRANS_BUILDINGS) // show transparent depots
389 2d394eeba5e5 (svn r581) -newgrf: Basic support for new stations - only waypoints supported now and only celestar parents: 337 diff changeset	1499	image = (image & 0x3FFF) \| 0x3224000;
2d394eeba5e5 (svn r581) -newgrf: Basic support for new stations - only waypoints supported now and only celestar parents: 337 diff changeset	1500	AddSortableSpriteToDraw(image, ti->x + x, ti->y + y, xsize, ysize, zsize, ti->z + z);
2d394eeba5e5 (svn r581) -newgrf: Basic support for new stations - only waypoints supported now and only celestar parents: 337 diff changeset	1501	}
2d394eeba5e5 (svn r581) -newgrf: Basic support for new stations - only waypoints supported now and only celestar parents: 337 diff changeset	1502
413 36afcda97345 (svn r610) -newgrf: Support for some basic deterministical spritegroups regarding stations. Waypoints look changes based on year now :^) (pasky). darkvater parents: 412 diff changeset	1503	/* This hacks together some dummy one-shot Station structure for a waypoint. */
36afcda97345 (svn r610) -newgrf: Support for some basic deterministical spritegroups regarding stations. Waypoints look changes based on year now :^) (pasky). darkvater parents: 412 diff changeset	1504	static Station *ComposeWaypointStation(uint tile)
36afcda97345 (svn r610) -newgrf: Support for some basic deterministical spritegroups regarding stations. Waypoints look changes based on year now :^) (pasky). darkvater parents: 412 diff changeset	1505	{
36afcda97345 (svn r610) -newgrf: Support for some basic deterministical spritegroups regarding stations. Waypoints look changes based on year now :^) (pasky). darkvater parents: 412 diff changeset	1506	Waypoint *waypt = &_waypoints[GetWaypointByTile(tile)];
36afcda97345 (svn r610) -newgrf: Support for some basic deterministical spritegroups regarding stations. Waypoints look changes based on year now :^) (pasky). darkvater parents: 412 diff changeset	1507	static Station stat;
36afcda97345 (svn r610) -newgrf: Support for some basic deterministical spritegroups regarding stations. Waypoints look changes based on year now :^) (pasky). darkvater parents: 412 diff changeset	1508
36afcda97345 (svn r610) -newgrf: Support for some basic deterministical spritegroups regarding stations. Waypoints look changes based on year now :^) (pasky). darkvater parents: 412 diff changeset	1509	stat.train_tile = stat.xy = waypt->xy;
36afcda97345 (svn r610) -newgrf: Support for some basic deterministical spritegroups regarding stations. Waypoints look changes based on year now :^) (pasky). darkvater parents: 412 diff changeset	1510	/* FIXME - We should always keep town. */
919 b0d6c7642f99 (svn r1407) -Codechange: changed a lot around _stations, _vehicles, _towns and _industries truelight parents: 889 diff changeset	1511	stat.town = waypt->town_or_string & 0xC000 ? GetTown(waypt->town_or_string & 0xFF) : NULL;
413 36afcda97345 (svn r610) -newgrf: Support for some basic deterministical spritegroups regarding stations. Waypoints look changes based on year now :^) (pasky). darkvater parents: 412 diff changeset	1512	stat.string_id = waypt->town_or_string & 0xC000 ? /* FIXME? */ 0 : waypt->town_or_string;
36afcda97345 (svn r610) -newgrf: Support for some basic deterministical spritegroups regarding stations. Waypoints look changes based on year now :^) (pasky). darkvater parents: 412 diff changeset	1513	stat.build_date = waypt->build_date;
36afcda97345 (svn r610) -newgrf: Support for some basic deterministical spritegroups regarding stations. Waypoints look changes based on year now :^) (pasky). darkvater parents: 412 diff changeset	1514	stat.class_id = 6; stat.stat_id = waypt->stat_id;
36afcda97345 (svn r610) -newgrf: Support for some basic deterministical spritegroups regarding stations. Waypoints look changes based on year now :^) (pasky). darkvater parents: 412 diff changeset	1515
36afcda97345 (svn r610) -newgrf: Support for some basic deterministical spritegroups regarding stations. Waypoints look changes based on year now :^) (pasky). darkvater parents: 412 diff changeset	1516	return &stat;
36afcda97345 (svn r610) -newgrf: Support for some basic deterministical spritegroups regarding stations. Waypoints look changes based on year now :^) (pasky). darkvater parents: 412 diff changeset	1517	}
36afcda97345 (svn r610) -newgrf: Support for some basic deterministical spritegroups regarding stations. Waypoints look changes based on year now :^) (pasky). darkvater parents: 412 diff changeset	1518
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1519	static void DrawTile_Track(TileInfo *ti)
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1520	{
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1521	uint32 tracktype_offs, image;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1522	byte m5;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1523
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1524	_drawtile_track_palette = SPRITE_PALETTE(PLAYER_SPRITE_COLOR(_map_owner[ti->tile]));
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1525
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1526	tracktype_offs = (_map3_lo[ti->tile] & 0xF) * TRACKTYPE_SPRITE_PITCH;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1527
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1528	m5 = (byte)ti->map5;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1529	if (!(m5 & RAIL_TYPE_SPECIAL)) {
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1530	bool special;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1531
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1532	m5 &= RAIL_BIT_MASK;
201 c40d343115f8 (svn r202) -Codechange: I missed some files with trailing spaces.. this should be truelight parents: 159 diff changeset	1533
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1534	special = false;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1535
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1536	// select the sprite to use based on the map5 byte.
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1537	(image = 0x3F3, m5 == RAIL_BIT_DIAG2) \|\|
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1538	(image++, m5 == RAIL_BIT_DIAG1) \|\|
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1539	(image++, m5 == RAIL_BIT_UPPER) \|\|
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1540	(image++, m5 == RAIL_BIT_LOWER) \|\|
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1541	(image++, m5 == RAIL_BIT_RIGHT) \|\|
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1542	(image++, m5 == RAIL_BIT_LEFT) \|\|
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1543	(image++, m5 == (RAIL_BIT_DIAG1\|RAIL_BIT_DIAG2)) \|\|
201 c40d343115f8 (svn r202) -Codechange: I missed some files with trailing spaces.. this should be truelight parents: 159 diff changeset	1544
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1545	(image = 0x40B, m5 == (RAIL_BIT_UPPER\|RAIL_BIT_LOWER)) \|\|
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1546	(image++, m5 == (RAIL_BIT_LEFT\|RAIL_BIT_RIGHT)) \|\|
201 c40d343115f8 (svn r202) -Codechange: I missed some files with trailing spaces.. this should be truelight parents: 159 diff changeset	1547
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1548	(special=true, false) \|\|
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1549
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1550	(image = 0x3FA, !(m5 & (RAIL_BIT_RIGHT\|RAIL_BIT_UPPER\|RAIL_BIT_DIAG1))) \|\|
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1551	(image++, !(m5 & (RAIL_BIT_LEFT\|RAIL_BIT_LOWER\|RAIL_BIT_DIAG1))) \|\|
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1552	(image++, !(m5 & (RAIL_BIT_LEFT\|RAIL_BIT_UPPER\|RAIL_BIT_DIAG2))) \|\|
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1553	(image++, !(m5 & (RAIL_BIT_RIGHT\|RAIL_BIT_LOWER\|RAIL_BIT_DIAG2))) \|\|
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1554	(image++, true);
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1555
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1556	if (ti->tileh != 0) {
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1557	int f = GetRailFoundation(ti->tileh, ti->map5 & 0x3F);
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1558	if (f) DrawFoundation(ti, f);
201 c40d343115f8 (svn r202) -Codechange: I missed some files with trailing spaces.. this should be truelight parents: 159 diff changeset	1559
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1560	// default sloped sprites..
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1561	if (ti->tileh != 0) image = _track_sloped_sprites[ti->tileh - 1] + 0x3F3;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1562	}
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1563
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1564	if ((_map2[ti->tile] & RAIL_MAP2LO_GROUND_MASK)==RAIL_GROUND_BROWN)
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1565	image = (image & 0xFFFF) \| 0x3178000; // use a brown palette
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1566	else if ((_map2[ti->tile] & RAIL_MAP2LO_GROUND_MASK)==RAIL_GROUND_ICE_DESERT)
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1567	image += 26;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1568
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1569	DrawGroundSprite(image + tracktype_offs);
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1570
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1571	if (special) {
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1572	if (m5 & RAIL_BIT_DIAG1) DrawGroundSprite(0x3ED + tracktype_offs);
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1573	if (m5 & RAIL_BIT_DIAG2) DrawGroundSprite(0x3EE + tracktype_offs);
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1574	if (m5 & RAIL_BIT_UPPER) DrawGroundSprite(0x3EF + tracktype_offs);
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1575	if (m5 & RAIL_BIT_LOWER) DrawGroundSprite(0x3F0 + tracktype_offs);
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1576	if (m5 & RAIL_BIT_LEFT) DrawGroundSprite(0x3F2 + tracktype_offs);
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1577	if (m5 & RAIL_BIT_RIGHT) DrawGroundSprite(0x3F1 + tracktype_offs);
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1578	}
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1579
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1580	if (_display_opt & DO_FULL_DETAIL) {
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1581	_detailed_track_proc[_map2[ti->tile] & RAIL_MAP2LO_GROUND_MASK](ti);
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1582	}
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1583
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1584	/* draw signals also? */
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1585	if (!(ti->map5 & RAIL_TYPE_SIGNALS))
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1586	return;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1587
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1588	{
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1589	byte m23;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1590
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1591	m23 = (_map3_lo[ti->tile] >> 4) \| (_map2[ti->tile] & 0xF0);
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1592
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1593	#define HAS_SIGNAL(x) (m23 & (byte)(0x1 << (x)))
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1594	#define ISON_SIGNAL(x) (m23 & (byte)(0x10 << (x)))
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1595	#define MAYBE_DRAW_SIGNAL(x,y,z) if (HAS_SIGNAL(x)) DrawSignalHelper(ti, ISON_SIGNAL(x), ((y-0x4FB) << 4)\|(z))
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1596
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1597	if (!(m5 & RAIL_BIT_DIAG2)) {
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1598	if (!(m5 & RAIL_BIT_DIAG1)) {
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1599	if (m5 & RAIL_BIT_LEFT) {
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1600	MAYBE_DRAW_SIGNAL(2, 0x509, 0);
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1601	MAYBE_DRAW_SIGNAL(3, 0x507, 1);
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1602	}
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1603	if (m5 & RAIL_BIT_RIGHT) {
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1604	MAYBE_DRAW_SIGNAL(0, 0x509, 2);
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1605	MAYBE_DRAW_SIGNAL(1, 0x507, 3);
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1606	}
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1607	if (m5 & RAIL_BIT_UPPER) {
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1608	MAYBE_DRAW_SIGNAL(3, 0x505, 4);
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1609	MAYBE_DRAW_SIGNAL(2, 0x503, 5);
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1610	}
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1611	if (m5 & RAIL_BIT_LOWER) {
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1612	MAYBE_DRAW_SIGNAL(1, 0x505, 6);
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1613	MAYBE_DRAW_SIGNAL(0, 0x503, 7);
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1614	}
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1615	} else {
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1616	MAYBE_DRAW_SIGNAL(3, 0x4FB, 8);
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1617	MAYBE_DRAW_SIGNAL(2, 0x4FD, 9);
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1618	}
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1619	} else {
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1620	MAYBE_DRAW_SIGNAL(3, 0x4FF, 10);
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1621	MAYBE_DRAW_SIGNAL(2, 0x501, 11);
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1622	}
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1623	}
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1624	} else {
395 4c990f33dab7 (svn r587) -newgrf: Rename all /Checkpoint/i tokens to 'Waypoint's. The name actually makes some sense and is also compatible with TTDPatch (pasky). darkvater parents: 393 diff changeset	1625	/* draw depots / waypoints */
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1626	const DrawTrackSeqStruct *drss;
395 4c990f33dab7 (svn r587) -newgrf: Rename all /Checkpoint/i tokens to 'Waypoint's. The name actually makes some sense and is also compatible with TTDPatch (pasky). darkvater parents: 393 diff changeset	1627	byte type = m5 & 0x3F; // 0-3: depots, 4-5: waypoints
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1628
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1629	if (!(m5 & (RAIL_TYPE_MASK&~RAIL_TYPE_SPECIAL)))
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1630	return;
201 c40d343115f8 (svn r202) -Codechange: I missed some files with trailing spaces.. this should be truelight parents: 159 diff changeset	1631
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1632	if (ti->tileh != 0) { DrawFoundation(ti, ti->tileh); }
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1633
1535 a5f686a20d2c (svn r2039) IS_RAIL_DEPOT -> IsRailDepot, IS_RAIL_WAYPOINT -> IsRailWaypoint tron parents: 1534 diff changeset	1634	if (IsRailWaypoint(m5) && _map3_lo[ti->tile] & 16) {
389 2d394eeba5e5 (svn r581) -newgrf: Basic support for new stations - only waypoints supported now and only celestar parents: 337 diff changeset	1635	// look for customization
1477 2174a73b11c9 (svn r1981) Typedef some structs and enums tron parents: 1399 diff changeset	1636	StationSpec *stat = GetCustomStation(STAT_CLASS_WAYP, _map3_hi[ti->tile]);
389 2d394eeba5e5 (svn r581) -newgrf: Basic support for new stations - only waypoints supported now and only celestar parents: 337 diff changeset	1637
403 bfb365c74e80 (svn r600) -newgrf: Relocation offset for custom station sprites is now stored separately, making it possible to show different sprites in waypoint selection dialog (pasky). darkvater parents: 399 diff changeset	1638	if (stat) {
389 2d394eeba5e5 (svn r581) -newgrf: Basic support for new stations - only waypoints supported now and only celestar parents: 337 diff changeset	1639	DrawTileSeqStruct const *seq;
403 bfb365c74e80 (svn r600) -newgrf: Relocation offset for custom station sprites is now stored separately, making it possible to show different sprites in waypoint selection dialog (pasky). darkvater parents: 399 diff changeset	1640	// emulate station tile - open with building
bfb365c74e80 (svn r600) -newgrf: Relocation offset for custom station sprites is now stored separately, making it possible to show different sprites in waypoint selection dialog (pasky). darkvater parents: 399 diff changeset	1641	DrawTileSprites *cust = &stat->renderdata[2 + (m5 & 0x1)];
413 36afcda97345 (svn r610) -newgrf: Support for some basic deterministical spritegroups regarding stations. Waypoints look changes based on year now :^) (pasky). darkvater parents: 412 diff changeset	1642	uint32 relocation = GetCustomStationRelocation(stat, ComposeWaypointStation(ti->tile), 0);
415 423de36034b8 (svn r612) [newgrf] Fix: custom waypoints on monorail/maglev are displayed correctly dominik parents: 413 diff changeset	1643	int railtype=(_map3_lo[ti->tile] & 0xF);
389 2d394eeba5e5 (svn r581) -newgrf: Basic support for new stations - only waypoints supported now and only celestar parents: 337 diff changeset	1644
447 aaf1f59a8957 (svn r657) Do not touch 0x8000 bit in sprite index for custom waypoints. (pasky) celestar parents: 438 diff changeset	1645	/* We don't touch the 0x8000 bit. In all this
aaf1f59a8957 (svn r657) Do not touch 0x8000 bit in sprite index for custom waypoints. (pasky) celestar parents: 438 diff changeset	1646	* waypoint code, it is used to indicate that
aaf1f59a8957 (svn r657) Do not touch 0x8000 bit in sprite index for custom waypoints. (pasky) celestar parents: 438 diff changeset	1647	* we should offset by railtype, but we always
aaf1f59a8957 (svn r657) Do not touch 0x8000 bit in sprite index for custom waypoints. (pasky) celestar parents: 438 diff changeset	1648	* do that for custom ground sprites and never
aaf1f59a8957 (svn r657) Do not touch 0x8000 bit in sprite index for custom waypoints. (pasky) celestar parents: 438 diff changeset	1649	* for station sprites. And in the drawing
aaf1f59a8957 (svn r657) Do not touch 0x8000 bit in sprite index for custom waypoints. (pasky) celestar parents: 438 diff changeset	1650	* code, it is used to indicate that the sprite
aaf1f59a8957 (svn r657) Do not touch 0x8000 bit in sprite index for custom waypoints. (pasky) celestar parents: 438 diff changeset	1651	* should be drawn in company colors, and it's
aaf1f59a8957 (svn r657) Do not touch 0x8000 bit in sprite index for custom waypoints. (pasky) celestar parents: 438 diff changeset	1652	* up to the GRF file to decide that. */
aaf1f59a8957 (svn r657) Do not touch 0x8000 bit in sprite index for custom waypoints. (pasky) celestar parents: 438 diff changeset	1653
417 0c63a94557a5 (svn r614) [newgrf] Some minor code fixes dominik parents: 415 diff changeset	1654	image = cust->ground_sprite;
0c63a94557a5 (svn r614) [newgrf] Some minor code fixes dominik parents: 415 diff changeset	1655	image += railtype*((image<_custom_sprites_base)?TRACKTYPE_SPRITE_PITCH:1);
415 423de36034b8 (svn r612) [newgrf] Fix: custom waypoints on monorail/maglev are displayed correctly dominik parents: 413 diff changeset	1656
389 2d394eeba5e5 (svn r581) -newgrf: Basic support for new stations - only waypoints supported now and only celestar parents: 337 diff changeset	1657	DrawGroundSprite(image);
2d394eeba5e5 (svn r581) -newgrf: Basic support for new stations - only waypoints supported now and only celestar parents: 337 diff changeset	1658
2d394eeba5e5 (svn r581) -newgrf: Basic support for new stations - only waypoints supported now and only celestar parents: 337 diff changeset	1659	foreach_draw_tile_seq(seq, cust->seq) {
403 bfb365c74e80 (svn r600) -newgrf: Relocation offset for custom station sprites is now stored separately, making it possible to show different sprites in waypoint selection dialog (pasky). darkvater parents: 399 diff changeset	1660	uint32 image = seq->image + relocation;
447 aaf1f59a8957 (svn r657) Do not touch 0x8000 bit in sprite index for custom waypoints. (pasky) celestar parents: 438 diff changeset	1661	DrawSpecialBuilding(image, 0, ti,
389 2d394eeba5e5 (svn r581) -newgrf: Basic support for new stations - only waypoints supported now and only celestar parents: 337 diff changeset	1662	seq->delta_x, seq->delta_y, seq->delta_z,
2d394eeba5e5 (svn r581) -newgrf: Basic support for new stations - only waypoints supported now and only celestar parents: 337 diff changeset	1663	seq->width, seq->height, seq->unk);
2d394eeba5e5 (svn r581) -newgrf: Basic support for new stations - only waypoints supported now and only celestar parents: 337 diff changeset	1664	}
2d394eeba5e5 (svn r581) -newgrf: Basic support for new stations - only waypoints supported now and only celestar parents: 337 diff changeset	1665	return;
2d394eeba5e5 (svn r581) -newgrf: Basic support for new stations - only waypoints supported now and only celestar parents: 337 diff changeset	1666	}
2d394eeba5e5 (svn r581) -newgrf: Basic support for new stations - only waypoints supported now and only celestar parents: 337 diff changeset	1667	}
2d394eeba5e5 (svn r581) -newgrf: Basic support for new stations - only waypoints supported now and only celestar parents: 337 diff changeset	1668
1399 4503bd2bfb82 (svn r1903) Replace some casts and macro magic with proper typing, similar to r1902 tron parents: 1363 diff changeset	1669	drss = _track_depot_layout_table[type];
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1670
1399 4503bd2bfb82 (svn r1903) Replace some casts and macro magic with proper typing, similar to r1902 tron parents: 1363 diff changeset	1671	image = drss++->image;
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1672	if (image & 0x8000) image = (image & 0x7FFF) + tracktype_offs;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1673
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1674	// adjust ground tile for desert
283 c1a99d78e5a3 (svn r289) Fix: Checkpoints on snow have correct ground now dominik parents: 282 diff changeset	1675	// (don't adjust for arctic depots, because snow in depots looks weird)
c1a99d78e5a3 (svn r289) Fix: Checkpoints on snow have correct ground now dominik parents: 282 diff changeset	1676	if ((_map2[ti->tile] & RAIL_MAP2LO_GROUND_MASK)==RAIL_GROUND_ICE_DESERT && (_opt.landscape == LT_DESERT \|\| type>=4))
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1677	{
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1678	if(image!=3981)
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1679	image += 26; // tile with tracks
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1680	else
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1681	image = 4550; // flat ground
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1682	}
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1683
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1684	DrawGroundSprite(image);
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1685
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1686	while ((image=drss->image) != 0) {
389 2d394eeba5e5 (svn r581) -newgrf: Basic support for new stations - only waypoints supported now and only celestar parents: 337 diff changeset	1687	DrawSpecialBuilding(image, type < 4 ? tracktype_offs : 0, ti,
2d394eeba5e5 (svn r581) -newgrf: Basic support for new stations - only waypoints supported now and only celestar parents: 337 diff changeset	1688	drss->subcoord_x, drss->subcoord_y, 0,
2d394eeba5e5 (svn r581) -newgrf: Basic support for new stations - only waypoints supported now and only celestar parents: 337 diff changeset	1689	drss->width, drss->height, 0x17);
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1690	drss++;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1691	}
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1692	}
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1693	}
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1694
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1695	void DrawTrainDepotSprite(int x, int y, int image, int railtype)
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1696	{
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1697	uint32 ormod, img;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1698	const DrawTrackSeqStruct *dtss;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1699
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1700	/* baseimage */
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1701	railtype *= TRACKTYPE_SPRITE_PITCH;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1702
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1703	ormod = PLAYER_SPRITE_COLOR(_local_player);
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1704
1399 4503bd2bfb82 (svn r1903) Replace some casts and macro magic with proper typing, similar to r1902 tron parents: 1363 diff changeset	1705	dtss = _track_depot_layout_table[image];
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1706
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1707	x+=33;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1708	y+=17;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1709
1399 4503bd2bfb82 (svn r1903) Replace some casts and macro magic with proper typing, similar to r1902 tron parents: 1363 diff changeset	1710	img = dtss++->image;
201 c40d343115f8 (svn r202) -Codechange: I missed some files with trailing spaces.. this should be truelight parents: 159 diff changeset	1711	if (img & 0x8000) img = (img & 0x7FFF) + railtype;
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1712	DrawSprite(img, x, y);
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1713
1399 4503bd2bfb82 (svn r1903) Replace some casts and macro magic with proper typing, similar to r1902 tron parents: 1363 diff changeset	1714	for (; dtss->image != 0; dtss++) {
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1715	Point pt = RemapCoords(dtss->subcoord_x, dtss->subcoord_y, 0);
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1716	image = dtss->image;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1717	if (image & 0x8000) image \|= ormod;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1718	DrawSprite(image + railtype, x + pt.x, y + pt.y);
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1719	}
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1720	}
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1721
415 423de36034b8 (svn r612) [newgrf] Fix: custom waypoints on monorail/maglev are displayed correctly dominik parents: 413 diff changeset	1722	void DrawWaypointSprite(int x, int y, int stat_id, int railtype)
393 82c2bf635cd9 (svn r585) -newgrf: GUI for selecting custom waypoint graphics to use. Patch by dominik81 and pasky. darkvater parents: 389 diff changeset	1723	{
1477 2174a73b11c9 (svn r1981) Typedef some structs and enums tron parents: 1399 diff changeset	1724	StationSpec *stat;
403 bfb365c74e80 (svn r600) -newgrf: Relocation offset for custom station sprites is now stored separately, making it possible to show different sprites in waypoint selection dialog (pasky). darkvater parents: 399 diff changeset	1725	uint32 relocation;
bfb365c74e80 (svn r600) -newgrf: Relocation offset for custom station sprites is now stored separately, making it possible to show different sprites in waypoint selection dialog (pasky). darkvater parents: 399 diff changeset	1726	DrawTileSprites *cust;
393 82c2bf635cd9 (svn r585) -newgrf: GUI for selecting custom waypoint graphics to use. Patch by dominik81 and pasky. darkvater parents: 389 diff changeset	1727	DrawTileSeqStruct const *seq;
82c2bf635cd9 (svn r585) -newgrf: GUI for selecting custom waypoint graphics to use. Patch by dominik81 and pasky. darkvater parents: 389 diff changeset	1728	uint32 ormod, img;
82c2bf635cd9 (svn r585) -newgrf: GUI for selecting custom waypoint graphics to use. Patch by dominik81 and pasky. darkvater parents: 389 diff changeset	1729
82c2bf635cd9 (svn r585) -newgrf: GUI for selecting custom waypoint graphics to use. Patch by dominik81 and pasky. darkvater parents: 389 diff changeset	1730	ormod = SPRITE_PALETTE(PLAYER_SPRITE_COLOR(_local_player));
82c2bf635cd9 (svn r585) -newgrf: GUI for selecting custom waypoint graphics to use. Patch by dominik81 and pasky. darkvater parents: 389 diff changeset	1731
82c2bf635cd9 (svn r585) -newgrf: GUI for selecting custom waypoint graphics to use. Patch by dominik81 and pasky. darkvater parents: 389 diff changeset	1732	x += 33;
82c2bf635cd9 (svn r585) -newgrf: GUI for selecting custom waypoint graphics to use. Patch by dominik81 and pasky. darkvater parents: 389 diff changeset	1733	y += 17;
82c2bf635cd9 (svn r585) -newgrf: GUI for selecting custom waypoint graphics to use. Patch by dominik81 and pasky. darkvater parents: 389 diff changeset	1734
411 18495773b26e (svn r608) [newgrf] enabled possibility to build default waypoint when custom waypoints are enabled dominik parents: 410 diff changeset	1735	// draw default waypoint graphics of ID 0
412 f0573bfb67a9 (svn r609) Fixed choose waypoints dialogs, it works without assertion failures and with custom waypoint #0 selectable now. (pasky) dominik parents: 411 diff changeset	1736	if (stat_id == 0) {
1399 4503bd2bfb82 (svn r1903) Replace some casts and macro magic with proper typing, similar to r1902 tron parents: 1363 diff changeset	1737	const DrawTrackSeqStruct *dtss = _track_depot_layout_table[4];
412 f0573bfb67a9 (svn r609) Fixed choose waypoints dialogs, it works without assertion failures and with custom waypoint #0 selectable now. (pasky) dominik parents: 411 diff changeset	1738
1399 4503bd2bfb82 (svn r1903) Replace some casts and macro magic with proper typing, similar to r1902 tron parents: 1363 diff changeset	1739	img = dtss++->image;
415 423de36034b8 (svn r612) [newgrf] Fix: custom waypoints on monorail/maglev are displayed correctly dominik parents: 413 diff changeset	1740	if (img & 0x8000) img = (img & 0x7FFF) + railtype*TRACKTYPE_SPRITE_PITCH;
411 18495773b26e (svn r608) [newgrf] enabled possibility to build default waypoint when custom waypoints are enabled dominik parents: 410 diff changeset	1741	DrawSprite(img, x, y);
18495773b26e (svn r608) [newgrf] enabled possibility to build default waypoint when custom waypoints are enabled dominik parents: 410 diff changeset	1742
1399 4503bd2bfb82 (svn r1903) Replace some casts and macro magic with proper typing, similar to r1902 tron parents: 1363 diff changeset	1743	for (; dtss->image != 0; dtss++) {
411 18495773b26e (svn r608) [newgrf] enabled possibility to build default waypoint when custom waypoints are enabled dominik parents: 410 diff changeset	1744	Point pt = RemapCoords(dtss->subcoord_x, dtss->subcoord_y, 0);
18495773b26e (svn r608) [newgrf] enabled possibility to build default waypoint when custom waypoints are enabled dominik parents: 410 diff changeset	1745	img = dtss->image;
18495773b26e (svn r608) [newgrf] enabled possibility to build default waypoint when custom waypoints are enabled dominik parents: 410 diff changeset	1746	if (img & 0x8000) img \|= ormod;
415 423de36034b8 (svn r612) [newgrf] Fix: custom waypoints on monorail/maglev are displayed correctly dominik parents: 413 diff changeset	1747	DrawSprite(img, x + pt.x, y + pt.y);
411 18495773b26e (svn r608) [newgrf] enabled possibility to build default waypoint when custom waypoints are enabled dominik parents: 410 diff changeset	1748	}
18495773b26e (svn r608) [newgrf] enabled possibility to build default waypoint when custom waypoints are enabled dominik parents: 410 diff changeset	1749	return;
18495773b26e (svn r608) [newgrf] enabled possibility to build default waypoint when custom waypoints are enabled dominik parents: 410 diff changeset	1750	}
18495773b26e (svn r608) [newgrf] enabled possibility to build default waypoint when custom waypoints are enabled dominik parents: 410 diff changeset	1751
438 79b5df3f394a (svn r647) Cleanup custom station classes handling. (pasky) miham parents: 417 diff changeset	1752	stat = GetCustomStation(STAT_CLASS_WAYP, stat_id - 1);
412 f0573bfb67a9 (svn r609) Fixed choose waypoints dialogs, it works without assertion failures and with custom waypoint #0 selectable now. (pasky) dominik parents: 411 diff changeset	1753	assert(stat);
f0573bfb67a9 (svn r609) Fixed choose waypoints dialogs, it works without assertion failures and with custom waypoint #0 selectable now. (pasky) dominik parents: 411 diff changeset	1754	relocation = GetCustomStationRelocation(stat, NULL, 1);
f0573bfb67a9 (svn r609) Fixed choose waypoints dialogs, it works without assertion failures and with custom waypoint #0 selectable now. (pasky) dominik parents: 411 diff changeset	1755	// emulate station tile - open with building
f0573bfb67a9 (svn r609) Fixed choose waypoints dialogs, it works without assertion failures and with custom waypoint #0 selectable now. (pasky) dominik parents: 411 diff changeset	1756	// add 1 to get the other direction
f0573bfb67a9 (svn r609) Fixed choose waypoints dialogs, it works without assertion failures and with custom waypoint #0 selectable now. (pasky) dominik parents: 411 diff changeset	1757	cust = &stat->renderdata[2];
f0573bfb67a9 (svn r609) Fixed choose waypoints dialogs, it works without assertion failures and with custom waypoint #0 selectable now. (pasky) dominik parents: 411 diff changeset	1758
417 0c63a94557a5 (svn r614) [newgrf] Some minor code fixes dominik parents: 415 diff changeset	1759	img = cust->ground_sprite;
0c63a94557a5 (svn r614) [newgrf] Some minor code fixes dominik parents: 415 diff changeset	1760	img += railtype*((img<_custom_sprites_base)?TRACKTYPE_SPRITE_PITCH:1);
0c63a94557a5 (svn r614) [newgrf] Some minor code fixes dominik parents: 415 diff changeset	1761
393 82c2bf635cd9 (svn r585) -newgrf: GUI for selecting custom waypoint graphics to use. Patch by dominik81 and pasky. darkvater parents: 389 diff changeset	1762	if (img & 0x8000) img = (img & 0x7FFF);
82c2bf635cd9 (svn r585) -newgrf: GUI for selecting custom waypoint graphics to use. Patch by dominik81 and pasky. darkvater parents: 389 diff changeset	1763	DrawSprite(img, x, y);
82c2bf635cd9 (svn r585) -newgrf: GUI for selecting custom waypoint graphics to use. Patch by dominik81 and pasky. darkvater parents: 389 diff changeset	1764
82c2bf635cd9 (svn r585) -newgrf: GUI for selecting custom waypoint graphics to use. Patch by dominik81 and pasky. darkvater parents: 389 diff changeset	1765	foreach_draw_tile_seq(seq, cust->seq) {
82c2bf635cd9 (svn r585) -newgrf: GUI for selecting custom waypoint graphics to use. Patch by dominik81 and pasky. darkvater parents: 389 diff changeset	1766	Point pt = RemapCoords(seq->delta_x, seq->delta_y, seq->delta_z);
403 bfb365c74e80 (svn r600) -newgrf: Relocation offset for custom station sprites is now stored separately, making it possible to show different sprites in waypoint selection dialog (pasky). darkvater parents: 399 diff changeset	1767	uint32 image = seq->image + relocation;
bfb365c74e80 (svn r600) -newgrf: Relocation offset for custom station sprites is now stored separately, making it possible to show different sprites in waypoint selection dialog (pasky). darkvater parents: 399 diff changeset	1768
bfb365c74e80 (svn r600) -newgrf: Relocation offset for custom station sprites is now stored separately, making it possible to show different sprites in waypoint selection dialog (pasky). darkvater parents: 399 diff changeset	1769	DrawSprite((image&0x3FFF) \| ormod, x + pt.x, y + pt.y);
393 82c2bf635cd9 (svn r585) -newgrf: GUI for selecting custom waypoint graphics to use. Patch by dominik81 and pasky. darkvater parents: 389 diff changeset	1770	}
82c2bf635cd9 (svn r585) -newgrf: GUI for selecting custom waypoint graphics to use. Patch by dominik81 and pasky. darkvater parents: 389 diff changeset	1771	}
82c2bf635cd9 (svn r585) -newgrf: GUI for selecting custom waypoint graphics to use. Patch by dominik81 and pasky. darkvater parents: 389 diff changeset	1772
82c2bf635cd9 (svn r585) -newgrf: GUI for selecting custom waypoint graphics to use. Patch by dominik81 and pasky. darkvater parents: 389 diff changeset	1773
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1774	#define NUM_SSD_ENTRY 256
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1775	#define NUM_SSD_STACK 32
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1776
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1777	typedef struct SetSignalsData {
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1778	int cur;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1779	int cur_stack;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1780	bool stop;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1781	bool has_presignal;
201 c40d343115f8 (svn r202) -Codechange: I missed some files with trailing spaces.. this should be truelight parents: 159 diff changeset	1782
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1783	// presignal info
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1784	int presignal_exits;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1785	int presignal_exits_free;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1786
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1787	// these are used to keep track of the signals that change.
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1788	byte bit[NUM_SSD_ENTRY];
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1789	TileIndex tile[NUM_SSD_ENTRY];
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1790
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1791	// these are used to keep track of the stack that modifies presignals recursively
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1792	TileIndex next_tile[NUM_SSD_STACK];
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1793	byte next_dir[NUM_SSD_STACK];
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1794
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1795	} SetSignalsData;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1796
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1797	static bool SetSignalsEnumProc(uint tile, SetSignalsData ssd, int track, uint length, byte state)
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1798	{
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1799	// the tile has signals?
1035 0a170deb6e33 (svn r1536) Move GET_TILEHEIGHT, GET_TILETYPE and IS_TILETYPE to map.h, turn them into inline functions and add some asserts tron parents: 1024 diff changeset	1800	if (IsTileType(tile, MP_RAILWAY)) {
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1801	if ((_map5[tile]&RAIL_TYPE_MASK) == RAIL_TYPE_SIGNALS) {
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1802	if ((_map3_lo[tile] & _signals_table_both[track]) != 0) {
201 c40d343115f8 (svn r202) -Codechange: I missed some files with trailing spaces.. this should be truelight parents: 159 diff changeset	1803
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1804	// is the signal pointing in to the segment existing?
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1805	if ((_map3_lo[tile] & _signals_table[track]) != 0) {
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1806	// yes, add the signal to the list of signals
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1807	if (ssd->cur != NUM_SSD_ENTRY) {
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1808	ssd->tile[ssd->cur] = tile; // remember the tile index
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1809	ssd->bit[ssd->cur] = track; // and the controlling bit number
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1810	ssd->cur++;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1811	}
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1812
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1813	// remember if this block has a presignal.
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1814	ssd->has_presignal \|= (_map3_hi[tile]&1);
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1815	}
201 c40d343115f8 (svn r202) -Codechange: I missed some files with trailing spaces.. this should be truelight parents: 159 diff changeset	1816
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1817	// is this an exit signal that points out from the segment?
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1818	if ((_map3_hi[tile]&2) && _map3_lo[tile]&_signals_table_other[track]) {
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1819	ssd->presignal_exits++;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1820	if ((_map2[tile]&_signals_table_other[track]) != 0)
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1821	ssd->presignal_exits_free++;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1822	}
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1823
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1824	return true;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1825	}
1535 a5f686a20d2c (svn r2039) IS_RAIL_DEPOT -> IsRailDepot, IS_RAIL_WAYPOINT -> IsRailWaypoint tron parents: 1534 diff changeset	1826	} else if (IsRailDepot(_map5[tile]))
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1827	return true; // don't look further if the tile is a depot
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1828	}
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1829	return false;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1830	}
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1831
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1832	static void SetSignalsAfterProc(TrackPathFinder *tpf)
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1833	{
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1834	SetSignalsData *ssd = tpf->userdata;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1835	Vehicle *v;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1836	uint tile, hash, val, offs;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1837	TrackPathFinderLink *link;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1838
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1839	ssd->stop = false;
201 c40d343115f8 (svn r202) -Codechange: I missed some files with trailing spaces.. this should be truelight parents: 159 diff changeset	1840
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1841	// for each train, check if it is in the segment.
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1842	// then we know that the signal should be red.
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1843	FOR_ALL_VEHICLES(v) {
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1844	if (v->type != VEH_Train)
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1845	continue;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1846
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1847	tile = v->tile;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1848	if (v->u.rail.track == 0x40) { tile = GetVehicleOutOfTunnelTile(v); }
201 c40d343115f8 (svn r202) -Codechange: I missed some files with trailing spaces.. this should be truelight parents: 159 diff changeset	1849
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1850	hash = PATHFIND_HASH_TILE(tile);
201 c40d343115f8 (svn r202) -Codechange: I missed some files with trailing spaces.. this should be truelight parents: 159 diff changeset	1851
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1852	val = tpf->hash_head[hash];
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1853	if (val == 0)
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1854	continue;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1855
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1856	if (!(val & 0x8000)) {
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1857	if ((TileIndex)tile == tpf->hash_tile[hash])
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1858	goto check_val;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1859	} else {
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1860	offs = tpf->hash_tile[hash];
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1861	do {
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1862	link = PATHFIND_GET_LINK_PTR(tpf, offs);
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1863	if ( (TileIndex)tile == link->tile) {
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1864	val = link->flags;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1865	check_val:;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1866	// the train is on the track, in either direction?
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1867	if (val & (v->u.rail.track + (v->u.rail.track<<8))) {
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1868	ssd->stop = true;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1869	return;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1870	}
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1871	break;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1872	}
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1873	} while ((offs=link->next) != 0xFFFF);
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1874	}
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1875	}
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1876	}
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1877
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1878	static const byte _dir_from_track[14] = {
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1879	0,1,0,1,2,1, 0,0,
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1880	2,3,3,2,3,0,
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1881	};
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1882
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1883
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1884	static void ChangeSignalStates(SetSignalsData *ssd)
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1885	{
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1886	int i;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1887
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1888	// thinking about presignals...
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1889	// the presignal is green if,
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1890	// if no train is in the segment AND
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1891	// there is at least one green exit signal OR
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1892	// there are no exit signals in the segment
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1893
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1894	// then mark the signals in the segment accordingly
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1895	for(i=0; i!=ssd->cur; i++) {
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1896	uint tile = ssd->tile[i];
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1897	byte bit = _signals_table[ssd->bit[i]];
817 4f9377b7fd2b (svn r1288) -Codechange: changed _map2 to an uint16. It is still saved and loaded as truelight parents: 679 diff changeset	1898	uint16 m2 = _map2[tile];
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1899
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1900	// presignals don't turn green if there is at least one presignal exit and none are free
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1901	if (_map3_hi[tile] & 1) {
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1902	int ex = ssd->presignal_exits, exfree = ssd->presignal_exits_free;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1903
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1904	// subtract for dual combo signals so they don't count themselves
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1905	if (_map3_hi[tile]&2 && _map3_lo[tile]&_signals_table_other[ssd->bit[i]]) {
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1906	ex--;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1907	if ((_map2[tile]&_signals_table_other[ssd->bit[i]]) != 0) exfree--;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1908	}
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1909
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1910	// if we have exits and none are free, make red.
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1911	if (ex && !exfree) goto make_red;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1912	}
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1913
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1914	// check if the signal is unaffected.
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1915	if (ssd->stop) {
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1916	make_red:
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1917	// turn red
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1918	if ( (bit&m2) == 0 )
201 c40d343115f8 (svn r202) -Codechange: I missed some files with trailing spaces.. this should be truelight parents: 159 diff changeset	1919	continue;
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1920	} else {
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1921	// turn green
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1922	if ( (bit&m2) != 0 )
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1923	continue;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1924	}
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1925
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1926	// Update signals on the other side of this exit signal, it changed.
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1927	// If this segment has presignals, then we treat exit signals going into the segment as normal signals.
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1928	if (_map3_hi[tile]&2 && (_map3_hi[tile]&1 \|\| !ssd->has_presignal)) {
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1929	if (ssd->cur_stack != NUM_SSD_STACK) {
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1930	ssd->next_tile[ssd->cur_stack] = tile;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1931	ssd->next_dir[ssd->cur_stack] = _dir_from_track[ssd->bit[i]];
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1932	ssd->cur_stack++;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1933	} else {
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1934	printf("NUM_SSD_STACK too small\n");
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1935	}
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1936	}
201 c40d343115f8 (svn r202) -Codechange: I missed some files with trailing spaces.. this should be truelight parents: 159 diff changeset	1937
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1938	// it changed, so toggle it
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1939	_map2[tile] = m2 ^ bit;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1940	MarkTileDirtyByTile(tile);
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1941	}
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1942	}
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1943
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1944
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1945	bool UpdateSignalsOnSegment(uint tile, byte direction)
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1946	{
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1947	SetSignalsData ssd;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1948	int result = -1;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1949
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1950	ssd.cur_stack = 0;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1951	direction>>=1;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1952
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1953	for(;;) {
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1954	// go through one segment and update all signals pointing into that segment.
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1955	ssd.cur = ssd.presignal_exits = ssd.presignal_exits_free = 0;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1956	ssd.has_presignal = false;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1957
159 139cf78bfb28 (svn r160) -Codechange: made GetTileTrackStatus more readable (blathijs) truelight parents: 149 diff changeset	1958	FollowTrack(tile, 0xC000 \| TRANSPORT_RAIL, direction, (TPFEnumProc*)SetSignalsEnumProc, SetSignalsAfterProc, &ssd);
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1959	ChangeSignalStates(&ssd);
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1960
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1961	// remember the result only for the first iteration.
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1962	if (result < 0) result = ssd.stop;
201 c40d343115f8 (svn r202) -Codechange: I missed some files with trailing spaces.. this should be truelight parents: 159 diff changeset	1963
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1964	// if any exit signals were changed, we need to keep going to modify the stuff behind those.
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1965	if(!ssd.cur_stack)
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1966	break;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1967
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1968	// one or more exit signals were changed, so we need to update another segment too.
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1969	tile = ssd.next_tile[--ssd.cur_stack];
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1970	direction = ssd.next_dir[ssd.cur_stack];
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1971	}
201 c40d343115f8 (svn r202) -Codechange: I missed some files with trailing spaces.. this should be truelight parents: 159 diff changeset	1972
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1973	return (bool)result;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1974	}
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1975
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1976	void SetSignalsOnBothDir(uint tile, byte track)
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1977	{
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1978	static const byte _search_dir_1[6] = {1, 3, 1, 3, 5, 3};
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1979	static const byte _search_dir_2[6] = {5, 7, 7, 5, 7, 1};
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1980
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1981	UpdateSignalsOnSegment(tile, _search_dir_1[track]);
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1982	UpdateSignalsOnSegment(tile, _search_dir_2[track]);
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1983	}
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1984
410 8de2aaf20800 (svn r607) -Patch: [ 985102 ] static cleanup tron parents: 408 diff changeset	1985	static uint GetSlopeZ_Track(TileInfo *ti)
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1986	{
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1987	uint z = ti->z;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1988	int th = ti->tileh;
13 3e7c1f74a996 (svn r14) Fix: railroad crossings on slopes are now possible dominik parents: 0 diff changeset	1989
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1990	// check if it's a foundation
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1991	if (ti->tileh != 0) {
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1992	if ((ti->map5 & 0x80) == 0) {
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1993	uint f = GetRailFoundation(ti->tileh, ti->map5 & 0x3F);
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1994	if (f != 0) {
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1995	if (f < 15) {
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1996	// leveled foundation
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1997	return z + 8;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1998	}
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1999	// inclined foundation
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	2000	th = _inclined_tileh[f - 15];
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	2001	}
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	2002	} else if ((ti->map5 & 0xC0) == 0xC0) {
395 4c990f33dab7 (svn r587) -newgrf: Rename all /Checkpoint/i tokens to 'Waypoint's. The name actually makes some sense and is also compatible with TTDPatch (pasky). darkvater parents: 393 diff changeset	2003	// depot or waypoint
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	2004	return z + 8;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	2005	}
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	2006	return GetPartialZ(ti->x&0xF, ti->y&0xF, th) + z;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	2007	}
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	2008	return z;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	2009	}
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	2010
1095 90220990fd7c (svn r1596) Add some more statics tron parents: 1093 diff changeset	2011	static uint GetSlopeTileh_Track(TileInfo *ti)
39 d177340ed556 (svn r40) Final slope graphics fix dominik parents: 22 diff changeset	2012	{
d177340ed556 (svn r40) Final slope graphics fix dominik parents: 22 diff changeset	2013	// check if it's a foundation
d177340ed556 (svn r40) Final slope graphics fix dominik parents: 22 diff changeset	2014	if (ti->tileh != 0) {
d177340ed556 (svn r40) Final slope graphics fix dominik parents: 22 diff changeset	2015	if ((ti->map5 & 0x80) == 0) {
d177340ed556 (svn r40) Final slope graphics fix dominik parents: 22 diff changeset	2016	uint f = GetRailFoundation(ti->tileh, ti->map5 & 0x3F);
d177340ed556 (svn r40) Final slope graphics fix dominik parents: 22 diff changeset	2017	if (f != 0) {
d177340ed556 (svn r40) Final slope graphics fix dominik parents: 22 diff changeset	2018	if (f < 15) {
d177340ed556 (svn r40) Final slope graphics fix dominik parents: 22 diff changeset	2019	// leveled foundation
d177340ed556 (svn r40) Final slope graphics fix dominik parents: 22 diff changeset	2020	return 0;
d177340ed556 (svn r40) Final slope graphics fix dominik parents: 22 diff changeset	2021	}
d177340ed556 (svn r40) Final slope graphics fix dominik parents: 22 diff changeset	2022	// inclined foundation
d177340ed556 (svn r40) Final slope graphics fix dominik parents: 22 diff changeset	2023	return _inclined_tileh[f - 15];
d177340ed556 (svn r40) Final slope graphics fix dominik parents: 22 diff changeset	2024	}
d177340ed556 (svn r40) Final slope graphics fix dominik parents: 22 diff changeset	2025	} else if ((ti->map5 & 0xC0) == 0xC0) {
395 4c990f33dab7 (svn r587) -newgrf: Rename all /Checkpoint/i tokens to 'Waypoint's. The name actually makes some sense and is also compatible with TTDPatch (pasky). darkvater parents: 393 diff changeset	2026	// depot or waypoint
39 d177340ed556 (svn r40) Final slope graphics fix dominik parents: 22 diff changeset	2027	return 0;
d177340ed556 (svn r40) Final slope graphics fix dominik parents: 22 diff changeset	2028	}
d177340ed556 (svn r40) Final slope graphics fix dominik parents: 22 diff changeset	2029	}
d177340ed556 (svn r40) Final slope graphics fix dominik parents: 22 diff changeset	2030	return ti->tileh;
d177340ed556 (svn r40) Final slope graphics fix dominik parents: 22 diff changeset	2031	}
d177340ed556 (svn r40) Final slope graphics fix dominik parents: 22 diff changeset	2032
473 0da86c59e3ae (svn r724) Remove restriction that a tile can only accept 3 cargo types. tron parents: 447 diff changeset	2033	static void GetAcceptedCargo_Track(uint tile, AcceptedCargo ac)
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	2034	{
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	2035	/* not used */
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	2036	}
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	2037
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	2038	static void AnimateTile_Track(uint tile)
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	2039	{
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	2040	/* not used */
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	2041	}
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	2042
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	2043	static void TileLoop_Track(uint tile)
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	2044	{
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	2045	byte a2;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	2046	byte rail;
817 4f9377b7fd2b (svn r1288) -Codechange: changed _map2 to an uint16. It is still saved and loaded as truelight parents: 679 diff changeset	2047	uint16 m2;
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	2048	byte owner;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	2049
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	2050	m2 = _map2[tile] & 0xF;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	2051
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	2052	/* special code for alps landscape */
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	2053	if (_opt.landscape == LT_HILLY) {
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	2054	/* convert into snow? */
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	2055	if (GetTileZ(tile) > _opt.snow_line) {
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	2056	a2 = RAIL_GROUND_ICE_DESERT;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	2057	goto modify_me;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	2058	}
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	2059
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	2060	/* special code for desert landscape */
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	2061	} else if (_opt.landscape == LT_DESERT) {
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	2062	/* convert into desert? */
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	2063	if (GetMapExtraBits(tile) == 1) {
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	2064	a2 = RAIL_GROUND_ICE_DESERT;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	2065	goto modify_me;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	2066	}
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	2067	}
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	2068
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	2069	// Don't continue tile loop for depots
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	2070	if (_map5[tile] & RAIL_TYPE_SPECIAL)
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	2071	return;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	2072
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	2073	a2 = RAIL_GROUND_GREEN;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	2074
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	2075	if (m2 != RAIL_GROUND_BROWN) { /* wait until bottom is green */
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	2076	/* determine direction of fence */
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	2077	rail = _map5[tile] & RAIL_BIT_MASK;
201 c40d343115f8 (svn r202) -Codechange: I missed some files with trailing spaces.. this should be truelight parents: 159 diff changeset	2078
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	2079	if (rail == RAIL_BIT_UPPER) {
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	2080	a2 = RAIL_GROUND_FENCE_HORIZ1;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	2081	} else if (rail == RAIL_BIT_LOWER) {
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	2082	a2 = RAIL_GROUND_FENCE_HORIZ2;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	2083	} else if (rail == RAIL_BIT_LEFT) {
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	2084	a2 = RAIL_GROUND_FENCE_VERT1;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	2085	} else if (rail == RAIL_BIT_RIGHT) {
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	2086	a2 = RAIL_GROUND_FENCE_VERT2;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	2087	} else {
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	2088	owner = _map_owner[tile];
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	2089
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	2090	if ( (!(rail&(RAIL_BIT_DIAG2\|RAIL_BIT_UPPER\|RAIL_BIT_LEFT)) && (rail&RAIL_BIT_DIAG1)) \|\| rail==(RAIL_BIT_LOWER\|RAIL_BIT_RIGHT)) {
1035 0a170deb6e33 (svn r1536) Move GET_TILEHEIGHT, GET_TILETYPE and IS_TILETYPE to map.h, turn them into inline functions and add some asserts tron parents: 1024 diff changeset	2091	if (!IsTileType(tile + TILE_XY(0,-1), MP_RAILWAY) \|\|
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	2092	owner != _map_owner[tile + TILE_XY(0,-1)] \|\|
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	2093	(_map5[tile + TILE_XY(0,-1)]==RAIL_BIT_UPPER \|\| _map5[tile + TILE_XY(0,-1)]==RAIL_BIT_LEFT))
201 c40d343115f8 (svn r202) -Codechange: I missed some files with trailing spaces.. this should be truelight parents: 159 diff changeset	2094	a2 = RAIL_GROUND_FENCE_NW;
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	2095	}
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	2096
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	2097	if ( (!(rail&(RAIL_BIT_DIAG2\|RAIL_BIT_LOWER\|RAIL_BIT_RIGHT)) && (rail&RAIL_BIT_DIAG1)) \|\| rail==(RAIL_BIT_UPPER\|RAIL_BIT_LEFT)) {
1035 0a170deb6e33 (svn r1536) Move GET_TILEHEIGHT, GET_TILETYPE and IS_TILETYPE to map.h, turn them into inline functions and add some asserts tron parents: 1024 diff changeset	2098	if (!IsTileType(tile + TILE_XY(0,1), MP_RAILWAY) \|\|
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	2099	owner != _map_owner[tile + TILE_XY(0,1)] \|\|
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	2100	(_map5[tile + TILE_XY(0,1)]==RAIL_BIT_LOWER \|\| _map5[tile + TILE_XY(0,1)]==RAIL_BIT_RIGHT))
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	2101	a2 = (a2 == RAIL_GROUND_FENCE_NW) ? RAIL_GROUND_FENCE_SENW : RAIL_GROUND_FENCE_SE;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	2102	}
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	2103
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	2104	if ( (!(rail&(RAIL_BIT_DIAG1\|RAIL_BIT_UPPER\|RAIL_BIT_RIGHT)) && (rail&RAIL_BIT_DIAG2)) \|\| rail==(RAIL_BIT_LOWER\|RAIL_BIT_LEFT)) {
1035 0a170deb6e33 (svn r1536) Move GET_TILEHEIGHT, GET_TILETYPE and IS_TILETYPE to map.h, turn them into inline functions and add some asserts tron parents: 1024 diff changeset	2105	if (!IsTileType(tile + TILE_XY(-1,0), MP_RAILWAY) \|\|
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	2106	owner != _map_owner[tile + TILE_XY(-1,0)] \|\|
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	2107	(_map5[tile + TILE_XY(-1,0)]==RAIL_BIT_UPPER \|\| _map5[tile + TILE_XY(-1,0)]==RAIL_BIT_RIGHT))
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	2108	a2 = RAIL_GROUND_FENCE_NE;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	2109	}
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	2110
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	2111	if ( (!(rail&(RAIL_BIT_DIAG1\|RAIL_BIT_LOWER\|RAIL_BIT_LEFT)) && (rail&RAIL_BIT_DIAG2)) \|\| rail==(RAIL_BIT_UPPER\|RAIL_BIT_RIGHT)) {
1035 0a170deb6e33 (svn r1536) Move GET_TILEHEIGHT, GET_TILETYPE and IS_TILETYPE to map.h, turn them into inline functions and add some asserts tron parents: 1024 diff changeset	2112	if (!IsTileType(tile + TILE_XY(1,0), MP_RAILWAY) \|\|
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	2113	owner != _map_owner[tile + TILE_XY(1,0)] \|\|
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	2114	(_map5[tile + TILE_XY(1,0)]==RAIL_BIT_LOWER \|\| _map5[tile + TILE_XY(1,0)]==RAIL_BIT_LEFT))
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	2115	a2 = (a2 == RAIL_GROUND_FENCE_NE) ? RAIL_GROUND_FENCE_NESW : RAIL_GROUND_FENCE_SW;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	2116	}
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	2117	}
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	2118	}
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	2119
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	2120	modify_me:;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	2121	/* tile changed? */
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	2122	if ( m2 != a2) {
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	2123	_map2[tile] = (_map2[tile] & ~RAIL_MAP2LO_GROUND_MASK) \| a2;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	2124	MarkTileDirtyByTile(tile);
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	2125	}
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	2126	}
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	2127
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	2128
159 139cf78bfb28 (svn r160) -Codechange: made GetTileTrackStatus more readable (blathijs) truelight parents: 149 diff changeset	2129	static uint32 GetTileTrackStatus_Track(uint tile, TransportType mode) {
817 4f9377b7fd2b (svn r1288) -Codechange: changed _map2 to an uint16. It is still saved and loaded as truelight parents: 679 diff changeset	2130	byte m5, a;
4f9377b7fd2b (svn r1288) -Codechange: changed _map2 to an uint16. It is still saved and loaded as truelight parents: 679 diff changeset	2131	uint16 b;
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	2132	uint32 ret;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	2133
159 139cf78bfb28 (svn r160) -Codechange: made GetTileTrackStatus more readable (blathijs) truelight parents: 149 diff changeset	2134	if (mode != TRANSPORT_RAIL)
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	2135	return 0;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	2136
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	2137	m5 = _map5[tile];
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	2138
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	2139	if (!(m5 & RAIL_TYPE_SPECIAL)) {
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	2140	ret = (m5 \| (m5 << 8)) & 0x3F3F;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	2141	if (!(m5 & RAIL_TYPE_SIGNALS)) {
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	2142	if ( (ret & 0xFF) == 3)
22 fe6f35cc987b (svn r23) -Some omments on the code (blathijs) darkvater parents: 13 diff changeset	2143	/* Diagonal crossing? */
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	2144	ret \|= 0x40;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	2145	} else {
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	2146	/* has_signals */
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	2147
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	2148	a = _map3_lo[tile];
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	2149	b = _map2[tile];
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	2150
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	2151	b &= a;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	2152
22 fe6f35cc987b (svn r23) -Some omments on the code (blathijs) darkvater parents: 13 diff changeset	2153	/* When signals are not present (in neither
fe6f35cc987b (svn r23) -Some omments on the code (blathijs) darkvater parents: 13 diff changeset	2154	* direction), we pretend them to be green. (So if
fe6f35cc987b (svn r23) -Some omments on the code (blathijs) darkvater parents: 13 diff changeset	2155	* signals are only one way, the other way will
fe6f35cc987b (svn r23) -Some omments on the code (blathijs) darkvater parents: 13 diff changeset	2156	* implicitely become `red' */
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	2157	if ((a & 0xC0) == 0) { b \|= 0xC0; }
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	2158	if ((a & 0x30) == 0) { b \|= 0x30; }
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	2159
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	2160	if ( (b & 0x80) == 0) ret \|= 0x10070000;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	2161	if ( (b & 0x40) == 0) ret \|= 0x7100000;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	2162	if ( (b & 0x20) == 0) ret \|= 0x20080000;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	2163	if ( (b & 0x10) == 0) ret \|= 0x8200000;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	2164	}
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	2165	} else if (m5 & 0x40) {
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	2166	static const byte _train_spec_tracks[6] = {1,2,1,2,1,2};
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	2167	m5 = _train_spec_tracks[m5 & 0x3F];
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	2168	ret = (m5 << 8) + m5;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	2169	} else
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	2170	return 0;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	2171	return ret;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	2172	}
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	2173
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	2174	static void ClickTile_Track(uint tile)
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	2175	{
1535 a5f686a20d2c (svn r2039) IS_RAIL_DEPOT -> IsRailDepot, IS_RAIL_WAYPOINT -> IsRailWaypoint tron parents: 1534 diff changeset	2176	if (IsRailDepot(_map5[tile]))
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	2177	ShowTrainDepotWindow(tile);
1535 a5f686a20d2c (svn r2039) IS_RAIL_DEPOT -> IsRailDepot, IS_RAIL_WAYPOINT -> IsRailWaypoint tron parents: 1534 diff changeset	2178	else if (IsRailWaypoint(_map5[tile]))
395 4c990f33dab7 (svn r587) -newgrf: Rename all /Checkpoint/i tokens to 'Waypoint's. The name actually makes some sense and is also compatible with TTDPatch (pasky). darkvater parents: 393 diff changeset	2179	ShowRenameWaypointWindow(&_waypoints[GetWaypointByTile(tile)]);
201 c40d343115f8 (svn r202) -Codechange: I missed some files with trailing spaces.. this should be truelight parents: 159 diff changeset	2180
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	2181	}
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	2182
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	2183	static void GetTileDesc_Track(uint tile, TileDesc *td)
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	2184	{
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	2185	byte m5 = _map5[tile];
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	2186	if (!(m5 & 0x80)) {
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	2187	if(!(m5 & 0x40)) // no signals
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	2188	td->str = STR_1021_RAILROAD_TRACK;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	2189	else
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	2190	{
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	2191	switch(_map3_hi[tile] & 0x03)
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	2192	{
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	2193	case 0: td->str = STR_RAILROAD_TRACK_WITH_NORMAL_SIGNALS;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	2194	break;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	2195	case 1: td->str = STR_RAILROAD_TRACK_WITH_PRESIGNALS;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	2196	break;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	2197	case 2: td->str = STR_RAILROAD_TRACK_WITH_EXITSIGNALS;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	2198	break;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	2199	case 3: td->str = STR_RAILROAD_TRACK_WITH_COMBOSIGNALS;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	2200	break;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	2201	}
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	2202	}
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	2203	} else {
395 4c990f33dab7 (svn r587) -newgrf: Rename all /Checkpoint/i tokens to 'Waypoint's. The name actually makes some sense and is also compatible with TTDPatch (pasky). darkvater parents: 393 diff changeset	2204	td->str = m5 < 0xC4 ? STR_1023_RAILROAD_TRAIN_DEPOT : STR_LANDINFO_WAYPOINT;
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	2205	}
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	2206	td->owner = _map_owner[tile];
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	2207	}
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	2208
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	2209	static void ChangeTileOwner_Track(uint tile, byte old_player, byte new_player)
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	2210	{
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	2211	if (_map_owner[tile] != old_player)
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	2212	return;
201 c40d343115f8 (svn r202) -Codechange: I missed some files with trailing spaces.. this should be truelight parents: 159 diff changeset	2213
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	2214	if (new_player != 255) {
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	2215	_map_owner[tile] = new_player;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	2216	} else {
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	2217	DoCommandByTile(tile, 0, 0, DC_EXEC, CMD_LANDSCAPE_CLEAR);
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	2218	}
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	2219	}
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	2220
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	2221	static const byte _fractcoords_behind[4] = { 0x8F, 0x8, 0x80, 0xF8 };
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	2222	static const byte _fractcoords_enter[4] = { 0x8A, 0x48, 0x84, 0xA8 };
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	2223	static const byte _fractcoords_leave[4] = { 0x81, 0xD8, 0x8D, 0x18 };
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	2224	static const byte _enter_directions[4] = {5, 7, 1, 3};
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	2225	static const byte _leave_directions[4] = {1, 3, 5, 7};
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	2226	static const byte _depot_track_mask[4] = {1, 2, 1, 2};
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	2227
410 8de2aaf20800 (svn r607) -Patch: [ 985102 ] static cleanup tron parents: 408 diff changeset	2228	static uint32 VehicleEnter_Track(Vehicle *v, uint tile, int x, int y)
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	2229	{
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	2230	byte fract_coord;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	2231	int dir;
201 c40d343115f8 (svn r202) -Codechange: I missed some files with trailing spaces.. this should be truelight parents: 159 diff changeset	2232
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	2233	// this routine applies only to trains in depot tiles
1535 a5f686a20d2c (svn r2039) IS_RAIL_DEPOT -> IsRailDepot, IS_RAIL_WAYPOINT -> IsRailWaypoint tron parents: 1534 diff changeset	2234	if (v->type != VEH_Train \|\| !IsRailDepot(_map5[tile]))
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	2235	return 0;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	2236
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	2237	/* depot direction */
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	2238	dir = _map5[tile] & RAIL_DEPOT_DIR;
201 c40d343115f8 (svn r202) -Codechange: I missed some files with trailing spaces.. this should be truelight parents: 159 diff changeset	2239
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	2240	fract_coord = (x & 0xF) + ((y & 0xF) << 4);
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	2241	if (_fractcoords_behind[dir] == fract_coord) {
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	2242	/* make sure a train is not entering the tile from behind */
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	2243	return 8;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	2244	} else if (_fractcoords_enter[dir] == fract_coord) {
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	2245	if (_enter_directions[dir] == v->direction) {
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	2246	/* enter the depot */
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	2247	v->u.rail.track = 0x80,
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	2248	v->vehstatus \|= VS_HIDDEN; /* hide it */
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	2249	v->direction ^= 4;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	2250	if (v->next == NULL)
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	2251	TrainEnterDepot(v, tile);
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	2252	v->tile = tile;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	2253	InvalidateWindow(WC_VEHICLE_DEPOT, tile);
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	2254	return 4;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	2255	}
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	2256	} else if (_fractcoords_leave[dir] == fract_coord) {
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	2257	if (_leave_directions[dir] == v->direction) {
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	2258	/* leave the depot? */
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	2259	if ((v=v->next) != NULL) {
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	2260	v->vehstatus &= ~VS_HIDDEN;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	2261	v->u.rail.track = _depot_track_mask[dir];
1330 8a67d04016ce (svn r1834) - Fix: NPF does not check the owner of its target, busses try to enter other players' depots. TODO matthijs parents: 1328 diff changeset	2262	assert(v->u.rail.track);
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	2263	}
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	2264	}
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	2265	}
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	2266
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	2267	return 0;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	2268	}
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	2269
1093 e8d26c7dc42f (svn r1594) Convert all undefined parameter lists to (void) and add the appropriate warning flags in the Makefile tron parents: 1084 diff changeset	2270	void InitializeRail(void)
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	2271	{
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	2272	_last_built_train_depot_tile = 0;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	2273	}
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	2274
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	2275	const TileTypeProcs _tile_type_rail_procs = {
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	2276	DrawTile_Track, /* draw_tile_proc */
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	2277	GetSlopeZ_Track, /* get_slope_z_proc */
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	2278	ClearTile_Track, /* clear_tile_proc */
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	2279	GetAcceptedCargo_Track, /* get_accepted_cargo_proc */
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	2280	GetTileDesc_Track, /* get_tile_desc_proc */
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	2281	GetTileTrackStatus_Track, /* get_tile_track_status_proc */
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	2282	ClickTile_Track, /* click_tile_proc */
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	2283	AnimateTile_Track, /* animate_tile_proc */
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	2284	TileLoop_Track, /* tile_loop_clear */
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	2285	ChangeTileOwner_Track, /* change_tile_owner_clear */
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	2286	NULL, /* get_produced_cargo_proc */
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	2287	VehicleEnter_Track, /* vehicle_enter_tile_proc */
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	2288	NULL, /* vehicle_leave_tile_proc */
39 d177340ed556 (svn r40) Final slope graphics fix dominik parents: 22 diff changeset	2289	GetSlopeTileh_Track, /* get_slope_tileh_proc */
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	2290	};

author	tron
	Thu, 24 Mar 2005 07:48:04 +0000
changeset 1536	69c91cec07c5
parent 1535	a5f686a20d2c
child 1542	2ca6d1624e6d
permissions	-rw-r--r--