openttd-mini: rail_cmd.c@06f7b463ee52 (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 775a7ee52369 (svn r1867) Include tables/sprites.h only in files which need it tron parents: 1330 diff changeset	3	#include "table/sprites.h"
507 04b5403aaf6b (svn r815) Include strings.h only in the files which need it. tron parents: 497 diff changeset	4	#include "table/strings.h"
1009 75140dc68759 (svn r1508) Remove duplicate declarations and include proper headers where necessary tron parents: 926 diff changeset	5	#include "gfx.h"
679 04ca2cd69420 (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 2e00193652b2 (svn r1713) Split off several functions which query/set information about a single tile from map.h and put them into a seperate file tile.h tron parents: 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 cbe0c766c947 (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 16ee9854091e (svn r581) -newgrf: Basic support for new stations - only waypoints supported now and only celestar parents: 337 diff changeset	14	#include "station.h"
405 415546028e8d (svn r602) -newgrf: Move DrawTileSeqStruct & co and struct SpriteGroup to sprite.h (pasky) darkvater parents: 403 diff changeset	15	#include "sprite.h"
1313 f1013ec3d318 (svn r1817) -Codechange: Moved depot-functions to depot.c truelight parents: 1247 diff changeset	16	#include "depot.h"
1542 62a03537ad0b (svn r2046) -Codechange: moved all waypoint code to waypoint.c/waypoint.h truelight parents: 1536 diff changeset	17	#include "waypoint.h"
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	18
415 20f981988266 (svn r612) [newgrf] Fix: custom waypoints on monorail/maglev are displayed correctly dominik parents: 413 diff changeset	19	extern uint16 _custom_sprites_base;
20f981988266 (svn r612) [newgrf] Fix: custom waypoints on monorail/maglev are displayed correctly dominik parents: 413 diff changeset	20
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	21	void ShowTrainDepotWindow(uint tile);
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	22
22 fe6f35cc987b (svn r23) -Some omments on the code (blathijs) darkvater parents: 13 diff changeset	23	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	24	RAIL_TYPE_NORMAL = 0,
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	25	RAIL_TYPE_SIGNALS = 0x40,
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	26	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	27	RAIL_TYPE_DEPOT = 0xC0,
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	28	RAIL_TYPE_MASK = 0xC0,
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	29
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	30	RAIL_BIT_DIAG1 = 1, // 0
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	31	RAIL_BIT_DIAG2 = 2, // 1
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	32	RAIL_BIT_UPPER = 4, // 2
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	33	RAIL_BIT_LOWER = 8, // 3
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	34	RAIL_BIT_LEFT = 16, // 4
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	35	RAIL_BIT_RIGHT = 32, // 5
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	36	RAIL_BIT_MASK = 0x3F,
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	37
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	38	RAIL_DEPOT_TRACK_MASK = 1,
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	39	RAIL_DEPOT_DIR = 3,
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	40
1534 304124d6b5e3 (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	41	RAIL_SUBTYPE_MASK = 0x3C,
304124d6b5e3 (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	RAIL_SUBTYPE_DEPOT = 0x00,
304124d6b5e3 (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_WAYPOINT = 0x04
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	44	};
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	45
1535 84d53678f31f (svn r2039) IS_RAIL_DEPOT -> IsRailDepot, IS_RAIL_WAYPOINT -> IsRailWaypoint tron parents: 1534 diff changeset	46	static inline bool IsRailDepot(byte m5)
84d53678f31f (svn r2039) IS_RAIL_DEPOT -> IsRailDepot, IS_RAIL_WAYPOINT -> IsRailWaypoint tron parents: 1534 diff changeset	47	{
84d53678f31f (svn r2039) IS_RAIL_DEPOT -> IsRailDepot, IS_RAIL_WAYPOINT -> IsRailWaypoint tron parents: 1534 diff changeset	48	return
84d53678f31f (svn r2039) IS_RAIL_DEPOT -> IsRailDepot, IS_RAIL_WAYPOINT -> IsRailWaypoint tron parents: 1534 diff changeset	49	(m5 & RAIL_TYPE_MASK) == RAIL_TYPE_DEPOT &&
84d53678f31f (svn r2039) IS_RAIL_DEPOT -> IsRailDepot, IS_RAIL_WAYPOINT -> IsRailWaypoint tron parents: 1534 diff changeset	50	(m5 & RAIL_SUBTYPE_MASK) == RAIL_SUBTYPE_DEPOT;
84d53678f31f (svn r2039) IS_RAIL_DEPOT -> IsRailDepot, IS_RAIL_WAYPOINT -> IsRailWaypoint tron parents: 1534 diff changeset	51	}
84d53678f31f (svn r2039) IS_RAIL_DEPOT -> IsRailDepot, IS_RAIL_WAYPOINT -> IsRailWaypoint tron parents: 1534 diff changeset	52
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	53	/* Format of rail map5 byte.
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	54	* 00 abcdef => Normal rail
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	55	* 01 abcdef => Rail with signals
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	56	* 10 ?????? => Unused
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	57	* 11 ????dd => Depot
22 fe6f35cc987b (svn r23) -Some omments on the code (blathijs) darkvater parents: 13 diff changeset	58	*
fe6f35cc987b (svn r23) -Some omments on the code (blathijs) darkvater parents: 13 diff changeset	59	* 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	60	* value for each track is given.
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
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	63	/* 4
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	64	* ---------
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	65	* \|\ /\|
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	66	* \| \ 1/ \|
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	67	* \| \ / \|
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	68	* \| \ / \|
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	69	* 16\| \ \|32
201 c40d343115f8 (svn r202) -Codechange: I missed some files with trailing spaces.. this should be truelight parents: 159 diff changeset	70	* \| / \2 \|
0 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	* \| / \ \|
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	* 8
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
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	79	// 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	80	enum RailMap2Lower4 {
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	81	RAIL_MAP2LO_GROUND_MASK = 0xF,
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	82	RAIL_GROUND_BROWN = 0,
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	83	RAIL_GROUND_GREEN = 1,
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	84	RAIL_GROUND_FENCE_NW = 2,
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	85	RAIL_GROUND_FENCE_SE = 3,
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	86	RAIL_GROUND_FENCE_SENW = 4,
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	87	RAIL_GROUND_FENCE_NE = 5,
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	88	RAIL_GROUND_FENCE_SW = 6,
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	89	RAIL_GROUND_FENCE_NESW = 7,
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	90	RAIL_GROUND_FENCE_VERT1 = 8,
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	91	RAIL_GROUND_FENCE_VERT2 = 9,
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	92	RAIL_GROUND_FENCE_HORIZ1 = 10,
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	93	RAIL_GROUND_FENCE_HORIZ2 = 11,
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	94	RAIL_GROUND_ICE_DESERT = 12,
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	95	};
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	96
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	97
22 fe6f35cc987b (svn r23) -Some omments on the code (blathijs) darkvater parents: 13 diff changeset	98	/* 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	99	* MAP3LO byte: abcd???? => Signal Exists?
22 fe6f35cc987b (svn r23) -Some omments on the code (blathijs) darkvater parents: 13 diff changeset	100	* a and b are for diagonals, upper and left,
fe6f35cc987b (svn r23) -Some omments on the code (blathijs) darkvater parents: 13 diff changeset	101	* one for each direction. (ie a == NE->SW, b ==
fe6f35cc987b (svn r23) -Some omments on the code (blathijs) darkvater parents: 13 diff changeset	102	* 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	103	* similar for lower and right.
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	104	* MAP2 byte: ????abcd => Type of ground.
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	105	* MAP3LO byte: ????abcd => Type of rail.
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	106	* MAP5: 00abcdef => rail
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	107	* 01abcdef => rail w/ signals
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	108	* 10uuuuuu => unused
201 c40d343115f8 (svn r202) -Codechange: I missed some files with trailing spaces.. this should be truelight parents: 159 diff changeset	109	* 11uuuudd => rail depot
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	110	*/
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	111
1627 f365c96e74a4 (svn r2131) -Fix: Rewrite CmdBuildSingleRail(), this addresses several issues: tron parents: 1609 diff changeset	112	static bool CheckTrackCombination(uint map5, uint trackbits, uint flags)
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	113	{
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	114	_error_message = STR_1001_IMPOSSIBLE_TRACK_COMBINATION;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	115
1591 a3fd676751a3 (svn r2095) In CheckTrackCombination(): if () cascade -> switch, improve readability tron parents: 1590 diff changeset	116	switch (map5 & RAIL_TYPE_MASK) {
a3fd676751a3 (svn r2095) In CheckTrackCombination(): if () cascade -> switch, improve readability tron parents: 1590 diff changeset	117	case RAIL_TYPE_NORMAL:
a3fd676751a3 (svn r2095) In CheckTrackCombination(): if () cascade -> switch, improve readability tron parents: 1590 diff changeset	118	if (map5 & trackbits) {
a3fd676751a3 (svn r2095) In CheckTrackCombination(): if () cascade -> switch, improve readability tron parents: 1590 diff changeset	119	_error_message = STR_1007_ALREADY_BUILT;
a3fd676751a3 (svn r2095) In CheckTrackCombination(): if () cascade -> switch, improve readability tron parents: 1590 diff changeset	120	return false;
a3fd676751a3 (svn r2095) In CheckTrackCombination(): if () cascade -> switch, improve readability tron parents: 1590 diff changeset	121	}
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	122
1591 a3fd676751a3 (svn r2095) In CheckTrackCombination(): if () cascade -> switch, improve readability tron parents: 1590 diff changeset	123	if (flags & DC_NO_RAIL_OVERLAP) {
a3fd676751a3 (svn r2095) In CheckTrackCombination(): if () cascade -> switch, improve readability tron parents: 1590 diff changeset	124	// Computer players are not allowed to intersect pieces of rail.
a3fd676751a3 (svn r2095) In CheckTrackCombination(): if () cascade -> switch, improve readability tron parents: 1590 diff changeset	125	map5 \|= trackbits;
a3fd676751a3 (svn r2095) In CheckTrackCombination(): if () cascade -> switch, improve readability tron parents: 1590 diff changeset	126	return
a3fd676751a3 (svn r2095) In CheckTrackCombination(): if () cascade -> switch, improve readability tron parents: 1590 diff changeset	127	map5 == (RAIL_BIT_UPPER \| RAIL_BIT_LOWER) \|\|
a3fd676751a3 (svn r2095) In CheckTrackCombination(): if () cascade -> switch, improve readability tron parents: 1590 diff changeset	128	map5 == (RAIL_BIT_LEFT \| RAIL_BIT_RIGHT);
a3fd676751a3 (svn r2095) In CheckTrackCombination(): if () cascade -> switch, improve readability tron parents: 1590 diff changeset	129	} else {
a3fd676751a3 (svn r2095) In CheckTrackCombination(): if () cascade -> switch, improve readability tron parents: 1590 diff changeset	130	return true;
a3fd676751a3 (svn r2095) In CheckTrackCombination(): if () cascade -> switch, improve readability tron parents: 1590 diff changeset	131	}
201 c40d343115f8 (svn r202) -Codechange: I missed some files with trailing spaces.. this should be truelight parents: 159 diff changeset	132
1591 a3fd676751a3 (svn r2095) In CheckTrackCombination(): if () cascade -> switch, improve readability tron parents: 1590 diff changeset	133	case RAIL_TYPE_SIGNALS:
a3fd676751a3 (svn r2095) In CheckTrackCombination(): if () cascade -> switch, improve readability tron parents: 1590 diff changeset	134	if (map5 & trackbits) {
a3fd676751a3 (svn r2095) In CheckTrackCombination(): if () cascade -> switch, improve readability tron parents: 1590 diff changeset	135	_error_message = STR_1007_ALREADY_BUILT;
a3fd676751a3 (svn r2095) In CheckTrackCombination(): if () cascade -> switch, improve readability tron parents: 1590 diff changeset	136	return false;
a3fd676751a3 (svn r2095) In CheckTrackCombination(): if () cascade -> switch, improve readability tron parents: 1590 diff changeset	137	}
201 c40d343115f8 (svn r202) -Codechange: I missed some files with trailing spaces.. this should be truelight parents: 159 diff changeset	138
1591 a3fd676751a3 (svn r2095) In CheckTrackCombination(): if () cascade -> switch, improve readability tron parents: 1590 diff changeset	139	map5 \|= trackbits;
a3fd676751a3 (svn r2095) In CheckTrackCombination(): if () cascade -> switch, improve readability tron parents: 1590 diff changeset	140	return
a3fd676751a3 (svn r2095) In CheckTrackCombination(): if () cascade -> switch, improve readability tron parents: 1590 diff changeset	141	map5 == (RAIL_TYPE_SIGNALS \| RAIL_BIT_UPPER \| RAIL_BIT_LOWER) \|\|
a3fd676751a3 (svn r2095) In CheckTrackCombination(): if () cascade -> switch, improve readability tron parents: 1590 diff changeset	142	map5 == (RAIL_TYPE_SIGNALS \| RAIL_BIT_LEFT \| RAIL_BIT_RIGHT);
a3fd676751a3 (svn r2095) In CheckTrackCombination(): if () cascade -> switch, improve readability tron parents: 1590 diff changeset	143
a3fd676751a3 (svn r2095) In CheckTrackCombination(): if () cascade -> switch, improve readability tron parents: 1590 diff changeset	144	default:
a3fd676751a3 (svn r2095) In CheckTrackCombination(): if () cascade -> switch, improve readability tron parents: 1590 diff changeset	145	return false;
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	146	}
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	147	}
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
13 3e7c1f74a996 (svn r14) Fix: railroad crossings on slopes are now possible dominik parents: 0 diff changeset	150	static const byte _valid_tileh_slopes[4][15] = {
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	151
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	152	// set of normal ones
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	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	155	RAIL_BIT_RIGHT,
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	156	RAIL_BIT_UPPER,
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	157	RAIL_BIT_DIAG1,
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	158
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	159	RAIL_BIT_LEFT,
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	160	0,
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	161	RAIL_BIT_DIAG2,
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	162	RAIL_BIT_LOWER,
201 c40d343115f8 (svn r202) -Codechange: I missed some files with trailing spaces.. this should be truelight parents: 159 diff changeset	163
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	164	RAIL_BIT_LOWER,
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	165	RAIL_BIT_DIAG2,
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	166	0,
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	167	RAIL_BIT_LEFT,
201 c40d343115f8 (svn r202) -Codechange: I missed some files with trailing spaces.. this should be truelight parents: 159 diff changeset	168
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	169	RAIL_BIT_DIAG1,
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	170	RAIL_BIT_UPPER,
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	171	RAIL_BIT_RIGHT,
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	172	},
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	173
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	174	// allowed rail for an evenly raised platform
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	0,
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	177	RAIL_BIT_LEFT,
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	178	RAIL_BIT_LOWER,
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	179	RAIL_BIT_DIAG2 \| RAIL_BIT_LOWER \| RAIL_BIT_LEFT,
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	180
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	181	RAIL_BIT_RIGHT,
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	182	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	183	RAIL_BIT_DIAG1 \| RAIL_BIT_LOWER \| 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
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	186	RAIL_BIT_UPPER,
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	187	RAIL_BIT_DIAG1 \| RAIL_BIT_UPPER \| RAIL_BIT_LEFT,
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	188	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	189	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	190
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	191	RAIL_BIT_DIAG2 \| RAIL_BIT_UPPER \| RAIL_BIT_RIGHT,
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	192	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	193	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	194	},
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	195
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	196	// allowed rail on coast tile
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	0,
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	199	RAIL_BIT_LEFT,
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	200	RAIL_BIT_LOWER,
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	201	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	202
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	203	RAIL_BIT_RIGHT,
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	204	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	205	RAIL_BIT_DIAG1\|RAIL_BIT_RIGHT\|RAIL_BIT_LOWER,
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
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	208	RAIL_BIT_UPPER,
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	209	RAIL_BIT_DIAG1\|RAIL_BIT_LEFT\|RAIL_BIT_UPPER,
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	210	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	211	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	212
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	213	RAIL_BIT_DIAG2\|RAIL_BIT_RIGHT\|RAIL_BIT_UPPER,
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	214	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	215	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	216	},
3e7c1f74a996 (svn r14) Fix: railroad crossings on slopes are now possible dominik parents: 0 diff changeset	217
3e7c1f74a996 (svn r14) Fix: railroad crossings on slopes are now possible dominik parents: 0 diff changeset	218	// valid railway crossings on slopes
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	1, 0, 0, // 0, 1, 2
3e7c1f74a996 (svn r14) Fix: railroad crossings on slopes are now possible dominik parents: 0 diff changeset	221	0, 0, 1, // 3, 4, 5
3e7c1f74a996 (svn r14) Fix: railroad crossings on slopes are now possible dominik parents: 0 diff changeset	222	0, 1, 0, // 6, 7, 8
3e7c1f74a996 (svn r14) Fix: railroad crossings on slopes are now possible dominik parents: 0 diff changeset	223	0, 1, 1, // 9, 10, 11
3e7c1f74a996 (svn r14) Fix: railroad crossings on slopes are now possible dominik parents: 0 diff changeset	224	0, 1, 1, // 12, 13, 14
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	225	}
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	226	};
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	227
84 1e0721c29bad (svn r85) -Add: initial commit of new AI (enable in Patch menu) truelight parents: 59 diff changeset	228	uint GetRailFoundation(uint tileh, uint bits)
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	229	{
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	230	int i;
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	if ((~_valid_tileh_slopes[0][tileh] & bits) == 0)
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	233	return 0;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	234
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	235	if ((~_valid_tileh_slopes[1][tileh] & bits) == 0)
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	236	return tileh;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	237
201 c40d343115f8 (svn r202) -Codechange: I missed some files with trailing spaces.. this should be truelight parents: 159 diff changeset	238	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	239	return i + 15;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	240
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	241	return 0;
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
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	244	//
1627 f365c96e74a4 (svn r2131) -Fix: Rewrite CmdBuildSingleRail(), this addresses several issues: tron parents: 1609 diff changeset	245	static uint32 CheckRailSlope(uint tileh, uint rail_bits, uint existing, TileIndex tile)
0 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	// never allow building on top of steep tiles
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	248	if (!(tileh & 0x10)) {
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	249	rail_bits \|= existing;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	250
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	251	// don't allow building on the lower side of a coast
1627 f365c96e74a4 (svn r2131) -Fix: Rewrite CmdBuildSingleRail(), this addresses several issues: tron parents: 1609 diff changeset	252	if (IsTileType(tile, MP_WATER) &&
f365c96e74a4 (svn r2131) -Fix: Rewrite CmdBuildSingleRail(), this addresses several issues: tron parents: 1609 diff changeset	253	~_valid_tileh_slopes[2][tileh] & rail_bits) {
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	254	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	255	}
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	// no special foundation
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	258	if ((~_valid_tileh_slopes[0][tileh] & rail_bits) == 0)
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	259	return 0;
201 c40d343115f8 (svn r202) -Codechange: I missed some files with trailing spaces.. this should be truelight parents: 159 diff changeset	260
1627 f365c96e74a4 (svn r2131) -Fix: Rewrite CmdBuildSingleRail(), this addresses several issues: tron parents: 1609 diff changeset	261	if ((~_valid_tileh_slopes[1][tileh] & rail_bits) == 0 \|\| ( // whole tile is leveled up
f365c96e74a4 (svn r2131) -Fix: Rewrite CmdBuildSingleRail(), this addresses several issues: tron parents: 1609 diff changeset	262	(rail_bits == RAIL_BIT_DIAG1 \|\| rail_bits == RAIL_BIT_DIAG2) &&
f365c96e74a4 (svn r2131) -Fix: Rewrite CmdBuildSingleRail(), this addresses several issues: tron parents: 1609 diff changeset	263	(tileh == 1 \|\| tileh == 2 \|\| tileh == 4 \|\| tileh == 8)
f365c96e74a4 (svn r2131) -Fix: Rewrite CmdBuildSingleRail(), this addresses several issues: tron parents: 1609 diff changeset	264	)) { // partly up
f365c96e74a4 (svn r2131) -Fix: Rewrite CmdBuildSingleRail(), this addresses several issues: tron parents: 1609 diff changeset	265	if (existing != 0) {
f365c96e74a4 (svn r2131) -Fix: Rewrite CmdBuildSingleRail(), this addresses several issues: tron parents: 1609 diff changeset	266	return 0;
f365c96e74a4 (svn r2131) -Fix: Rewrite CmdBuildSingleRail(), this addresses several issues: tron parents: 1609 diff changeset	267	} else if (!_patches.build_on_slopes \|\|
f365c96e74a4 (svn r2131) -Fix: Rewrite CmdBuildSingleRail(), this addresses several issues: tron parents: 1609 diff changeset	268	(_is_ai_player && !_patches.ainew_active)) {
f365c96e74a4 (svn r2131) -Fix: Rewrite CmdBuildSingleRail(), this addresses several issues: tron parents: 1609 diff changeset	269	return_cmd_error(STR_1000_LAND_SLOPED_IN_WRONG_DIRECTION);
f365c96e74a4 (svn r2131) -Fix: Rewrite CmdBuildSingleRail(), this addresses several issues: tron parents: 1609 diff changeset	270	} else {
f365c96e74a4 (svn r2131) -Fix: Rewrite CmdBuildSingleRail(), this addresses several issues: tron parents: 1609 diff changeset	271	return _price.terraform;
f365c96e74a4 (svn r2131) -Fix: Rewrite CmdBuildSingleRail(), this addresses several issues: tron parents: 1609 diff changeset	272	}
0 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	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	276	}
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	277
1775 548dc04d50e2 (svn r2279) - Fix: Check the parameters of the first 10 Commands. While there also add proper comments for the functions and fix up CmdFailed() Darkvater parents: 1719 diff changeset	278	/* Validate functions for rail building */
1781 5e2fef482637 (svn r2285) - Codechange: Fix up some of the missing things from server-checking; namely bridge-type, bridge-length, dragged end-tile (bridge/station), station_spread Darkvater parents: 1775 diff changeset	279	static inline bool ValParamTrackOrientation(uint32 rail) {return rail <= 5;}
1775 548dc04d50e2 (svn r2279) - Fix: Check the parameters of the first 10 Commands. While there also add proper comments for the functions and fix up CmdFailed() Darkvater parents: 1719 diff changeset	280
548dc04d50e2 (svn r2279) - Fix: Check the parameters of the first 10 Commands. While there also add proper comments for the functions and fix up CmdFailed() Darkvater parents: 1719 diff changeset	281	/** Build a single piece of rail
548dc04d50e2 (svn r2279) - Fix: Check the parameters of the first 10 Commands. While there also add proper comments for the functions and fix up CmdFailed() Darkvater parents: 1719 diff changeset	282	* @param x,y coordinates on where to build
548dc04d50e2 (svn r2279) - Fix: Check the parameters of the first 10 Commands. While there also add proper comments for the functions and fix up CmdFailed() Darkvater parents: 1719 diff changeset	283	* @param p1 railtype of being built piece (normal, mono, maglev)
548dc04d50e2 (svn r2279) - Fix: Check the parameters of the first 10 Commands. While there also add proper comments for the functions and fix up CmdFailed() Darkvater parents: 1719 diff changeset	284	* @param p2 rail combination to build
548dc04d50e2 (svn r2279) - Fix: Check the parameters of the first 10 Commands. While there also add proper comments for the functions and fix up CmdFailed() Darkvater parents: 1719 diff changeset	285	*/
548dc04d50e2 (svn r2279) - Fix: Check the parameters of the first 10 Commands. While there also add proper comments for the functions and fix up CmdFailed() Darkvater parents: 1719 diff changeset	286	int32 CmdBuildSingleRail(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	287	{
1627 f365c96e74a4 (svn r2131) -Fix: Rewrite CmdBuildSingleRail(), this addresses several issues: tron parents: 1609 diff changeset	288	TileIndex tile;
f365c96e74a4 (svn r2131) -Fix: Rewrite CmdBuildSingleRail(), this addresses several issues: tron parents: 1609 diff changeset	289	uint tileh;
f365c96e74a4 (svn r2131) -Fix: Rewrite CmdBuildSingleRail(), this addresses several issues: tron parents: 1609 diff changeset	290	uint m5;
f365c96e74a4 (svn r2131) -Fix: Rewrite CmdBuildSingleRail(), this addresses several issues: tron parents: 1609 diff changeset	291	uint rail_bit;
f365c96e74a4 (svn r2131) -Fix: Rewrite CmdBuildSingleRail(), this addresses several issues: tron parents: 1609 diff changeset	292	int32 cost = 0;
f365c96e74a4 (svn r2131) -Fix: Rewrite CmdBuildSingleRail(), this addresses several issues: tron parents: 1609 diff changeset	293	int32 ret;
f365c96e74a4 (svn r2131) -Fix: Rewrite CmdBuildSingleRail(), this addresses several issues: tron parents: 1609 diff changeset	294
1781 5e2fef482637 (svn r2285) - Codechange: Fix up some of the missing things from server-checking; namely bridge-type, bridge-length, dragged end-tile (bridge/station), station_spread Darkvater parents: 1775 diff changeset	295	if (!ValParamRailtype(p1) \|\| !ValParamTrackOrientation(p2)) return CMD_ERROR;
1627 f365c96e74a4 (svn r2131) -Fix: Rewrite CmdBuildSingleRail(), this addresses several issues: tron parents: 1609 diff changeset	296
f365c96e74a4 (svn r2131) -Fix: Rewrite CmdBuildSingleRail(), this addresses several issues: tron parents: 1609 diff changeset	297	tile = TILE_FROM_XY(x, y);
f365c96e74a4 (svn r2131) -Fix: Rewrite CmdBuildSingleRail(), this addresses several issues: tron parents: 1609 diff changeset	298	tileh = GetTileSlope(tile, NULL);
f365c96e74a4 (svn r2131) -Fix: Rewrite CmdBuildSingleRail(), this addresses several issues: tron parents: 1609 diff changeset	299	m5 = _map5[tile];
1775 548dc04d50e2 (svn r2279) - Fix: Check the parameters of the first 10 Commands. While there also add proper comments for the functions and fix up CmdFailed() Darkvater parents: 1719 diff changeset	300	rail_bit = 1 << p2;
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	301
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	302	SET_EXPENSES_TYPE(EXPENSES_CONSTRUCTION);
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	303
1627 f365c96e74a4 (svn r2131) -Fix: Rewrite CmdBuildSingleRail(), this addresses several issues: tron parents: 1609 diff changeset	304	switch (GetTileType(tile)) {
f365c96e74a4 (svn r2131) -Fix: Rewrite CmdBuildSingleRail(), this addresses several issues: tron parents: 1609 diff changeset	305	case MP_TUNNELBRIDGE:
f365c96e74a4 (svn r2131) -Fix: Rewrite CmdBuildSingleRail(), this addresses several issues: tron parents: 1609 diff changeset	306	if ((m5 & 0xC0) != 0xC0 \|\| // not bridge middle part?
1630 c41253d72a84 (svn r2134) Return the correct error message if rail is already under a bridge, fix for r2131 tron parents: 1628 diff changeset	307	(m5 & 0x01 ? 1 : 2) != rail_bit) { // wrong direction?
1627 f365c96e74a4 (svn r2131) -Fix: Rewrite CmdBuildSingleRail(), this addresses several issues: tron parents: 1609 diff changeset	308	// Get detailed error message
f365c96e74a4 (svn r2131) -Fix: Rewrite CmdBuildSingleRail(), this addresses several issues: tron parents: 1609 diff changeset	309	return DoCommandByTile(tile, 0, 0, flags, CMD_LANDSCAPE_CLEAR);
f365c96e74a4 (svn r2131) -Fix: Rewrite CmdBuildSingleRail(), this addresses several issues: tron parents: 1609 diff changeset	310	}
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	311
1630 c41253d72a84 (svn r2134) Return the correct error message if rail is already under a bridge, fix for r2131 tron parents: 1628 diff changeset	312	switch (m5 & 0x38) { // what's under the bridge?
c41253d72a84 (svn r2134) Return the correct error message if rail is already under a bridge, fix for r2131 tron parents: 1628 diff changeset	313	case 0x00: // clear land
c41253d72a84 (svn r2134) Return the correct error message if rail is already under a bridge, fix for r2131 tron parents: 1628 diff changeset	314	ret = CheckRailSlope(tileh, rail_bit, 0, tile);
1691 852ca27d6eef (svn r2195) Add CmdFailed() as the One True Way(tm) to check if a command failed. tron parents: 1669 diff changeset	315	if (CmdFailed(ret)) return ret;
1630 c41253d72a84 (svn r2134) Return the correct error message if rail is already under a bridge, fix for r2131 tron parents: 1628 diff changeset	316	cost += ret;
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	317
1630 c41253d72a84 (svn r2134) Return the correct error message if rail is already under a bridge, fix for r2131 tron parents: 1628 diff changeset	318	if (flags & DC_EXEC) {
c41253d72a84 (svn r2134) Return the correct error message if rail is already under a bridge, fix for r2131 tron parents: 1628 diff changeset	319	_map_owner[tile] = _current_player;
c41253d72a84 (svn r2134) Return the correct error message if rail is already under a bridge, fix for r2131 tron parents: 1628 diff changeset	320	_map3_lo[tile] &= ~0x0F;
1775 548dc04d50e2 (svn r2279) - Fix: Check the parameters of the first 10 Commands. While there also add proper comments for the functions and fix up CmdFailed() Darkvater parents: 1719 diff changeset	321	_map3_lo[tile] \|= p1;
1630 c41253d72a84 (svn r2134) Return the correct error message if rail is already under a bridge, fix for r2131 tron parents: 1628 diff changeset	322	_map5[tile] = (m5 & 0xC7) \| 0x20; // railroad under bridge
c41253d72a84 (svn r2134) Return the correct error message if rail is already under a bridge, fix for r2131 tron parents: 1628 diff changeset	323	}
c41253d72a84 (svn r2134) Return the correct error message if rail is already under a bridge, fix for r2131 tron parents: 1628 diff changeset	324	break;
c41253d72a84 (svn r2134) Return the correct error message if rail is already under a bridge, fix for r2131 tron parents: 1628 diff changeset	325
c41253d72a84 (svn r2134) Return the correct error message if rail is already under a bridge, fix for r2131 tron parents: 1628 diff changeset	326	case 0x20: // rail already there
c41253d72a84 (svn r2134) Return the correct error message if rail is already under a bridge, fix for r2131 tron parents: 1628 diff changeset	327	return_cmd_error(STR_1007_ALREADY_BUILT);
c41253d72a84 (svn r2134) Return the correct error message if rail is already under a bridge, fix for r2131 tron parents: 1628 diff changeset	328
c41253d72a84 (svn r2134) Return the correct error message if rail is already under a bridge, fix for r2131 tron parents: 1628 diff changeset	329	default:
c41253d72a84 (svn r2134) Return the correct error message if rail is already under a bridge, fix for r2131 tron parents: 1628 diff changeset	330	// Get detailed error message
c41253d72a84 (svn r2134) Return the correct error message if rail is already under a bridge, fix for r2131 tron parents: 1628 diff changeset	331	return DoCommandByTile(tile, 0, 0, flags, CMD_LANDSCAPE_CLEAR);
1627 f365c96e74a4 (svn r2131) -Fix: Rewrite CmdBuildSingleRail(), this addresses several issues: tron parents: 1609 diff changeset	332	}
f365c96e74a4 (svn r2131) -Fix: Rewrite CmdBuildSingleRail(), this addresses several issues: tron parents: 1609 diff changeset	333	break;
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	334
1627 f365c96e74a4 (svn r2131) -Fix: Rewrite CmdBuildSingleRail(), this addresses several issues: tron parents: 1609 diff changeset	335	case MP_RAILWAY:
f365c96e74a4 (svn r2131) -Fix: Rewrite CmdBuildSingleRail(), this addresses several issues: tron parents: 1609 diff changeset	336	if (!CheckTrackCombination(m5, rail_bit, flags) \|\|
f365c96e74a4 (svn r2131) -Fix: Rewrite CmdBuildSingleRail(), this addresses several issues: tron parents: 1609 diff changeset	337	!EnsureNoVehicle(tile)) {
f365c96e74a4 (svn r2131) -Fix: Rewrite CmdBuildSingleRail(), this addresses several issues: tron parents: 1609 diff changeset	338	return CMD_ERROR;
f365c96e74a4 (svn r2131) -Fix: Rewrite CmdBuildSingleRail(), this addresses several issues: tron parents: 1609 diff changeset	339	}
f365c96e74a4 (svn r2131) -Fix: Rewrite CmdBuildSingleRail(), this addresses several issues: tron parents: 1609 diff changeset	340	if (m5 & RAIL_TYPE_SPECIAL \|\|
f365c96e74a4 (svn r2131) -Fix: Rewrite CmdBuildSingleRail(), this addresses several issues: tron parents: 1609 diff changeset	341	_map_owner[tile] != _current_player \|\|
1775 548dc04d50e2 (svn r2279) - Fix: Check the parameters of the first 10 Commands. While there also add proper comments for the functions and fix up CmdFailed() Darkvater parents: 1719 diff changeset	342	(_map3_lo[tile] & 0xFU) != p1) {
1627 f365c96e74a4 (svn r2131) -Fix: Rewrite CmdBuildSingleRail(), this addresses several issues: tron parents: 1609 diff changeset	343	// Get detailed error message
f365c96e74a4 (svn r2131) -Fix: Rewrite CmdBuildSingleRail(), this addresses several issues: tron parents: 1609 diff changeset	344	return DoCommandByTile(tile, 0, 0, flags, CMD_LANDSCAPE_CLEAR);
f365c96e74a4 (svn r2131) -Fix: Rewrite CmdBuildSingleRail(), this addresses several issues: tron parents: 1609 diff changeset	345	}
f365c96e74a4 (svn r2131) -Fix: Rewrite CmdBuildSingleRail(), this addresses several issues: tron parents: 1609 diff changeset	346
f365c96e74a4 (svn r2131) -Fix: Rewrite CmdBuildSingleRail(), this addresses several issues: tron parents: 1609 diff changeset	347	ret = CheckRailSlope(tileh, rail_bit, m5 & RAIL_BIT_MASK, tile);
1691 852ca27d6eef (svn r2195) Add CmdFailed() as the One True Way(tm) to check if a command failed. tron parents: 1669 diff changeset	348	if (CmdFailed(ret)) return ret;
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	349	cost += ret;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	350
1719 ddb7e8c7d1a4 (svn r2223) When adding tracks to a railway tile reset the ground to bare land, fix for a glitch in r2131 tron parents: 1691 diff changeset	351	if (flags & DC_EXEC) {
ddb7e8c7d1a4 (svn r2223) When adding tracks to a railway tile reset the ground to bare land, fix for a glitch in r2131 tron parents: 1691 diff changeset	352	_map2[tile] &= ~RAIL_MAP2LO_GROUND_MASK; // Bare land
ddb7e8c7d1a4 (svn r2223) When adding tracks to a railway tile reset the ground to bare land, fix for a glitch in r2131 tron parents: 1691 diff changeset	353	_map5[tile] = m5 \| rail_bit;
ddb7e8c7d1a4 (svn r2223) When adding tracks to a railway tile reset the ground to bare land, fix for a glitch in r2131 tron parents: 1691 diff changeset	354	}
1627 f365c96e74a4 (svn r2131) -Fix: Rewrite CmdBuildSingleRail(), this addresses several issues: tron parents: 1609 diff changeset	355	break;
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	356
1627 f365c96e74a4 (svn r2131) -Fix: Rewrite CmdBuildSingleRail(), this addresses several issues: tron parents: 1609 diff changeset	357	case MP_STREET:
f365c96e74a4 (svn r2131) -Fix: Rewrite CmdBuildSingleRail(), this addresses several issues: tron parents: 1609 diff changeset	358	if (!_valid_tileh_slopes[3][tileh]) // prevent certain slopes
f365c96e74a4 (svn r2131) -Fix: Rewrite CmdBuildSingleRail(), this addresses several issues: tron parents: 1609 diff changeset	359	return_cmd_error(STR_1000_LAND_SLOPED_IN_WRONG_DIRECTION);
f365c96e74a4 (svn r2131) -Fix: Rewrite CmdBuildSingleRail(), this addresses several issues: tron parents: 1609 diff changeset	360	if (!EnsureNoVehicle(tile)) return CMD_ERROR;
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	361
1627 f365c96e74a4 (svn r2131) -Fix: Rewrite CmdBuildSingleRail(), this addresses several issues: tron parents: 1609 diff changeset	362	if ((m5 & 0xF0) == 0 && ( // normal road?
f365c96e74a4 (svn r2131) -Fix: Rewrite CmdBuildSingleRail(), this addresses several issues: tron parents: 1609 diff changeset	363	(rail_bit == 1 && m5 == 0x05) \|\|
f365c96e74a4 (svn r2131) -Fix: Rewrite CmdBuildSingleRail(), this addresses several issues: tron parents: 1609 diff changeset	364	(rail_bit == 2 && m5 == 0x0A) // correct direction?
f365c96e74a4 (svn r2131) -Fix: Rewrite CmdBuildSingleRail(), this addresses several issues: tron parents: 1609 diff changeset	365	)) {
f365c96e74a4 (svn r2131) -Fix: Rewrite CmdBuildSingleRail(), this addresses several issues: tron parents: 1609 diff changeset	366	if (flags & DC_EXEC) {
f365c96e74a4 (svn r2131) -Fix: Rewrite CmdBuildSingleRail(), this addresses several issues: tron parents: 1609 diff changeset	367	_map3_lo[tile] = _map_owner[tile];
f365c96e74a4 (svn r2131) -Fix: Rewrite CmdBuildSingleRail(), this addresses several issues: tron parents: 1609 diff changeset	368	_map_owner[tile] = _current_player;
1775 548dc04d50e2 (svn r2279) - Fix: Check the parameters of the first 10 Commands. While there also add proper comments for the functions and fix up CmdFailed() Darkvater parents: 1719 diff changeset	369	_map3_hi[tile] = p1;
1627 f365c96e74a4 (svn r2131) -Fix: Rewrite CmdBuildSingleRail(), this addresses several issues: tron parents: 1609 diff changeset	370	_map5[tile] = 0x10 \| (rail_bit == 1 ? 0x08 : 0x00); // level crossing
f365c96e74a4 (svn r2131) -Fix: Rewrite CmdBuildSingleRail(), this addresses several issues: tron parents: 1609 diff changeset	371	}
f365c96e74a4 (svn r2131) -Fix: Rewrite CmdBuildSingleRail(), this addresses several issues: tron parents: 1609 diff changeset	372	break;
f365c96e74a4 (svn r2131) -Fix: Rewrite CmdBuildSingleRail(), this addresses several issues: tron parents: 1609 diff changeset	373	}
f365c96e74a4 (svn r2131) -Fix: Rewrite CmdBuildSingleRail(), this addresses several issues: tron parents: 1609 diff changeset	374
f365c96e74a4 (svn r2131) -Fix: Rewrite CmdBuildSingleRail(), this addresses several issues: tron parents: 1609 diff changeset	375	if ((m5 & 0xF0) == 0x10 && (m5 & 0x08 ? 1 : 2) == rail_bit)
f365c96e74a4 (svn r2131) -Fix: Rewrite CmdBuildSingleRail(), this addresses several issues: tron parents: 1609 diff changeset	376	return_cmd_error(STR_1007_ALREADY_BUILT);
f365c96e74a4 (svn r2131) -Fix: Rewrite CmdBuildSingleRail(), this addresses several issues: tron parents: 1609 diff changeset	377	/* FALLTHROUGH */
f365c96e74a4 (svn r2131) -Fix: Rewrite CmdBuildSingleRail(), this addresses several issues: tron parents: 1609 diff changeset	378
f365c96e74a4 (svn r2131) -Fix: Rewrite CmdBuildSingleRail(), this addresses several issues: tron parents: 1609 diff changeset	379	default:
f365c96e74a4 (svn r2131) -Fix: Rewrite CmdBuildSingleRail(), this addresses several issues: tron parents: 1609 diff changeset	380	ret = CheckRailSlope(tileh, rail_bit, 0, tile);
1691 852ca27d6eef (svn r2195) Add CmdFailed() as the One True Way(tm) to check if a command failed. tron parents: 1669 diff changeset	381	if (CmdFailed(ret)) return ret;
1627 f365c96e74a4 (svn r2131) -Fix: Rewrite CmdBuildSingleRail(), this addresses several issues: tron parents: 1609 diff changeset	382	cost += ret;
f365c96e74a4 (svn r2131) -Fix: Rewrite CmdBuildSingleRail(), this addresses several issues: tron parents: 1609 diff changeset	383
f365c96e74a4 (svn r2131) -Fix: Rewrite CmdBuildSingleRail(), this addresses several issues: tron parents: 1609 diff changeset	384	ret = DoCommandByTile(tile, 0, 0, flags, CMD_LANDSCAPE_CLEAR);
1691 852ca27d6eef (svn r2195) Add CmdFailed() as the One True Way(tm) to check if a command failed. tron parents: 1669 diff changeset	385	if (CmdFailed(ret)) return ret;
1627 f365c96e74a4 (svn r2131) -Fix: Rewrite CmdBuildSingleRail(), this addresses several issues: tron parents: 1609 diff changeset	386	cost += ret;
f365c96e74a4 (svn r2131) -Fix: Rewrite CmdBuildSingleRail(), this addresses several issues: tron parents: 1609 diff changeset	387
f365c96e74a4 (svn r2131) -Fix: Rewrite CmdBuildSingleRail(), this addresses several issues: tron parents: 1609 diff changeset	388	if (flags & DC_EXEC) {
f365c96e74a4 (svn r2131) -Fix: Rewrite CmdBuildSingleRail(), this addresses several issues: tron parents: 1609 diff changeset	389	SetTileType(tile, MP_RAILWAY);
f365c96e74a4 (svn r2131) -Fix: Rewrite CmdBuildSingleRail(), this addresses several issues: tron parents: 1609 diff changeset	390	_map_owner[tile] = _current_player;
f365c96e74a4 (svn r2131) -Fix: Rewrite CmdBuildSingleRail(), this addresses several issues: tron parents: 1609 diff changeset	391	_map2[tile] = 0; // Bare land
1775 548dc04d50e2 (svn r2279) - Fix: Check the parameters of the first 10 Commands. While there also add proper comments for the functions and fix up CmdFailed() Darkvater parents: 1719 diff changeset	392	_map3_lo[tile] = p1; // No signals, rail type
1627 f365c96e74a4 (svn r2131) -Fix: Rewrite CmdBuildSingleRail(), this addresses several issues: tron parents: 1609 diff changeset	393	_map5[tile] = rail_bit;
f365c96e74a4 (svn r2131) -Fix: Rewrite CmdBuildSingleRail(), this addresses several issues: tron parents: 1609 diff changeset	394	}
f365c96e74a4 (svn r2131) -Fix: Rewrite CmdBuildSingleRail(), this addresses several issues: tron parents: 1609 diff changeset	395	break;
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	396	}
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	397
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	398	if (flags & DC_EXEC) {
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	399	MarkTileDirtyByTile(tile);
1775 548dc04d50e2 (svn r2279) - Fix: Check the parameters of the first 10 Commands. While there also add proper comments for the functions and fix up CmdFailed() Darkvater parents: 1719 diff changeset	400	SetSignalsOnBothDir(tile, p2);
0 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
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	403	return cost + _price.build_rail;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	404	}
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	405
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	406	static const byte _signals_table[] = {
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	407	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	408	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	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_other[] = {
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	412	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	413	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	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_both[] = {
201 c40d343115f8 (svn r202) -Codechange: I missed some files with trailing spaces.. this should be truelight parents: 159 diff changeset	417	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	418	0xC0, 0xC0, 0xC0, 0x30, 0xC0, 0x30, 0, 0
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
1775 548dc04d50e2 (svn r2279) - Fix: Check the parameters of the first 10 Commands. While there also add proper comments for the functions and fix up CmdFailed() Darkvater parents: 1719 diff changeset	422	/** Remove a single piece of track
548dc04d50e2 (svn r2279) - Fix: Check the parameters of the first 10 Commands. While there also add proper comments for the functions and fix up CmdFailed() Darkvater parents: 1719 diff changeset	423	* @param x,y coordinates for removal of track
548dc04d50e2 (svn r2279) - Fix: Check the parameters of the first 10 Commands. While there also add proper comments for the functions and fix up CmdFailed() Darkvater parents: 1719 diff changeset	424	* @param p1 unused
548dc04d50e2 (svn r2279) - Fix: Check the parameters of the first 10 Commands. While there also add proper comments for the functions and fix up CmdFailed() Darkvater parents: 1719 diff changeset	425	* @param p2 rail orientation
0 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	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	428	{
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	429	TileInfo ti;
1775 548dc04d50e2 (svn r2279) - Fix: Check the parameters of the first 10 Commands. While there also add proper comments for the functions and fix up CmdFailed() Darkvater parents: 1719 diff changeset	430	TileIndex tile;
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	431	byte rail_bit = 1 << p2;
1775 548dc04d50e2 (svn r2279) - Fix: Check the parameters of the first 10 Commands. While there also add proper comments for the functions and fix up CmdFailed() Darkvater parents: 1719 diff changeset	432
548dc04d50e2 (svn r2279) - Fix: Check the parameters of the first 10 Commands. While there also add proper comments for the functions and fix up CmdFailed() Darkvater parents: 1719 diff changeset	433	if (!ValParamTrackOrientation(p2)) return CMD_ERROR;
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	434
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	435	SET_EXPENSES_TYPE(EXPENSES_CONSTRUCTION);
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	436
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	437	FindLandscapeHeight(&ti, x, y);
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	tile = ti.tile;
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	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	442	return CMD_ERROR;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	443
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	444	if (_current_player != OWNER_WATER && !CheckTileOwnership(tile))
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	445	return CMD_ERROR;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	446
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	447	// 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	448	if (ti.type != MP_TUNNELBRIDGE && !EnsureNoVehicle(tile))
0 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	if (ti.type == MP_TUNNELBRIDGE) {
1041 94db182c3614 (svn r1542) Rename TileHeight to TilePixelHeight, because this is what it actually returns tron parents: 1035 diff changeset	452	if (!EnsureNoVehicleZ(tile, TilePixelHeight(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.map5 & 0xF8) != 0xE0)
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	456	return CMD_ERROR;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	457
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	458	if ( ((ti.map5 & 1) ? 1 : 2) != rail_bit )
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	459	return CMD_ERROR;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	460
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	461	if (!(flags & DC_EXEC))
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	462	return _price.remove_rail;
201 c40d343115f8 (svn r202) -Codechange: I missed some files with trailing spaces.. this should be truelight parents: 159 diff changeset	463
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	464	_map_owner[tile] = OWNER_NONE;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	465	_map5[tile] = ti.map5 & 0xC7;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	466	} else if (ti.type == MP_STREET) {
1775 548dc04d50e2 (svn r2279) - Fix: Check the parameters of the first 10 Commands. While there also add proper comments for the functions and fix up CmdFailed() Darkvater parents: 1719 diff changeset	467	byte m5;
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	468	if (!(ti.map5 & 0xF0))
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	469	return CMD_ERROR;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	470
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	471	if (ti.map5 & 0xE0)
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 & 8) {
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	475	m5 = 5;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	476	if (rail_bit != 1)
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	477	return CMD_ERROR;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	478	} else {
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	479	m5 = 10;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	480	if (rail_bit != 2)
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	481	return CMD_ERROR;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	482	}
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	483
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	484	if (!(flags & DC_EXEC))
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	485	return _price.remove_rail;
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	_map5[tile] = m5;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	488	_map_owner[tile] = _map3_lo[tile];
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	489	_map2[tile] = 0;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	490	} else {
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	491	assert(ti.type == MP_RAILWAY);
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	492
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	493	if (ti.map5 & RAIL_TYPE_SPECIAL)
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	494	return CMD_ERROR;
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_bit))
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	// 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	500	if (ti.map5 & RAIL_TYPE_SIGNALS) {
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	501	if (_map3_lo[tile] & _signals_table_both[p2])
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	502	return CMD_ERROR;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	503	}
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	504
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	505	if (!(flags & DC_EXEC))
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	506	return _price.remove_rail;
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 ( (_map5[tile] ^= rail_bit) == 0) {
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	509	DoClearSquare(tile);
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	510	goto skip_mark_dirty;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	511	}
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	512	}
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	513
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	514	/* mark_dirty */
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	515	MarkTileDirtyByTile(tile);
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	skip_mark_dirty:;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	518
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	519	SetSignalsOnBothDir(tile, (byte)p2);
201 c40d343115f8 (svn r202) -Codechange: I missed some files with trailing spaces.. this should be truelight parents: 159 diff changeset	520
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	521	return _price.remove_rail;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	522	}
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	523
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	524	static const struct {
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	525	int8 xinc[16];
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	526	int8 yinc[16];
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	527	} _railbit = {{
1227 1d940a5e02d2 (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	528	// 0 1 2 3 4 5
1d940a5e02d2 (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	529	-16, 0,-16, 0, 16, 0, 0, 0,
1d940a5e02d2 (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	530	16, 0, 0, 16, 0,-16, 0, 0,
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	531	},{
1227 1d940a5e02d2 (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	0, 16, 0, 16, 0, 16, 0, 0,
1d940a5e02d2 (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	0,-16,-16, 0,-16, 0, 0, 0,
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	534	}};
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	535
1775 548dc04d50e2 (svn r2279) - Fix: Check the parameters of the first 10 Commands. While there also add proper comments for the functions and fix up CmdFailed() Darkvater parents: 1719 diff changeset	536	static int32 ValidateAutoDrag(byte *railbit, int x, int y, int ex, int ey)
1227 1d940a5e02d2 (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	537	{
1d940a5e02d2 (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	538	int dx, dy, trdx, trdy;
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	539
1775 548dc04d50e2 (svn r2279) - Fix: Check the parameters of the first 10 Commands. While there also add proper comments for the functions and fix up CmdFailed() Darkvater parents: 1719 diff changeset	540	if (!ValParamTrackOrientation(*railbit)) return CMD_ERROR;
1227 1d940a5e02d2 (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
1d940a5e02d2 (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	542	// calculate delta x,y from start to end tile
1d940a5e02d2 (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	dx = ex - x;
1d940a5e02d2 (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	dy = ey - y;
1d940a5e02d2 (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
1d940a5e02d2 (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	// calculate delta x,y for the first direction
1d940a5e02d2 (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	trdx = _railbit.xinc[*railbit];
1d940a5e02d2 (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	trdy = _railbit.yinc[*railbit];
1d940a5e02d2 (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
1d940a5e02d2 (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	if (*railbit & 0x6) {
1d940a5e02d2 (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	trdx += _railbit.xinc[*railbit ^ 1];
1d940a5e02d2 (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	trdy += _railbit.yinc[*railbit ^ 1];
1d940a5e02d2 (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	}
1d940a5e02d2 (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
1d940a5e02d2 (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	// validate the direction
1d940a5e02d2 (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	while (((trdx <= 0) && (dx > 0)) \|\| ((trdx >= 0) && (dx < 0)) \|\|
1d940a5e02d2 (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	((trdy <= 0) && (dy > 0)) \|\| ((trdy >= 0) && (dy < 0))) {
1d940a5e02d2 (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	if (*railbit < 8) { // first direction is invalid, try the other
1d940a5e02d2 (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	SETBIT(*railbit, 3);
1d940a5e02d2 (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	trdx = -trdx;
1d940a5e02d2 (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	trdy = -trdy;
1d940a5e02d2 (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	} else // other direction is invalid too, invalid drag
1d940a5e02d2 (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	return CMD_ERROR;
1d940a5e02d2 (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	}
1d940a5e02d2 (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
1d940a5e02d2 (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	// (for diagonal tracks, this is already made sure of by above test), but:
1d940a5e02d2 (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	// for non-diagonal tracks, check if the start and end tile are on 1 line
1d940a5e02d2 (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	if (*railbit & 0x6) {
1d940a5e02d2 (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	trdx = _railbit.xinc[*railbit];
1d940a5e02d2 (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	trdy = _railbit.yinc[*railbit];
1d940a5e02d2 (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 ((abs(dx) != abs(dy)) && (abs(dx) + abs(trdy) != abs(dy) + abs(trdx)))
1d940a5e02d2 (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	return CMD_ERROR;
1d940a5e02d2 (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	}
1d940a5e02d2 (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
1d940a5e02d2 (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 0;
1d940a5e02d2 (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	}
1d940a5e02d2 (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
1775 548dc04d50e2 (svn r2279) - Fix: Check the parameters of the first 10 Commands. While there also add proper comments for the functions and fix up CmdFailed() Darkvater parents: 1719 diff changeset	578	/** Build a stretch of railroad tracks.
548dc04d50e2 (svn r2279) - Fix: Check the parameters of the first 10 Commands. While there also add proper comments for the functions and fix up CmdFailed() Darkvater parents: 1719 diff changeset	579	* @param x,y start tile of drag
548dc04d50e2 (svn r2279) - Fix: Check the parameters of the first 10 Commands. While there also add proper comments for the functions and fix up CmdFailed() Darkvater parents: 1719 diff changeset	580	* @param p1 end tile of drag
548dc04d50e2 (svn r2279) - Fix: Check the parameters of the first 10 Commands. While there also add proper comments for the functions and fix up CmdFailed() Darkvater parents: 1719 diff changeset	581	* @param p2 various bitstuffed elements
548dc04d50e2 (svn r2279) - Fix: Check the parameters of the first 10 Commands. While there also add proper comments for the functions and fix up CmdFailed() Darkvater parents: 1719 diff changeset	582	* - p2 = (bit 0-3) - railroad type normal/maglev (0 = normal, 1 = mono, 2 = maglev)
548dc04d50e2 (svn r2279) - Fix: Check the parameters of the first 10 Commands. While there also add proper comments for the functions and fix up CmdFailed() Darkvater parents: 1719 diff changeset	583	* - p2 = (bit 4-6) - track-orientation, valid values: 0-5
548dc04d50e2 (svn r2279) - Fix: Check the parameters of the first 10 Commands. While there also add proper comments for the functions and fix up CmdFailed() Darkvater parents: 1719 diff changeset	584	* - p2 = (bit 7) - 0 = build, 1 = remove tracks
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	585	*/
1227 1d940a5e02d2 (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	static int32 CmdRailTrackHelper(int x, int y, uint32 flags, uint32 p1, uint32 p2)
1d940a5e02d2 (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	587	{
1d940a5e02d2 (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	int ex, ey;
1d940a5e02d2 (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	int32 ret, total_cost = 0;
1775 548dc04d50e2 (svn r2279) - Fix: Check the parameters of the first 10 Commands. While there also add proper comments for the functions and fix up CmdFailed() Darkvater parents: 1719 diff changeset	590	byte railbit = (p2 >> 4) & 7;
1227 1d940a5e02d2 (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	byte mode = HASBIT(p2, 7);
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	592
1781 5e2fef482637 (svn r2285) - Codechange: Fix up some of the missing things from server-checking; namely bridge-type, bridge-length, dragged end-tile (bridge/station), station_spread Darkvater parents: 1775 diff changeset	593	if (!ValParamRailtype(p2 & 0x3) \|\| !ValParamTrackOrientation(railbit)) return CMD_ERROR;
5e2fef482637 (svn r2285) - Codechange: Fix up some of the missing things from server-checking; namely bridge-type, bridge-length, dragged end-tile (bridge/station), station_spread Darkvater parents: 1775 diff changeset	594	if (p1 > MapSize()) return CMD_ERROR;
1775 548dc04d50e2 (svn r2279) - Fix: Check the parameters of the first 10 Commands. While there also add proper comments for the functions and fix up CmdFailed() Darkvater parents: 1719 diff changeset	595
1227 1d940a5e02d2 (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	/* unpack end point */
1d940a5e02d2 (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	ex = TileX(p1) * 16;
1d940a5e02d2 (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	598	ey = TileY(p1) * 16;
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	599
889 64d2f7d5f02b (svn r1375) -Fix: [1050990] Buying trains sometimes accounted for incorrectly. Was the result of the cost getting reset in a recursive call of docommand. That is fixed. In addition all cost-commands are typed explicitely. Please do not forget to do so or your costs will be credited to construction if you are unlucky. darkvater parents: 826 diff changeset	600	SET_EXPENSES_TYPE(EXPENSES_CONSTRUCTION);
64d2f7d5f02b (svn r1375) -Fix: [1050990] Buying trains sometimes accounted for incorrectly. Was the result of the cost getting reset in a recursive call of docommand. That is fixed. In addition all cost-commands are typed explicitely. Please do not forget to do so or your costs will be credited to construction if you are unlucky. darkvater parents: 826 diff changeset	601
1775 548dc04d50e2 (svn r2279) - Fix: Check the parameters of the first 10 Commands. While there also add proper comments for the functions and fix up CmdFailed() Darkvater parents: 1719 diff changeset	602	if (CmdFailed(ValidateAutoDrag(&railbit, x, y, ex, ey))) return CMD_ERROR;
201 c40d343115f8 (svn r202) -Codechange: I missed some files with trailing spaces.. this should be truelight parents: 159 diff changeset	603
1775 548dc04d50e2 (svn r2279) - Fix: Check the parameters of the first 10 Commands. While there also add proper comments for the functions and fix up CmdFailed() Darkvater parents: 1719 diff changeset	604	if (flags & DC_EXEC) SndPlayTileFx(SND_20_SPLAT_2, TILE_FROM_XY(x,y));
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	605
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	606	for(;;) {
1775 548dc04d50e2 (svn r2279) - Fix: Check the parameters of the first 10 Commands. While there also add proper comments for the functions and fix up CmdFailed() Darkvater parents: 1719 diff changeset	607	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	608
1775 548dc04d50e2 (svn r2279) - Fix: Check the parameters of the first 10 Commands. While there also add proper comments for the functions and fix up CmdFailed() Darkvater parents: 1719 diff changeset	609	if (CmdFailed(ret)) {
1227 1d940a5e02d2 (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	610	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	611	break;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	612	} else
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	613	total_cost += ret;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	614
1227 1d940a5e02d2 (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	615	if (x == ex && y == ey)
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	616	break;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	617
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	618	x += _railbit.xinc[railbit];
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	619	y += _railbit.yinc[railbit];
201 c40d343115f8 (svn r202) -Codechange: I missed some files with trailing spaces.. this should be truelight parents: 159 diff changeset	620
1227 1d940a5e02d2 (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	621	// toggle railbit for the non-diagonal tracks
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	622	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	623	}
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	624
1775 548dc04d50e2 (svn r2279) - Fix: Check the parameters of the first 10 Commands. While there also add proper comments for the functions and fix up CmdFailed() Darkvater parents: 1719 diff changeset	625	return (total_cost == 0) ? CMD_ERROR : total_cost;
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	626	}
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	627
1227 1d940a5e02d2 (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	628	int32 CmdBuildRailroadTrack(int x, int y, uint32 flags, uint32 p1, uint32 p2)
1d940a5e02d2 (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	629	{
1775 548dc04d50e2 (svn r2279) - Fix: Check the parameters of the first 10 Commands. While there also add proper comments for the functions and fix up CmdFailed() Darkvater parents: 1719 diff changeset	630	return CmdRailTrackHelper(x, y, flags, p1, CLRBIT(p2, 7));
1227 1d940a5e02d2 (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	631	}
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	632
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	633	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	634	{
1227 1d940a5e02d2 (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	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	636	}
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	637
1775 548dc04d50e2 (svn r2279) - Fix: Check the parameters of the first 10 Commands. While there also add proper comments for the functions and fix up CmdFailed() Darkvater parents: 1719 diff changeset	638	/** Build a train depot
548dc04d50e2 (svn r2279) - Fix: Check the parameters of the first 10 Commands. While there also add proper comments for the functions and fix up CmdFailed() Darkvater parents: 1719 diff changeset	639	* @param x,y position of the train depot
548dc04d50e2 (svn r2279) - Fix: Check the parameters of the first 10 Commands. While there also add proper comments for the functions and fix up CmdFailed() Darkvater parents: 1719 diff changeset	640	* @param p1 rail type
548dc04d50e2 (svn r2279) - Fix: Check the parameters of the first 10 Commands. While there also add proper comments for the functions and fix up CmdFailed() Darkvater parents: 1719 diff changeset	641	* @param p2 depot direction (0 through 3), where 0 is NW, 1 is NE, etc.
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	642	*/
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	643	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	644	{
1775 548dc04d50e2 (svn r2279) - Fix: Check the parameters of the first 10 Commands. While there also add proper comments for the functions and fix up CmdFailed() Darkvater parents: 1719 diff changeset	645	Depot *d;
548dc04d50e2 (svn r2279) - Fix: Check the parameters of the first 10 Commands. While there also add proper comments for the functions and fix up CmdFailed() Darkvater parents: 1719 diff changeset	646	TileIndex tile = TILE_FROM_XY(x,y);
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	647	int32 cost, ret;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	648	uint tileh;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	649
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	650	SET_EXPENSES_TYPE(EXPENSES_CONSTRUCTION);
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	651
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	652	if (!EnsureNoVehicle(tile)) return CMD_ERROR;
1775 548dc04d50e2 (svn r2279) - Fix: Check the parameters of the first 10 Commands. While there also add proper comments for the functions and fix up CmdFailed() Darkvater parents: 1719 diff changeset	653	/* check railtype and valid direction for depot (0 through 3), 4 in total */
548dc04d50e2 (svn r2279) - Fix: Check the parameters of the first 10 Commands. While there also add proper comments for the functions and fix up CmdFailed() Darkvater parents: 1719 diff changeset	654	if (!ValParamRailtype(p1) \|\| p2 > 3) return CMD_ERROR;
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	655
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	656	tileh = GetTileSlope(tile, NULL);
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	657	if (tileh != 0) {
84 1e0721c29bad (svn r85) -Add: initial commit of new AI (enable in Patch menu) truelight parents: 59 diff changeset	658	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	659	return_cmd_error(STR_0007_FLAT_LAND_REQUIRED);
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	660	}
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	ret = DoCommandByTile(tile, 0, 0, flags, CMD_LANDSCAPE_CLEAR);
1775 548dc04d50e2 (svn r2279) - Fix: Check the parameters of the first 10 Commands. While there also add proper comments for the functions and fix up CmdFailed() Darkvater parents: 1719 diff changeset	663	if (CmdFailed(ret)) return CMD_ERROR;
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	664	cost = ret;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	665
1775 548dc04d50e2 (svn r2279) - Fix: Check the parameters of the first 10 Commands. While there also add proper comments for the functions and fix up CmdFailed() Darkvater parents: 1719 diff changeset	666	d = AllocateDepot();
548dc04d50e2 (svn r2279) - Fix: Check the parameters of the first 10 Commands. While there also add proper comments for the functions and fix up CmdFailed() Darkvater parents: 1719 diff changeset	667	if (d == NULL)
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	668	return CMD_ERROR;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	669
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	670	if (flags & DC_EXEC) {
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	671	if (_current_player == _local_player)
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	672	_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	673
c40d343115f8 (svn r202) -Codechange: I missed some files with trailing spaces.. this should be truelight parents: 159 diff changeset	674	ModifyTile(tile,
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	675	MP_SETTYPE(MP_RAILWAY) \|
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	676	MP_MAP3LO \| MP_MAPOWNER_CURRENT \| MP_MAP5,
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	677	p1, /* map3_lo */
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	678	p2 \| RAIL_TYPE_DEPOT /* map5 */
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	679	);
201 c40d343115f8 (svn r202) -Codechange: I missed some files with trailing spaces.. this should be truelight parents: 159 diff changeset	680
1775 548dc04d50e2 (svn r2279) - Fix: Check the parameters of the first 10 Commands. While there also add proper comments for the functions and fix up CmdFailed() Darkvater parents: 1719 diff changeset	681	d->xy = tile;
548dc04d50e2 (svn r2279) - Fix: Check the parameters of the first 10 Commands. While there also add proper comments for the functions and fix up CmdFailed() Darkvater parents: 1719 diff changeset	682	d->town_index = ClosestTownFromTile(tile, (uint)-1)->index;
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	683
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	684	SetSignalsOnBothDir(tile, (p2&1) ? 2 : 1);
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	685
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	return cost + _price.build_train_depot;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	689	}
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	690
1775 548dc04d50e2 (svn r2279) - Fix: Check the parameters of the first 10 Commands. While there also add proper comments for the functions and fix up CmdFailed() Darkvater parents: 1719 diff changeset	691	/** Build signals, alternate between double/single, signal/semaphore,
548dc04d50e2 (svn r2279) - Fix: Check the parameters of the first 10 Commands. While there also add proper comments for the functions and fix up CmdFailed() Darkvater parents: 1719 diff changeset	692	* pre/exit/combo-signals, and what-else not
548dc04d50e2 (svn r2279) - Fix: Check the parameters of the first 10 Commands. While there also add proper comments for the functions and fix up CmdFailed() Darkvater parents: 1719 diff changeset	693	* @param x,y coordinates where signals is being built
548dc04d50e2 (svn r2279) - Fix: Check the parameters of the first 10 Commands. While there also add proper comments for the functions and fix up CmdFailed() Darkvater parents: 1719 diff changeset	694	* @param p1 various bitstuffed elements
548dc04d50e2 (svn r2279) - Fix: Check the parameters of the first 10 Commands. While there also add proper comments for the functions and fix up CmdFailed() Darkvater parents: 1719 diff changeset	695	* - p1 = (bit 0-2) - track-orientation, valid values: 0-5
548dc04d50e2 (svn r2279) - Fix: Check the parameters of the first 10 Commands. While there also add proper comments for the functions and fix up CmdFailed() Darkvater parents: 1719 diff changeset	696	* - p1 = (bit 3) - choose semaphores/signals or cycle normal/pre/exit/combo depending on context
548dc04d50e2 (svn r2279) - Fix: Check the parameters of the first 10 Commands. While there also add proper comments for the functions and fix up CmdFailed() Darkvater parents: 1719 diff changeset	697	* @param 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	698	*/
1227 1d940a5e02d2 (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	699	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	700	{
1084 95b7385f8b7b (svn r1585) Rewrite CmdBuildSignals() tron parents: 1066 diff changeset	701	TileIndex tile = TILE_FROM_XY(x, y);
95b7385f8b7b (svn r1585) Rewrite CmdBuildSignals() tron parents: 1066 diff changeset	702	bool semaphore;
95b7385f8b7b (svn r1585) Rewrite CmdBuildSignals() tron parents: 1066 diff changeset	703	bool pre_signal;
95b7385f8b7b (svn r1585) Rewrite CmdBuildSignals() tron parents: 1066 diff changeset	704	uint track = p1 & 0x7;
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	705	byte m5;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	706	int32 cost;
201 c40d343115f8 (svn r202) -Codechange: I missed some files with trailing spaces.. this should be truelight parents: 159 diff changeset	707
1775 548dc04d50e2 (svn r2279) - Fix: Check the parameters of the first 10 Commands. While there also add proper comments for the functions and fix up CmdFailed() Darkvater parents: 1719 diff changeset	708	if (!ValParamTrackOrientation(track) \|\| !IsTileType(tile, MP_RAILWAY) \|\| !EnsureNoVehicle(tile))
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	709	return CMD_ERROR;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	710
1775 548dc04d50e2 (svn r2279) - Fix: Check the parameters of the first 10 Commands. While there also add proper comments for the functions and fix up CmdFailed() Darkvater parents: 1719 diff changeset	711	/* Protect against invalid signal copying */
548dc04d50e2 (svn r2279) - Fix: Check the parameters of the first 10 Commands. While there also add proper comments for the functions and fix up CmdFailed() Darkvater parents: 1719 diff changeset	712	if (p2 != 0 && (p2 & _signals_table_both[track]) == 0) return CMD_ERROR;
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	713
1084 95b7385f8b7b (svn r1585) Rewrite CmdBuildSignals() tron parents: 1066 diff changeset	714	m5 = _map5[tile];
95b7385f8b7b (svn r1585) Rewrite CmdBuildSignals() tron parents: 1066 diff changeset	715
1775 548dc04d50e2 (svn r2279) - Fix: Check the parameters of the first 10 Commands. While there also add proper comments for the functions and fix up CmdFailed() Darkvater parents: 1719 diff changeset	716	/* You can't build signals in a depot, and the selected track must exist */
548dc04d50e2 (svn r2279) - Fix: Check the parameters of the first 10 Commands. While there also add proper comments for the functions and fix up CmdFailed() Darkvater parents: 1719 diff changeset	717	if (m5 & 0x80 \|\| !HASBIT(m5, track)) return CMD_ERROR;
1084 95b7385f8b7b (svn r1585) Rewrite CmdBuildSignals() tron parents: 1066 diff changeset	718
95b7385f8b7b (svn r1585) Rewrite CmdBuildSignals() tron parents: 1066 diff changeset	719	if (!CheckTileOwnership(tile)) return CMD_ERROR;
95b7385f8b7b (svn r1585) Rewrite CmdBuildSignals() tron parents: 1066 diff changeset	720
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	721	_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	722
0 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	byte m = m5 & RAIL_BIT_MASK;
1084 95b7385f8b7b (svn r1585) Rewrite CmdBuildSignals() tron parents: 1066 diff changeset	725	if (m != RAIL_BIT_DIAG1 &&
95b7385f8b7b (svn r1585) Rewrite CmdBuildSignals() tron parents: 1066 diff changeset	726	m != RAIL_BIT_DIAG2 &&
95b7385f8b7b (svn r1585) Rewrite CmdBuildSignals() tron parents: 1066 diff changeset	727	m != RAIL_BIT_UPPER &&
95b7385f8b7b (svn r1585) Rewrite CmdBuildSignals() tron parents: 1066 diff changeset	728	m != RAIL_BIT_LOWER &&
95b7385f8b7b (svn r1585) Rewrite CmdBuildSignals() tron parents: 1066 diff changeset	729	m != RAIL_BIT_LEFT &&
95b7385f8b7b (svn r1585) Rewrite CmdBuildSignals() tron parents: 1066 diff changeset	730	m != RAIL_BIT_RIGHT &&
95b7385f8b7b (svn r1585) Rewrite CmdBuildSignals() tron parents: 1066 diff changeset	731	m != (RAIL_BIT_UPPER \| RAIL_BIT_LOWER) &&
95b7385f8b7b (svn r1585) Rewrite CmdBuildSignals() tron parents: 1066 diff changeset	732	m != (RAIL_BIT_LEFT \| RAIL_BIT_RIGHT))
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	733	return CMD_ERROR;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	734	}
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	735
1084 95b7385f8b7b (svn r1585) Rewrite CmdBuildSignals() tron parents: 1066 diff changeset	736	SET_EXPENSES_TYPE(EXPENSES_CONSTRUCTION);
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	737
1084 95b7385f8b7b (svn r1585) Rewrite CmdBuildSignals() tron parents: 1066 diff changeset	738	// Same bit, used in different contexts
95b7385f8b7b (svn r1585) Rewrite CmdBuildSignals() tron parents: 1066 diff changeset	739	semaphore = pre_signal = HASBIT(p1, 3);
1066 eaef1465d3ab (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	740
1084 95b7385f8b7b (svn r1585) Rewrite CmdBuildSignals() tron parents: 1066 diff changeset	741	if ((_map3_lo[tile] & _signals_table_both[track]) == 0) {
95b7385f8b7b (svn r1585) Rewrite CmdBuildSignals() tron parents: 1066 diff changeset	742	// build new signals
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	743	cost = _price.build_signals;
1066 eaef1465d3ab (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	744	} else {
1084 95b7385f8b7b (svn r1585) Rewrite CmdBuildSignals() tron parents: 1066 diff changeset	745	if (p2 != 0 &&
95b7385f8b7b (svn r1585) Rewrite CmdBuildSignals() tron parents: 1066 diff changeset	746	((semaphore && !HASBIT(_map3_hi[tile], 2)) \|\|
95b7385f8b7b (svn r1585) Rewrite CmdBuildSignals() tron parents: 1066 diff changeset	747	(!semaphore && HASBIT(_map3_hi[tile], 2)))) {
95b7385f8b7b (svn r1585) Rewrite CmdBuildSignals() tron parents: 1066 diff changeset	748	// convert signals <-> semaphores
95b7385f8b7b (svn r1585) Rewrite CmdBuildSignals() tron parents: 1066 diff changeset	749	cost = _price.build_signals + _price.remove_signals;
95b7385f8b7b (svn r1585) Rewrite CmdBuildSignals() tron parents: 1066 diff changeset	750	} else {
95b7385f8b7b (svn r1585) Rewrite CmdBuildSignals() tron parents: 1066 diff changeset	751	// it is free to change orientation/pre-exit-combo signals
95b7385f8b7b (svn r1585) Rewrite CmdBuildSignals() tron parents: 1066 diff changeset	752	cost = 0;
95b7385f8b7b (svn r1585) Rewrite CmdBuildSignals() tron parents: 1066 diff changeset	753	}
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	754	}
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	755
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	756	if (flags & DC_EXEC) {
1084 95b7385f8b7b (svn r1585) Rewrite CmdBuildSignals() tron parents: 1066 diff changeset	757	if (!(m5 & RAIL_TYPE_SIGNALS)) {
95b7385f8b7b (svn r1585) Rewrite CmdBuildSignals() tron parents: 1066 diff changeset	758	// 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	759	_map5[tile] \|= RAIL_TYPE_SIGNALS; // change into signals
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	760	_map2[tile] \|= 0xF0; // all signals are on
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	761	_map3_lo[tile] &= ~0xF0; // no signals built by default
1084 95b7385f8b7b (svn r1585) Rewrite CmdBuildSignals() tron parents: 1066 diff changeset	762	_map3_hi[tile] = semaphore ? 4 : 0;
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	763	}
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	764
1084 95b7385f8b7b (svn r1585) Rewrite CmdBuildSignals() tron parents: 1066 diff changeset	765	if (p2 == 0) {
95b7385f8b7b (svn r1585) Rewrite CmdBuildSignals() tron parents: 1066 diff changeset	766	if ((_map3_lo[tile] & _signals_table_both[track]) == 0) {
95b7385f8b7b (svn r1585) Rewrite CmdBuildSignals() tron parents: 1066 diff changeset	767	// build new signals
95b7385f8b7b (svn r1585) Rewrite CmdBuildSignals() tron parents: 1066 diff changeset	768	_map3_lo[tile] \|= _signals_table_both[track];
95b7385f8b7b (svn r1585) Rewrite CmdBuildSignals() tron parents: 1066 diff changeset	769	} else {
95b7385f8b7b (svn r1585) Rewrite CmdBuildSignals() tron parents: 1066 diff changeset	770	if (pre_signal) {
95b7385f8b7b (svn r1585) Rewrite CmdBuildSignals() tron parents: 1066 diff changeset	771	// cycle between normal -> pre -> exit -> combo -> ...
95b7385f8b7b (svn r1585) Rewrite CmdBuildSignals() tron parents: 1066 diff changeset	772	byte type = (_map3_hi[tile] + 1) & 0x03;
95b7385f8b7b (svn r1585) Rewrite CmdBuildSignals() tron parents: 1066 diff changeset	773	_map3_hi[tile] &= ~0x03;
95b7385f8b7b (svn r1585) Rewrite CmdBuildSignals() tron parents: 1066 diff changeset	774	_map3_hi[tile] \|= type;
95b7385f8b7b (svn r1585) Rewrite CmdBuildSignals() tron parents: 1066 diff changeset	775	} else {
95b7385f8b7b (svn r1585) Rewrite CmdBuildSignals() tron parents: 1066 diff changeset	776	// cycle between two-way -> one-way -> one-way -> ...
95b7385f8b7b (svn r1585) Rewrite CmdBuildSignals() tron parents: 1066 diff changeset	777	switch (track) {
95b7385f8b7b (svn r1585) Rewrite CmdBuildSignals() tron parents: 1066 diff changeset	778	case 3:
95b7385f8b7b (svn r1585) Rewrite CmdBuildSignals() tron parents: 1066 diff changeset	779	case 5: {
95b7385f8b7b (svn r1585) Rewrite CmdBuildSignals() tron parents: 1066 diff changeset	780	byte signal = (_map3_lo[tile] - 0x10) & 0x30;
95b7385f8b7b (svn r1585) Rewrite CmdBuildSignals() tron parents: 1066 diff changeset	781	if (signal == 0) signal = 0x30;
95b7385f8b7b (svn r1585) Rewrite CmdBuildSignals() tron parents: 1066 diff changeset	782	_map3_lo[tile] &= ~0x30;
95b7385f8b7b (svn r1585) Rewrite CmdBuildSignals() tron parents: 1066 diff changeset	783	_map3_lo[tile] \|= signal;
95b7385f8b7b (svn r1585) Rewrite CmdBuildSignals() tron parents: 1066 diff changeset	784	break;
95b7385f8b7b (svn r1585) Rewrite CmdBuildSignals() tron parents: 1066 diff changeset	785	}
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	786
1084 95b7385f8b7b (svn r1585) Rewrite CmdBuildSignals() tron parents: 1066 diff changeset	787	default: {
95b7385f8b7b (svn r1585) Rewrite CmdBuildSignals() tron parents: 1066 diff changeset	788	byte signal = (_map3_lo[tile] - 0x40) & 0xC0;
95b7385f8b7b (svn r1585) Rewrite CmdBuildSignals() tron parents: 1066 diff changeset	789	if (signal == 0) signal = 0xC0;
95b7385f8b7b (svn r1585) Rewrite CmdBuildSignals() tron parents: 1066 diff changeset	790	_map3_lo[tile] &= ~0xC0;
95b7385f8b7b (svn r1585) Rewrite CmdBuildSignals() tron parents: 1066 diff changeset	791	_map3_lo[tile] \|= signal;
95b7385f8b7b (svn r1585) Rewrite CmdBuildSignals() tron parents: 1066 diff changeset	792	break;
95b7385f8b7b (svn r1585) Rewrite CmdBuildSignals() tron parents: 1066 diff changeset	793	}
95b7385f8b7b (svn r1585) Rewrite CmdBuildSignals() tron parents: 1066 diff changeset	794	}
95b7385f8b7b (svn r1585) Rewrite CmdBuildSignals() tron parents: 1066 diff changeset	795	}
95b7385f8b7b (svn r1585) Rewrite CmdBuildSignals() tron parents: 1066 diff changeset	796	}
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	797	} else {
1084 95b7385f8b7b (svn r1585) Rewrite CmdBuildSignals() tron parents: 1066 diff changeset	798	/* If CmdBuildManySignals is called with copying signals, just copy the
95b7385f8b7b (svn r1585) Rewrite CmdBuildSignals() tron parents: 1066 diff changeset	799	* style of the first signal given as parameter by CmdBuildManySignals */
95b7385f8b7b (svn r1585) Rewrite CmdBuildSignals() tron parents: 1066 diff changeset	800	_map3_lo[tile] &= ~_signals_table_both[track];
95b7385f8b7b (svn r1585) Rewrite CmdBuildSignals() tron parents: 1066 diff changeset	801	_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	802	// convert between signal<->semaphores when dragging
1084 95b7385f8b7b (svn r1585) Rewrite CmdBuildSignals() tron parents: 1066 diff changeset	803	if (semaphore)
95b7385f8b7b (svn r1585) Rewrite CmdBuildSignals() tron parents: 1066 diff changeset	804	SETBIT(_map3_hi[tile], 2);
95b7385f8b7b (svn r1585) Rewrite CmdBuildSignals() tron parents: 1066 diff changeset	805	else
95b7385f8b7b (svn r1585) Rewrite CmdBuildSignals() tron parents: 1066 diff changeset	806	CLRBIT(_map3_hi[tile], 2);
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	807	}
201 c40d343115f8 (svn r202) -Codechange: I missed some files with trailing spaces.. this should be truelight parents: 159 diff changeset	808
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	809	MarkTileDirtyByTile(tile);
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	810	SetSignalsOnBothDir(tile, track);
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	811	}
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	812
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	813	return cost;
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
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	816	/* Build many signals by dragging: AutoSignals
1227 1d940a5e02d2 (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	817	* x,y = start tile
1d940a5e02d2 (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	818	* p1 = end tile
1d940a5e02d2 (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	819	* p2 = (bit 0) - 0 = build, 1 = remove signals
1d940a5e02d2 (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	820	* p2 = (bit 3) - 0 = signals, 1 = semaphores
1d940a5e02d2 (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	821	* p2 = (bit 4-6) - track-orientation, valid values: 0-5
1d940a5e02d2 (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	822	* 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	823	*/
1227 1d940a5e02d2 (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	824	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	825	{
1227 1d940a5e02d2 (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	826	int ex, ey;
1775 548dc04d50e2 (svn r2279) - Fix: Check the parameters of the first 10 Commands. While there also add proper comments for the functions and fix up CmdFailed() Darkvater parents: 1719 diff changeset	827	byte 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	828	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	829	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	830	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	831	byte m5, semaphores = (HASBIT(p2, 3)) ? 8 : 0;
1227 1d940a5e02d2 (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	832	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	833	// 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	834	// since the original amount will be too dense (shorter tracks)
1227 1d940a5e02d2 (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	835	byte signal_density = (railbit & 0x6) ? (p2 >> 24) * 2: (p2 >> 24);
1d940a5e02d2 (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	836	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	837
889 64d2f7d5f02b (svn r1375) -Fix: [1050990] Buying trains sometimes accounted for incorrectly. Was the result of the cost getting reset in a recursive call of docommand. That is fixed. In addition all cost-commands are typed explicitely. Please do not forget to do so or your costs will be credited to construction if you are unlucky. darkvater parents: 826 diff changeset	838	SET_EXPENSES_TYPE(EXPENSES_CONSTRUCTION);
64d2f7d5f02b (svn r1375) -Fix: [1050990] Buying trains sometimes accounted for incorrectly. Was the result of the cost getting reset in a recursive call of docommand. That is fixed. In addition all cost-commands are typed explicitely. Please do not forget to do so or your costs will be credited to construction if you are unlucky. darkvater parents: 826 diff changeset	839
1227 1d940a5e02d2 (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	840	// unpack end tile
926 a6d140a6a4de (svn r1414) Move TileIndex, TILE_MASK and GET_TILE_[XY] to map.h and turn the latter into inline functions names Tile[XY] tron parents: 919 diff changeset	841	ex = TileX(p1) * 16;
a6d140a6a4de (svn r1414) Move TileIndex, TILE_MASK and GET_TILE_[XY] to map.h and turn the latter into inline functions names Tile[XY] tron parents: 919 diff changeset	842	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	843
1227 1d940a5e02d2 (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	844	if (ValidateAutoDrag(&railbit, x, y, ex, ey) == CMD_ERROR)
1d940a5e02d2 (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	845	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	846
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	847	// 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	848	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	849	if (!(m5 & RAIL_TYPE_SPECIAL) && (m5 & RAIL_BIT_MASK) && (m5 & RAIL_TYPE_SIGNALS)) {
1227 1d940a5e02d2 (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	850	signals = _map3_lo[tile] & _signals_table_both[railbit];
1d940a5e02d2 (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	851	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	852
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	853	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	854	} else { // no signals exist, drag a two-way signal stretch
1227 1d940a5e02d2 (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	855	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	856	}
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	857
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	858	/* 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	859	* 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	860	**********
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	861	* 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	862	* semaphores - semaphores or signals
201 c40d343115f8 (svn r202) -Codechange: I missed some files with trailing spaces.. this should be truelight parents: 159 diff changeset	863	* 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	864	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	865	* 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	866	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	867	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	868	// 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	869	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	870	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	871
826 fff56bbc3606 (svn r1297) Language fixes in the source.. (ln-) miham parents: 817 diff changeset	872	/* 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	873	* 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	874	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	875	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	876	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	877	}
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	878	} 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	879	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	880	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	881	}
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	882	}
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	883
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	884	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	885	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	886
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	887	x += _railbit.xinc[railbit];
201 c40d343115f8 (svn r202) -Codechange: I missed some files with trailing spaces.. this should be truelight parents: 159 diff changeset	888	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	889	signal_ctr++;
201 c40d343115f8 (svn r202) -Codechange: I missed some files with trailing spaces.. this should be truelight parents: 159 diff changeset	890
1227 1d940a5e02d2 (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	891	// 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	892	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	893	}
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	894
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	895	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	896	}
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	897
1227 1d940a5e02d2 (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	898	/* Stub for the unified Signal builder/remover */
1d940a5e02d2 (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	899	int32 CmdBuildSignalTrack(int x, int y, uint32 flags, uint32 p1, uint32 p2)
1d940a5e02d2 (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	900	{
1d940a5e02d2 (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	901	return CmdSignalTrackHelper(x, y, flags, p1, p2);
1d940a5e02d2 (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	902	}
1d940a5e02d2 (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	903
1775 548dc04d50e2 (svn r2279) - Fix: Check the parameters of the first 10 Commands. While there also add proper comments for the functions and fix up CmdFailed() Darkvater parents: 1719 diff changeset	904	/** Remove signals
548dc04d50e2 (svn r2279) - Fix: Check the parameters of the first 10 Commands. While there also add proper comments for the functions and fix up CmdFailed() Darkvater parents: 1719 diff changeset	905	* @param x,y coordinates where signal is being deleted from
548dc04d50e2 (svn r2279) - Fix: Check the parameters of the first 10 Commands. While there also add proper comments for the functions and fix up CmdFailed() Darkvater parents: 1719 diff changeset	906	* @param p1 track combination to remove signal from
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	907	*/
1227 1d940a5e02d2 (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	908	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	909	{
1518 9a876c45238b (svn r2022) Revise CmdRemoveSingleSignal: Check parameters for validity and simplify the function tron parents: 1477 diff changeset	910	TileIndex tile = TILE_FROM_XY(x, y);
9a876c45238b (svn r2022) Revise CmdRemoveSingleSignal: Check parameters for validity and simplify the function tron parents: 1477 diff changeset	911	uint track = p1 & 0x7;
9a876c45238b (svn r2022) Revise CmdRemoveSingleSignal: Check parameters for validity and simplify the function tron parents: 1477 diff changeset	912
1775 548dc04d50e2 (svn r2279) - Fix: Check the parameters of the first 10 Commands. While there also add proper comments for the functions and fix up CmdFailed() Darkvater parents: 1719 diff changeset	913	if (!ValParamTrackOrientation(track) \|\| !IsTileType(tile, MP_RAILWAY) \|\| !EnsureNoVehicle(tile))
1518 9a876c45238b (svn r2022) Revise CmdRemoveSingleSignal: Check parameters for validity and simplify the function tron parents: 1477 diff changeset	914	return CMD_ERROR;
9a876c45238b (svn r2022) Revise CmdRemoveSingleSignal: Check parameters for validity and simplify the function tron parents: 1477 diff changeset	915
9a876c45238b (svn r2022) Revise CmdRemoveSingleSignal: Check parameters for validity and simplify the function tron parents: 1477 diff changeset	916	if ((_map5[tile] & RAIL_TYPE_MASK) != RAIL_TYPE_SIGNALS \|\|
9a876c45238b (svn r2022) Revise CmdRemoveSingleSignal: Check parameters for validity and simplify the function tron parents: 1477 diff changeset	917	(_map3_lo[tile] & _signals_table_both[track]) == 0) // signals on track?
9a876c45238b (svn r2022) Revise CmdRemoveSingleSignal: Check parameters for validity and simplify the function tron parents: 1477 diff changeset	918	return CMD_ERROR;
9a876c45238b (svn r2022) Revise CmdRemoveSingleSignal: Check parameters for validity and simplify the function tron parents: 1477 diff changeset	919
1775 548dc04d50e2 (svn r2279) - Fix: Check the parameters of the first 10 Commands. While there also add proper comments for the functions and fix up CmdFailed() Darkvater parents: 1719 diff changeset	920	/* Only water can remove signals from anyone */
548dc04d50e2 (svn r2279) - Fix: Check the parameters of the first 10 Commands. While there also add proper comments for the functions and fix up CmdFailed() Darkvater parents: 1719 diff changeset	921	if (_current_player != OWNER_WATER && !CheckTileOwnership(tile)) return CMD_ERROR;
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	922
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	923	SET_EXPENSES_TYPE(EXPENSES_CONSTRUCTION);
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	924
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	925	/* Do it? */
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	926	if (flags & DC_EXEC) {
1518 9a876c45238b (svn r2022) Revise CmdRemoveSingleSignal: Check parameters for validity and simplify the function tron parents: 1477 diff changeset	927	_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	928
1066 eaef1465d3ab (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	929	/* removed last signal from tile? */
eaef1465d3ab (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	930	if ((_map3_lo[tile] & 0xF0) == 0) {
eaef1465d3ab (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	931	_map5[tile] &= ~RAIL_TYPE_SIGNALS;
eaef1465d3ab (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	932	_map2[tile] &= ~0xF0;
eaef1465d3ab (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	933	CLRBIT(_map3_hi[tile], 2); // remove any possible semaphores
eaef1465d3ab (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	}
1109 ecb98f43ba2c (svn r1610) Remove trailing whitespace (last time ever, i hope) tron parents: 1095 diff changeset	935
1066 eaef1465d3ab (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	936	SetSignalsOnBothDir(tile, track);
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	937
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	938	MarkTileDirtyByTile(tile);
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	939	}
201 c40d343115f8 (svn r202) -Codechange: I missed some files with trailing spaces.. this should be truelight parents: 159 diff changeset	940
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	941	return _price.remove_signals;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	942	}
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	943
1227 1d940a5e02d2 (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	944	/* Stub for the unified Signal builder/remover */
1d940a5e02d2 (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	945	int32 CmdRemoveSignalTrack(int x, int y, uint32 flags, uint32 p1, uint32 p2)
1d940a5e02d2 (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	946	{
1229 f698e29a6908 (svn r1733) - Fix: oops "\| 1" is SETBIT(x, 0), not 1 :(. Now you can remove signals again darkvater parents: 1227 diff changeset	947	return CmdSignalTrackHelper(x, y, flags, p1, SETBIT(p2, 0));
1227 1d940a5e02d2 (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	948	}
1d940a5e02d2 (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	949
201 c40d343115f8 (svn r202) -Codechange: I missed some files with trailing spaces.. this should be truelight parents: 159 diff changeset	950	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	951
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	952	static int32 DoConvertRail(uint tile, uint totype, bool exec)
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	953	{
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	954	if (!CheckTileOwnership(tile) \|\| !EnsureNoVehicle(tile))
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	955	return CMD_ERROR;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	956
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	957	// tile is already of requested type?
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	958	if ( (uint)(_map3_lo[tile] & 0xF) == totype)
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	959	return CMD_ERROR;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	960
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	961	// change type.
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	962	if (exec) {
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	963	_map3_lo[tile] = (_map3_lo[tile] & 0xF0) + totype;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	964	MarkTileDirtyByTile(tile);
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	965	}
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	966
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	967	return _price.build_rail >> 1;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	968	}
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	969
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	970	extern int32 DoConvertStationRail(uint tile, uint totype, bool exec);
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	971	extern int32 DoConvertStreetRail(uint tile, uint totype, bool exec);
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	972	extern int32 DoConvertTunnelBridgeRail(uint tile, uint totype, bool exec);
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	973
1782 48749e4c2dc6 (svn r2286) - CodeChange: paramcheck the next batch of commands. Darkvater parents: 1781 diff changeset	974	/** Convert one rail type to the other. You can convert normal rail to
48749e4c2dc6 (svn r2286) - CodeChange: paramcheck the next batch of commands. Darkvater parents: 1781 diff changeset	975	* monorail/maglev easily or vice-versa.
48749e4c2dc6 (svn r2286) - CodeChange: paramcheck the next batch of commands. Darkvater parents: 1781 diff changeset	976	* @param ex,ey end tile of rail conversion drag
48749e4c2dc6 (svn r2286) - CodeChange: paramcheck the next batch of commands. Darkvater parents: 1781 diff changeset	977	* @param p1 start tile of drag
48749e4c2dc6 (svn r2286) - CodeChange: paramcheck the next batch of commands. Darkvater parents: 1781 diff changeset	978	* @param p2 new railtype to convert to
48749e4c2dc6 (svn r2286) - CodeChange: paramcheck the next batch of commands. Darkvater parents: 1781 diff changeset	979	*/
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	980	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	981	{
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	982	int32 ret, cost, money;
1782 48749e4c2dc6 (svn r2286) - CodeChange: paramcheck the next batch of commands. Darkvater parents: 1781 diff changeset	983	int sx, sy, x, y;
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	984
889 64d2f7d5f02b (svn r1375) -Fix: [1050990] Buying trains sometimes accounted for incorrectly. Was the result of the cost getting reset in a recursive call of docommand. That is fixed. In addition all cost-commands are typed explicitely. Please do not forget to do so or your costs will be credited to construction if you are unlucky. darkvater parents: 826 diff changeset	985	SET_EXPENSES_TYPE(EXPENSES_CONSTRUCTION);
64d2f7d5f02b (svn r1375) -Fix: [1050990] Buying trains sometimes accounted for incorrectly. Was the result of the cost getting reset in a recursive call of docommand. That is fixed. In addition all cost-commands are typed explicitely. Please do not forget to do so or your costs will be credited to construction if you are unlucky. darkvater parents: 826 diff changeset	986
1782 48749e4c2dc6 (svn r2286) - CodeChange: paramcheck the next batch of commands. Darkvater parents: 1781 diff changeset	987	if (!ValParamRailtype(p2)) return CMD_ERROR;
48749e4c2dc6 (svn r2286) - CodeChange: paramcheck the next batch of commands. Darkvater parents: 1781 diff changeset	988	if (p1 > MapSize()) return CMD_ERROR;
48749e4c2dc6 (svn r2286) - CodeChange: paramcheck the next batch of commands. Darkvater parents: 1781 diff changeset	989
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	990	// make sure sx,sy are smaller than ex,ey
926 a6d140a6a4de (svn r1414) Move TileIndex, TILE_MASK and GET_TILE_[XY] to map.h and turn the latter into inline functions names Tile[XY] tron parents: 919 diff changeset	991	sx = TileX(p1) * 16;
a6d140a6a4de (svn r1414) Move TileIndex, TILE_MASK and GET_TILE_[XY] to map.h and turn the latter into inline functions names Tile[XY] tron parents: 919 diff changeset	992	sy = TileY(p1) * 16;
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	993	if (ex < sx) intswap(ex, sx);
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	994	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	995
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	996	money = GetAvailableMoneyForCommand();
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	997	cost = 0;
201 c40d343115f8 (svn r202) -Codechange: I missed some files with trailing spaces.. this should be truelight parents: 159 diff changeset	998
1782 48749e4c2dc6 (svn r2286) - CodeChange: paramcheck the next batch of commands. Darkvater parents: 1781 diff changeset	999	for (x = sx; x <= ex; x += 16) {
48749e4c2dc6 (svn r2286) - CodeChange: paramcheck the next batch of commands. Darkvater parents: 1781 diff changeset	1000	for (y = sy; y <= ey; y += 16) {
48749e4c2dc6 (svn r2286) - CodeChange: paramcheck the next batch of commands. Darkvater parents: 1781 diff changeset	1001	TileIndex tile = TILE_FROM_XY(x,y);
48749e4c2dc6 (svn r2286) - CodeChange: paramcheck the next batch of commands. Darkvater parents: 1781 diff changeset	1002	DoConvertRailProc *proc;
48749e4c2dc6 (svn r2286) - CodeChange: paramcheck the next batch of commands. Darkvater parents: 1781 diff changeset	1003
48749e4c2dc6 (svn r2286) - CodeChange: paramcheck the next batch of commands. Darkvater parents: 1781 diff changeset	1004	if (IsTileType(tile, MP_RAILWAY)) proc = DoConvertRail;
48749e4c2dc6 (svn r2286) - CodeChange: paramcheck the next batch of commands. Darkvater parents: 1781 diff changeset	1005	else if (IsTileType(tile, MP_STATION)) proc = DoConvertStationRail;
48749e4c2dc6 (svn r2286) - CodeChange: paramcheck the next batch of commands. Darkvater parents: 1781 diff changeset	1006	else if (IsTileType(tile, MP_STREET)) proc = DoConvertStreetRail;
48749e4c2dc6 (svn r2286) - CodeChange: paramcheck the next batch of commands. Darkvater parents: 1781 diff changeset	1007	else if (IsTileType(tile, MP_TUNNELBRIDGE)) proc = DoConvertTunnelBridgeRail;
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1008	else continue;
201 c40d343115f8 (svn r202) -Codechange: I missed some files with trailing spaces.. this should be truelight parents: 159 diff changeset	1009
1782 48749e4c2dc6 (svn r2286) - CodeChange: paramcheck the next batch of commands. Darkvater parents: 1781 diff changeset	1010	ret = proc(tile, p2, false);
48749e4c2dc6 (svn r2286) - CodeChange: paramcheck the next batch of commands. Darkvater parents: 1781 diff changeset	1011	if (CmdFailed(ret)) continue;
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1012	cost += ret;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1013
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1014	if (flags & DC_EXEC) {
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1015	if ( (money -= ret) < 0) { _additional_cash_required = ret; return cost - ret; }
1782 48749e4c2dc6 (svn r2286) - CodeChange: paramcheck the next batch of commands. Darkvater parents: 1781 diff changeset	1016	proc(tile, p2, true);
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1017	}
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1018	}
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1019	}
1782 48749e4c2dc6 (svn r2286) - CodeChange: paramcheck the next batch of commands. Darkvater parents: 1781 diff changeset	1020
48749e4c2dc6 (svn r2286) - CodeChange: paramcheck the next batch of commands. Darkvater parents: 1781 diff changeset	1021	return (cost == 0) ? CMD_ERROR : cost;
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1022	}
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1023
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1024	static int32 RemoveTrainDepot(uint tile, uint32 flags)
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1025	{
149 5f7d4b21df01 (svn r150) -Fix: [1010833] Turning on the magic bulldozer removes oil rigs darkvater parents: 84 diff changeset	1026	if (!CheckTileOwnership(tile) && _current_player != OWNER_WATER)
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1027	return CMD_ERROR;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1028
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1029	if (!EnsureNoVehicle(tile))
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1030	return CMD_ERROR;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1031
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1032	if (flags & DC_EXEC) {
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1033	int track = _map5[tile] & RAIL_DEPOT_TRACK_MASK;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1034
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1035	DoDeleteDepot(tile);
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1036	SetSignalsOnBothDir(tile, track);
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1037	}
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1038
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1039	return _price.remove_train_depot;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1040	}
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1041
1534 304124d6b5e3 (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	1042	static int32 ClearTile_Track(TileIndex tile, byte flags)
304124d6b5e3 (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	1043	{
304124d6b5e3 (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	1044	int32 cost;
304124d6b5e3 (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	1045	int32 ret;
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1046	byte m5;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1047
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1048	m5 = _map5[tile];
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1049
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1050	if (flags & DC_AUTO) {
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1051	if (m5 & RAIL_TYPE_SPECIAL)
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1052	return_cmd_error(STR_2004_BUILDING_MUST_BE_DEMOLISHED);
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1053
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1054	if (_map_owner[tile] != _current_player)
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1055	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	1056
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1057	return_cmd_error(STR_1008_MUST_REMOVE_RAILROAD_TRACK);
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1058	}
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1059
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1060	cost = 0;
201 c40d343115f8 (svn r202) -Codechange: I missed some files with trailing spaces.. this should be truelight parents: 159 diff changeset	1061
1534 304124d6b5e3 (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	1062	switch (m5 & RAIL_TYPE_MASK) {
304124d6b5e3 (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	1063	case RAIL_TYPE_SIGNALS:
304124d6b5e3 (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	1064	if (_map3_lo[tile] & _signals_table_both[0]) {
304124d6b5e3 (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	1065	ret = DoCommandByTile(tile, 0, 0, flags, CMD_REMOVE_SIGNALS);
304124d6b5e3 (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	1066	if (ret == CMD_ERROR) return CMD_ERROR;
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1067	cost += ret;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1068	}
1534 304124d6b5e3 (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	1069	if (_map3_lo[tile] & _signals_table_both[3]) {
304124d6b5e3 (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	1070	ret = DoCommandByTile(tile, 3, 0, flags, CMD_REMOVE_SIGNALS);
304124d6b5e3 (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	1071	if (ret == CMD_ERROR) return CMD_ERROR;
304124d6b5e3 (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	1072	cost += ret;
304124d6b5e3 (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	1073	}
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1074
1534 304124d6b5e3 (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	1075	m5 &= RAIL_BIT_MASK;
1598 f34ca0eb3506 (svn r2102) Fix bug introduced in r2038, which gave you money for clearing occupied railway tiles ([1171926]) tron parents: 1591 diff changeset	1076	if (!(flags & DC_EXEC)) {
f34ca0eb3506 (svn r2102) Fix bug introduced in r2038, which gave you money for clearing occupied railway tiles ([1171926]) tron parents: 1591 diff changeset	1077	for (; m5 != 0; m5 >>= 1) if (m5 & 1) cost += _price.remove_rail;
f34ca0eb3506 (svn r2102) Fix bug introduced in r2038, which gave you money for clearing occupied railway tiles ([1171926]) tron parents: 1591 diff changeset	1078	return cost;
f34ca0eb3506 (svn r2102) Fix bug introduced in r2038, which gave you money for clearing occupied railway tiles ([1171926]) tron parents: 1591 diff changeset	1079	}
1534 304124d6b5e3 (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	1080	/* FALLTHROUGH */
1109 ecb98f43ba2c (svn r1610) Remove trailing whitespace (last time ever, i hope) tron parents: 1095 diff changeset	1081
1534 304124d6b5e3 (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	1082	case RAIL_TYPE_NORMAL: {
304124d6b5e3 (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	1083	uint i;
304124d6b5e3 (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	1084
304124d6b5e3 (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	1085	for (i = 0; m5 != 0; i++, m5 >>= 1) {
304124d6b5e3 (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	1086	if (m5 & 1) {
1598 f34ca0eb3506 (svn r2102) Fix bug introduced in r2038, which gave you money for clearing occupied railway tiles ([1171926]) tron parents: 1591 diff changeset	1087	ret = DoCommandByTile(tile, 0, i, flags, CMD_REMOVE_SINGLE_RAIL);
f34ca0eb3506 (svn r2102) Fix bug introduced in r2038, which gave you money for clearing occupied railway tiles ([1171926]) tron parents: 1591 diff changeset	1088	if (ret == CMD_ERROR) return CMD_ERROR;
1534 304124d6b5e3 (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	1089	cost += ret;
304124d6b5e3 (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	1090	}
304124d6b5e3 (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	1091	}
304124d6b5e3 (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	1092	return cost;
304124d6b5e3 (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	1093	}
304124d6b5e3 (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	1094
304124d6b5e3 (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	1095	case RAIL_TYPE_DEPOT:
304124d6b5e3 (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	1096	switch (m5 & RAIL_SUBTYPE_MASK) {
304124d6b5e3 (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	1097	case RAIL_SUBTYPE_DEPOT:
304124d6b5e3 (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	1098	return RemoveTrainDepot(tile, flags);
304124d6b5e3 (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	1099
304124d6b5e3 (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	1100	case RAIL_SUBTYPE_WAYPOINT:
304124d6b5e3 (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	1101	return RemoveTrainWaypoint(tile, flags, false);
304124d6b5e3 (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	1102
304124d6b5e3 (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	1103	default:
304124d6b5e3 (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	1104	return CMD_ERROR;
304124d6b5e3 (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	1105	}
304124d6b5e3 (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	1106
304124d6b5e3 (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	1107	default:
304124d6b5e3 (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	1108	return CMD_ERROR;
304124d6b5e3 (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	1109	}
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1110	}
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1111
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1112
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1113
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1114	#include "table/track_land.h"
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1115
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1116	// used for presignals
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1117	static const SpriteID _signal_base_sprites[16] = {
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1118	0x4FB,
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1119	0x1323,
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1120	0x1333,
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1121	0x1343,
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1122
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1123	// use semaphores instead of signals?
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1124	0x1353,
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1125	0x1363,
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1126	0x1373,
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1127	0x1383,
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1128
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1129	// mirrored versions
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1130	0x4FB,
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1131	0x1323,
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1132	0x1333,
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1133	0x1343,
201 c40d343115f8 (svn r202) -Codechange: I missed some files with trailing spaces.. this should be truelight parents: 159 diff changeset	1134
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1135	0x13C6,
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1136	0x13D6,
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1137	0x13E6,
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1138	0x13F6,
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1139	};
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1140
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1141	// 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	1142	static const byte _signal_position[24] = {
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1143	/* original: left side position */
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1144	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	1145	/* patch: ride side position */
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1146	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	1147	};
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1148
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1149	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	1150	{
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1151	bool otherside = _opt.road_side & _patches.signal_side;
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	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	1154	uint x = ti->x \| (v&0xF);
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1155	uint y = ti->y \| (v>>4);
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1156	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	1157	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	1158	}
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1159
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1160	static uint32 _drawtile_track_palette;
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	static void DrawTrackFence_NW(TileInfo *ti)
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	uint32 image = 0x515;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1166	if (ti->tileh != 0) {
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1167	image = 0x519;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1168	if (!(ti->tileh & 2)) {
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1169	image = 0x51B;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1170	}
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1171	}
201 c40d343115f8 (svn r202) -Codechange: I missed some files with trailing spaces.. this should be truelight parents: 159 diff changeset	1172	AddSortableSpriteToDraw(image \| _drawtile_track_palette,
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1173	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	1174	}
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1175
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1176	static void DrawTrackFence_SE(TileInfo *ti)
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1177	{
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1178	uint32 image = 0x515;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1179	if (ti->tileh != 0) {
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1180	image = 0x519;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1181	if (!(ti->tileh & 2)) {
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1182	image = 0x51B;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1183	}
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1184	}
201 c40d343115f8 (svn r202) -Codechange: I missed some files with trailing spaces.. this should be truelight parents: 159 diff changeset	1185	AddSortableSpriteToDraw(image \| _drawtile_track_palette,
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1186	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	1187	}
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1188
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1189	static void DrawTrackFence_NW_SE(TileInfo *ti)
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1190	{
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1191	DrawTrackFence_NW(ti);
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1192	DrawTrackFence_SE(ti);
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1193	}
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1194
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1195	static void DrawTrackFence_NE(TileInfo *ti)
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1196	{
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1197	uint32 image = 0x516;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1198	if (ti->tileh != 0) {
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1199	image = 0x51A;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1200	if (!(ti->tileh & 2)) {
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1201	image = 0x51C;
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	}
201 c40d343115f8 (svn r202) -Codechange: I missed some files with trailing spaces.. this should be truelight parents: 159 diff changeset	1204	AddSortableSpriteToDraw(image \| _drawtile_track_palette,
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1205	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	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	static void DrawTrackFence_SW(TileInfo *ti)
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1209	{
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1210	uint32 image = 0x516;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1211	if (ti->tileh != 0) {
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1212	image = 0x51A;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1213	if (!(ti->tileh & 2)) {
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1214	image = 0x51C;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1215	}
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1216	}
201 c40d343115f8 (svn r202) -Codechange: I missed some files with trailing spaces.. this should be truelight parents: 159 diff changeset	1217	AddSortableSpriteToDraw(image \| _drawtile_track_palette,
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1218	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	1219	}
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	static void DrawTrackFence_NE_SW(TileInfo *ti)
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1222	{
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1223	DrawTrackFence_NE(ti);
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1224	DrawTrackFence_SW(ti);
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1225	}
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	static void DrawTrackFence_NS_1(TileInfo *ti)
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1228	{
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1229	int z = ti->z;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1230	if (ti->tileh & 1)
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1231	z += 8;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1232	AddSortableSpriteToDraw(0x517 \| _drawtile_track_palette,
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1233	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	1234	}
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1235
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1236	static void DrawTrackFence_NS_2(TileInfo *ti)
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1237	{
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1238	int z = ti->z;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1239	if (ti->tileh & 4)
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1240	z += 8;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1241	AddSortableSpriteToDraw(0x517 \| _drawtile_track_palette,
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1242	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	1243	}
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1244
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1245	static void DrawTrackFence_WE_1(TileInfo *ti)
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1246	{
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1247	int z = ti->z;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1248	if (ti->tileh & 8)
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1249	z += 8;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1250	AddSortableSpriteToDraw(0x518 \| _drawtile_track_palette,
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1251	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	1252	}
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1253
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1254	static void DrawTrackFence_WE_2(TileInfo *ti)
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1255	{
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1256	int z = ti->z;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1257	if (ti->tileh & 2)
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1258	z += 8;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1259	AddSortableSpriteToDraw(0x518 \| _drawtile_track_palette,
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1260	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	1261	}
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1262
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1263	static void DetTrackDrawProc_Null(TileInfo *ti)
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1264	{
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1265	/* nothing should be here */
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1266	}
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1267
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1268	typedef void DetailedTrackProc(TileInfo *ti);
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1269	DetailedTrackProc * const _detailed_track_proc[16] = {
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1270	DetTrackDrawProc_Null,
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1271	DetTrackDrawProc_Null,
201 c40d343115f8 (svn r202) -Codechange: I missed some files with trailing spaces.. this should be truelight parents: 159 diff changeset	1272
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1273	DrawTrackFence_NW,
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1274	DrawTrackFence_SE,
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1275	DrawTrackFence_NW_SE,
201 c40d343115f8 (svn r202) -Codechange: I missed some files with trailing spaces.. this should be truelight parents: 159 diff changeset	1276
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1277	DrawTrackFence_NE,
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1278	DrawTrackFence_SW,
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1279	DrawTrackFence_NE_SW,
201 c40d343115f8 (svn r202) -Codechange: I missed some files with trailing spaces.. this should be truelight parents: 159 diff changeset	1280
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1281	DrawTrackFence_NS_1,
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1282	DrawTrackFence_NS_2,
201 c40d343115f8 (svn r202) -Codechange: I missed some files with trailing spaces.. this should be truelight parents: 159 diff changeset	1283
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1284	DrawTrackFence_WE_1,
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1285	DrawTrackFence_WE_2,
201 c40d343115f8 (svn r202) -Codechange: I missed some files with trailing spaces.. this should be truelight parents: 159 diff changeset	1286
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1287	DetTrackDrawProc_Null,
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1288	DetTrackDrawProc_Null,
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1289	DetTrackDrawProc_Null,
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1290	DetTrackDrawProc_Null,
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1291	};
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1292
389 16ee9854091e (svn r581) -newgrf: Basic support for new stations - only waypoints supported now and only celestar parents: 337 diff changeset	1293	static void DrawSpecialBuilding(uint32 image, uint32 tracktype_offs,
16ee9854091e (svn r581) -newgrf: Basic support for new stations - only waypoints supported now and only celestar parents: 337 diff changeset	1294	TileInfo *ti,
16ee9854091e (svn r581) -newgrf: Basic support for new stations - only waypoints supported now and only celestar parents: 337 diff changeset	1295	byte x, byte y, byte z,
16ee9854091e (svn r581) -newgrf: Basic support for new stations - only waypoints supported now and only celestar parents: 337 diff changeset	1296	byte xsize, byte ysize, byte zsize)
16ee9854091e (svn r581) -newgrf: Basic support for new stations - only waypoints supported now and only celestar parents: 337 diff changeset	1297	{
16ee9854091e (svn r581) -newgrf: Basic support for new stations - only waypoints supported now and only celestar parents: 337 diff changeset	1298	if (image & 0x8000)
16ee9854091e (svn r581) -newgrf: Basic support for new stations - only waypoints supported now and only celestar parents: 337 diff changeset	1299	image \|= _drawtile_track_palette;
16ee9854091e (svn r581) -newgrf: Basic support for new stations - only waypoints supported now and only celestar parents: 337 diff changeset	1300	image += tracktype_offs;
497 4d1c889526ee (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	1301	if (_display_opt & DO_TRANS_BUILDINGS) // show transparent depots
389 16ee9854091e (svn r581) -newgrf: Basic support for new stations - only waypoints supported now and only celestar parents: 337 diff changeset	1302	image = (image & 0x3FFF) \| 0x3224000;
16ee9854091e (svn r581) -newgrf: Basic support for new stations - only waypoints supported now and only celestar parents: 337 diff changeset	1303	AddSortableSpriteToDraw(image, ti->x + x, ti->y + y, xsize, ysize, zsize, ti->z + z);
16ee9854091e (svn r581) -newgrf: Basic support for new stations - only waypoints supported now and only celestar parents: 337 diff changeset	1304	}
16ee9854091e (svn r581) -newgrf: Basic support for new stations - only waypoints supported now and only celestar parents: 337 diff changeset	1305
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1306	static void DrawTile_Track(TileInfo *ti)
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1307	{
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1308	uint32 tracktype_offs, image;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1309	byte m5;
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	_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	1312
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1313	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	1314
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1315	m5 = (byte)ti->map5;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1316	if (!(m5 & RAIL_TYPE_SPECIAL)) {
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1317	bool special;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1318
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1319	m5 &= RAIL_BIT_MASK;
201 c40d343115f8 (svn r202) -Codechange: I missed some files with trailing spaces.. this should be truelight parents: 159 diff changeset	1320
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1321	special = false;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1322
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1323	// 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	1324	(image = 0x3F3, m5 == RAIL_BIT_DIAG2) \|\|
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1325	(image++, m5 == RAIL_BIT_DIAG1) \|\|
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1326	(image++, m5 == RAIL_BIT_UPPER) \|\|
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1327	(image++, m5 == RAIL_BIT_LOWER) \|\|
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1328	(image++, m5 == RAIL_BIT_RIGHT) \|\|
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1329	(image++, m5 == RAIL_BIT_LEFT) \|\|
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1330	(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	1331
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1332	(image = 0x40B, m5 == (RAIL_BIT_UPPER\|RAIL_BIT_LOWER)) \|\|
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1333	(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	1334
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1335	(special=true, false) \|\|
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	(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	1338	(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	1339	(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	1340	(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	1341	(image++, true);
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1342
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1343	if (ti->tileh != 0) {
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1344	int f = GetRailFoundation(ti->tileh, ti->map5 & 0x3F);
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1345	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	1346
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1347	// default sloped sprites..
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1348	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	1349	}
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1350
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1351	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	1352	image = (image & 0xFFFF) \| 0x3178000; // use a brown palette
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1353	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	1354	image += 26;
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	DrawGroundSprite(image + tracktype_offs);
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1357
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1358	if (special) {
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1359	if (m5 & RAIL_BIT_DIAG1) DrawGroundSprite(0x3ED + tracktype_offs);
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1360	if (m5 & RAIL_BIT_DIAG2) DrawGroundSprite(0x3EE + tracktype_offs);
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1361	if (m5 & RAIL_BIT_UPPER) DrawGroundSprite(0x3EF + tracktype_offs);
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1362	if (m5 & RAIL_BIT_LOWER) DrawGroundSprite(0x3F0 + tracktype_offs);
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1363	if (m5 & RAIL_BIT_LEFT) DrawGroundSprite(0x3F2 + tracktype_offs);
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1364	if (m5 & RAIL_BIT_RIGHT) DrawGroundSprite(0x3F1 + tracktype_offs);
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1365	}
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1366
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1367	if (_display_opt & DO_FULL_DETAIL) {
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1368	_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	1369	}
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1370
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1371	/* draw signals also? */
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1372	if (!(ti->map5 & RAIL_TYPE_SIGNALS))
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1373	return;
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	{
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1376	byte m23;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1377
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1378	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	1379
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1380	#define HAS_SIGNAL(x) (m23 & (byte)(0x1 << (x)))
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1381	#define ISON_SIGNAL(x) (m23 & (byte)(0x10 << (x)))
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1382	#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	1383
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1384	if (!(m5 & RAIL_BIT_DIAG2)) {
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1385	if (!(m5 & RAIL_BIT_DIAG1)) {
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1386	if (m5 & RAIL_BIT_LEFT) {
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1387	MAYBE_DRAW_SIGNAL(2, 0x509, 0);
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1388	MAYBE_DRAW_SIGNAL(3, 0x507, 1);
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1389	}
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1390	if (m5 & RAIL_BIT_RIGHT) {
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1391	MAYBE_DRAW_SIGNAL(0, 0x509, 2);
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1392	MAYBE_DRAW_SIGNAL(1, 0x507, 3);
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	if (m5 & RAIL_BIT_UPPER) {
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1395	MAYBE_DRAW_SIGNAL(3, 0x505, 4);
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1396	MAYBE_DRAW_SIGNAL(2, 0x503, 5);
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1397	}
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1398	if (m5 & RAIL_BIT_LOWER) {
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1399	MAYBE_DRAW_SIGNAL(1, 0x505, 6);
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1400	MAYBE_DRAW_SIGNAL(0, 0x503, 7);
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1401	}
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1402	} else {
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1403	MAYBE_DRAW_SIGNAL(3, 0x4FB, 8);
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1404	MAYBE_DRAW_SIGNAL(2, 0x4FD, 9);
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1405	}
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1406	} else {
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1407	MAYBE_DRAW_SIGNAL(3, 0x4FF, 10);
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1408	MAYBE_DRAW_SIGNAL(2, 0x501, 11);
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1409	}
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1410	}
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1411	} else {
395 788a9bba0889 (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	1412	/* draw depots / waypoints */
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1413	const DrawTrackSeqStruct *drss;
395 788a9bba0889 (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	1414	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	1415
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1416	if (!(m5 & (RAIL_TYPE_MASK&~RAIL_TYPE_SPECIAL)))
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1417	return;
201 c40d343115f8 (svn r202) -Codechange: I missed some files with trailing spaces.. this should be truelight parents: 159 diff changeset	1418
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1419	if (ti->tileh != 0) { DrawFoundation(ti, ti->tileh); }
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1420
1535 84d53678f31f (svn r2039) IS_RAIL_DEPOT -> IsRailDepot, IS_RAIL_WAYPOINT -> IsRailWaypoint tron parents: 1534 diff changeset	1421	if (IsRailWaypoint(m5) && _map3_lo[ti->tile] & 16) {
389 16ee9854091e (svn r581) -newgrf: Basic support for new stations - only waypoints supported now and only celestar parents: 337 diff changeset	1422	// look for customization
1477 9389baf2bf3c (svn r1981) Typedef some structs and enums tron parents: 1399 diff changeset	1423	StationSpec *stat = GetCustomStation(STAT_CLASS_WAYP, _map3_hi[ti->tile]);
389 16ee9854091e (svn r581) -newgrf: Basic support for new stations - only waypoints supported now and only celestar parents: 337 diff changeset	1424
403 dc7aef17c13e (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	1425	if (stat) {
389 16ee9854091e (svn r581) -newgrf: Basic support for new stations - only waypoints supported now and only celestar parents: 337 diff changeset	1426	DrawTileSeqStruct const *seq;
403 dc7aef17c13e (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	1427	// emulate station tile - open with building
dc7aef17c13e (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	1428	DrawTileSprites *cust = &stat->renderdata[2 + (m5 & 0x1)];
413 36f14a6d63d7 (svn r610) -newgrf: Support for some basic deterministical spritegroups regarding stations. Waypoints look changes based on year now :^) (pasky). darkvater parents: 412 diff changeset	1429	uint32 relocation = GetCustomStationRelocation(stat, ComposeWaypointStation(ti->tile), 0);
415 20f981988266 (svn r612) [newgrf] Fix: custom waypoints on monorail/maglev are displayed correctly dominik parents: 413 diff changeset	1430	int railtype=(_map3_lo[ti->tile] & 0xF);
389 16ee9854091e (svn r581) -newgrf: Basic support for new stations - only waypoints supported now and only celestar parents: 337 diff changeset	1431
447 7e4bb71b8752 (svn r657) Do not touch 0x8000 bit in sprite index for custom waypoints. (pasky) celestar parents: 438 diff changeset	1432	/* We don't touch the 0x8000 bit. In all this
7e4bb71b8752 (svn r657) Do not touch 0x8000 bit in sprite index for custom waypoints. (pasky) celestar parents: 438 diff changeset	1433	* waypoint code, it is used to indicate that
7e4bb71b8752 (svn r657) Do not touch 0x8000 bit in sprite index for custom waypoints. (pasky) celestar parents: 438 diff changeset	1434	* we should offset by railtype, but we always
7e4bb71b8752 (svn r657) Do not touch 0x8000 bit in sprite index for custom waypoints. (pasky) celestar parents: 438 diff changeset	1435	* do that for custom ground sprites and never
7e4bb71b8752 (svn r657) Do not touch 0x8000 bit in sprite index for custom waypoints. (pasky) celestar parents: 438 diff changeset	1436	* for station sprites. And in the drawing
7e4bb71b8752 (svn r657) Do not touch 0x8000 bit in sprite index for custom waypoints. (pasky) celestar parents: 438 diff changeset	1437	* code, it is used to indicate that the sprite
7e4bb71b8752 (svn r657) Do not touch 0x8000 bit in sprite index for custom waypoints. (pasky) celestar parents: 438 diff changeset	1438	* should be drawn in company colors, and it's
7e4bb71b8752 (svn r657) Do not touch 0x8000 bit in sprite index for custom waypoints. (pasky) celestar parents: 438 diff changeset	1439	* up to the GRF file to decide that. */
7e4bb71b8752 (svn r657) Do not touch 0x8000 bit in sprite index for custom waypoints. (pasky) celestar parents: 438 diff changeset	1440
417 6a7b22f86424 (svn r614) [newgrf] Some minor code fixes dominik parents: 415 diff changeset	1441	image = cust->ground_sprite;
6a7b22f86424 (svn r614) [newgrf] Some minor code fixes dominik parents: 415 diff changeset	1442	image += railtype*((image<_custom_sprites_base)?TRACKTYPE_SPRITE_PITCH:1);
415 20f981988266 (svn r612) [newgrf] Fix: custom waypoints on monorail/maglev are displayed correctly dominik parents: 413 diff changeset	1443
389 16ee9854091e (svn r581) -newgrf: Basic support for new stations - only waypoints supported now and only celestar parents: 337 diff changeset	1444	DrawGroundSprite(image);
16ee9854091e (svn r581) -newgrf: Basic support for new stations - only waypoints supported now and only celestar parents: 337 diff changeset	1445
16ee9854091e (svn r581) -newgrf: Basic support for new stations - only waypoints supported now and only celestar parents: 337 diff changeset	1446	foreach_draw_tile_seq(seq, cust->seq) {
403 dc7aef17c13e (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	1447	uint32 image = seq->image + relocation;
447 7e4bb71b8752 (svn r657) Do not touch 0x8000 bit in sprite index for custom waypoints. (pasky) celestar parents: 438 diff changeset	1448	DrawSpecialBuilding(image, 0, ti,
389 16ee9854091e (svn r581) -newgrf: Basic support for new stations - only waypoints supported now and only celestar parents: 337 diff changeset	1449	seq->delta_x, seq->delta_y, seq->delta_z,
16ee9854091e (svn r581) -newgrf: Basic support for new stations - only waypoints supported now and only celestar parents: 337 diff changeset	1450	seq->width, seq->height, seq->unk);
16ee9854091e (svn r581) -newgrf: Basic support for new stations - only waypoints supported now and only celestar parents: 337 diff changeset	1451	}
16ee9854091e (svn r581) -newgrf: Basic support for new stations - only waypoints supported now and only celestar parents: 337 diff changeset	1452	return;
16ee9854091e (svn r581) -newgrf: Basic support for new stations - only waypoints supported now and only celestar parents: 337 diff changeset	1453	}
16ee9854091e (svn r581) -newgrf: Basic support for new stations - only waypoints supported now and only celestar parents: 337 diff changeset	1454	}
16ee9854091e (svn r581) -newgrf: Basic support for new stations - only waypoints supported now and only celestar parents: 337 diff changeset	1455
1399 61e7c68e9da6 (svn r1903) Replace some casts and macro magic with proper typing, similar to r1902 tron parents: 1363 diff changeset	1456	drss = _track_depot_layout_table[type];
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1457
1399 61e7c68e9da6 (svn r1903) Replace some casts and macro magic with proper typing, similar to r1902 tron parents: 1363 diff changeset	1458	image = drss++->image;
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1459	if (image & 0x8000) image = (image & 0x7FFF) + tracktype_offs;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1460
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1461	// adjust ground tile for desert
283 1ab67e2e4907 (svn r289) Fix: Checkpoints on snow have correct ground now dominik parents: 282 diff changeset	1462	// (don't adjust for arctic depots, because snow in depots looks weird)
1ab67e2e4907 (svn r289) Fix: Checkpoints on snow have correct ground now dominik parents: 282 diff changeset	1463	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	1464	{
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1465	if(image!=3981)
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1466	image += 26; // tile with tracks
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1467	else
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1468	image = 4550; // flat ground
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1469	}
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1470
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1471	DrawGroundSprite(image);
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1472
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1473	while ((image=drss->image) != 0) {
389 16ee9854091e (svn r581) -newgrf: Basic support for new stations - only waypoints supported now and only celestar parents: 337 diff changeset	1474	DrawSpecialBuilding(image, type < 4 ? tracktype_offs : 0, ti,
16ee9854091e (svn r581) -newgrf: Basic support for new stations - only waypoints supported now and only celestar parents: 337 diff changeset	1475	drss->subcoord_x, drss->subcoord_y, 0,
16ee9854091e (svn r581) -newgrf: Basic support for new stations - only waypoints supported now and only celestar parents: 337 diff changeset	1476	drss->width, drss->height, 0x17);
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1477	drss++;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1478	}
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1479	}
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1480	}
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1481
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1482	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	1483	{
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1484	uint32 ormod, img;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1485	const DrawTrackSeqStruct *dtss;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1486
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1487	/* baseimage */
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1488	railtype *= TRACKTYPE_SPRITE_PITCH;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1489
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1490	ormod = PLAYER_SPRITE_COLOR(_local_player);
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1491
1399 61e7c68e9da6 (svn r1903) Replace some casts and macro magic with proper typing, similar to r1902 tron parents: 1363 diff changeset	1492	dtss = _track_depot_layout_table[image];
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1493
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1494	x+=33;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1495	y+=17;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1496
1399 61e7c68e9da6 (svn r1903) Replace some casts and macro magic with proper typing, similar to r1902 tron parents: 1363 diff changeset	1497	img = dtss++->image;
201 c40d343115f8 (svn r202) -Codechange: I missed some files with trailing spaces.. this should be truelight parents: 159 diff changeset	1498	if (img & 0x8000) img = (img & 0x7FFF) + railtype;
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1499	DrawSprite(img, x, y);
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1500
1399 61e7c68e9da6 (svn r1903) Replace some casts and macro magic with proper typing, similar to r1902 tron parents: 1363 diff changeset	1501	for (; dtss->image != 0; dtss++) {
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1502	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	1503	image = dtss->image;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1504	if (image & 0x8000) image \|= ormod;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1505	DrawSprite(image + railtype, x + pt.x, y + pt.y);
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1506	}
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1507	}
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1508
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1509	#define NUM_SSD_ENTRY 256
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1510	#define NUM_SSD_STACK 32
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1511
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1512	typedef struct SetSignalsData {
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1513	int cur;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1514	int cur_stack;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1515	bool stop;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1516	bool has_presignal;
201 c40d343115f8 (svn r202) -Codechange: I missed some files with trailing spaces.. this should be truelight parents: 159 diff changeset	1517
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1518	// presignal info
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1519	int presignal_exits;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1520	int presignal_exits_free;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1521
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1522	// 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	1523	byte bit[NUM_SSD_ENTRY];
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1524	TileIndex tile[NUM_SSD_ENTRY];
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	// 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	1527	TileIndex next_tile[NUM_SSD_STACK];
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1528	byte next_dir[NUM_SSD_STACK];
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1529
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1530	} SetSignalsData;
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	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	1533	{
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1534	// the tile has signals?
1035 812f837ee03f (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	1535	if (IsTileType(tile, MP_RAILWAY)) {
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1536	if ((_map5[tile]&RAIL_TYPE_MASK) == RAIL_TYPE_SIGNALS) {
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1537	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	1538
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1539	// is the signal pointing in to the segment existing?
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1540	if ((_map3_lo[tile] & _signals_table[track]) != 0) {
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1541	// yes, add the signal to the list of signals
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1542	if (ssd->cur != NUM_SSD_ENTRY) {
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1543	ssd->tile[ssd->cur] = tile; // remember the tile index
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1544	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	1545	ssd->cur++;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1546	}
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1547
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1548	// remember if this block has a presignal.
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1549	ssd->has_presignal \|= (_map3_hi[tile]&1);
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1550	}
201 c40d343115f8 (svn r202) -Codechange: I missed some files with trailing spaces.. this should be truelight parents: 159 diff changeset	1551
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1552	// 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	1553	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	1554	ssd->presignal_exits++;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1555	if ((_map2[tile]&_signals_table_other[track]) != 0)
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1556	ssd->presignal_exits_free++;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1557	}
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1558
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1559	return true;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1560	}
1535 84d53678f31f (svn r2039) IS_RAIL_DEPOT -> IsRailDepot, IS_RAIL_WAYPOINT -> IsRailWaypoint tron parents: 1534 diff changeset	1561	} else if (IsRailDepot(_map5[tile]))
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1562	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	1563	}
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1564	return false;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1565	}
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1566
1555 7259e8f70267 (svn r2059) -Codechange: rewrote SetSignalsAfterProc so now the tiles from the PF truelight parents: 1542 diff changeset	1567	/* Struct to parse data from VehicleFromPos to SignalVehicleCheckProc */
7259e8f70267 (svn r2059) -Codechange: rewrote SetSignalsAfterProc so now the tiles from the PF truelight parents: 1542 diff changeset	1568	typedef struct SignalVehicleCheckStruct {
7259e8f70267 (svn r2059) -Codechange: rewrote SetSignalsAfterProc so now the tiles from the PF truelight parents: 1542 diff changeset	1569	TileIndex tile;
7259e8f70267 (svn r2059) -Codechange: rewrote SetSignalsAfterProc so now the tiles from the PF truelight parents: 1542 diff changeset	1570	uint track;
7259e8f70267 (svn r2059) -Codechange: rewrote SetSignalsAfterProc so now the tiles from the PF truelight parents: 1542 diff changeset	1571	} SignalVehicleCheckStruct;
7259e8f70267 (svn r2059) -Codechange: rewrote SetSignalsAfterProc so now the tiles from the PF truelight parents: 1542 diff changeset	1572
7259e8f70267 (svn r2059) -Codechange: rewrote SetSignalsAfterProc so now the tiles from the PF truelight parents: 1542 diff changeset	1573	static void SignalVehicleCheckProc(Vehicle v, void *data)
7259e8f70267 (svn r2059) -Codechange: rewrote SetSignalsAfterProc so now the tiles from the PF truelight parents: 1542 diff changeset	1574	{
7259e8f70267 (svn r2059) -Codechange: rewrote SetSignalsAfterProc so now the tiles from the PF truelight parents: 1542 diff changeset	1575	SignalVehicleCheckStruct *dest = data;
7259e8f70267 (svn r2059) -Codechange: rewrote SetSignalsAfterProc so now the tiles from the PF truelight parents: 1542 diff changeset	1576	TileIndex tile;
7259e8f70267 (svn r2059) -Codechange: rewrote SetSignalsAfterProc so now the tiles from the PF truelight parents: 1542 diff changeset	1577
1609 108c0501019e (svn r2113) -Fix: first check if a vehicle is a train, before accessing u.rail truelight parents: 1598 diff changeset	1578	if (v->type != VEH_Train)
108c0501019e (svn r2113) -Fix: first check if a vehicle is a train, before accessing u.rail truelight parents: 1598 diff changeset	1579	return NULL;
108c0501019e (svn r2113) -Fix: first check if a vehicle is a train, before accessing u.rail truelight parents: 1598 diff changeset	1580
1555 7259e8f70267 (svn r2059) -Codechange: rewrote SetSignalsAfterProc so now the tiles from the PF truelight parents: 1542 diff changeset	1581	/* Find the tile outside the tunnel, for signalling */
1609 108c0501019e (svn r2113) -Fix: first check if a vehicle is a train, before accessing u.rail truelight parents: 1598 diff changeset	1582	if (v->u.rail.track == 0x40)
1555 7259e8f70267 (svn r2059) -Codechange: rewrote SetSignalsAfterProc so now the tiles from the PF truelight parents: 1542 diff changeset	1583	tile = GetVehicleOutOfTunnelTile(v);
1609 108c0501019e (svn r2113) -Fix: first check if a vehicle is a train, before accessing u.rail truelight parents: 1598 diff changeset	1584	else
1555 7259e8f70267 (svn r2059) -Codechange: rewrote SetSignalsAfterProc so now the tiles from the PF truelight parents: 1542 diff changeset	1585	tile = v->tile;
7259e8f70267 (svn r2059) -Codechange: rewrote SetSignalsAfterProc so now the tiles from the PF truelight parents: 1542 diff changeset	1586
7259e8f70267 (svn r2059) -Codechange: rewrote SetSignalsAfterProc so now the tiles from the PF truelight parents: 1542 diff changeset	1587	/* Wrong tile, or no train? Not a match */
1609 108c0501019e (svn r2113) -Fix: first check if a vehicle is a train, before accessing u.rail truelight parents: 1598 diff changeset	1588	if (tile != dest->tile)
1555 7259e8f70267 (svn r2059) -Codechange: rewrote SetSignalsAfterProc so now the tiles from the PF truelight parents: 1542 diff changeset	1589	return NULL;
7259e8f70267 (svn r2059) -Codechange: rewrote SetSignalsAfterProc so now the tiles from the PF truelight parents: 1542 diff changeset	1590
7259e8f70267 (svn r2059) -Codechange: rewrote SetSignalsAfterProc so now the tiles from the PF truelight parents: 1542 diff changeset	1591	/* Are we on the same piece of track? */
7259e8f70267 (svn r2059) -Codechange: rewrote SetSignalsAfterProc so now the tiles from the PF truelight parents: 1542 diff changeset	1592	if (dest->track & (v->u.rail.track + (v->u.rail.track<<8)))
7259e8f70267 (svn r2059) -Codechange: rewrote SetSignalsAfterProc so now the tiles from the PF truelight parents: 1542 diff changeset	1593	return v;
7259e8f70267 (svn r2059) -Codechange: rewrote SetSignalsAfterProc so now the tiles from the PF truelight parents: 1542 diff changeset	1594
7259e8f70267 (svn r2059) -Codechange: rewrote SetSignalsAfterProc so now the tiles from the PF truelight parents: 1542 diff changeset	1595	return NULL;
7259e8f70267 (svn r2059) -Codechange: rewrote SetSignalsAfterProc so now the tiles from the PF truelight parents: 1542 diff changeset	1596	}
7259e8f70267 (svn r2059) -Codechange: rewrote SetSignalsAfterProc so now the tiles from the PF truelight parents: 1542 diff changeset	1597
7259e8f70267 (svn r2059) -Codechange: rewrote SetSignalsAfterProc so now the tiles from the PF truelight parents: 1542 diff changeset	1598	/* Special check for SetSignalsAfterProc, to see if there is a vehicle on this tile */
7259e8f70267 (svn r2059) -Codechange: rewrote SetSignalsAfterProc so now the tiles from the PF truelight parents: 1542 diff changeset	1599	bool SignalVehicleCheck(TileIndex tile, uint track)
7259e8f70267 (svn r2059) -Codechange: rewrote SetSignalsAfterProc so now the tiles from the PF truelight parents: 1542 diff changeset	1600	{
7259e8f70267 (svn r2059) -Codechange: rewrote SetSignalsAfterProc so now the tiles from the PF truelight parents: 1542 diff changeset	1601	SignalVehicleCheckStruct dest;
7259e8f70267 (svn r2059) -Codechange: rewrote SetSignalsAfterProc so now the tiles from the PF truelight parents: 1542 diff changeset	1602
7259e8f70267 (svn r2059) -Codechange: rewrote SetSignalsAfterProc so now the tiles from the PF truelight parents: 1542 diff changeset	1603	dest.tile = tile;
7259e8f70267 (svn r2059) -Codechange: rewrote SetSignalsAfterProc so now the tiles from the PF truelight parents: 1542 diff changeset	1604	dest.track = track;
7259e8f70267 (svn r2059) -Codechange: rewrote SetSignalsAfterProc so now the tiles from the PF truelight parents: 1542 diff changeset	1605
7259e8f70267 (svn r2059) -Codechange: rewrote SetSignalsAfterProc so now the tiles from the PF truelight parents: 1542 diff changeset	1606	return VehicleFromPos(tile, &dest, SignalVehicleCheckProc) != NULL;
7259e8f70267 (svn r2059) -Codechange: rewrote SetSignalsAfterProc so now the tiles from the PF truelight parents: 1542 diff changeset	1607	}
7259e8f70267 (svn r2059) -Codechange: rewrote SetSignalsAfterProc so now the tiles from the PF truelight parents: 1542 diff changeset	1608
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1609	static void SetSignalsAfterProc(TrackPathFinder *tpf)
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	SetSignalsData *ssd = tpf->userdata;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1612	TrackPathFinderLink *link;
1555 7259e8f70267 (svn r2059) -Codechange: rewrote SetSignalsAfterProc so now the tiles from the PF truelight parents: 1542 diff changeset	1613	uint offs;
7259e8f70267 (svn r2059) -Codechange: rewrote SetSignalsAfterProc so now the tiles from the PF truelight parents: 1542 diff changeset	1614	uint i;
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1615
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1616	ssd->stop = false;
201 c40d343115f8 (svn r202) -Codechange: I missed some files with trailing spaces.. this should be truelight parents: 159 diff changeset	1617
1555 7259e8f70267 (svn r2059) -Codechange: rewrote SetSignalsAfterProc so now the tiles from the PF truelight parents: 1542 diff changeset	1618	/* Go through all the PF tiles */
7259e8f70267 (svn r2059) -Codechange: rewrote SetSignalsAfterProc so now the tiles from the PF truelight parents: 1542 diff changeset	1619	for (i = 0; i < lengthof(tpf->hash_head); i++) {
7259e8f70267 (svn r2059) -Codechange: rewrote SetSignalsAfterProc so now the tiles from the PF truelight parents: 1542 diff changeset	1620	/* Empty hash item */
7259e8f70267 (svn r2059) -Codechange: rewrote SetSignalsAfterProc so now the tiles from the PF truelight parents: 1542 diff changeset	1621	if (tpf->hash_head[i] == 0)
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1622	continue;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1623
1555 7259e8f70267 (svn r2059) -Codechange: rewrote SetSignalsAfterProc so now the tiles from the PF truelight parents: 1542 diff changeset	1624	/* If 0x8000 is not set, there is only 1 item */
7259e8f70267 (svn r2059) -Codechange: rewrote SetSignalsAfterProc so now the tiles from the PF truelight parents: 1542 diff changeset	1625	if (!(tpf->hash_head[i] & 0x8000)) {
7259e8f70267 (svn r2059) -Codechange: rewrote SetSignalsAfterProc so now the tiles from the PF truelight parents: 1542 diff changeset	1626	/* Check if there is a vehicle on this tile */
7259e8f70267 (svn r2059) -Codechange: rewrote SetSignalsAfterProc so now the tiles from the PF truelight parents: 1542 diff changeset	1627	if (SignalVehicleCheck(tpf->hash_tile[i], tpf->hash_head[i])) {
7259e8f70267 (svn r2059) -Codechange: rewrote SetSignalsAfterProc so now the tiles from the PF truelight parents: 1542 diff changeset	1628	ssd->stop = true;
7259e8f70267 (svn r2059) -Codechange: rewrote SetSignalsAfterProc so now the tiles from the PF truelight parents: 1542 diff changeset	1629	return;
7259e8f70267 (svn r2059) -Codechange: rewrote SetSignalsAfterProc so now the tiles from the PF truelight parents: 1542 diff changeset	1630	}
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1631	} else {
1555 7259e8f70267 (svn r2059) -Codechange: rewrote SetSignalsAfterProc so now the tiles from the PF truelight parents: 1542 diff changeset	1632	/* There are multiple items, where hash_tile points to the first item in the list */
7259e8f70267 (svn r2059) -Codechange: rewrote SetSignalsAfterProc so now the tiles from the PF truelight parents: 1542 diff changeset	1633	offs = tpf->hash_tile[i];
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1634	do {
1555 7259e8f70267 (svn r2059) -Codechange: rewrote SetSignalsAfterProc so now the tiles from the PF truelight parents: 1542 diff changeset	1635	/* Find the next item */
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1636	link = PATHFIND_GET_LINK_PTR(tpf, offs);
1555 7259e8f70267 (svn r2059) -Codechange: rewrote SetSignalsAfterProc so now the tiles from the PF truelight parents: 1542 diff changeset	1637	/* Check if there is a vehicle on this tile */
7259e8f70267 (svn r2059) -Codechange: rewrote SetSignalsAfterProc so now the tiles from the PF truelight parents: 1542 diff changeset	1638	if (SignalVehicleCheck(link->tile, link->flags)) {
7259e8f70267 (svn r2059) -Codechange: rewrote SetSignalsAfterProc so now the tiles from the PF truelight parents: 1542 diff changeset	1639	ssd->stop = true;
7259e8f70267 (svn r2059) -Codechange: rewrote SetSignalsAfterProc so now the tiles from the PF truelight parents: 1542 diff changeset	1640	return;
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1641	}
1555 7259e8f70267 (svn r2059) -Codechange: rewrote SetSignalsAfterProc so now the tiles from the PF truelight parents: 1542 diff changeset	1642	/* Goto the next item */
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1643	} while ((offs=link->next) != 0xFFFF);
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1644	}
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1645	}
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1646	}
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1647
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1648	static const byte _dir_from_track[14] = {
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1649	0,1,0,1,2,1, 0,0,
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1650	2,3,3,2,3,0,
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1651	};
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1652
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1653
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1654	static void ChangeSignalStates(SetSignalsData *ssd)
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1655	{
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1656	int i;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1657
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1658	// thinking about presignals...
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1659	// the presignal is green if,
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1660	// if no train is in the segment AND
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1661	// there is at least one green exit signal OR
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1662	// there are no exit signals in the segment
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1663
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1664	// then mark the signals in the segment accordingly
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1665	for(i=0; i!=ssd->cur; i++) {
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1666	uint tile = ssd->tile[i];
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1667	byte bit = _signals_table[ssd->bit[i]];
817 238bbdaa228b (svn r1288) -Codechange: changed _map2 to an uint16. It is still saved and loaded as truelight parents: 679 diff changeset	1668	uint16 m2 = _map2[tile];
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1669
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1670	// 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	1671	if (_map3_hi[tile] & 1) {
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1672	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	1673
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1674	// 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	1675	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	1676	ex--;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1677	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	1678	}
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1679
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1680	// 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	1681	if (ex && !exfree) goto make_red;
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	// check if the signal is unaffected.
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1685	if (ssd->stop) {
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1686	make_red:
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1687	// turn red
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1688	if ( (bit&m2) == 0 )
201 c40d343115f8 (svn r202) -Codechange: I missed some files with trailing spaces.. this should be truelight parents: 159 diff changeset	1689	continue;
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1690	} else {
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1691	// turn green
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1692	if ( (bit&m2) != 0 )
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1693	continue;
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
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1696	// 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	1697	// 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	1698	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	1699	if (ssd->cur_stack != NUM_SSD_STACK) {
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1700	ssd->next_tile[ssd->cur_stack] = tile;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1701	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	1702	ssd->cur_stack++;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1703	} else {
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1704	printf("NUM_SSD_STACK too small\n");
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1705	}
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1706	}
201 c40d343115f8 (svn r202) -Codechange: I missed some files with trailing spaces.. this should be truelight parents: 159 diff changeset	1707
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1708	// it changed, so toggle it
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1709	_map2[tile] = m2 ^ bit;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1710	MarkTileDirtyByTile(tile);
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1711	}
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1712	}
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1713
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1714
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1715	bool UpdateSignalsOnSegment(uint tile, byte direction)
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1716	{
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1717	SetSignalsData ssd;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1718	int result = -1;
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	ssd.cur_stack = 0;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1721	direction>>=1;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1722
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1723	for(;;) {
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1724	// 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	1725	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	1726	ssd.has_presignal = false;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1727
159 139cf78bfb28 (svn r160) -Codechange: made GetTileTrackStatus more readable (blathijs) truelight parents: 149 diff changeset	1728	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	1729	ChangeSignalStates(&ssd);
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1730
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1731	// remember the result only for the first iteration.
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1732	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	1733
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1734	// 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	1735	if(!ssd.cur_stack)
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1736	break;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1737
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1738	// 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	1739	tile = ssd.next_tile[--ssd.cur_stack];
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1740	direction = ssd.next_dir[ssd.cur_stack];
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1741	}
201 c40d343115f8 (svn r202) -Codechange: I missed some files with trailing spaces.. this should be truelight parents: 159 diff changeset	1742
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1743	return (bool)result;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1744	}
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1745
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1746	void SetSignalsOnBothDir(uint tile, byte track)
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1747	{
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1748	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	1749	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	1750
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1751	UpdateSignalsOnSegment(tile, _search_dir_1[track]);
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1752	UpdateSignalsOnSegment(tile, _search_dir_2[track]);
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1753	}
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1754
410 0efd84450b01 (svn r607) -Patch: [ 985102 ] static cleanup tron parents: 408 diff changeset	1755	static uint GetSlopeZ_Track(TileInfo *ti)
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1756	{
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1757	uint z = ti->z;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1758	int th = ti->tileh;
13 3e7c1f74a996 (svn r14) Fix: railroad crossings on slopes are now possible dominik parents: 0 diff changeset	1759
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1760	// check if it's a foundation
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1761	if (ti->tileh != 0) {
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1762	if ((ti->map5 & 0x80) == 0) {
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1763	uint f = GetRailFoundation(ti->tileh, ti->map5 & 0x3F);
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1764	if (f != 0) {
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1765	if (f < 15) {
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1766	// leveled foundation
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1767	return z + 8;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1768	}
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1769	// inclined foundation
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1770	th = _inclined_tileh[f - 15];
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1771	}
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1772	} else if ((ti->map5 & 0xC0) == 0xC0) {
395 788a9bba0889 (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	1773	// depot or waypoint
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1774	return z + 8;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1775	}
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1776	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	1777	}
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1778	return z;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1779	}
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1780
1095 b59632d9df1b (svn r1596) Add some more statics tron parents: 1093 diff changeset	1781	static uint GetSlopeTileh_Track(TileInfo *ti)
39 d177340ed556 (svn r40) Final slope graphics fix dominik parents: 22 diff changeset	1782	{
d177340ed556 (svn r40) Final slope graphics fix dominik parents: 22 diff changeset	1783	// check if it's a foundation
d177340ed556 (svn r40) Final slope graphics fix dominik parents: 22 diff changeset	1784	if (ti->tileh != 0) {
d177340ed556 (svn r40) Final slope graphics fix dominik parents: 22 diff changeset	1785	if ((ti->map5 & 0x80) == 0) {
d177340ed556 (svn r40) Final slope graphics fix dominik parents: 22 diff changeset	1786	uint f = GetRailFoundation(ti->tileh, ti->map5 & 0x3F);
d177340ed556 (svn r40) Final slope graphics fix dominik parents: 22 diff changeset	1787	if (f != 0) {
d177340ed556 (svn r40) Final slope graphics fix dominik parents: 22 diff changeset	1788	if (f < 15) {
d177340ed556 (svn r40) Final slope graphics fix dominik parents: 22 diff changeset	1789	// leveled foundation
d177340ed556 (svn r40) Final slope graphics fix dominik parents: 22 diff changeset	1790	return 0;
d177340ed556 (svn r40) Final slope graphics fix dominik parents: 22 diff changeset	1791	}
d177340ed556 (svn r40) Final slope graphics fix dominik parents: 22 diff changeset	1792	// inclined foundation
d177340ed556 (svn r40) Final slope graphics fix dominik parents: 22 diff changeset	1793	return _inclined_tileh[f - 15];
d177340ed556 (svn r40) Final slope graphics fix dominik parents: 22 diff changeset	1794	}
d177340ed556 (svn r40) Final slope graphics fix dominik parents: 22 diff changeset	1795	} else if ((ti->map5 & 0xC0) == 0xC0) {
395 788a9bba0889 (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	1796	// depot or waypoint
39 d177340ed556 (svn r40) Final slope graphics fix dominik parents: 22 diff changeset	1797	return 0;
d177340ed556 (svn r40) Final slope graphics fix dominik parents: 22 diff changeset	1798	}
d177340ed556 (svn r40) Final slope graphics fix dominik parents: 22 diff changeset	1799	}
d177340ed556 (svn r40) Final slope graphics fix dominik parents: 22 diff changeset	1800	return ti->tileh;
d177340ed556 (svn r40) Final slope graphics fix dominik parents: 22 diff changeset	1801	}
d177340ed556 (svn r40) Final slope graphics fix dominik parents: 22 diff changeset	1802
473 77f0ef57e7cf (svn r724) Remove restriction that a tile can only accept 3 cargo types. tron parents: 447 diff changeset	1803	static void GetAcceptedCargo_Track(uint tile, AcceptedCargo ac)
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1804	{
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1805	/* not used */
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1806	}
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1807
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1808	static void AnimateTile_Track(uint tile)
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1809	{
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1810	/* not used */
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	static void TileLoop_Track(uint tile)
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1814	{
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1815	byte a2;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1816	byte rail;
817 238bbdaa228b (svn r1288) -Codechange: changed _map2 to an uint16. It is still saved and loaded as truelight parents: 679 diff changeset	1817	uint16 m2;
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1818	byte owner;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1819
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1820	m2 = _map2[tile] & 0xF;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1821
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1822	/* special code for alps landscape */
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1823	if (_opt.landscape == LT_HILLY) {
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1824	/* convert into snow? */
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1825	if (GetTileZ(tile) > _opt.snow_line) {
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1826	a2 = RAIL_GROUND_ICE_DESERT;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1827	goto modify_me;
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
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1830	/* special code for desert landscape */
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1831	} else if (_opt.landscape == LT_DESERT) {
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1832	/* convert into desert? */
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1833	if (GetMapExtraBits(tile) == 1) {
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1834	a2 = RAIL_GROUND_ICE_DESERT;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1835	goto modify_me;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1836	}
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1837	}
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	// Don't continue tile loop for depots
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1840	if (_map5[tile] & RAIL_TYPE_SPECIAL)
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1841	return;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1842
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1843	a2 = RAIL_GROUND_GREEN;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1844
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1845	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	1846	/* determine direction of fence */
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1847	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	1848
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1849	if (rail == RAIL_BIT_UPPER) {
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1850	a2 = RAIL_GROUND_FENCE_HORIZ1;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1851	} else if (rail == RAIL_BIT_LOWER) {
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1852	a2 = RAIL_GROUND_FENCE_HORIZ2;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1853	} else if (rail == RAIL_BIT_LEFT) {
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1854	a2 = RAIL_GROUND_FENCE_VERT1;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1855	} else if (rail == RAIL_BIT_RIGHT) {
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1856	a2 = RAIL_GROUND_FENCE_VERT2;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1857	} else {
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1858	owner = _map_owner[tile];
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1859
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1860	if ( (!(rail&(RAIL_BIT_DIAG2\|RAIL_BIT_UPPER\|RAIL_BIT_LEFT)) && (rail&RAIL_BIT_DIAG1)) \|\| rail==(RAIL_BIT_LOWER\|RAIL_BIT_RIGHT)) {
1035 812f837ee03f (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	1861	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	1862	owner != _map_owner[tile + TILE_XY(0,-1)] \|\|
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1863	(_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	1864	a2 = RAIL_GROUND_FENCE_NW;
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1865	}
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1866
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1867	if ( (!(rail&(RAIL_BIT_DIAG2\|RAIL_BIT_LOWER\|RAIL_BIT_RIGHT)) && (rail&RAIL_BIT_DIAG1)) \|\| rail==(RAIL_BIT_UPPER\|RAIL_BIT_LEFT)) {
1035 812f837ee03f (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	1868	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	1869	owner != _map_owner[tile + TILE_XY(0,1)] \|\|
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1870	(_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	1871	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	1872	}
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1873
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1874	if ( (!(rail&(RAIL_BIT_DIAG1\|RAIL_BIT_UPPER\|RAIL_BIT_RIGHT)) && (rail&RAIL_BIT_DIAG2)) \|\| rail==(RAIL_BIT_LOWER\|RAIL_BIT_LEFT)) {
1035 812f837ee03f (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	1875	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	1876	owner != _map_owner[tile + TILE_XY(-1,0)] \|\|
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1877	(_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	1878	a2 = RAIL_GROUND_FENCE_NE;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1879	}
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1880
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1881	if ( (!(rail&(RAIL_BIT_DIAG1\|RAIL_BIT_LOWER\|RAIL_BIT_LEFT)) && (rail&RAIL_BIT_DIAG2)) \|\| rail==(RAIL_BIT_UPPER\|RAIL_BIT_RIGHT)) {
1035 812f837ee03f (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	1882	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	1883	owner != _map_owner[tile + TILE_XY(1,0)] \|\|
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1884	(_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	1885	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	1886	}
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	}
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1889
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1890	modify_me:;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1891	/* tile changed? */
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1892	if ( m2 != a2) {
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1893	_map2[tile] = (_map2[tile] & ~RAIL_MAP2LO_GROUND_MASK) \| a2;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1894	MarkTileDirtyByTile(tile);
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1895	}
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1896	}
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1897
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1898
159 139cf78bfb28 (svn r160) -Codechange: made GetTileTrackStatus more readable (blathijs) truelight parents: 149 diff changeset	1899	static uint32 GetTileTrackStatus_Track(uint tile, TransportType mode) {
817 238bbdaa228b (svn r1288) -Codechange: changed _map2 to an uint16. It is still saved and loaded as truelight parents: 679 diff changeset	1900	byte m5, a;
238bbdaa228b (svn r1288) -Codechange: changed _map2 to an uint16. It is still saved and loaded as truelight parents: 679 diff changeset	1901	uint16 b;
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1902	uint32 ret;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1903
159 139cf78bfb28 (svn r160) -Codechange: made GetTileTrackStatus more readable (blathijs) truelight parents: 149 diff changeset	1904	if (mode != TRANSPORT_RAIL)
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1905	return 0;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1906
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1907	m5 = _map5[tile];
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	if (!(m5 & RAIL_TYPE_SPECIAL)) {
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1910	ret = (m5 \| (m5 << 8)) & 0x3F3F;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1911	if (!(m5 & RAIL_TYPE_SIGNALS)) {
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1912	if ( (ret & 0xFF) == 3)
22 fe6f35cc987b (svn r23) -Some omments on the code (blathijs) darkvater parents: 13 diff changeset	1913	/* Diagonal crossing? */
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1914	ret \|= 0x40;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1915	} else {
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1916	/* has_signals */
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1917
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1918	a = _map3_lo[tile];
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1919	b = _map2[tile];
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1920
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1921	b &= a;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1922
22 fe6f35cc987b (svn r23) -Some omments on the code (blathijs) darkvater parents: 13 diff changeset	1923	/* When signals are not present (in neither
fe6f35cc987b (svn r23) -Some omments on the code (blathijs) darkvater parents: 13 diff changeset	1924	* direction), we pretend them to be green. (So if
fe6f35cc987b (svn r23) -Some omments on the code (blathijs) darkvater parents: 13 diff changeset	1925	* signals are only one way, the other way will
fe6f35cc987b (svn r23) -Some omments on the code (blathijs) darkvater parents: 13 diff changeset	1926	* implicitely become `red' */
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1927	if ((a & 0xC0) == 0) { b \|= 0xC0; }
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1928	if ((a & 0x30) == 0) { b \|= 0x30; }
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1929
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1930	if ( (b & 0x80) == 0) ret \|= 0x10070000;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1931	if ( (b & 0x40) == 0) ret \|= 0x7100000;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1932	if ( (b & 0x20) == 0) ret \|= 0x20080000;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1933	if ( (b & 0x10) == 0) ret \|= 0x8200000;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1934	}
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1935	} else if (m5 & 0x40) {
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1936	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	1937	m5 = _train_spec_tracks[m5 & 0x3F];
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1938	ret = (m5 << 8) + m5;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1939	} else
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1940	return 0;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1941	return ret;
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	static void ClickTile_Track(uint tile)
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1945	{
1535 84d53678f31f (svn r2039) IS_RAIL_DEPOT -> IsRailDepot, IS_RAIL_WAYPOINT -> IsRailWaypoint tron parents: 1534 diff changeset	1946	if (IsRailDepot(_map5[tile]))
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1947	ShowTrainDepotWindow(tile);
1535 84d53678f31f (svn r2039) IS_RAIL_DEPOT -> IsRailDepot, IS_RAIL_WAYPOINT -> IsRailWaypoint tron parents: 1534 diff changeset	1948	else if (IsRailWaypoint(_map5[tile]))
1542 62a03537ad0b (svn r2046) -Codechange: moved all waypoint code to waypoint.c/waypoint.h truelight parents: 1536 diff changeset	1949	ShowRenameWaypointWindow(GetWaypointByTile(tile));
201 c40d343115f8 (svn r202) -Codechange: I missed some files with trailing spaces.. this should be truelight parents: 159 diff changeset	1950
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1951	}
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1952
1590 3351993cb1da (svn r2094) In GetTileDesc_Track(): uint -> TileIndex, use enums, if () cascade -> switch tron parents: 1555 diff changeset	1953	static void GetTileDesc_Track(TileIndex tile, TileDesc *td)
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1954	{
1590 3351993cb1da (svn r2094) In GetTileDesc_Track(): uint -> TileIndex, use enums, if () cascade -> switch tron parents: 1555 diff changeset	1955	td->owner = _map_owner[tile];
3351993cb1da (svn r2094) In GetTileDesc_Track(): uint -> TileIndex, use enums, if () cascade -> switch tron parents: 1555 diff changeset	1956	switch (_map5[tile] & RAIL_TYPE_MASK) {
3351993cb1da (svn r2094) In GetTileDesc_Track(): uint -> TileIndex, use enums, if () cascade -> switch tron parents: 1555 diff changeset	1957	case RAIL_TYPE_NORMAL:
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1958	td->str = STR_1021_RAILROAD_TRACK;
1590 3351993cb1da (svn r2094) In GetTileDesc_Track(): uint -> TileIndex, use enums, if () cascade -> switch tron parents: 1555 diff changeset	1959	break;
3351993cb1da (svn r2094) In GetTileDesc_Track(): uint -> TileIndex, use enums, if () cascade -> switch tron parents: 1555 diff changeset	1960
3351993cb1da (svn r2094) In GetTileDesc_Track(): uint -> TileIndex, use enums, if () cascade -> switch tron parents: 1555 diff changeset	1961	case RAIL_TYPE_SIGNALS: {
3351993cb1da (svn r2094) In GetTileDesc_Track(): uint -> TileIndex, use enums, if () cascade -> switch tron parents: 1555 diff changeset	1962	const StringID signal_type[] = {
3351993cb1da (svn r2094) In GetTileDesc_Track(): uint -> TileIndex, use enums, if () cascade -> switch tron parents: 1555 diff changeset	1963	STR_RAILROAD_TRACK_WITH_NORMAL_SIGNALS,
3351993cb1da (svn r2094) In GetTileDesc_Track(): uint -> TileIndex, use enums, if () cascade -> switch tron parents: 1555 diff changeset	1964	STR_RAILROAD_TRACK_WITH_PRESIGNALS,
3351993cb1da (svn r2094) In GetTileDesc_Track(): uint -> TileIndex, use enums, if () cascade -> switch tron parents: 1555 diff changeset	1965	STR_RAILROAD_TRACK_WITH_EXITSIGNALS,
3351993cb1da (svn r2094) In GetTileDesc_Track(): uint -> TileIndex, use enums, if () cascade -> switch tron parents: 1555 diff changeset	1966	STR_RAILROAD_TRACK_WITH_COMBOSIGNALS
3351993cb1da (svn r2094) In GetTileDesc_Track(): uint -> TileIndex, use enums, if () cascade -> switch tron parents: 1555 diff changeset	1967	};
3351993cb1da (svn r2094) In GetTileDesc_Track(): uint -> TileIndex, use enums, if () cascade -> switch tron parents: 1555 diff changeset	1968
3351993cb1da (svn r2094) In GetTileDesc_Track(): uint -> TileIndex, use enums, if () cascade -> switch tron parents: 1555 diff changeset	1969	td->str = signal_type[_map3_hi[tile] & 0x03];
3351993cb1da (svn r2094) In GetTileDesc_Track(): uint -> TileIndex, use enums, if () cascade -> switch tron parents: 1555 diff changeset	1970	break;
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1971	}
1590 3351993cb1da (svn r2094) In GetTileDesc_Track(): uint -> TileIndex, use enums, if () cascade -> switch tron parents: 1555 diff changeset	1972
3351993cb1da (svn r2094) In GetTileDesc_Track(): uint -> TileIndex, use enums, if () cascade -> switch tron parents: 1555 diff changeset	1973	case RAIL_TYPE_DEPOT:
3351993cb1da (svn r2094) In GetTileDesc_Track(): uint -> TileIndex, use enums, if () cascade -> switch tron parents: 1555 diff changeset	1974	default:
3351993cb1da (svn r2094) In GetTileDesc_Track(): uint -> TileIndex, use enums, if () cascade -> switch tron parents: 1555 diff changeset	1975	td->str = ((_map5[tile] & RAIL_SUBTYPE_MASK) == RAIL_SUBTYPE_DEPOT) ?
3351993cb1da (svn r2094) In GetTileDesc_Track(): uint -> TileIndex, use enums, if () cascade -> switch tron parents: 1555 diff changeset	1976	STR_1023_RAILROAD_TRAIN_DEPOT : STR_LANDINFO_WAYPOINT;
3351993cb1da (svn r2094) In GetTileDesc_Track(): uint -> TileIndex, use enums, if () cascade -> switch tron parents: 1555 diff changeset	1977	break;
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1978	}
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1979	}
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	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	1982	{
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1983	if (_map_owner[tile] != old_player)
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1984	return;
201 c40d343115f8 (svn r202) -Codechange: I missed some files with trailing spaces.. this should be truelight parents: 159 diff changeset	1985
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1986	if (new_player != 255) {
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1987	_map_owner[tile] = new_player;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1988	} else {
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1989	DoCommandByTile(tile, 0, 0, DC_EXEC, CMD_LANDSCAPE_CLEAR);
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1990	}
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1991	}
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1992
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1993	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	1994	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	1995	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	1996	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	1997	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	1998	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	1999
410 0efd84450b01 (svn r607) -Patch: [ 985102 ] static cleanup tron parents: 408 diff changeset	2000	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	2001	{
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	2002	byte fract_coord;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	2003	int dir;
201 c40d343115f8 (svn r202) -Codechange: I missed some files with trailing spaces.. this should be truelight parents: 159 diff changeset	2004
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	2005	// this routine applies only to trains in depot tiles
1535 84d53678f31f (svn r2039) IS_RAIL_DEPOT -> IsRailDepot, IS_RAIL_WAYPOINT -> IsRailWaypoint tron parents: 1534 diff changeset	2006	if (v->type != VEH_Train \|\| !IsRailDepot(_map5[tile]))
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	2007	return 0;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	2008
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	2009	/* depot direction */
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	2010	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	2011
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	2012	fract_coord = (x & 0xF) + ((y & 0xF) << 4);
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	2013	if (_fractcoords_behind[dir] == fract_coord) {
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	2014	/* 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	2015	return 8;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	2016	} else if (_fractcoords_enter[dir] == fract_coord) {
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	2017	if (_enter_directions[dir] == v->direction) {
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	2018	/* enter the depot */
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	2019	v->u.rail.track = 0x80,
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	2020	v->vehstatus \|= VS_HIDDEN; /* hide it */
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	2021	v->direction ^= 4;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	2022	if (v->next == NULL)
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	2023	TrainEnterDepot(v, tile);
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	2024	v->tile = tile;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	2025	InvalidateWindow(WC_VEHICLE_DEPOT, tile);
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	2026	return 4;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	2027	}
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	2028	} else if (_fractcoords_leave[dir] == fract_coord) {
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	2029	if (_leave_directions[dir] == v->direction) {
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	2030	/* leave the depot? */
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	2031	if ((v=v->next) != NULL) {
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	2032	v->vehstatus &= ~VS_HIDDEN;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	2033	v->u.rail.track = _depot_track_mask[dir];
1330 5d76a0522a11 (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	2034	assert(v->u.rail.track);
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	2035	}
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
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	2039	return 0;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	2040	}
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	2041
1093 4fdc46eaf423 (svn r1594) Convert all undefined parameter lists to (void) and add the appropriate warning flags in the Makefile tron parents: 1084 diff changeset	2042	void InitializeRail(void)
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	2043	{
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	2044	_last_built_train_depot_tile = 0;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	2045	}
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	2046
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	2047	const TileTypeProcs _tile_type_rail_procs = {
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	2048	DrawTile_Track, /* draw_tile_proc */
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	2049	GetSlopeZ_Track, /* get_slope_z_proc */
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	2050	ClearTile_Track, /* clear_tile_proc */
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	2051	GetAcceptedCargo_Track, /* get_accepted_cargo_proc */
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	2052	GetTileDesc_Track, /* get_tile_desc_proc */
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	2053	GetTileTrackStatus_Track, /* get_tile_track_status_proc */
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	2054	ClickTile_Track, /* click_tile_proc */
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	2055	AnimateTile_Track, /* animate_tile_proc */
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	2056	TileLoop_Track, /* tile_loop_clear */
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	2057	ChangeTileOwner_Track, /* change_tile_owner_clear */
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	2058	NULL, /* get_produced_cargo_proc */
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	2059	VehicleEnter_Track, /* vehicle_enter_tile_proc */
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	2060	NULL, /* vehicle_leave_tile_proc */
39 d177340ed556 (svn r40) Final slope graphics fix dominik parents: 22 diff changeset	2061	GetSlopeTileh_Track, /* get_slope_tileh_proc */
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	2062	};

author	Darkvater
	Thu, 12 May 2005 00:20:16 +0000
changeset 1795	06f7b463ee52
parent 1782	48749e4c2dc6
child 1796	614d996f6be7
permissions	-rw-r--r--