openttd-ottdgrfs: rail_cmd.c@3f78323707bb (annotated)

2186 461a2aff3486 (svn r2701) Insert Id tags into all source files tron parents: 2163 diff changeset	1	/* $Id$ */
461a2aff3486 (svn r2701) Insert Id tags into all source files tron parents: 2163 diff changeset	2
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	3	#include "stdafx.h"
1891 92a3b0aa0946 (svn r2397) - CodeChange: rename all "ttd" files to "openttd" files. Darkvater parents: 1818 diff changeset	4	#include "openttd.h"
1922 797081e56d13 (svn r2428) - Feature: [newgrf] Implement shorter train vehicles (Therax), and the callback that goes with it. hackykid parents: 1903 diff changeset	5	#include "debug.h"
2163 637ec3c361f5 (svn r2673) Include functions.h directly, not globally via openttd.h tron parents: 2148 diff changeset	6	#include "functions.h"
1363 01d3de5d8039 (svn r1867) Include tables/sprites.h only in files which need it tron parents: 1330 diff changeset	7	#include "table/sprites.h"
507 8aa8100b0b22 (svn r815) Include strings.h only in the files which need it. tron parents: 497 diff changeset	8	#include "table/strings.h"
679 e959706a3e4d (svn r1117) Move map arrays and some related macros into their own files map.c and map.h tron parents: 555 diff changeset	9	#include "map.h"
1209 a1ac96655b79 (svn r1713) Split off several functions which query/set information about a single tile from map.h and put them into a seperate file tile.h tron parents: 1123 diff changeset	10	#include "tile.h"
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	11	#include "vehicle.h"
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	12	#include "viewport.h"
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	13	#include "command.h"
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	14	#include "pathfind.h"
1922 797081e56d13 (svn r2428) - Feature: [newgrf] Implement shorter train vehicles (Therax), and the callback that goes with it. hackykid parents: 1903 diff changeset	15	#include "engine.h"
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	16	#include "town.h"
337 66647f97e7c0 (svn r513) Merge revisions 402, 416, 417, 478, 479, 511, 512 from map to trunk tron parents: 283 diff changeset	17	#include "sound.h"
389 2d394eeba5e5 (svn r581) -newgrf: Basic support for new stations - only waypoints supported now and only celestar parents: 337 diff changeset	18	#include "station.h"
405 6830ae7a0d5d (svn r602) -newgrf: Move DrawTileSeqStruct & co and struct SpriteGroup to sprite.h (pasky) darkvater parents: 403 diff changeset	19	#include "sprite.h"
1313 bba6afb8a995 (svn r1817) -Codechange: Moved depot-functions to depot.c truelight parents: 1247 diff changeset	20	#include "depot.h"
2008 c9d6585c96c8 (svn r2516) - Feature: [pbs] Implement path-based-signalling. This allows multiple trains within the same signal block, provided their paths dont intersect. For this the block must have all exit and entry signals be pbs signals. Place these by ctrl-clicking 4 times on a normal signal. hackykid parents: 2007 diff changeset	21	#include "pbs.h"
1542 2ca6d1624e6d (svn r2046) -Codechange: moved all waypoint code to waypoint.c/waypoint.h truelight parents: 1536 diff changeset	22	#include "waypoint.h"
2008 c9d6585c96c8 (svn r2516) - Feature: [pbs] Implement path-based-signalling. This allows multiple trains within the same signal block, provided their paths dont intersect. For this the block must have all exit and entry signals be pbs signals. Place these by ctrl-clicking 4 times on a normal signal. hackykid parents: 2007 diff changeset	23	#include "npf.h"
1942 634961366cdc (svn r2448) General cleanup of rail related code, more to follow. matthijs parents: 1928 diff changeset	24	#include "rail.h"
2236 55f4d7353f52 (svn r2756) Renamed railtypes into _railtypes ludde parents: 2233 diff changeset	25	#include "railtypes.h" // include table for railtypes
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	26
415 423de36034b8 (svn r612) [newgrf] Fix: custom waypoints on monorail/maglev are displayed correctly dominik parents: 413 diff changeset	27	extern uint16 _custom_sprites_base;
423de36034b8 (svn r612) [newgrf] Fix: custom waypoints on monorail/maglev are displayed correctly dominik parents: 413 diff changeset	28
2261 3f78323707bb (svn r2781) Fix some of the issues with variables in .h files. ludde parents: 2254 diff changeset	29	const byte _track_sloped_sprites[14] = {
3f78323707bb (svn r2781) Fix some of the issues with variables in .h files. ludde parents: 2254 diff changeset	30	14, 15, 22, 13,
3f78323707bb (svn r2781) Fix some of the issues with variables in .h files. ludde parents: 2254 diff changeset	31	0, 21, 17, 12,
3f78323707bb (svn r2781) Fix some of the issues with variables in .h files. ludde parents: 2254 diff changeset	32	23, 0, 18, 20,
3f78323707bb (svn r2781) Fix some of the issues with variables in .h files. ludde parents: 2254 diff changeset	33	19, 16
3f78323707bb (svn r2781) Fix some of the issues with variables in .h files. ludde parents: 2254 diff changeset	34	};
3f78323707bb (svn r2781) Fix some of the issues with variables in .h files. ludde parents: 2254 diff changeset	35
1977 4392ae3d8e31 (svn r2483) Replace almost 500 "uint tile" (and variants) with "TileIndex tile" tron parents: 1963 diff changeset	36	void ShowTrainDepotWindow(TileIndex tile);
0 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	/* Format of rail map5 byte.
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	39	* 00 abcdef => Normal rail
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	40	* 01 abcdef => Rail with signals
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	41	* 10 ?????? => Unused
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	42	* 11 ????dd => Depot
22 fe6f35cc987b (svn r23) -Some omments on the code (blathijs) darkvater parents: 13 diff changeset	43	*
fe6f35cc987b (svn r23) -Some omments on the code (blathijs) darkvater parents: 13 diff changeset	44	* 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	45	* value for each track is given.
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	46	*/
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	47
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	48	/* 4
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	49	* ---------
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	50	* \|\ /\|
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	51	* \| \ 1/ \|
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	52	* \| \ / \|
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	53	* \| \ / \|
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	54	* 16\| \ \|32
201 c40d343115f8 (svn r202) -Codechange: I missed some files with trailing spaces.. this should be truelight parents: 159 diff changeset	55	* \| / \2 \|
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	56	* \| / \ \|
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	57	* \| / \ \|
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	58	* \|/ \\|
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	59	* ---------
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	60	* 8
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
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	64	// 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	65	enum RailMap2Lower4 {
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	66	RAIL_MAP2LO_GROUND_MASK = 0xF,
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	67	RAIL_GROUND_BROWN = 0,
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	68	RAIL_GROUND_GREEN = 1,
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	69	RAIL_GROUND_FENCE_NW = 2,
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	70	RAIL_GROUND_FENCE_SE = 3,
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	71	RAIL_GROUND_FENCE_SENW = 4,
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	72	RAIL_GROUND_FENCE_NE = 5,
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	73	RAIL_GROUND_FENCE_SW = 6,
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	74	RAIL_GROUND_FENCE_NESW = 7,
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	75	RAIL_GROUND_FENCE_VERT1 = 8,
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	76	RAIL_GROUND_FENCE_VERT2 = 9,
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	77	RAIL_GROUND_FENCE_HORIZ1 = 10,
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	78	RAIL_GROUND_FENCE_HORIZ2 = 11,
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	79	RAIL_GROUND_ICE_DESERT = 12,
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	80	};
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	81
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	82
22 fe6f35cc987b (svn r23) -Some omments on the code (blathijs) darkvater parents: 13 diff changeset	83	/* 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	84	* MAP3LO byte: abcd???? => Signal Exists?
22 fe6f35cc987b (svn r23) -Some omments on the code (blathijs) darkvater parents: 13 diff changeset	85	* a and b are for diagonals, upper and left,
fe6f35cc987b (svn r23) -Some omments on the code (blathijs) darkvater parents: 13 diff changeset	86	* one for each direction. (ie a == NE->SW, b ==
fe6f35cc987b (svn r23) -Some omments on the code (blathijs) darkvater parents: 13 diff changeset	87	* 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	88	* similar for lower and right.
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	89	* MAP2 byte: ????abcd => Type of ground.
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	90	* MAP3LO byte: ????abcd => Type of rail.
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	91	* MAP5: 00abcdef => rail
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	92	* 01abcdef => rail w/ signals
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	93	* 10uuuuuu => unused
201 c40d343115f8 (svn r202) -Codechange: I missed some files with trailing spaces.. this should be truelight parents: 159 diff changeset	94	* 11uuuudd => rail depot
0 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
1942 634961366cdc (svn r2448) General cleanup of rail related code, more to follow. matthijs parents: 1928 diff changeset	97	static bool CheckTrackCombination(TileIndex tile, TrackBits to_build, uint flags)
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	98	{
1942 634961366cdc (svn r2448) General cleanup of rail related code, more to follow. matthijs parents: 1928 diff changeset	99	RailTileType type = GetRailTileType(tile);
634961366cdc (svn r2448) General cleanup of rail related code, more to follow. matthijs parents: 1928 diff changeset	100	TrackBits current; /* The current track layout */
634961366cdc (svn r2448) General cleanup of rail related code, more to follow. matthijs parents: 1928 diff changeset	101	TrackBits future; /* The track layout we want to build */
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	102	_error_message = STR_1001_IMPOSSIBLE_TRACK_COMBINATION;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	103
1942 634961366cdc (svn r2448) General cleanup of rail related code, more to follow. matthijs parents: 1928 diff changeset	104	if (type != RAIL_TYPE_NORMAL && type != RAIL_TYPE_SIGNALS)
634961366cdc (svn r2448) General cleanup of rail related code, more to follow. matthijs parents: 1928 diff changeset	105	return false; /* Cannot build anything on depots and checkpoints */
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	106
1942 634961366cdc (svn r2448) General cleanup of rail related code, more to follow. matthijs parents: 1928 diff changeset	107	/* So, we have a tile with tracks on it (and possibly signals). Let's see
634961366cdc (svn r2448) General cleanup of rail related code, more to follow. matthijs parents: 1928 diff changeset	108	* what tracks first */
634961366cdc (svn r2448) General cleanup of rail related code, more to follow. matthijs parents: 1928 diff changeset	109	current = GetTrackBits(tile);
1946 68e7ee03016a (svn r2452) Fix defect in r2448 which caused building tracks unexpectedly fail or succeed tron parents: 1942 diff changeset	110	future = current \| to_build;
201 c40d343115f8 (svn r202) -Codechange: I missed some files with trailing spaces.. this should be truelight parents: 159 diff changeset	111
1942 634961366cdc (svn r2448) General cleanup of rail related code, more to follow. matthijs parents: 1928 diff changeset	112	/* Are we really building something new? */
634961366cdc (svn r2448) General cleanup of rail related code, more to follow. matthijs parents: 1928 diff changeset	113	if (current == future) {
634961366cdc (svn r2448) General cleanup of rail related code, more to follow. matthijs parents: 1928 diff changeset	114	/* Nothing new is being built */
634961366cdc (svn r2448) General cleanup of rail related code, more to follow. matthijs parents: 1928 diff changeset	115	_error_message = STR_1007_ALREADY_BUILT;
634961366cdc (svn r2448) General cleanup of rail related code, more to follow. matthijs parents: 1928 diff changeset	116	return false;
634961366cdc (svn r2448) General cleanup of rail related code, more to follow. matthijs parents: 1928 diff changeset	117	}
201 c40d343115f8 (svn r202) -Codechange: I missed some files with trailing spaces.. this should be truelight parents: 159 diff changeset	118
1942 634961366cdc (svn r2448) General cleanup of rail related code, more to follow. matthijs parents: 1928 diff changeset	119	/* Let's see if we may build this */
634961366cdc (svn r2448) General cleanup of rail related code, more to follow. matthijs parents: 1928 diff changeset	120	if ((flags & DC_NO_RAIL_OVERLAP) \|\| type == RAIL_TYPE_SIGNALS) {
634961366cdc (svn r2448) General cleanup of rail related code, more to follow. matthijs parents: 1928 diff changeset	121	/* If we are not allowed to overlap (flag is on for ai players or we have
634961366cdc (svn r2448) General cleanup of rail related code, more to follow. matthijs parents: 1928 diff changeset	122	* signals on the tile), check that */
634961366cdc (svn r2448) General cleanup of rail related code, more to follow. matthijs parents: 1928 diff changeset	123	return
634961366cdc (svn r2448) General cleanup of rail related code, more to follow. matthijs parents: 1928 diff changeset	124	future == (TRACK_BIT_UPPER \| TRACK_BIT_LOWER) \|\|
634961366cdc (svn r2448) General cleanup of rail related code, more to follow. matthijs parents: 1928 diff changeset	125	future == (TRACK_BIT_LEFT \| TRACK_BIT_RIGHT);
634961366cdc (svn r2448) General cleanup of rail related code, more to follow. matthijs parents: 1928 diff changeset	126	} else {
634961366cdc (svn r2448) General cleanup of rail related code, more to follow. matthijs parents: 1928 diff changeset	127	/* Normally, we may overlap and any combination is valid */
634961366cdc (svn r2448) General cleanup of rail related code, more to follow. matthijs parents: 1928 diff changeset	128	return true;
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	129	}
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	130	}
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	131
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	132
13 3e7c1f74a996 (svn r14) Fix: railroad crossings on slopes are now possible dominik parents: 0 diff changeset	133	static const byte _valid_tileh_slopes[4][15] = {
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	134
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	135	// set of normal ones
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	136	{
1942 634961366cdc (svn r2448) General cleanup of rail related code, more to follow. matthijs parents: 1928 diff changeset	137	TRACK_BIT_DIAG1\|TRACK_BIT_DIAG2\|TRACK_BIT_UPPER\|TRACK_BIT_LOWER\|TRACK_BIT_LEFT\|TRACK_BIT_RIGHT,
634961366cdc (svn r2448) General cleanup of rail related code, more to follow. matthijs parents: 1928 diff changeset	138	TRACK_BIT_RIGHT,
634961366cdc (svn r2448) General cleanup of rail related code, more to follow. matthijs parents: 1928 diff changeset	139	TRACK_BIT_UPPER,
634961366cdc (svn r2448) General cleanup of rail related code, more to follow. matthijs parents: 1928 diff changeset	140	TRACK_BIT_DIAG1,
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	141
1942 634961366cdc (svn r2448) General cleanup of rail related code, more to follow. matthijs parents: 1928 diff changeset	142	TRACK_BIT_LEFT,
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	143	0,
1942 634961366cdc (svn r2448) General cleanup of rail related code, more to follow. matthijs parents: 1928 diff changeset	144	TRACK_BIT_DIAG2,
634961366cdc (svn r2448) General cleanup of rail related code, more to follow. matthijs parents: 1928 diff changeset	145	TRACK_BIT_LOWER,
201 c40d343115f8 (svn r202) -Codechange: I missed some files with trailing spaces.. this should be truelight parents: 159 diff changeset	146
1942 634961366cdc (svn r2448) General cleanup of rail related code, more to follow. matthijs parents: 1928 diff changeset	147	TRACK_BIT_LOWER,
634961366cdc (svn r2448) General cleanup of rail related code, more to follow. matthijs parents: 1928 diff changeset	148	TRACK_BIT_DIAG2,
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	149	0,
1942 634961366cdc (svn r2448) General cleanup of rail related code, more to follow. matthijs parents: 1928 diff changeset	150	TRACK_BIT_LEFT,
201 c40d343115f8 (svn r202) -Codechange: I missed some files with trailing spaces.. this should be truelight parents: 159 diff changeset	151
1942 634961366cdc (svn r2448) General cleanup of rail related code, more to follow. matthijs parents: 1928 diff changeset	152	TRACK_BIT_DIAG1,
634961366cdc (svn r2448) General cleanup of rail related code, more to follow. matthijs parents: 1928 diff changeset	153	TRACK_BIT_UPPER,
634961366cdc (svn r2448) General cleanup of rail related code, more to follow. matthijs parents: 1928 diff changeset	154	TRACK_BIT_RIGHT,
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	155	},
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	156
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	157	// allowed rail for an evenly raised platform
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	0,
1942 634961366cdc (svn r2448) General cleanup of rail related code, more to follow. matthijs parents: 1928 diff changeset	160	TRACK_BIT_LEFT,
634961366cdc (svn r2448) General cleanup of rail related code, more to follow. matthijs parents: 1928 diff changeset	161	TRACK_BIT_LOWER,
634961366cdc (svn r2448) General cleanup of rail related code, more to follow. matthijs parents: 1928 diff changeset	162	TRACK_BIT_DIAG2 \| TRACK_BIT_LOWER \| TRACK_BIT_LEFT,
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	163
1942 634961366cdc (svn r2448) General cleanup of rail related code, more to follow. matthijs parents: 1928 diff changeset	164	TRACK_BIT_RIGHT,
634961366cdc (svn r2448) General cleanup of rail related code, more to follow. matthijs parents: 1928 diff changeset	165	TRACK_BIT_DIAG1\|TRACK_BIT_DIAG2\|TRACK_BIT_UPPER\|TRACK_BIT_LOWER\|TRACK_BIT_LEFT\|TRACK_BIT_RIGHT,
634961366cdc (svn r2448) General cleanup of rail related code, more to follow. matthijs parents: 1928 diff changeset	166	TRACK_BIT_DIAG1 \| TRACK_BIT_LOWER \| TRACK_BIT_RIGHT,
634961366cdc (svn r2448) General cleanup of rail related code, more to follow. matthijs parents: 1928 diff changeset	167	TRACK_BIT_DIAG1\|TRACK_BIT_DIAG2\|TRACK_BIT_UPPER\|TRACK_BIT_LOWER\|TRACK_BIT_LEFT\|TRACK_BIT_RIGHT,
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	168
1942 634961366cdc (svn r2448) General cleanup of rail related code, more to follow. matthijs parents: 1928 diff changeset	169	TRACK_BIT_UPPER,
634961366cdc (svn r2448) General cleanup of rail related code, more to follow. matthijs parents: 1928 diff changeset	170	TRACK_BIT_DIAG1 \| TRACK_BIT_UPPER \| TRACK_BIT_LEFT,
634961366cdc (svn r2448) General cleanup of rail related code, more to follow. matthijs parents: 1928 diff changeset	171	TRACK_BIT_DIAG1\|TRACK_BIT_DIAG2\|TRACK_BIT_UPPER\|TRACK_BIT_LOWER\|TRACK_BIT_LEFT\|TRACK_BIT_RIGHT,
634961366cdc (svn r2448) General cleanup of rail related code, more to follow. matthijs parents: 1928 diff changeset	172	TRACK_BIT_DIAG1\|TRACK_BIT_DIAG2\|TRACK_BIT_UPPER\|TRACK_BIT_LOWER\|TRACK_BIT_LEFT\|TRACK_BIT_RIGHT,
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	173
1942 634961366cdc (svn r2448) General cleanup of rail related code, more to follow. matthijs parents: 1928 diff changeset	174	TRACK_BIT_DIAG2 \| TRACK_BIT_UPPER \| TRACK_BIT_RIGHT,
634961366cdc (svn r2448) General cleanup of rail related code, more to follow. matthijs parents: 1928 diff changeset	175	TRACK_BIT_DIAG1\|TRACK_BIT_DIAG2\|TRACK_BIT_UPPER\|TRACK_BIT_LOWER\|TRACK_BIT_LEFT\|TRACK_BIT_RIGHT,
634961366cdc (svn r2448) General cleanup of rail related code, more to follow. matthijs parents: 1928 diff changeset	176	TRACK_BIT_DIAG1\|TRACK_BIT_DIAG2\|TRACK_BIT_UPPER\|TRACK_BIT_LOWER\|TRACK_BIT_LEFT\|TRACK_BIT_RIGHT,
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	177	},
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	178
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	179	// allowed rail on coast tile
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	0,
1942 634961366cdc (svn r2448) General cleanup of rail related code, more to follow. matthijs parents: 1928 diff changeset	182	TRACK_BIT_LEFT,
634961366cdc (svn r2448) General cleanup of rail related code, more to follow. matthijs parents: 1928 diff changeset	183	TRACK_BIT_LOWER,
634961366cdc (svn r2448) General cleanup of rail related code, more to follow. matthijs parents: 1928 diff changeset	184	TRACK_BIT_DIAG2\|TRACK_BIT_LEFT\|TRACK_BIT_LOWER,
201 c40d343115f8 (svn r202) -Codechange: I missed some files with trailing spaces.. this should be truelight parents: 159 diff changeset	185
1942 634961366cdc (svn r2448) General cleanup of rail related code, more to follow. matthijs parents: 1928 diff changeset	186	TRACK_BIT_RIGHT,
634961366cdc (svn r2448) General cleanup of rail related code, more to follow. matthijs parents: 1928 diff changeset	187	TRACK_BIT_DIAG1\|TRACK_BIT_DIAG2\|TRACK_BIT_UPPER\|TRACK_BIT_LOWER\|TRACK_BIT_LEFT\|TRACK_BIT_RIGHT,
634961366cdc (svn r2448) General cleanup of rail related code, more to follow. matthijs parents: 1928 diff changeset	188	TRACK_BIT_DIAG1\|TRACK_BIT_RIGHT\|TRACK_BIT_LOWER,
634961366cdc (svn r2448) General cleanup of rail related code, more to follow. matthijs parents: 1928 diff changeset	189	TRACK_BIT_DIAG1\|TRACK_BIT_DIAG2\|TRACK_BIT_UPPER\|TRACK_BIT_LOWER\|TRACK_BIT_LEFT\|TRACK_BIT_RIGHT,
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	190
1942 634961366cdc (svn r2448) General cleanup of rail related code, more to follow. matthijs parents: 1928 diff changeset	191	TRACK_BIT_UPPER,
634961366cdc (svn r2448) General cleanup of rail related code, more to follow. matthijs parents: 1928 diff changeset	192	TRACK_BIT_DIAG1\|TRACK_BIT_LEFT\|TRACK_BIT_UPPER,
634961366cdc (svn r2448) General cleanup of rail related code, more to follow. matthijs parents: 1928 diff changeset	193	TRACK_BIT_DIAG1\|TRACK_BIT_DIAG2\|TRACK_BIT_UPPER\|TRACK_BIT_LOWER\|TRACK_BIT_LEFT\|TRACK_BIT_RIGHT,
634961366cdc (svn r2448) General cleanup of rail related code, more to follow. matthijs parents: 1928 diff changeset	194	TRACK_BIT_DIAG1\|TRACK_BIT_DIAG2\|TRACK_BIT_UPPER\|TRACK_BIT_LOWER\|TRACK_BIT_LEFT\|TRACK_BIT_RIGHT,
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	195
1942 634961366cdc (svn r2448) General cleanup of rail related code, more to follow. matthijs parents: 1928 diff changeset	196	TRACK_BIT_DIAG2\|TRACK_BIT_RIGHT\|TRACK_BIT_UPPER,
634961366cdc (svn r2448) General cleanup of rail related code, more to follow. matthijs parents: 1928 diff changeset	197	TRACK_BIT_DIAG1\|TRACK_BIT_DIAG2\|TRACK_BIT_UPPER\|TRACK_BIT_LOWER\|TRACK_BIT_LEFT\|TRACK_BIT_RIGHT,
634961366cdc (svn r2448) General cleanup of rail related code, more to follow. matthijs parents: 1928 diff changeset	198	TRACK_BIT_DIAG1\|TRACK_BIT_DIAG2\|TRACK_BIT_UPPER\|TRACK_BIT_LOWER\|TRACK_BIT_LEFT\|TRACK_BIT_RIGHT,
13 3e7c1f74a996 (svn r14) Fix: railroad crossings on slopes are now possible dominik parents: 0 diff changeset	199	},
3e7c1f74a996 (svn r14) Fix: railroad crossings on slopes are now possible dominik parents: 0 diff changeset	200
3e7c1f74a996 (svn r14) Fix: railroad crossings on slopes are now possible dominik parents: 0 diff changeset	201	// valid railway crossings on slopes
3e7c1f74a996 (svn r14) Fix: railroad crossings on slopes are now possible dominik parents: 0 diff changeset	202	{
3e7c1f74a996 (svn r14) Fix: railroad crossings on slopes are now possible dominik parents: 0 diff changeset	203	1, 0, 0, // 0, 1, 2
3e7c1f74a996 (svn r14) Fix: railroad crossings on slopes are now possible dominik parents: 0 diff changeset	204	0, 0, 1, // 3, 4, 5
3e7c1f74a996 (svn r14) Fix: railroad crossings on slopes are now possible dominik parents: 0 diff changeset	205	0, 1, 0, // 6, 7, 8
3e7c1f74a996 (svn r14) Fix: railroad crossings on slopes are now possible dominik parents: 0 diff changeset	206	0, 1, 1, // 9, 10, 11
3e7c1f74a996 (svn r14) Fix: railroad crossings on slopes are now possible dominik parents: 0 diff changeset	207	0, 1, 1, // 12, 13, 14
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	208	}
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	209	};
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	210
84 1e0721c29bad (svn r85) -Add: initial commit of new AI (enable in Patch menu) truelight parents: 59 diff changeset	211	uint GetRailFoundation(uint tileh, uint bits)
0 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	int i;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	214
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	215	if ((~_valid_tileh_slopes[0][tileh] & bits) == 0)
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	216	return 0;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	217
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	218	if ((~_valid_tileh_slopes[1][tileh] & bits) == 0)
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	219	return tileh;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	220
1942 634961366cdc (svn r2448) General cleanup of rail related code, more to follow. matthijs parents: 1928 diff changeset	221	if ( ((i=0, tileh == 1) \|\| (i+=2, tileh == 2) \|\| (i+=2, tileh == 4) \|\| (i+=2, tileh == 8)) && (bits == TRACK_BIT_DIAG1 \|\| (i++, bits == TRACK_BIT_DIAG2)))
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	222	return i + 15;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	223
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	224	return 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	//
1942 634961366cdc (svn r2448) General cleanup of rail related code, more to follow. matthijs parents: 1928 diff changeset	228	static uint32 CheckRailSlope(uint tileh, TrackBits rail_bits, TrackBits existing, TileIndex tile)
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	// never allow building on top of steep tiles
2085 ae9e92ffe168 (svn r2595) -Codechange: Introduced "IsSteepTileh" to find whether a tile is steep celestar parents: 2049 diff changeset	231	if (!IsSteepTileh(tileh)) {
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	232	rail_bits \|= existing;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	233
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	234	// don't allow building on the lower side of a coast
1627 d88508d9ced0 (svn r2131) -Fix: Rewrite CmdBuildSingleRail(), this addresses several issues: tron parents: 1609 diff changeset	235	if (IsTileType(tile, MP_WATER) &&
d88508d9ced0 (svn r2131) -Fix: Rewrite CmdBuildSingleRail(), this addresses several issues: tron parents: 1609 diff changeset	236	~_valid_tileh_slopes[2][tileh] & rail_bits) {
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	237	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	238	}
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	239
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	240	// no special foundation
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	241	if ((~_valid_tileh_slopes[0][tileh] & rail_bits) == 0)
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	242	return 0;
201 c40d343115f8 (svn r202) -Codechange: I missed some files with trailing spaces.. this should be truelight parents: 159 diff changeset	243
1627 d88508d9ced0 (svn r2131) -Fix: Rewrite CmdBuildSingleRail(), this addresses several issues: tron parents: 1609 diff changeset	244	if ((~_valid_tileh_slopes[1][tileh] & rail_bits) == 0 \|\| ( // whole tile is leveled up
1942 634961366cdc (svn r2448) General cleanup of rail related code, more to follow. matthijs parents: 1928 diff changeset	245	(rail_bits == TRACK_BIT_DIAG1 \|\| rail_bits == TRACK_BIT_DIAG2) &&
1627 d88508d9ced0 (svn r2131) -Fix: Rewrite CmdBuildSingleRail(), this addresses several issues: tron parents: 1609 diff changeset	246	(tileh == 1 \|\| tileh == 2 \|\| tileh == 4 \|\| tileh == 8)
d88508d9ced0 (svn r2131) -Fix: Rewrite CmdBuildSingleRail(), this addresses several issues: tron parents: 1609 diff changeset	247	)) { // partly up
d88508d9ced0 (svn r2131) -Fix: Rewrite CmdBuildSingleRail(), this addresses several issues: tron parents: 1609 diff changeset	248	if (existing != 0) {
d88508d9ced0 (svn r2131) -Fix: Rewrite CmdBuildSingleRail(), this addresses several issues: tron parents: 1609 diff changeset	249	return 0;
d88508d9ced0 (svn r2131) -Fix: Rewrite CmdBuildSingleRail(), this addresses several issues: tron parents: 1609 diff changeset	250	} else if (!_patches.build_on_slopes \|\|
d88508d9ced0 (svn r2131) -Fix: Rewrite CmdBuildSingleRail(), this addresses several issues: tron parents: 1609 diff changeset	251	(_is_ai_player && !_patches.ainew_active)) {
d88508d9ced0 (svn r2131) -Fix: Rewrite CmdBuildSingleRail(), this addresses several issues: tron parents: 1609 diff changeset	252	return_cmd_error(STR_1000_LAND_SLOPED_IN_WRONG_DIRECTION);
d88508d9ced0 (svn r2131) -Fix: Rewrite CmdBuildSingleRail(), this addresses several issues: tron parents: 1609 diff changeset	253	} else {
d88508d9ced0 (svn r2131) -Fix: Rewrite CmdBuildSingleRail(), this addresses several issues: tron parents: 1609 diff changeset	254	return _price.terraform;
d88508d9ced0 (svn r2131) -Fix: Rewrite CmdBuildSingleRail(), this addresses several issues: tron parents: 1609 diff changeset	255	}
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	256	}
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	257	}
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	258	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	259	}
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	260
1775 08ff0f12ccdc (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	261	/* Validate functions for rail building */
1942 634961366cdc (svn r2448) General cleanup of rail related code, more to follow. matthijs parents: 1928 diff changeset	262	static inline bool ValParamTrackOrientation(Track track) {return IsValidTrack(track);}
1775 08ff0f12ccdc (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	263
08ff0f12ccdc (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	264	/** Build a single piece of rail
08ff0f12ccdc (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	265	* @param x,y coordinates on where to build
08ff0f12ccdc (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	266	* @param p1 railtype of being built piece (normal, mono, maglev)
1942 634961366cdc (svn r2448) General cleanup of rail related code, more to follow. matthijs parents: 1928 diff changeset	267	* @param p2 rail track to build
1775 08ff0f12ccdc (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	268	*/
08ff0f12ccdc (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	269	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	270	{
1627 d88508d9ced0 (svn r2131) -Fix: Rewrite CmdBuildSingleRail(), this addresses several issues: tron parents: 1609 diff changeset	271	TileIndex tile;
d88508d9ced0 (svn r2131) -Fix: Rewrite CmdBuildSingleRail(), this addresses several issues: tron parents: 1609 diff changeset	272	uint tileh;
1942 634961366cdc (svn r2448) General cleanup of rail related code, more to follow. matthijs parents: 1928 diff changeset	273	uint m5; /* XXX: Used only as a cache, should probably be removed? */
634961366cdc (svn r2448) General cleanup of rail related code, more to follow. matthijs parents: 1928 diff changeset	274	Track track = (Track)p2;
634961366cdc (svn r2448) General cleanup of rail related code, more to follow. matthijs parents: 1928 diff changeset	275	TrackBits trackbit;
1627 d88508d9ced0 (svn r2131) -Fix: Rewrite CmdBuildSingleRail(), this addresses several issues: tron parents: 1609 diff changeset	276	int32 cost = 0;
d88508d9ced0 (svn r2131) -Fix: Rewrite CmdBuildSingleRail(), this addresses several issues: tron parents: 1609 diff changeset	277	int32 ret;
d88508d9ced0 (svn r2131) -Fix: Rewrite CmdBuildSingleRail(), this addresses several issues: tron parents: 1609 diff changeset	278
1942 634961366cdc (svn r2448) General cleanup of rail related code, more to follow. matthijs parents: 1928 diff changeset	279	if (!ValParamRailtype(p1) \|\| !ValParamTrackOrientation(track)) return CMD_ERROR;
1627 d88508d9ced0 (svn r2131) -Fix: Rewrite CmdBuildSingleRail(), this addresses several issues: tron parents: 1609 diff changeset	280
1980 9ea0c89fbb58 (svn r2486) Turn TILE_FROM_XY into an inline function and rename it to TileVirtXY tron parents: 1977 diff changeset	281	tile = TileVirtXY(x, y);
1627 d88508d9ced0 (svn r2131) -Fix: Rewrite CmdBuildSingleRail(), this addresses several issues: tron parents: 1609 diff changeset	282	tileh = GetTileSlope(tile, NULL);
2049 ad0d49c916d4 (svn r2558) Change the internal map format from 7 arrays to one array of structs, this doesn't change the saved format for now. It's a stepping stone for further changes. tron parents: 2020 diff changeset	283	m5 = _m[tile].m5;
1942 634961366cdc (svn r2448) General cleanup of rail related code, more to follow. matthijs parents: 1928 diff changeset	284	trackbit = TrackToTrackBits(track);
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	285
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	286	SET_EXPENSES_TYPE(EXPENSES_CONSTRUCTION);
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	287
1627 d88508d9ced0 (svn r2131) -Fix: Rewrite CmdBuildSingleRail(), this addresses several issues: tron parents: 1609 diff changeset	288	switch (GetTileType(tile)) {
d88508d9ced0 (svn r2131) -Fix: Rewrite CmdBuildSingleRail(), this addresses several issues: tron parents: 1609 diff changeset	289	case MP_TUNNELBRIDGE:
d88508d9ced0 (svn r2131) -Fix: Rewrite CmdBuildSingleRail(), this addresses several issues: tron parents: 1609 diff changeset	290	if ((m5 & 0xC0) != 0xC0 \|\| // not bridge middle part?
1942 634961366cdc (svn r2448) General cleanup of rail related code, more to follow. matthijs parents: 1928 diff changeset	291	(m5 & 0x01 ? 1 : 2) != trackbit) { // wrong direction?
1627 d88508d9ced0 (svn r2131) -Fix: Rewrite CmdBuildSingleRail(), this addresses several issues: tron parents: 1609 diff changeset	292	// Get detailed error message
d88508d9ced0 (svn r2131) -Fix: Rewrite CmdBuildSingleRail(), this addresses several issues: tron parents: 1609 diff changeset	293	return DoCommandByTile(tile, 0, 0, flags, CMD_LANDSCAPE_CLEAR);
d88508d9ced0 (svn r2131) -Fix: Rewrite CmdBuildSingleRail(), this addresses several issues: tron parents: 1609 diff changeset	294	}
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	295
1630 15a88bda48fd (svn r2134) Return the correct error message if rail is already under a bridge, fix for r2131 tron parents: 1628 diff changeset	296	switch (m5 & 0x38) { // what's under the bridge?
15a88bda48fd (svn r2134) Return the correct error message if rail is already under a bridge, fix for r2131 tron parents: 1628 diff changeset	297	case 0x00: // clear land
1942 634961366cdc (svn r2448) General cleanup of rail related code, more to follow. matthijs parents: 1928 diff changeset	298	ret = CheckRailSlope(tileh, trackbit, 0, tile);
1691 fcd9fefaed02 (svn r2195) Add CmdFailed() as the One True Way(tm) to check if a command failed. tron parents: 1669 diff changeset	299	if (CmdFailed(ret)) return ret;
1630 15a88bda48fd (svn r2134) Return the correct error message if rail is already under a bridge, fix for r2131 tron parents: 1628 diff changeset	300	cost += ret;
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	301
1630 15a88bda48fd (svn r2134) Return the correct error message if rail is already under a bridge, fix for r2131 tron parents: 1628 diff changeset	302	if (flags & DC_EXEC) {
1902 5d653da1abb7 (svn r2408) Introduce SetTileOwner() and use it tron parents: 1901 diff changeset	303	SetTileOwner(tile, _current_player);
2049 ad0d49c916d4 (svn r2558) Change the internal map format from 7 arrays to one array of structs, this doesn't change the saved format for now. It's a stepping stone for further changes. tron parents: 2020 diff changeset	304	_m[tile].m3 &= ~0x0F;
ad0d49c916d4 (svn r2558) Change the internal map format from 7 arrays to one array of structs, this doesn't change the saved format for now. It's a stepping stone for further changes. tron parents: 2020 diff changeset	305	_m[tile].m3 \|= p1;
ad0d49c916d4 (svn r2558) Change the internal map format from 7 arrays to one array of structs, this doesn't change the saved format for now. It's a stepping stone for further changes. tron parents: 2020 diff changeset	306	_m[tile].m5 = (m5 & 0xC7) \| 0x20; // railroad under bridge
1630 15a88bda48fd (svn r2134) Return the correct error message if rail is already under a bridge, fix for r2131 tron parents: 1628 diff changeset	307	}
15a88bda48fd (svn r2134) Return the correct error message if rail is already under a bridge, fix for r2131 tron parents: 1628 diff changeset	308	break;
15a88bda48fd (svn r2134) Return the correct error message if rail is already under a bridge, fix for r2131 tron parents: 1628 diff changeset	309
15a88bda48fd (svn r2134) Return the correct error message if rail is already under a bridge, fix for r2131 tron parents: 1628 diff changeset	310	case 0x20: // rail already there
15a88bda48fd (svn r2134) Return the correct error message if rail is already under a bridge, fix for r2131 tron parents: 1628 diff changeset	311	return_cmd_error(STR_1007_ALREADY_BUILT);
15a88bda48fd (svn r2134) Return the correct error message if rail is already under a bridge, fix for r2131 tron parents: 1628 diff changeset	312
15a88bda48fd (svn r2134) Return the correct error message if rail is already under a bridge, fix for r2131 tron parents: 1628 diff changeset	313	default:
15a88bda48fd (svn r2134) Return the correct error message if rail is already under a bridge, fix for r2131 tron parents: 1628 diff changeset	314	// Get detailed error message
15a88bda48fd (svn r2134) Return the correct error message if rail is already under a bridge, fix for r2131 tron parents: 1628 diff changeset	315	return DoCommandByTile(tile, 0, 0, flags, CMD_LANDSCAPE_CLEAR);
1627 d88508d9ced0 (svn r2131) -Fix: Rewrite CmdBuildSingleRail(), this addresses several issues: tron parents: 1609 diff changeset	316	}
d88508d9ced0 (svn r2131) -Fix: Rewrite CmdBuildSingleRail(), this addresses several issues: tron parents: 1609 diff changeset	317	break;
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	318
1627 d88508d9ced0 (svn r2131) -Fix: Rewrite CmdBuildSingleRail(), this addresses several issues: tron parents: 1609 diff changeset	319	case MP_RAILWAY:
1942 634961366cdc (svn r2448) General cleanup of rail related code, more to follow. matthijs parents: 1928 diff changeset	320	if (!CheckTrackCombination(tile, trackbit, flags) \|\|
1627 d88508d9ced0 (svn r2131) -Fix: Rewrite CmdBuildSingleRail(), this addresses several issues: tron parents: 1609 diff changeset	321	!EnsureNoVehicle(tile)) {
d88508d9ced0 (svn r2131) -Fix: Rewrite CmdBuildSingleRail(), this addresses several issues: tron parents: 1609 diff changeset	322	return CMD_ERROR;
d88508d9ced0 (svn r2131) -Fix: Rewrite CmdBuildSingleRail(), this addresses several issues: tron parents: 1609 diff changeset	323	}
d88508d9ced0 (svn r2131) -Fix: Rewrite CmdBuildSingleRail(), this addresses several issues: tron parents: 1609 diff changeset	324	if (m5 & RAIL_TYPE_SPECIAL \|\|
1903 725cdd1ec467 (svn r2409) Missed one _map_owner -> IsTileOwner() tron parents: 1902 diff changeset	325	!IsTileOwner(tile, _current_player) \|\|
2049 ad0d49c916d4 (svn r2558) Change the internal map format from 7 arrays to one array of structs, this doesn't change the saved format for now. It's a stepping stone for further changes. tron parents: 2020 diff changeset	326	(_m[tile].m3 & 0xFU) != p1) {
1627 d88508d9ced0 (svn r2131) -Fix: Rewrite CmdBuildSingleRail(), this addresses several issues: tron parents: 1609 diff changeset	327	// Get detailed error message
d88508d9ced0 (svn r2131) -Fix: Rewrite CmdBuildSingleRail(), this addresses several issues: tron parents: 1609 diff changeset	328	return DoCommandByTile(tile, 0, 0, flags, CMD_LANDSCAPE_CLEAR);
d88508d9ced0 (svn r2131) -Fix: Rewrite CmdBuildSingleRail(), this addresses several issues: tron parents: 1609 diff changeset	329	}
d88508d9ced0 (svn r2131) -Fix: Rewrite CmdBuildSingleRail(), this addresses several issues: tron parents: 1609 diff changeset	330
1942 634961366cdc (svn r2448) General cleanup of rail related code, more to follow. matthijs parents: 1928 diff changeset	331	ret = CheckRailSlope(tileh, trackbit, GetTrackBits(tile), tile);
1691 fcd9fefaed02 (svn r2195) Add CmdFailed() as the One True Way(tm) to check if a command failed. tron parents: 1669 diff changeset	332	if (CmdFailed(ret)) return ret;
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	333	cost += ret;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	334
1719 b428568cec03 (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	335	if (flags & DC_EXEC) {
2049 ad0d49c916d4 (svn r2558) Change the internal map format from 7 arrays to one array of structs, this doesn't change the saved format for now. It's a stepping stone for further changes. tron parents: 2020 diff changeset	336	_m[tile].m2 &= ~RAIL_MAP2LO_GROUND_MASK; // Bare land
ad0d49c916d4 (svn r2558) Change the internal map format from 7 arrays to one array of structs, this doesn't change the saved format for now. It's a stepping stone for further changes. tron parents: 2020 diff changeset	337	_m[tile].m5 = m5 \| trackbit;
1719 b428568cec03 (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	338	}
1627 d88508d9ced0 (svn r2131) -Fix: Rewrite CmdBuildSingleRail(), this addresses several issues: tron parents: 1609 diff changeset	339	break;
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	340
1627 d88508d9ced0 (svn r2131) -Fix: Rewrite CmdBuildSingleRail(), this addresses several issues: tron parents: 1609 diff changeset	341	case MP_STREET:
d88508d9ced0 (svn r2131) -Fix: Rewrite CmdBuildSingleRail(), this addresses several issues: tron parents: 1609 diff changeset	342	if (!_valid_tileh_slopes[3][tileh]) // prevent certain slopes
d88508d9ced0 (svn r2131) -Fix: Rewrite CmdBuildSingleRail(), this addresses several issues: tron parents: 1609 diff changeset	343	return_cmd_error(STR_1000_LAND_SLOPED_IN_WRONG_DIRECTION);
d88508d9ced0 (svn r2131) -Fix: Rewrite CmdBuildSingleRail(), this addresses several issues: tron parents: 1609 diff changeset	344	if (!EnsureNoVehicle(tile)) return CMD_ERROR;
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	345
1627 d88508d9ced0 (svn r2131) -Fix: Rewrite CmdBuildSingleRail(), this addresses several issues: tron parents: 1609 diff changeset	346	if ((m5 & 0xF0) == 0 && ( // normal road?
1942 634961366cdc (svn r2448) General cleanup of rail related code, more to follow. matthijs parents: 1928 diff changeset	347	(track == TRACK_DIAG1 && m5 == 0x05) \|\|
634961366cdc (svn r2448) General cleanup of rail related code, more to follow. matthijs parents: 1928 diff changeset	348	(track == TRACK_DIAG2 && m5 == 0x0A) // correct direction?
1627 d88508d9ced0 (svn r2131) -Fix: Rewrite CmdBuildSingleRail(), this addresses several issues: tron parents: 1609 diff changeset	349	)) {
d88508d9ced0 (svn r2131) -Fix: Rewrite CmdBuildSingleRail(), this addresses several issues: tron parents: 1609 diff changeset	350	if (flags & DC_EXEC) {
2049 ad0d49c916d4 (svn r2558) Change the internal map format from 7 arrays to one array of structs, this doesn't change the saved format for now. It's a stepping stone for further changes. tron parents: 2020 diff changeset	351	_m[tile].m3 = GetTileOwner(tile);
1902 5d653da1abb7 (svn r2408) Introduce SetTileOwner() and use it tron parents: 1901 diff changeset	352	SetTileOwner(tile, _current_player);
2049 ad0d49c916d4 (svn r2558) Change the internal map format from 7 arrays to one array of structs, this doesn't change the saved format for now. It's a stepping stone for further changes. tron parents: 2020 diff changeset	353	_m[tile].m4 = p1;
ad0d49c916d4 (svn r2558) Change the internal map format from 7 arrays to one array of structs, this doesn't change the saved format for now. It's a stepping stone for further changes. tron parents: 2020 diff changeset	354	_m[tile].m5 = 0x10 \| (track == TRACK_DIAG1 ? 0x08 : 0x00); // level crossing
1627 d88508d9ced0 (svn r2131) -Fix: Rewrite CmdBuildSingleRail(), this addresses several issues: tron parents: 1609 diff changeset	355	}
d88508d9ced0 (svn r2131) -Fix: Rewrite CmdBuildSingleRail(), this addresses several issues: tron parents: 1609 diff changeset	356	break;
d88508d9ced0 (svn r2131) -Fix: Rewrite CmdBuildSingleRail(), this addresses several issues: tron parents: 1609 diff changeset	357	}
d88508d9ced0 (svn r2131) -Fix: Rewrite CmdBuildSingleRail(), this addresses several issues: tron parents: 1609 diff changeset	358
1942 634961366cdc (svn r2448) General cleanup of rail related code, more to follow. matthijs parents: 1928 diff changeset	359	if (IsLevelCrossing(tile) && (m5 & 0x08 ? TRACK_DIAG1 : TRACK_DIAG2) == track)
1627 d88508d9ced0 (svn r2131) -Fix: Rewrite CmdBuildSingleRail(), this addresses several issues: tron parents: 1609 diff changeset	360	return_cmd_error(STR_1007_ALREADY_BUILT);
d88508d9ced0 (svn r2131) -Fix: Rewrite CmdBuildSingleRail(), this addresses several issues: tron parents: 1609 diff changeset	361	/* FALLTHROUGH */
d88508d9ced0 (svn r2131) -Fix: Rewrite CmdBuildSingleRail(), this addresses several issues: tron parents: 1609 diff changeset	362
d88508d9ced0 (svn r2131) -Fix: Rewrite CmdBuildSingleRail(), this addresses several issues: tron parents: 1609 diff changeset	363	default:
1942 634961366cdc (svn r2448) General cleanup of rail related code, more to follow. matthijs parents: 1928 diff changeset	364	ret = CheckRailSlope(tileh, trackbit, 0, tile);
1691 fcd9fefaed02 (svn r2195) Add CmdFailed() as the One True Way(tm) to check if a command failed. tron parents: 1669 diff changeset	365	if (CmdFailed(ret)) return ret;
1627 d88508d9ced0 (svn r2131) -Fix: Rewrite CmdBuildSingleRail(), this addresses several issues: tron parents: 1609 diff changeset	366	cost += ret;
d88508d9ced0 (svn r2131) -Fix: Rewrite CmdBuildSingleRail(), this addresses several issues: tron parents: 1609 diff changeset	367
d88508d9ced0 (svn r2131) -Fix: Rewrite CmdBuildSingleRail(), this addresses several issues: tron parents: 1609 diff changeset	368	ret = DoCommandByTile(tile, 0, 0, flags, CMD_LANDSCAPE_CLEAR);
1691 fcd9fefaed02 (svn r2195) Add CmdFailed() as the One True Way(tm) to check if a command failed. tron parents: 1669 diff changeset	369	if (CmdFailed(ret)) return ret;
1627 d88508d9ced0 (svn r2131) -Fix: Rewrite CmdBuildSingleRail(), this addresses several issues: tron parents: 1609 diff changeset	370	cost += ret;
d88508d9ced0 (svn r2131) -Fix: Rewrite CmdBuildSingleRail(), this addresses several issues: tron parents: 1609 diff changeset	371
d88508d9ced0 (svn r2131) -Fix: Rewrite CmdBuildSingleRail(), this addresses several issues: tron parents: 1609 diff changeset	372	if (flags & DC_EXEC) {
d88508d9ced0 (svn r2131) -Fix: Rewrite CmdBuildSingleRail(), this addresses several issues: tron parents: 1609 diff changeset	373	SetTileType(tile, MP_RAILWAY);
1902 5d653da1abb7 (svn r2408) Introduce SetTileOwner() and use it tron parents: 1901 diff changeset	374	SetTileOwner(tile, _current_player);
2049 ad0d49c916d4 (svn r2558) Change the internal map format from 7 arrays to one array of structs, this doesn't change the saved format for now. It's a stepping stone for further changes. tron parents: 2020 diff changeset	375	_m[tile].m2 = 0; // Bare land
ad0d49c916d4 (svn r2558) Change the internal map format from 7 arrays to one array of structs, this doesn't change the saved format for now. It's a stepping stone for further changes. tron parents: 2020 diff changeset	376	_m[tile].m3 = p1; // No signals, rail type
ad0d49c916d4 (svn r2558) Change the internal map format from 7 arrays to one array of structs, this doesn't change the saved format for now. It's a stepping stone for further changes. tron parents: 2020 diff changeset	377	_m[tile].m5 = trackbit;
1627 d88508d9ced0 (svn r2131) -Fix: Rewrite CmdBuildSingleRail(), this addresses several issues: tron parents: 1609 diff changeset	378	}
d88508d9ced0 (svn r2131) -Fix: Rewrite CmdBuildSingleRail(), this addresses several issues: tron parents: 1609 diff changeset	379	break;
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	380	}
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	381
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	382	if (flags & DC_EXEC) {
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	383	MarkTileDirtyByTile(tile);
1942 634961366cdc (svn r2448) General cleanup of rail related code, more to follow. matthijs parents: 1928 diff changeset	384	SetSignalsOnBothDir(tile, track);
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	385	}
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	386
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	387	return cost + _price.build_rail;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	388	}
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	389
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	390	static const byte _signals_table[] = {
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	391	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	392	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	393	};
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	394
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	395	static const byte _signals_table_other[] = {
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	396	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	397	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	398	};
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	399
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	400	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	401	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	402	0xC0, 0xC0, 0xC0, 0x30, 0xC0, 0x30, 0, 0
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	403	};
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	404
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	405
1775 08ff0f12ccdc (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	406	/** Remove a single piece of track
08ff0f12ccdc (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	407	* @param x,y coordinates for removal of track
08ff0f12ccdc (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	408	* @param p1 unused
08ff0f12ccdc (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	409	* @param p2 rail orientation
0 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	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	412	{
1942 634961366cdc (svn r2448) General cleanup of rail related code, more to follow. matthijs parents: 1928 diff changeset	413	Track track = (Track)p2;
634961366cdc (svn r2448) General cleanup of rail related code, more to follow. matthijs parents: 1928 diff changeset	414	TrackBits trackbit;
634961366cdc (svn r2448) General cleanup of rail related code, more to follow. matthijs parents: 1928 diff changeset	415	uint tileh;
1775 08ff0f12ccdc (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	416	TileIndex tile;
1942 634961366cdc (svn r2448) General cleanup of rail related code, more to follow. matthijs parents: 1928 diff changeset	417	byte m5;
1963 8a398139fb87 (svn r2469) - Add: When removing tracks with the 'remove' tool, have it automatically remove signals on the tracks. hackykid parents: 1954 diff changeset	418	int32 cost = _price.remove_rail;
1775 08ff0f12ccdc (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	419
08ff0f12ccdc (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	420	if (!ValParamTrackOrientation(p2)) return CMD_ERROR;
1942 634961366cdc (svn r2448) General cleanup of rail related code, more to follow. matthijs parents: 1928 diff changeset	421	trackbit = TrackToTrackBits(track);
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	422
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	423	SET_EXPENSES_TYPE(EXPENSES_CONSTRUCTION);
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	424
1980 9ea0c89fbb58 (svn r2486) Turn TILE_FROM_XY into an inline function and rename it to TileVirtXY tron parents: 1977 diff changeset	425	tile = TileVirtXY(x, y);
1942 634961366cdc (svn r2448) General cleanup of rail related code, more to follow. matthijs parents: 1928 diff changeset	426	tileh = GetTileSlope(tile, NULL);
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	427
1942 634961366cdc (svn r2448) General cleanup of rail related code, more to follow. matthijs parents: 1928 diff changeset	428	if (!IsTileType(tile, MP_TUNNELBRIDGE) && !IsTileType(tile, MP_STREET) && !IsTileType(tile, MP_RAILWAY))
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	429	return CMD_ERROR;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	430
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	431	if (_current_player != OWNER_WATER && !CheckTileOwnership(tile))
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	432	return CMD_ERROR;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	433
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	434	// allow building rail under bridge
1942 634961366cdc (svn r2448) General cleanup of rail related code, more to follow. matthijs parents: 1928 diff changeset	435	if (!IsTileType(tile, MP_TUNNELBRIDGE) && !EnsureNoVehicle(tile))
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	436	return CMD_ERROR;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	437
1942 634961366cdc (svn r2448) General cleanup of rail related code, more to follow. matthijs parents: 1928 diff changeset	438	switch(GetTileType(tile))
634961366cdc (svn r2448) General cleanup of rail related code, more to follow. matthijs parents: 1928 diff changeset	439	{
634961366cdc (svn r2448) General cleanup of rail related code, more to follow. matthijs parents: 1928 diff changeset	440	case MP_TUNNELBRIDGE:
634961366cdc (svn r2448) General cleanup of rail related code, more to follow. matthijs parents: 1928 diff changeset	441	if (!EnsureNoVehicleZ(tile, TilePixelHeight(tile)))
634961366cdc (svn r2448) General cleanup of rail related code, more to follow. matthijs parents: 1928 diff changeset	442	return CMD_ERROR;
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	443
2049 ad0d49c916d4 (svn r2558) Change the internal map format from 7 arrays to one array of structs, this doesn't change the saved format for now. It's a stepping stone for further changes. tron parents: 2020 diff changeset	444	if ((_m[tile].m5 & 0xF8) != 0xE0)
1942 634961366cdc (svn r2448) General cleanup of rail related code, more to follow. matthijs parents: 1928 diff changeset	445	return CMD_ERROR;
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	446
2049 ad0d49c916d4 (svn r2558) Change the internal map format from 7 arrays to one array of structs, this doesn't change the saved format for now. It's a stepping stone for further changes. tron parents: 2020 diff changeset	447	if ( ((_m[tile].m5 & 1) ? 1 : 2) != trackbit )
1942 634961366cdc (svn r2448) General cleanup of rail related code, more to follow. matthijs parents: 1928 diff changeset	448	return CMD_ERROR;
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	449
1942 634961366cdc (svn r2448) General cleanup of rail related code, more to follow. matthijs parents: 1928 diff changeset	450	if (!(flags & DC_EXEC))
634961366cdc (svn r2448) General cleanup of rail related code, more to follow. matthijs parents: 1928 diff changeset	451	return _price.remove_rail;
201 c40d343115f8 (svn r202) -Codechange: I missed some files with trailing spaces.. this should be truelight parents: 159 diff changeset	452
1902 5d653da1abb7 (svn r2408) Introduce SetTileOwner() and use it tron parents: 1901 diff changeset	453	SetTileOwner(tile, OWNER_NONE);
2049 ad0d49c916d4 (svn r2558) Change the internal map format from 7 arrays to one array of structs, this doesn't change the saved format for now. It's a stepping stone for further changes. tron parents: 2020 diff changeset	454	_m[tile].m5 = _m[tile].m5 & 0xC7;
1942 634961366cdc (svn r2448) General cleanup of rail related code, more to follow. matthijs parents: 1928 diff changeset	455	break;
634961366cdc (svn r2448) General cleanup of rail related code, more to follow. matthijs parents: 1928 diff changeset	456	case MP_STREET:
2049 ad0d49c916d4 (svn r2558) Change the internal map format from 7 arrays to one array of structs, this doesn't change the saved format for now. It's a stepping stone for further changes. tron parents: 2020 diff changeset	457	if (!(_m[tile].m5 & 0xF0))
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	458	return CMD_ERROR;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	459
2049 ad0d49c916d4 (svn r2558) Change the internal map format from 7 arrays to one array of structs, this doesn't change the saved format for now. It's a stepping stone for further changes. tron parents: 2020 diff changeset	460	if (_m[tile].m5 & 0xE0)
1942 634961366cdc (svn r2448) General cleanup of rail related code, more to follow. matthijs parents: 1928 diff changeset	461	return CMD_ERROR;
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	462
1942 634961366cdc (svn r2448) General cleanup of rail related code, more to follow. matthijs parents: 1928 diff changeset	463	/* This is a crossing, let's check if the direction is correct */
2049 ad0d49c916d4 (svn r2558) Change the internal map format from 7 arrays to one array of structs, this doesn't change the saved format for now. It's a stepping stone for further changes. tron parents: 2020 diff changeset	464	if (_m[tile].m5 & 8) {
1942 634961366cdc (svn r2448) General cleanup of rail related code, more to follow. matthijs parents: 1928 diff changeset	465	m5 = 5;
634961366cdc (svn r2448) General cleanup of rail related code, more to follow. matthijs parents: 1928 diff changeset	466	if (track != TRACK_DIAG1)
634961366cdc (svn r2448) General cleanup of rail related code, more to follow. matthijs parents: 1928 diff changeset	467	return CMD_ERROR;
634961366cdc (svn r2448) General cleanup of rail related code, more to follow. matthijs parents: 1928 diff changeset	468	} else {
634961366cdc (svn r2448) General cleanup of rail related code, more to follow. matthijs parents: 1928 diff changeset	469	m5 = 10;
634961366cdc (svn r2448) General cleanup of rail related code, more to follow. matthijs parents: 1928 diff changeset	470	if (track != TRACK_DIAG2)
634961366cdc (svn r2448) General cleanup of rail related code, more to follow. matthijs parents: 1928 diff changeset	471	return CMD_ERROR;
634961366cdc (svn r2448) General cleanup of rail related code, more to follow. matthijs parents: 1928 diff changeset	472	}
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	473
1942 634961366cdc (svn r2448) General cleanup of rail related code, more to follow. matthijs parents: 1928 diff changeset	474	if (!(flags & DC_EXEC))
634961366cdc (svn r2448) General cleanup of rail related code, more to follow. matthijs parents: 1928 diff changeset	475	return _price.remove_rail;
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	476
2049 ad0d49c916d4 (svn r2558) Change the internal map format from 7 arrays to one array of structs, this doesn't change the saved format for now. It's a stepping stone for further changes. tron parents: 2020 diff changeset	477	_m[tile].m5 = m5;
ad0d49c916d4 (svn r2558) Change the internal map format from 7 arrays to one array of structs, this doesn't change the saved format for now. It's a stepping stone for further changes. tron parents: 2020 diff changeset	478	SetTileOwner(tile, _m[tile].m3);
ad0d49c916d4 (svn r2558) Change the internal map format from 7 arrays to one array of structs, this doesn't change the saved format for now. It's a stepping stone for further changes. tron parents: 2020 diff changeset	479	_m[tile].m2 = 0;
1942 634961366cdc (svn r2448) General cleanup of rail related code, more to follow. matthijs parents: 1928 diff changeset	480	break;
634961366cdc (svn r2448) General cleanup of rail related code, more to follow. matthijs parents: 1928 diff changeset	481	case MP_RAILWAY:
634961366cdc (svn r2448) General cleanup of rail related code, more to follow. matthijs parents: 1928 diff changeset	482
634961366cdc (svn r2448) General cleanup of rail related code, more to follow. matthijs parents: 1928 diff changeset	483	if (!IsPlainRailTile(tile))
634961366cdc (svn r2448) General cleanup of rail related code, more to follow. matthijs parents: 1928 diff changeset	484	return CMD_ERROR;
634961366cdc (svn r2448) General cleanup of rail related code, more to follow. matthijs parents: 1928 diff changeset	485
634961366cdc (svn r2448) General cleanup of rail related code, more to follow. matthijs parents: 1928 diff changeset	486	/* See if the track to remove is actually there */
634961366cdc (svn r2448) General cleanup of rail related code, more to follow. matthijs parents: 1928 diff changeset	487	if (!(GetTrackBits(tile) & trackbit))
634961366cdc (svn r2448) General cleanup of rail related code, more to follow. matthijs parents: 1928 diff changeset	488	return CMD_ERROR;
634961366cdc (svn r2448) General cleanup of rail related code, more to follow. matthijs parents: 1928 diff changeset	489
1963 8a398139fb87 (svn r2469) - Add: When removing tracks with the 'remove' tool, have it automatically remove signals on the tracks. hackykid parents: 1954 diff changeset	490	/* Charge extra to remove signals on the track, if they are there */
1942 634961366cdc (svn r2448) General cleanup of rail related code, more to follow. matthijs parents: 1928 diff changeset	491	if (HasSignalOnTrack(tile, track))
1963 8a398139fb87 (svn r2469) - Add: When removing tracks with the 'remove' tool, have it automatically remove signals on the tracks. hackykid parents: 1954 diff changeset	492	cost += DoCommand(x, y, track, 0, flags, CMD_REMOVE_SIGNALS);
1942 634961366cdc (svn r2448) General cleanup of rail related code, more to follow. matthijs parents: 1928 diff changeset	493
634961366cdc (svn r2448) General cleanup of rail related code, more to follow. matthijs parents: 1928 diff changeset	494	if (!(flags & DC_EXEC))
1963 8a398139fb87 (svn r2469) - Add: When removing tracks with the 'remove' tool, have it automatically remove signals on the tracks. hackykid parents: 1954 diff changeset	495	return cost;
1942 634961366cdc (svn r2448) General cleanup of rail related code, more to follow. matthijs parents: 1928 diff changeset	496
634961366cdc (svn r2448) General cleanup of rail related code, more to follow. matthijs parents: 1928 diff changeset	497	/* We remove the trackbit here. */
2049 ad0d49c916d4 (svn r2558) Change the internal map format from 7 arrays to one array of structs, this doesn't change the saved format for now. It's a stepping stone for further changes. tron parents: 2020 diff changeset	498	_m[tile].m5 &= ~trackbit;
1942 634961366cdc (svn r2448) General cleanup of rail related code, more to follow. matthijs parents: 1928 diff changeset	499
2111 5161d1e8db4c (svn r2621) - Fix: [pbs] When removing tracks, clear their reserved status. hackykid parents: 2085 diff changeset	500	/* Unreserve track for PBS */
5161d1e8db4c (svn r2621) - Fix: [pbs] When removing tracks, clear their reserved status. hackykid parents: 2085 diff changeset	501	if (PBSTileReserved(tile) & trackbit)
5161d1e8db4c (svn r2621) - Fix: [pbs] When removing tracks, clear their reserved status. hackykid parents: 2085 diff changeset	502	PBSClearTrack(tile, track);
5161d1e8db4c (svn r2621) - Fix: [pbs] When removing tracks, clear their reserved status. hackykid parents: 2085 diff changeset	503
1942 634961366cdc (svn r2448) General cleanup of rail related code, more to follow. matthijs parents: 1928 diff changeset	504	if (GetTrackBits(tile) == 0) {
634961366cdc (svn r2448) General cleanup of rail related code, more to follow. matthijs parents: 1928 diff changeset	505	/* The tile has no tracks left, it is no longer a rail tile */
634961366cdc (svn r2448) General cleanup of rail related code, more to follow. matthijs parents: 1928 diff changeset	506	DoClearSquare(tile);
634961366cdc (svn r2448) General cleanup of rail related code, more to follow. matthijs parents: 1928 diff changeset	507	/* XXX: This is an optimisation, right? Is it really worth the ugly goto? */
634961366cdc (svn r2448) General cleanup of rail related code, more to follow. matthijs parents: 1928 diff changeset	508	goto skip_mark_dirty;
634961366cdc (svn r2448) General cleanup of rail related code, more to follow. matthijs parents: 1928 diff changeset	509	}
634961366cdc (svn r2448) General cleanup of rail related code, more to follow. matthijs parents: 1928 diff changeset	510	break;
634961366cdc (svn r2448) General cleanup of rail related code, more to follow. matthijs parents: 1928 diff changeset	511	default:
634961366cdc (svn r2448) General cleanup of rail related code, more to follow. matthijs parents: 1928 diff changeset	512	assert(0);
0 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
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	515	/* mark_dirty */
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	516	MarkTileDirtyByTile(tile);
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	517
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	518	skip_mark_dirty:;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	519
1942 634961366cdc (svn r2448) General cleanup of rail related code, more to follow. matthijs parents: 1928 diff changeset	520	SetSignalsOnBothDir(tile, track);
201 c40d343115f8 (svn r202) -Codechange: I missed some files with trailing spaces.. this should be truelight parents: 159 diff changeset	521
1963 8a398139fb87 (svn r2469) - Add: When removing tracks with the 'remove' tool, have it automatically remove signals on the tracks. hackykid parents: 1954 diff changeset	522	return cost;
0 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
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	525	static const struct {
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	526	int8 xinc[16];
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	527	int8 yinc[16];
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	528	} _railbit = {{
1227 3552f20fcfcb (svn r1731) - Fix: [ 1106930 ] BugFix: placing signals with 2x1 drags workaround is completely rewritten. Also features checks for hacked/modified clients. Thanks a lot Hackykid! darkvater parents: 1209 diff changeset	529	// 0 1 2 3 4 5
3552f20fcfcb (svn r1731) - Fix: [ 1106930 ] BugFix: placing signals with 2x1 drags workaround is completely rewritten. Also features checks for hacked/modified clients. Thanks a lot Hackykid! darkvater parents: 1209 diff changeset	530	-16, 0,-16, 0, 16, 0, 0, 0,
3552f20fcfcb (svn r1731) - Fix: [ 1106930 ] BugFix: placing signals with 2x1 drags workaround is completely rewritten. Also features checks for hacked/modified clients. Thanks a lot Hackykid! darkvater parents: 1209 diff changeset	531	16, 0, 0, 16, 0,-16, 0, 0,
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	532	},{
1227 3552f20fcfcb (svn r1731) - Fix: [ 1106930 ] BugFix: placing signals with 2x1 drags workaround is completely rewritten. Also features checks for hacked/modified clients. Thanks a lot Hackykid! darkvater parents: 1209 diff changeset	533	0, 16, 0, 16, 0, 16, 0, 0,
3552f20fcfcb (svn r1731) - Fix: [ 1106930 ] BugFix: placing signals with 2x1 drags workaround is completely rewritten. Also features checks for hacked/modified clients. Thanks a lot Hackykid! darkvater parents: 1209 diff changeset	534	0,-16,-16, 0,-16, 0, 0, 0,
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	535	}};
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	536
1942 634961366cdc (svn r2448) General cleanup of rail related code, more to follow. matthijs parents: 1928 diff changeset	537	static int32 ValidateAutoDrag(Trackdir *trackdir, int x, int y, int ex, int ey)
1227 3552f20fcfcb (svn r1731) - Fix: [ 1106930 ] BugFix: placing signals with 2x1 drags workaround is completely rewritten. Also features checks for hacked/modified clients. Thanks a lot Hackykid! darkvater parents: 1209 diff changeset	538	{
3552f20fcfcb (svn r1731) - Fix: [ 1106930 ] BugFix: placing signals with 2x1 drags workaround is completely rewritten. Also features checks for hacked/modified clients. Thanks a lot Hackykid! darkvater parents: 1209 diff changeset	539	int dx, dy, trdx, trdy;
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	540
1942 634961366cdc (svn r2448) General cleanup of rail related code, more to follow. matthijs parents: 1928 diff changeset	541	if (!ValParamTrackOrientation(*trackdir)) return CMD_ERROR;
1227 3552f20fcfcb (svn r1731) - Fix: [ 1106930 ] BugFix: placing signals with 2x1 drags workaround is completely rewritten. Also features checks for hacked/modified clients. Thanks a lot Hackykid! darkvater parents: 1209 diff changeset	542
3552f20fcfcb (svn r1731) - Fix: [ 1106930 ] BugFix: placing signals with 2x1 drags workaround is completely rewritten. Also features checks for hacked/modified clients. Thanks a lot Hackykid! darkvater parents: 1209 diff changeset	543	// calculate delta x,y from start to end tile
3552f20fcfcb (svn r1731) - Fix: [ 1106930 ] BugFix: placing signals with 2x1 drags workaround is completely rewritten. Also features checks for hacked/modified clients. Thanks a lot Hackykid! darkvater parents: 1209 diff changeset	544	dx = ex - x;
3552f20fcfcb (svn r1731) - Fix: [ 1106930 ] BugFix: placing signals with 2x1 drags workaround is completely rewritten. Also features checks for hacked/modified clients. Thanks a lot Hackykid! darkvater parents: 1209 diff changeset	545	dy = ey - y;
3552f20fcfcb (svn r1731) - Fix: [ 1106930 ] BugFix: placing signals with 2x1 drags workaround is completely rewritten. Also features checks for hacked/modified clients. Thanks a lot Hackykid! darkvater parents: 1209 diff changeset	546
3552f20fcfcb (svn r1731) - Fix: [ 1106930 ] BugFix: placing signals with 2x1 drags workaround is completely rewritten. Also features checks for hacked/modified clients. Thanks a lot Hackykid! darkvater parents: 1209 diff changeset	547	// calculate delta x,y for the first direction
1942 634961366cdc (svn r2448) General cleanup of rail related code, more to follow. matthijs parents: 1928 diff changeset	548	trdx = _railbit.xinc[*trackdir];
634961366cdc (svn r2448) General cleanup of rail related code, more to follow. matthijs parents: 1928 diff changeset	549	trdy = _railbit.yinc[*trackdir];
1227 3552f20fcfcb (svn r1731) - Fix: [ 1106930 ] BugFix: placing signals with 2x1 drags workaround is completely rewritten. Also features checks for hacked/modified clients. Thanks a lot Hackykid! darkvater parents: 1209 diff changeset	550
1942 634961366cdc (svn r2448) General cleanup of rail related code, more to follow. matthijs parents: 1928 diff changeset	551	if (!IsDiagonalTrackdir(*trackdir)) {
634961366cdc (svn r2448) General cleanup of rail related code, more to follow. matthijs parents: 1928 diff changeset	552	trdx += _railbit.xinc[*trackdir ^ 1];
634961366cdc (svn r2448) General cleanup of rail related code, more to follow. matthijs parents: 1928 diff changeset	553	trdy += _railbit.yinc[*trackdir ^ 1];
1227 3552f20fcfcb (svn r1731) - Fix: [ 1106930 ] BugFix: placing signals with 2x1 drags workaround is completely rewritten. Also features checks for hacked/modified clients. Thanks a lot Hackykid! darkvater parents: 1209 diff changeset	554	}
3552f20fcfcb (svn r1731) - Fix: [ 1106930 ] BugFix: placing signals with 2x1 drags workaround is completely rewritten. Also features checks for hacked/modified clients. Thanks a lot Hackykid! darkvater parents: 1209 diff changeset	555
3552f20fcfcb (svn r1731) - Fix: [ 1106930 ] BugFix: placing signals with 2x1 drags workaround is completely rewritten. Also features checks for hacked/modified clients. Thanks a lot Hackykid! darkvater parents: 1209 diff changeset	556	// validate the direction
3552f20fcfcb (svn r1731) - Fix: [ 1106930 ] BugFix: placing signals with 2x1 drags workaround is completely rewritten. Also features checks for hacked/modified clients. Thanks a lot Hackykid! darkvater parents: 1209 diff changeset	557	while (((trdx <= 0) && (dx > 0)) \|\| ((trdx >= 0) && (dx < 0)) \|\|
3552f20fcfcb (svn r1731) - Fix: [ 1106930 ] BugFix: placing signals with 2x1 drags workaround is completely rewritten. Also features checks for hacked/modified clients. Thanks a lot Hackykid! darkvater parents: 1209 diff changeset	558	((trdy <= 0) && (dy > 0)) \|\| ((trdy >= 0) && (dy < 0))) {
1942 634961366cdc (svn r2448) General cleanup of rail related code, more to follow. matthijs parents: 1928 diff changeset	559	if (!HASBIT(*trackdir, 3)) { // first direction is invalid, try the other
634961366cdc (svn r2448) General cleanup of rail related code, more to follow. matthijs parents: 1928 diff changeset	560	SETBIT(*trackdir, 3); // reverse the direction
1227 3552f20fcfcb (svn r1731) - Fix: [ 1106930 ] BugFix: placing signals with 2x1 drags workaround is completely rewritten. Also features checks for hacked/modified clients. Thanks a lot Hackykid! darkvater parents: 1209 diff changeset	561	trdx = -trdx;
3552f20fcfcb (svn r1731) - Fix: [ 1106930 ] BugFix: placing signals with 2x1 drags workaround is completely rewritten. Also features checks for hacked/modified clients. Thanks a lot Hackykid! darkvater parents: 1209 diff changeset	562	trdy = -trdy;
3552f20fcfcb (svn r1731) - Fix: [ 1106930 ] BugFix: placing signals with 2x1 drags workaround is completely rewritten. Also features checks for hacked/modified clients. Thanks a lot Hackykid! darkvater parents: 1209 diff changeset	563	} else // other direction is invalid too, invalid drag
3552f20fcfcb (svn r1731) - Fix: [ 1106930 ] BugFix: placing signals with 2x1 drags workaround is completely rewritten. Also features checks for hacked/modified clients. Thanks a lot Hackykid! darkvater parents: 1209 diff changeset	564	return CMD_ERROR;
3552f20fcfcb (svn r1731) - Fix: [ 1106930 ] BugFix: placing signals with 2x1 drags workaround is completely rewritten. Also features checks for hacked/modified clients. Thanks a lot Hackykid! darkvater parents: 1209 diff changeset	565	}
3552f20fcfcb (svn r1731) - Fix: [ 1106930 ] BugFix: placing signals with 2x1 drags workaround is completely rewritten. Also features checks for hacked/modified clients. Thanks a lot Hackykid! darkvater parents: 1209 diff changeset	566
3552f20fcfcb (svn r1731) - Fix: [ 1106930 ] BugFix: placing signals with 2x1 drags workaround is completely rewritten. Also features checks for hacked/modified clients. Thanks a lot Hackykid! darkvater parents: 1209 diff changeset	567	// (for diagonal tracks, this is already made sure of by above test), but:
3552f20fcfcb (svn r1731) - Fix: [ 1106930 ] BugFix: placing signals with 2x1 drags workaround is completely rewritten. Also features checks for hacked/modified clients. Thanks a lot Hackykid! darkvater parents: 1209 diff changeset	568	// for non-diagonal tracks, check if the start and end tile are on 1 line
1942 634961366cdc (svn r2448) General cleanup of rail related code, more to follow. matthijs parents: 1928 diff changeset	569	if (!IsDiagonalTrackdir(*trackdir)) {
634961366cdc (svn r2448) General cleanup of rail related code, more to follow. matthijs parents: 1928 diff changeset	570	trdx = _railbit.xinc[*trackdir];
634961366cdc (svn r2448) General cleanup of rail related code, more to follow. matthijs parents: 1928 diff changeset	571	trdy = _railbit.yinc[*trackdir];
1227 3552f20fcfcb (svn r1731) - Fix: [ 1106930 ] BugFix: placing signals with 2x1 drags workaround is completely rewritten. Also features checks for hacked/modified clients. Thanks a lot Hackykid! darkvater parents: 1209 diff changeset	572	if ((abs(dx) != abs(dy)) && (abs(dx) + abs(trdy) != abs(dy) + abs(trdx)))
3552f20fcfcb (svn r1731) - Fix: [ 1106930 ] BugFix: placing signals with 2x1 drags workaround is completely rewritten. Also features checks for hacked/modified clients. Thanks a lot Hackykid! darkvater parents: 1209 diff changeset	573	return CMD_ERROR;
3552f20fcfcb (svn r1731) - Fix: [ 1106930 ] BugFix: placing signals with 2x1 drags workaround is completely rewritten. Also features checks for hacked/modified clients. Thanks a lot Hackykid! darkvater parents: 1209 diff changeset	574	}
3552f20fcfcb (svn r1731) - Fix: [ 1106930 ] BugFix: placing signals with 2x1 drags workaround is completely rewritten. Also features checks for hacked/modified clients. Thanks a lot Hackykid! darkvater parents: 1209 diff changeset	575
3552f20fcfcb (svn r1731) - Fix: [ 1106930 ] BugFix: placing signals with 2x1 drags workaround is completely rewritten. Also features checks for hacked/modified clients. Thanks a lot Hackykid! darkvater parents: 1209 diff changeset	576	return 0;
3552f20fcfcb (svn r1731) - Fix: [ 1106930 ] BugFix: placing signals with 2x1 drags workaround is completely rewritten. Also features checks for hacked/modified clients. Thanks a lot Hackykid! darkvater parents: 1209 diff changeset	577	}
3552f20fcfcb (svn r1731) - Fix: [ 1106930 ] BugFix: placing signals with 2x1 drags workaround is completely rewritten. Also features checks for hacked/modified clients. Thanks a lot Hackykid! darkvater parents: 1209 diff changeset	578
1775 08ff0f12ccdc (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	/** Build a stretch of railroad tracks.
08ff0f12ccdc (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 x,y start tile of drag
08ff0f12ccdc (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 p1 end tile of drag
08ff0f12ccdc (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	* @param p2 various bitstuffed elements
08ff0f12ccdc (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 0-3) - railroad type normal/maglev (0 = normal, 1 = mono, 2 = maglev)
1942 634961366cdc (svn r2448) General cleanup of rail related code, more to follow. matthijs parents: 1928 diff changeset	584	* - p2 = (bit 4-6) - track-orientation, valid values: 0-5 (Track enum)
1775 08ff0f12ccdc (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	585	* - p2 = (bit 7) - 0 = build, 1 = remove tracks
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	586	*/
1227 3552f20fcfcb (svn r1731) - Fix: [ 1106930 ] BugFix: placing signals with 2x1 drags workaround is completely rewritten. Also features checks for hacked/modified clients. Thanks a lot Hackykid! darkvater parents: 1209 diff changeset	587	static int32 CmdRailTrackHelper(int x, int y, uint32 flags, uint32 p1, uint32 p2)
3552f20fcfcb (svn r1731) - Fix: [ 1106930 ] BugFix: placing signals with 2x1 drags workaround is completely rewritten. Also features checks for hacked/modified clients. Thanks a lot Hackykid! darkvater parents: 1209 diff changeset	588	{
3552f20fcfcb (svn r1731) - Fix: [ 1106930 ] BugFix: placing signals with 2x1 drags workaround is completely rewritten. Also features checks for hacked/modified clients. Thanks a lot Hackykid! darkvater parents: 1209 diff changeset	589	int ex, ey;
3552f20fcfcb (svn r1731) - Fix: [ 1106930 ] BugFix: placing signals with 2x1 drags workaround is completely rewritten. Also features checks for hacked/modified clients. Thanks a lot Hackykid! darkvater parents: 1209 diff changeset	590	int32 ret, total_cost = 0;
2140 d708eb80ab8b (svn r2650) Convert many explicit shifts+ands to extract bits to invocations of GB - should be a bit nicer to read tron parents: 2111 diff changeset	591	Track track = (Track)GB(p2, 4, 3);
1942 634961366cdc (svn r2448) General cleanup of rail related code, more to follow. matthijs parents: 1928 diff changeset	592	Trackdir trackdir;
1227 3552f20fcfcb (svn r1731) - Fix: [ 1106930 ] BugFix: placing signals with 2x1 drags workaround is completely rewritten. Also features checks for hacked/modified clients. Thanks a lot Hackykid! darkvater parents: 1209 diff changeset	593	byte mode = HASBIT(p2, 7);
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	594
1942 634961366cdc (svn r2448) General cleanup of rail related code, more to follow. matthijs parents: 1928 diff changeset	595	if (!ValParamRailtype(p2 & 0x3) \|\| !ValParamTrackOrientation(track)) return CMD_ERROR;
1781 92e08797c84b (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	596	if (p1 > MapSize()) return CMD_ERROR;
1942 634961366cdc (svn r2448) General cleanup of rail related code, more to follow. matthijs parents: 1928 diff changeset	597	trackdir = TrackToTrackdir(track);
1775 08ff0f12ccdc (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	598
1227 3552f20fcfcb (svn r1731) - Fix: [ 1106930 ] BugFix: placing signals with 2x1 drags workaround is completely rewritten. Also features checks for hacked/modified clients. Thanks a lot Hackykid! darkvater parents: 1209 diff changeset	599	/* unpack end point */
1942 634961366cdc (svn r2448) General cleanup of rail related code, more to follow. matthijs parents: 1928 diff changeset	600	ex = TileX(p1) * TILE_SIZE;
634961366cdc (svn r2448) General cleanup of rail related code, more to follow. matthijs parents: 1928 diff changeset	601	ey = TileY(p1) * TILE_SIZE;
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	602
889 7f8630bfea41 (svn r1375) -Fix: [1050990] Buying trains sometimes accounted for incorrectly. Was the result of the cost getting reset in a recursive call of docommand. That is fixed. In addition all cost-commands are typed explicitely. Please do not forget to do so or your costs will be credited to construction if you are unlucky. darkvater parents: 826 diff changeset	603	SET_EXPENSES_TYPE(EXPENSES_CONSTRUCTION);
7f8630bfea41 (svn r1375) -Fix: [1050990] Buying trains sometimes accounted for incorrectly. Was the result of the cost getting reset in a recursive call of docommand. That is fixed. In addition all cost-commands are typed explicitely. Please do not forget to do so or your costs will be credited to construction if you are unlucky. darkvater parents: 826 diff changeset	604
1942 634961366cdc (svn r2448) General cleanup of rail related code, more to follow. matthijs parents: 1928 diff changeset	605	if (CmdFailed(ValidateAutoDrag(&trackdir, 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	606
1980 9ea0c89fbb58 (svn r2486) Turn TILE_FROM_XY into an inline function and rename it to TileVirtXY tron parents: 1977 diff changeset	607	if (flags & DC_EXEC) SndPlayTileFx(SND_20_SPLAT_2, TileVirtXY(x, y));
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	608
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	609	for(;;) {
1942 634961366cdc (svn r2448) General cleanup of rail related code, more to follow. matthijs parents: 1928 diff changeset	610	ret = DoCommand(x, y, p2 & 0x3, TrackdirToTrack(trackdir), 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	611
1775 08ff0f12ccdc (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	612	if (CmdFailed(ret)) {
1227 3552f20fcfcb (svn r1731) - Fix: [ 1106930 ] BugFix: placing signals with 2x1 drags workaround is completely rewritten. Also features checks for hacked/modified clients. Thanks a lot Hackykid! darkvater parents: 1209 diff changeset	613	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	614	break;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	615	} else
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	616	total_cost += ret;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	617
1227 3552f20fcfcb (svn r1731) - Fix: [ 1106930 ] BugFix: placing signals with 2x1 drags workaround is completely rewritten. Also features checks for hacked/modified clients. Thanks a lot Hackykid! darkvater parents: 1209 diff changeset	618	if (x == ex && y == ey)
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	619	break;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	620
1942 634961366cdc (svn r2448) General cleanup of rail related code, more to follow. matthijs parents: 1928 diff changeset	621	x += _railbit.xinc[trackdir];
634961366cdc (svn r2448) General cleanup of rail related code, more to follow. matthijs parents: 1928 diff changeset	622	y += _railbit.yinc[trackdir];
201 c40d343115f8 (svn r202) -Codechange: I missed some files with trailing spaces.. this should be truelight parents: 159 diff changeset	623
1227 3552f20fcfcb (svn r1731) - Fix: [ 1106930 ] BugFix: placing signals with 2x1 drags workaround is completely rewritten. Also features checks for hacked/modified clients. Thanks a lot Hackykid! darkvater parents: 1209 diff changeset	624	// toggle railbit for the non-diagonal tracks
1942 634961366cdc (svn r2448) General cleanup of rail related code, more to follow. matthijs parents: 1928 diff changeset	625	if (!IsDiagonalTrackdir(trackdir)) trackdir ^= 1;
201 c40d343115f8 (svn r202) -Codechange: I missed some files with trailing spaces.. this should be truelight parents: 159 diff changeset	626	}
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	627
1775 08ff0f12ccdc (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	628	return (total_cost == 0) ? CMD_ERROR : total_cost;
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	629	}
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	630
1796 cae31916ae54 (svn r2300) - CodeChange: check the last number of commands, now only the refit ones remain, and some server-only commands. Darkvater parents: 1782 diff changeset	631	/** Build rail on a stretch of track.
cae31916ae54 (svn r2300) - CodeChange: check the last number of commands, now only the refit ones remain, and some server-only commands. Darkvater parents: 1782 diff changeset	632	* Stub for the unified rail builder/remover
cae31916ae54 (svn r2300) - CodeChange: check the last number of commands, now only the refit ones remain, and some server-only commands. Darkvater parents: 1782 diff changeset	633	* @see CmdRailTrackHelper
cae31916ae54 (svn r2300) - CodeChange: check the last number of commands, now only the refit ones remain, and some server-only commands. Darkvater parents: 1782 diff changeset	634	*/
1227 3552f20fcfcb (svn r1731) - Fix: [ 1106930 ] BugFix: placing signals with 2x1 drags workaround is completely rewritten. Also features checks for hacked/modified clients. Thanks a lot Hackykid! darkvater parents: 1209 diff changeset	635	int32 CmdBuildRailroadTrack(int x, int y, uint32 flags, uint32 p1, uint32 p2)
3552f20fcfcb (svn r1731) - Fix: [ 1106930 ] BugFix: placing signals with 2x1 drags workaround is completely rewritten. Also features checks for hacked/modified clients. Thanks a lot Hackykid! darkvater parents: 1209 diff changeset	636	{
1775 08ff0f12ccdc (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	637	return CmdRailTrackHelper(x, y, flags, p1, CLRBIT(p2, 7));
1227 3552f20fcfcb (svn r1731) - Fix: [ 1106930 ] BugFix: placing signals with 2x1 drags workaround is completely rewritten. Also features checks for hacked/modified clients. Thanks a lot Hackykid! darkvater parents: 1209 diff changeset	638	}
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	639
1796 cae31916ae54 (svn r2300) - CodeChange: check the last number of commands, now only the refit ones remain, and some server-only commands. Darkvater parents: 1782 diff changeset	640	/** Build rail on a stretch of track.
cae31916ae54 (svn r2300) - CodeChange: check the last number of commands, now only the refit ones remain, and some server-only commands. Darkvater parents: 1782 diff changeset	641	* Stub for the unified rail builder/remover
cae31916ae54 (svn r2300) - CodeChange: check the last number of commands, now only the refit ones remain, and some server-only commands. Darkvater parents: 1782 diff changeset	642	* @see CmdRailTrackHelper
cae31916ae54 (svn r2300) - CodeChange: check the last number of commands, now only the refit ones remain, and some server-only commands. Darkvater parents: 1782 diff changeset	643	*/
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	644	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	645	{
1227 3552f20fcfcb (svn r1731) - Fix: [ 1106930 ] BugFix: placing signals with 2x1 drags workaround is completely rewritten. Also features checks for hacked/modified clients. Thanks a lot Hackykid! darkvater parents: 1209 diff changeset	646	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	647	}
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	648
1775 08ff0f12ccdc (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	649	/** Build a train depot
08ff0f12ccdc (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	650	* @param x,y position of the train depot
08ff0f12ccdc (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	651	* @param p1 rail type
2085 ae9e92ffe168 (svn r2595) -Codechange: Introduced "IsSteepTileh" to find whether a tile is steep celestar parents: 2049 diff changeset	652	* @param p2 depot direction (0 through 3), where 0 is NE, 1 is SE, 2 is SW, 3 is NW
ae9e92ffe168 (svn r2595) -Codechange: Introduced "IsSteepTileh" to find whether a tile is steep celestar parents: 2049 diff changeset	653	*
ae9e92ffe168 (svn r2595) -Codechange: Introduced "IsSteepTileh" to find whether a tile is steep celestar parents: 2049 diff changeset	654	* @todo When checking for the tile slope,
ae9e92ffe168 (svn r2595) -Codechange: Introduced "IsSteepTileh" to find whether a tile is steep celestar parents: 2049 diff changeset	655	* distingush between "Flat land required" and "land sloped in wrong direction"
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	656	*/
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	657	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	658	{
1775 08ff0f12ccdc (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	659	Depot *d;
1980 9ea0c89fbb58 (svn r2486) Turn TILE_FROM_XY into an inline function and rename it to TileVirtXY tron parents: 1977 diff changeset	660	TileIndex tile = TileVirtXY(x, y);
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	661	int32 cost, ret;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	662	uint tileh;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	663
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	664	SET_EXPENSES_TYPE(EXPENSES_CONSTRUCTION);
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	665
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	666	if (!EnsureNoVehicle(tile)) return CMD_ERROR;
1775 08ff0f12ccdc (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	/* check railtype and valid direction for depot (0 through 3), 4 in total */
08ff0f12ccdc (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	668	if (!ValParamRailtype(p1) \|\| p2 > 3) return CMD_ERROR;
0 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	tileh = GetTileSlope(tile, NULL);
2085 ae9e92ffe168 (svn r2595) -Codechange: Introduced "IsSteepTileh" to find whether a tile is steep celestar parents: 2049 diff changeset	671
ae9e92ffe168 (svn r2595) -Codechange: Introduced "IsSteepTileh" to find whether a tile is steep celestar parents: 2049 diff changeset	672	/* Prohibit construction if
ae9e92ffe168 (svn r2595) -Codechange: Introduced "IsSteepTileh" to find whether a tile is steep celestar parents: 2049 diff changeset	673	The tile is non-flat AND
ae9e92ffe168 (svn r2595) -Codechange: Introduced "IsSteepTileh" to find whether a tile is steep celestar parents: 2049 diff changeset	674	1) The AI is "old-school"
ae9e92ffe168 (svn r2595) -Codechange: Introduced "IsSteepTileh" to find whether a tile is steep celestar parents: 2049 diff changeset	675	2) build-on-slopes is disabled
ae9e92ffe168 (svn r2595) -Codechange: Introduced "IsSteepTileh" to find whether a tile is steep celestar parents: 2049 diff changeset	676	3) the tile is steep i.e. spans two height levels
ae9e92ffe168 (svn r2595) -Codechange: Introduced "IsSteepTileh" to find whether a tile is steep celestar parents: 2049 diff changeset	677	4) the exit points in the wrong direction
ae9e92ffe168 (svn r2595) -Codechange: Introduced "IsSteepTileh" to find whether a tile is steep celestar parents: 2049 diff changeset	678
ae9e92ffe168 (svn r2595) -Codechange: Introduced "IsSteepTileh" to find whether a tile is steep celestar parents: 2049 diff changeset	679	*/
ae9e92ffe168 (svn r2595) -Codechange: Introduced "IsSteepTileh" to find whether a tile is steep celestar parents: 2049 diff changeset	680
ae9e92ffe168 (svn r2595) -Codechange: Introduced "IsSteepTileh" to find whether a tile is steep celestar parents: 2049 diff changeset	681	if (tileh != 0 && (
ae9e92ffe168 (svn r2595) -Codechange: Introduced "IsSteepTileh" to find whether a tile is steep celestar parents: 2049 diff changeset	682	(!_patches.ainew_active && _is_ai_player) \|\|
ae9e92ffe168 (svn r2595) -Codechange: Introduced "IsSteepTileh" to find whether a tile is steep celestar parents: 2049 diff changeset	683	!_patches.build_on_slopes \|\|
ae9e92ffe168 (svn r2595) -Codechange: Introduced "IsSteepTileh" to find whether a tile is steep celestar parents: 2049 diff changeset	684	IsSteepTileh(tileh) \|\|
ae9e92ffe168 (svn r2595) -Codechange: Introduced "IsSteepTileh" to find whether a tile is steep celestar parents: 2049 diff changeset	685	!CanBuildDepotByTileh(p2, tileh)
ae9e92ffe168 (svn r2595) -Codechange: Introduced "IsSteepTileh" to find whether a tile is steep celestar parents: 2049 diff changeset	686	)
ae9e92ffe168 (svn r2595) -Codechange: Introduced "IsSteepTileh" to find whether a tile is steep celestar parents: 2049 diff changeset	687	) {
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	688	return_cmd_error(STR_0007_FLAT_LAND_REQUIRED);
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
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	691	ret = DoCommandByTile(tile, 0, 0, flags, CMD_LANDSCAPE_CLEAR);
1775 08ff0f12ccdc (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	if (CmdFailed(ret)) return CMD_ERROR;
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	693	cost = ret;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	694
1775 08ff0f12ccdc (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	d = AllocateDepot();
08ff0f12ccdc (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	if (d == NULL)
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	697	return CMD_ERROR;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	698
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	699	if (flags & DC_EXEC) {
1986 5dd3db2b86d7 (svn r2492) Remove some pointless casts and fix some nearby indentation tron parents: 1981 diff changeset	700	if (_current_player == _local_player) _last_built_train_depot_tile = tile;
201 c40d343115f8 (svn r202) -Codechange: I missed some files with trailing spaces.. this should be truelight parents: 159 diff changeset	701
c40d343115f8 (svn r202) -Codechange: I missed some files with trailing spaces.. this should be truelight parents: 159 diff changeset	702	ModifyTile(tile,
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	703	MP_SETTYPE(MP_RAILWAY) \|
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	704	MP_MAP3LO \| MP_MAPOWNER_CURRENT \| MP_MAP5,
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	705	p1, /* map3_lo */
1942 634961366cdc (svn r2448) General cleanup of rail related code, more to follow. matthijs parents: 1928 diff changeset	706	p2 \| RAIL_TYPE_DEPOT_WAYPOINT /* map5 */
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	707	);
201 c40d343115f8 (svn r202) -Codechange: I missed some files with trailing spaces.. this should be truelight parents: 159 diff changeset	708
1775 08ff0f12ccdc (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	709	d->xy = tile;
08ff0f12ccdc (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	710	d->town_index = ClosestTownFromTile(tile, (uint)-1)->index;
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	711
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	712	SetSignalsOnBothDir(tile, (p2&1) ? 2 : 1);
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	713
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	714	}
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	715
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	716	return cost + _price.build_train_depot;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	717	}
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	718
1775 08ff0f12ccdc (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	719	/** Build signals, alternate between double/single, signal/semaphore,
08ff0f12ccdc (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	720	* pre/exit/combo-signals, and what-else not
08ff0f12ccdc (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	721	* @param x,y coordinates where signals is being built
08ff0f12ccdc (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	722	* @param p1 various bitstuffed elements
1942 634961366cdc (svn r2448) General cleanup of rail related code, more to follow. matthijs parents: 1928 diff changeset	723	* - p1 = (bit 0-2) - track-orientation, valid values: 0-5 (Track enum)
1775 08ff0f12ccdc (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	724	* - p1 = (bit 3) - choose semaphores/signals or cycle normal/pre/exit/combo depending on context
1942 634961366cdc (svn r2448) General cleanup of rail related code, more to follow. matthijs parents: 1928 diff changeset	725	* @param p2 used for CmdBuildManySignals() to copy direction of first signal
634961366cdc (svn r2448) General cleanup of rail related code, more to follow. matthijs parents: 1928 diff changeset	726	* TODO: p2 should be replaced by two bits for "along" and "against" the 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	727	*/
1227 3552f20fcfcb (svn r1731) - Fix: [ 1106930 ] BugFix: placing signals with 2x1 drags workaround is completely rewritten. Also features checks for hacked/modified clients. Thanks a lot Hackykid! darkvater parents: 1209 diff changeset	728	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	729	{
1980 9ea0c89fbb58 (svn r2486) Turn TILE_FROM_XY into an inline function and rename it to TileVirtXY tron parents: 1977 diff changeset	730	TileIndex tile = TileVirtXY(x, y);
1084 16db2b52597e (svn r1585) Rewrite CmdBuildSignals() tron parents: 1066 diff changeset	731	bool semaphore;
16db2b52597e (svn r1585) Rewrite CmdBuildSignals() tron parents: 1066 diff changeset	732	bool pre_signal;
1942 634961366cdc (svn r2448) General cleanup of rail related code, more to follow. matthijs parents: 1928 diff changeset	733	Track track = (Track)(p1 & 0x7);
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	734	byte m5;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	735	int32 cost;
201 c40d343115f8 (svn r202) -Codechange: I missed some files with trailing spaces.. this should be truelight parents: 159 diff changeset	736
1942 634961366cdc (svn r2448) General cleanup of rail related code, more to follow. matthijs parents: 1928 diff changeset	737	// Same bit, used in different contexts
634961366cdc (svn r2448) General cleanup of rail related code, more to follow. matthijs parents: 1928 diff changeset	738	semaphore = pre_signal = HASBIT(p1, 3);
634961366cdc (svn r2448) General cleanup of rail related code, more to follow. matthijs parents: 1928 diff changeset	739
1775 08ff0f12ccdc (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	740	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	741	return CMD_ERROR;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	742
1775 08ff0f12ccdc (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	743	/* Protect against invalid signal copying */
1942 634961366cdc (svn r2448) General cleanup of rail related code, more to follow. matthijs parents: 1928 diff changeset	744	if (p2 != 0 && (p2 & SignalOnTrack(track)) == 0) return CMD_ERROR;
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	745
2049 ad0d49c916d4 (svn r2558) Change the internal map format from 7 arrays to one array of structs, this doesn't change the saved format for now. It's a stepping stone for further changes. tron parents: 2020 diff changeset	746	m5 = _m[tile].m5;
1084 16db2b52597e (svn r1585) Rewrite CmdBuildSignals() tron parents: 1066 diff changeset	747
1942 634961366cdc (svn r2448) General cleanup of rail related code, more to follow. matthijs parents: 1928 diff changeset	748	/* You can only build signals on plain rail tiles, and the selected track must exist */
634961366cdc (svn r2448) General cleanup of rail related code, more to follow. matthijs parents: 1928 diff changeset	749	if (!IsPlainRailTile(tile) \|\| !HasTrack(tile, track)) return CMD_ERROR;
1084 16db2b52597e (svn r1585) Rewrite CmdBuildSignals() tron parents: 1066 diff changeset	750
16db2b52597e (svn r1585) Rewrite CmdBuildSignals() tron parents: 1066 diff changeset	751	if (!CheckTileOwnership(tile)) return CMD_ERROR;
16db2b52597e (svn r1585) Rewrite CmdBuildSignals() tron parents: 1066 diff changeset	752
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	753	_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	754
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	755	{
1942 634961366cdc (svn r2448) General cleanup of rail related code, more to follow. matthijs parents: 1928 diff changeset	756	/* See if this is a valid track combination for signals, (ie, no overlap) */
634961366cdc (svn r2448) General cleanup of rail related code, more to follow. matthijs parents: 1928 diff changeset	757	TrackBits trackbits = GetTrackBits(tile);
634961366cdc (svn r2448) General cleanup of rail related code, more to follow. matthijs parents: 1928 diff changeset	758	if (KILL_FIRST_BIT(trackbits) != 0 && /* More than one track present */
634961366cdc (svn r2448) General cleanup of rail related code, more to follow. matthijs parents: 1928 diff changeset	759	trackbits != (TRACK_BIT_UPPER \| TRACK_BIT_LOWER) && /* Horizontal parallel, non-intersecting tracks */
634961366cdc (svn r2448) General cleanup of rail related code, more to follow. matthijs parents: 1928 diff changeset	760	trackbits != (TRACK_BIT_LEFT \| TRACK_BIT_RIGHT) /* Vertical parallel, non-intersecting tracks */
634961366cdc (svn r2448) General cleanup of rail related code, more to follow. matthijs parents: 1928 diff changeset	761	)
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	762	return CMD_ERROR;
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 16db2b52597e (svn r1585) Rewrite CmdBuildSignals() tron parents: 1066 diff changeset	765	SET_EXPENSES_TYPE(EXPENSES_CONSTRUCTION);
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	766
1942 634961366cdc (svn r2448) General cleanup of rail related code, more to follow. matthijs parents: 1928 diff changeset	767	if (!HasSignalOnTrack(tile, track)) {
1084 16db2b52597e (svn r1585) Rewrite CmdBuildSignals() tron parents: 1066 diff changeset	768	// build new signals
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	769	cost = _price.build_signals;
1066 aad3c6ad147f (svn r1567) -Fix: [110452] On horizontal/vertical tracks you are also charged for building/removing signals on the parallel track on the same tile. Signal updating is also correct. (Hackykid) darkvater parents: 1059 diff changeset	770	} else {
1942 634961366cdc (svn r2448) General cleanup of rail related code, more to follow. matthijs parents: 1928 diff changeset	771	if (p2 != 0 && semaphore != HasSemaphores(tile, track)) {
1084 16db2b52597e (svn r1585) Rewrite CmdBuildSignals() tron parents: 1066 diff changeset	772	// convert signals <-> semaphores
16db2b52597e (svn r1585) Rewrite CmdBuildSignals() tron parents: 1066 diff changeset	773	cost = _price.build_signals + _price.remove_signals;
16db2b52597e (svn r1585) Rewrite CmdBuildSignals() tron parents: 1066 diff changeset	774	} else {
16db2b52597e (svn r1585) Rewrite CmdBuildSignals() tron parents: 1066 diff changeset	775	// it is free to change orientation/pre-exit-combo signals
16db2b52597e (svn r1585) Rewrite CmdBuildSignals() tron parents: 1066 diff changeset	776	cost = 0;
16db2b52597e (svn r1585) Rewrite CmdBuildSignals() tron parents: 1066 diff changeset	777	}
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	778	}
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	779
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	780	if (flags & DC_EXEC) {
1942 634961366cdc (svn r2448) General cleanup of rail related code, more to follow. matthijs parents: 1928 diff changeset	781	if (GetRailTileType(tile) != RAIL_TYPE_SIGNALS) {
1084 16db2b52597e (svn r1585) Rewrite CmdBuildSignals() tron parents: 1066 diff changeset	782	// there are no signals at all on this tile yet
2049 ad0d49c916d4 (svn r2558) Change the internal map format from 7 arrays to one array of structs, this doesn't change the saved format for now. It's a stepping stone for further changes. tron parents: 2020 diff changeset	783	_m[tile].m5 \|= RAIL_TYPE_SIGNALS; // change into signals
ad0d49c916d4 (svn r2558) Change the internal map format from 7 arrays to one array of structs, this doesn't change the saved format for now. It's a stepping stone for further changes. tron parents: 2020 diff changeset	784	_m[tile].m2 \|= 0xF0; // all signals are on
ad0d49c916d4 (svn r2558) Change the internal map format from 7 arrays to one array of structs, this doesn't change the saved format for now. It's a stepping stone for further changes. tron parents: 2020 diff changeset	785	_m[tile].m3 &= ~0xF0; // no signals built by default
ad0d49c916d4 (svn r2558) Change the internal map format from 7 arrays to one array of structs, this doesn't change the saved format for now. It's a stepping stone for further changes. tron parents: 2020 diff changeset	786	_m[tile].m4 = semaphore ? 0x08 : 0;
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	787	}
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	788
1084 16db2b52597e (svn r1585) Rewrite CmdBuildSignals() tron parents: 1066 diff changeset	789	if (p2 == 0) {
1942 634961366cdc (svn r2448) General cleanup of rail related code, more to follow. matthijs parents: 1928 diff changeset	790	if (!HasSignalOnTrack(tile, track)) {
1084 16db2b52597e (svn r1585) Rewrite CmdBuildSignals() tron parents: 1066 diff changeset	791	// build new signals
2049 ad0d49c916d4 (svn r2558) Change the internal map format from 7 arrays to one array of structs, this doesn't change the saved format for now. It's a stepping stone for further changes. tron parents: 2020 diff changeset	792	_m[tile].m3 \|= SignalOnTrack(track);
1084 16db2b52597e (svn r1585) Rewrite CmdBuildSignals() tron parents: 1066 diff changeset	793	} else {
16db2b52597e (svn r1585) Rewrite CmdBuildSignals() tron parents: 1066 diff changeset	794	if (pre_signal) {
2008 c9d6585c96c8 (svn r2516) - Feature: [pbs] Implement path-based-signalling. This allows multiple trains within the same signal block, provided their paths dont intersect. For this the block must have all exit and entry signals be pbs signals. Place these by ctrl-clicking 4 times on a normal signal. hackykid parents: 2007 diff changeset	795	// cycle between normal -> pre -> exit -> combo -> pbs ->...
c9d6585c96c8 (svn r2516) - Feature: [pbs] Implement path-based-signalling. This allows multiple trains within the same signal block, provided their paths dont intersect. For this the block must have all exit and entry signals be pbs signals. Place these by ctrl-clicking 4 times on a normal signal. hackykid parents: 2007 diff changeset	796	byte type = ((GetSignalType(tile, track) + 1) % 5);
2049 ad0d49c916d4 (svn r2558) Change the internal map format from 7 arrays to one array of structs, this doesn't change the saved format for now. It's a stepping stone for further changes. tron parents: 2020 diff changeset	797	_m[tile].m4 &= ~0x07;
ad0d49c916d4 (svn r2558) Change the internal map format from 7 arrays to one array of structs, this doesn't change the saved format for now. It's a stepping stone for further changes. tron parents: 2020 diff changeset	798	_m[tile].m4 \|= type ;
1084 16db2b52597e (svn r1585) Rewrite CmdBuildSignals() tron parents: 1066 diff changeset	799	} else {
16db2b52597e (svn r1585) Rewrite CmdBuildSignals() tron parents: 1066 diff changeset	800	// cycle between two-way -> one-way -> one-way -> ...
1942 634961366cdc (svn r2448) General cleanup of rail related code, more to follow. matthijs parents: 1928 diff changeset	801	/* TODO: Rewrite switch into something more general */
1084 16db2b52597e (svn r1585) Rewrite CmdBuildSignals() tron parents: 1066 diff changeset	802	switch (track) {
1942 634961366cdc (svn r2448) General cleanup of rail related code, more to follow. matthijs parents: 1928 diff changeset	803	case TRACK_LOWER:
634961366cdc (svn r2448) General cleanup of rail related code, more to follow. matthijs parents: 1928 diff changeset	804	case TRACK_RIGHT: {
2049 ad0d49c916d4 (svn r2558) Change the internal map format from 7 arrays to one array of structs, this doesn't change the saved format for now. It's a stepping stone for further changes. tron parents: 2020 diff changeset	805	byte signal = (_m[tile].m3 - 0x10) & 0x30;
1084 16db2b52597e (svn r1585) Rewrite CmdBuildSignals() tron parents: 1066 diff changeset	806	if (signal == 0) signal = 0x30;
2049 ad0d49c916d4 (svn r2558) Change the internal map format from 7 arrays to one array of structs, this doesn't change the saved format for now. It's a stepping stone for further changes. tron parents: 2020 diff changeset	807	_m[tile].m3 &= ~0x30;
ad0d49c916d4 (svn r2558) Change the internal map format from 7 arrays to one array of structs, this doesn't change the saved format for now. It's a stepping stone for further changes. tron parents: 2020 diff changeset	808	_m[tile].m3 \|= signal;
1084 16db2b52597e (svn r1585) Rewrite CmdBuildSignals() tron parents: 1066 diff changeset	809	break;
16db2b52597e (svn r1585) Rewrite CmdBuildSignals() tron parents: 1066 diff changeset	810	}
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	811
1084 16db2b52597e (svn r1585) Rewrite CmdBuildSignals() tron parents: 1066 diff changeset	812	default: {
2049 ad0d49c916d4 (svn r2558) Change the internal map format from 7 arrays to one array of structs, this doesn't change the saved format for now. It's a stepping stone for further changes. tron parents: 2020 diff changeset	813	byte signal = (_m[tile].m3 - 0x40) & 0xC0;
1084 16db2b52597e (svn r1585) Rewrite CmdBuildSignals() tron parents: 1066 diff changeset	814	if (signal == 0) signal = 0xC0;
2049 ad0d49c916d4 (svn r2558) Change the internal map format from 7 arrays to one array of structs, this doesn't change the saved format for now. It's a stepping stone for further changes. tron parents: 2020 diff changeset	815	_m[tile].m3 &= ~0xC0;
ad0d49c916d4 (svn r2558) Change the internal map format from 7 arrays to one array of structs, this doesn't change the saved format for now. It's a stepping stone for further changes. tron parents: 2020 diff changeset	816	_m[tile].m3 \|= signal;
1084 16db2b52597e (svn r1585) Rewrite CmdBuildSignals() tron parents: 1066 diff changeset	817	break;
16db2b52597e (svn r1585) Rewrite CmdBuildSignals() tron parents: 1066 diff changeset	818	}
16db2b52597e (svn r1585) Rewrite CmdBuildSignals() tron parents: 1066 diff changeset	819	}
16db2b52597e (svn r1585) Rewrite CmdBuildSignals() tron parents: 1066 diff changeset	820	}
16db2b52597e (svn r1585) Rewrite CmdBuildSignals() tron parents: 1066 diff changeset	821	}
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	822	} else {
1084 16db2b52597e (svn r1585) Rewrite CmdBuildSignals() tron parents: 1066 diff changeset	823	/* If CmdBuildManySignals is called with copying signals, just copy the
1942 634961366cdc (svn r2448) General cleanup of rail related code, more to follow. matthijs parents: 1928 diff changeset	824	* direction of the first signal given as parameter by CmdBuildManySignals */
2049 ad0d49c916d4 (svn r2558) Change the internal map format from 7 arrays to one array of structs, this doesn't change the saved format for now. It's a stepping stone for further changes. tron parents: 2020 diff changeset	825	_m[tile].m3 &= ~SignalOnTrack(track);
ad0d49c916d4 (svn r2558) Change the internal map format from 7 arrays to one array of structs, this doesn't change the saved format for now. It's a stepping stone for further changes. tron parents: 2020 diff changeset	826	_m[tile].m3 \|= p2 & SignalOnTrack(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	827	// convert between signal<->semaphores when dragging
1084 16db2b52597e (svn r1585) Rewrite CmdBuildSignals() tron parents: 1066 diff changeset	828	if (semaphore)
2049 ad0d49c916d4 (svn r2558) Change the internal map format from 7 arrays to one array of structs, this doesn't change the saved format for now. It's a stepping stone for further changes. tron parents: 2020 diff changeset	829	SETBIT(_m[tile].m4, 3);
1084 16db2b52597e (svn r1585) Rewrite CmdBuildSignals() tron parents: 1066 diff changeset	830	else
2049 ad0d49c916d4 (svn r2558) Change the internal map format from 7 arrays to one array of structs, this doesn't change the saved format for now. It's a stepping stone for further changes. tron parents: 2020 diff changeset	831	CLRBIT(_m[tile].m4, 3);
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	832	}
201 c40d343115f8 (svn r202) -Codechange: I missed some files with trailing spaces.. this should be truelight parents: 159 diff changeset	833
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	834	MarkTileDirtyByTile(tile);
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	835	SetSignalsOnBothDir(tile, track);
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	836	}
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	837
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	838	return cost;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	839	}
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	840
1796 cae31916ae54 (svn r2300) - CodeChange: check the last number of commands, now only the refit ones remain, and some server-only commands. Darkvater parents: 1782 diff changeset	841	/** Build many signals by dragging; AutoSignals
cae31916ae54 (svn r2300) - CodeChange: check the last number of commands, now only the refit ones remain, and some server-only commands. Darkvater parents: 1782 diff changeset	842	* @param x,y start tile of drag
cae31916ae54 (svn r2300) - CodeChange: check the last number of commands, now only the refit ones remain, and some server-only commands. Darkvater parents: 1782 diff changeset	843	* @param p1 end tile of drag
cae31916ae54 (svn r2300) - CodeChange: check the last number of commands, now only the refit ones remain, and some server-only commands. Darkvater parents: 1782 diff changeset	844	* @param p2 various bitstuffed elements
cae31916ae54 (svn r2300) - CodeChange: check the last number of commands, now only the refit ones remain, and some server-only commands. Darkvater parents: 1782 diff changeset	845	* - p2 = (bit 0) - 0 = build, 1 = remove signals
cae31916ae54 (svn r2300) - CodeChange: check the last number of commands, now only the refit ones remain, and some server-only commands. Darkvater parents: 1782 diff changeset	846	* - p2 = (bit 3) - 0 = signals, 1 = semaphores
1942 634961366cdc (svn r2448) General cleanup of rail related code, more to follow. matthijs parents: 1928 diff changeset	847	* - p2 = (bit 4- 6) - track-orientation, valid values: 0-5 (Track enum)
1796 cae31916ae54 (svn r2300) - CodeChange: check the last number of commands, now only the refit ones remain, and some server-only commands. Darkvater parents: 1782 diff changeset	848	* - 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	849	*/
1227 3552f20fcfcb (svn r1731) - Fix: [ 1106930 ] BugFix: placing signals with 2x1 drags workaround is completely rewritten. Also features checks for hacked/modified clients. Thanks a lot Hackykid! darkvater parents: 1209 diff changeset	850	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	851	{
1227 3552f20fcfcb (svn r1731) - Fix: [ 1106930 ] BugFix: placing signals with 2x1 drags workaround is completely rewritten. Also features checks for hacked/modified clients. Thanks a lot Hackykid! darkvater parents: 1209 diff changeset	852	int ex, ey;
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	853	int32 ret, total_cost, signal_ctr;
1954 58fee2f9eb81 (svn r2460) - Fix: Prevent assertion failure when trying to drag signals starting from a non-rail tile. hackykid parents: 1946 diff changeset	854	byte signals;
1980 9ea0c89fbb58 (svn r2486) Turn TILE_FROM_XY into an inline function and rename it to TileVirtXY tron parents: 1977 diff changeset	855	TileIndex tile = TileVirtXY(x, y);
1796 cae31916ae54 (svn r2300) - CodeChange: check the last number of commands, now only the refit ones remain, and some server-only commands. Darkvater parents: 1782 diff changeset	856	bool error = true;
cae31916ae54 (svn r2300) - CodeChange: check the last number of commands, now only the refit ones remain, and some server-only commands. Darkvater parents: 1782 diff changeset	857
1227 3552f20fcfcb (svn r1731) - Fix: [ 1106930 ] BugFix: placing signals with 2x1 drags workaround is completely rewritten. Also features checks for hacked/modified clients. Thanks a lot Hackykid! darkvater parents: 1209 diff changeset	858	int mode = p2 & 0x1;
2140 d708eb80ab8b (svn r2650) Convert many explicit shifts+ands to extract bits to invocations of GB - should be a bit nicer to read tron parents: 2111 diff changeset	859	Track track = GB(p2, 4, 3);
1942 634961366cdc (svn r2448) General cleanup of rail related code, more to follow. matthijs parents: 1928 diff changeset	860	Trackdir trackdir = TrackToTrackdir(track);
1796 cae31916ae54 (svn r2300) - CodeChange: check the last number of commands, now only the refit ones remain, and some server-only commands. Darkvater parents: 1782 diff changeset	861	byte semaphores = (HASBIT(p2, 3)) ? 8 : 0;
cae31916ae54 (svn r2300) - CodeChange: check the last number of commands, now only the refit ones remain, and some server-only commands. Darkvater parents: 1782 diff changeset	862	byte signal_density = (p2 >> 24);
cae31916ae54 (svn r2300) - CodeChange: check the last number of commands, now only the refit ones remain, and some server-only commands. Darkvater parents: 1782 diff changeset	863
cae31916ae54 (svn r2300) - CodeChange: check the last number of commands, now only the refit ones remain, and some server-only commands. Darkvater parents: 1782 diff changeset	864	if (p1 > MapSize()) return CMD_ERROR;
cae31916ae54 (svn r2300) - CodeChange: check the last number of commands, now only the refit ones remain, and some server-only commands. Darkvater parents: 1782 diff changeset	865	if (signal_density == 0 \|\| signal_density > 20) 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	866
1954 58fee2f9eb81 (svn r2460) - Fix: Prevent assertion failure when trying to drag signals starting from a non-rail tile. hackykid parents: 1946 diff changeset	867	if (!IsTileType(tile, MP_RAILWAY))
58fee2f9eb81 (svn r2460) - Fix: Prevent assertion failure when trying to drag signals starting from a non-rail tile. hackykid parents: 1946 diff changeset	868	return CMD_ERROR;
58fee2f9eb81 (svn r2460) - Fix: Prevent assertion failure when trying to drag signals starting from a non-rail tile. hackykid parents: 1946 diff changeset	869
889 7f8630bfea41 (svn r1375) -Fix: [1050990] Buying trains sometimes accounted for incorrectly. Was the result of the cost getting reset in a recursive call of docommand. That is fixed. In addition all cost-commands are typed explicitely. Please do not forget to do so or your costs will be credited to construction if you are unlucky. darkvater parents: 826 diff changeset	870	SET_EXPENSES_TYPE(EXPENSES_CONSTRUCTION);
7f8630bfea41 (svn r1375) -Fix: [1050990] Buying trains sometimes accounted for incorrectly. Was the result of the cost getting reset in a recursive call of docommand. That is fixed. In addition all cost-commands are typed explicitely. Please do not forget to do so or your costs will be credited to construction if you are unlucky. darkvater parents: 826 diff changeset	871
1796 cae31916ae54 (svn r2300) - CodeChange: check the last number of commands, now only the refit ones remain, and some server-only commands. Darkvater parents: 1782 diff changeset	872	/* for vertical/horizontal tracks, double the given signals density
cae31916ae54 (svn r2300) - CodeChange: check the last number of commands, now only the refit ones remain, and some server-only commands. Darkvater parents: 1782 diff changeset	873	* since the original amount will be too dense (shorter tracks) */
1942 634961366cdc (svn r2448) General cleanup of rail related code, more to follow. matthijs parents: 1928 diff changeset	874	if (!IsDiagonalTrack(track))
634961366cdc (svn r2448) General cleanup of rail related code, more to follow. matthijs parents: 1928 diff changeset	875	signal_density *= 2;
1796 cae31916ae54 (svn r2300) - CodeChange: check the last number of commands, now only the refit ones remain, and some server-only commands. Darkvater parents: 1782 diff changeset	876
1227 3552f20fcfcb (svn r1731) - Fix: [ 1106930 ] BugFix: placing signals with 2x1 drags workaround is completely rewritten. Also features checks for hacked/modified clients. Thanks a lot Hackykid! darkvater parents: 1209 diff changeset	877	// unpack end tile
1942 634961366cdc (svn r2448) General cleanup of rail related code, more to follow. matthijs parents: 1928 diff changeset	878	ex = TileX(p1) * TILE_SIZE;
634961366cdc (svn r2448) General cleanup of rail related code, more to follow. matthijs parents: 1928 diff changeset	879	ey = TileY(p1) * TILE_SIZE;
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	880
1942 634961366cdc (svn r2448) General cleanup of rail related code, more to follow. matthijs parents: 1928 diff changeset	881	if (CmdFailed(ValidateAutoDrag(&trackdir, x, y, ex, ey))) return CMD_ERROR;
634961366cdc (svn r2448) General cleanup of rail related code, more to follow. matthijs parents: 1928 diff changeset	882
634961366cdc (svn r2448) General cleanup of rail related code, more to follow. matthijs parents: 1928 diff changeset	883	track = TrackdirToTrack(trackdir); /* trackdir might have changed, keep track in sync */
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	884
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	// copy the signal-style of the first rail-piece if existing
1942 634961366cdc (svn r2448) General cleanup of rail related code, more to follow. matthijs parents: 1928 diff changeset	886	if (GetRailTileType(tile) == RAIL_TYPE_SIGNALS && GetTrackBits(tile) != 0) { /* XXX: GetTrackBits check useless? */
2049 ad0d49c916d4 (svn r2558) Change the internal map format from 7 arrays to one array of structs, this doesn't change the saved format for now. It's a stepping stone for further changes. tron parents: 2020 diff changeset	887	signals = _m[tile].m3 & SignalOnTrack(track);
1942 634961366cdc (svn r2448) General cleanup of rail related code, more to follow. matthijs parents: 1928 diff changeset	888	if (signals == 0) signals = SignalOnTrack(track); /* Can this actually occur? */
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
1942 634961366cdc (svn r2448) General cleanup of rail related code, more to follow. matthijs parents: 1928 diff changeset	890	semaphores = (HasSemaphores(tile, track) ? 8 : 0); // copy signal/semaphores style (independent of CTRL)
1796 cae31916ae54 (svn r2300) - CodeChange: check the last number of commands, now only the refit ones remain, and some server-only commands. Darkvater parents: 1782 diff changeset	891	} else // no signals exist, drag a two-way signal stretch
1942 634961366cdc (svn r2448) General cleanup of rail related code, more to follow. matthijs parents: 1928 diff changeset	892	signals = SignalOnTrack(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	893
1954 58fee2f9eb81 (svn r2460) - Fix: Prevent assertion failure when trying to drag signals starting from a non-rail tile. hackykid parents: 1946 diff changeset	894	/* signal_ctr - amount of tiles already processed
1942 634961366cdc (svn r2448) General cleanup of rail related code, more to follow. matthijs parents: 1928 diff changeset	895	* signals_density - patch setting to put signal on every Nth tile (double space on \|, -- 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	896	**********
1954 58fee2f9eb81 (svn r2460) - Fix: Prevent assertion failure when trying to drag signals starting from a non-rail tile. hackykid parents: 1946 diff changeset	897	* trackdir - trackdir to build with autorail
58fee2f9eb81 (svn r2460) - Fix: Prevent assertion failure when trying to drag signals starting from a non-rail tile. hackykid parents: 1946 diff changeset	898	* semaphores - semaphores or signals
1942 634961366cdc (svn r2448) General cleanup of rail related code, more to follow. matthijs parents: 1928 diff changeset	899	* signals - is there a signal/semaphore on the first tile, copy its style (two-way/single-way)
634961366cdc (svn r2448) General cleanup of rail related code, more to follow. matthijs parents: 1928 diff changeset	900	and convert all others to semaphore/signal
1954 58fee2f9eb81 (svn r2460) - Fix: Prevent assertion failure when trying to drag signals starting from a non-rail tile. hackykid parents: 1946 diff changeset	901	* mode - 1 remove signals, 0 build 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	902	signal_ctr = total_cost = 0;
1796 cae31916ae54 (svn r2300) - CodeChange: check the last number of commands, now only the refit ones remain, and some server-only commands. Darkvater parents: 1782 diff changeset	903	for (;;) {
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	904	// only build/remove signals with the specified density
1954 58fee2f9eb81 (svn r2460) - Fix: Prevent assertion failure when trying to drag signals starting from a non-rail tile. hackykid parents: 1946 diff changeset	905	if ((signal_ctr % signal_density) == 0 ) {
1942 634961366cdc (svn r2448) General cleanup of rail related code, more to follow. matthijs parents: 1928 diff changeset	906	ret = DoCommand(x, y, TrackdirToTrack(trackdir) \| semaphores, signals, flags, (mode == 1) ? CMD_REMOVE_SIGNALS : CMD_BUILD_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	907
826 0e2b569b737b (svn r1297) Language fixes in the source.. (ln-) miham parents: 817 diff changeset	908	/* 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	909	* This includes vehicles on track, competitor's tracks, etc. */
1796 cae31916ae54 (svn r2300) - CodeChange: check the last number of commands, now only the refit ones remain, and some server-only commands. Darkvater parents: 1782 diff changeset	910	if (CmdFailed(ret)) {
cae31916ae54 (svn r2300) - CodeChange: check the last number of commands, now only the refit ones remain, and some server-only commands. Darkvater parents: 1782 diff changeset	911	if (_error_message != STR_1005_NO_SUITABLE_RAILROAD_TRACK && mode != 1) 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	912	} 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	913	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	914	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	915	}
b9fdcc9b5c90 (svn r59) -Feature: Added Autosignals, just like Autorail. Can copy signal style, convert signal<->semaphore, etc. Big thanks to betatesters Dribbel and Testman57 (Darkvater) darkvater parents: 39 diff changeset	916	}
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	917
1796 cae31916ae54 (svn r2300) - CodeChange: check the last number of commands, now only the refit ones remain, and some server-only commands. Darkvater parents: 1782 diff changeset	918	if (ex == x && ey == y) break; // reached end of drag
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	919
1942 634961366cdc (svn r2448) General cleanup of rail related code, more to follow. matthijs parents: 1928 diff changeset	920	x += _railbit.xinc[trackdir];
634961366cdc (svn r2448) General cleanup of rail related code, more to follow. matthijs parents: 1928 diff changeset	921	y += _railbit.yinc[trackdir];
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	922	signal_ctr++;
201 c40d343115f8 (svn r202) -Codechange: I missed some files with trailing spaces.. this should be truelight parents: 159 diff changeset	923
1227 3552f20fcfcb (svn r1731) - Fix: [ 1106930 ] BugFix: placing signals with 2x1 drags workaround is completely rewritten. Also features checks for hacked/modified clients. Thanks a lot Hackykid! darkvater parents: 1209 diff changeset	924	// toggle railbit for the non-diagonal tracks (\|, -- tracks)
1942 634961366cdc (svn r2448) General cleanup of rail related code, more to follow. matthijs parents: 1928 diff changeset	925	if (!IsDiagonalTrackdir(trackdir)) trackdir ^= 1;
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	926	}
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	927
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	928	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	929	}
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	930
1796 cae31916ae54 (svn r2300) - CodeChange: check the last number of commands, now only the refit ones remain, and some server-only commands. Darkvater parents: 1782 diff changeset	931	/** Build signals on a stretch of track.
cae31916ae54 (svn r2300) - CodeChange: check the last number of commands, now only the refit ones remain, and some server-only commands. Darkvater parents: 1782 diff changeset	932	* Stub for the unified signal builder/remover
cae31916ae54 (svn r2300) - CodeChange: check the last number of commands, now only the refit ones remain, and some server-only commands. Darkvater parents: 1782 diff changeset	933	* @see CmdSignalTrackHelper
cae31916ae54 (svn r2300) - CodeChange: check the last number of commands, now only the refit ones remain, and some server-only commands. Darkvater parents: 1782 diff changeset	934	*/
1227 3552f20fcfcb (svn r1731) - Fix: [ 1106930 ] BugFix: placing signals with 2x1 drags workaround is completely rewritten. Also features checks for hacked/modified clients. Thanks a lot Hackykid! darkvater parents: 1209 diff changeset	935	int32 CmdBuildSignalTrack(int x, int y, uint32 flags, uint32 p1, uint32 p2)
3552f20fcfcb (svn r1731) - Fix: [ 1106930 ] BugFix: placing signals with 2x1 drags workaround is completely rewritten. Also features checks for hacked/modified clients. Thanks a lot Hackykid! darkvater parents: 1209 diff changeset	936	{
3552f20fcfcb (svn r1731) - Fix: [ 1106930 ] BugFix: placing signals with 2x1 drags workaround is completely rewritten. Also features checks for hacked/modified clients. Thanks a lot Hackykid! darkvater parents: 1209 diff changeset	937	return CmdSignalTrackHelper(x, y, flags, p1, p2);
3552f20fcfcb (svn r1731) - Fix: [ 1106930 ] BugFix: placing signals with 2x1 drags workaround is completely rewritten. Also features checks for hacked/modified clients. Thanks a lot Hackykid! darkvater parents: 1209 diff changeset	938	}
3552f20fcfcb (svn r1731) - Fix: [ 1106930 ] BugFix: placing signals with 2x1 drags workaround is completely rewritten. Also features checks for hacked/modified clients. Thanks a lot Hackykid! darkvater parents: 1209 diff changeset	939
1775 08ff0f12ccdc (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	940	/** Remove signals
08ff0f12ccdc (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	941	* @param x,y coordinates where signal is being deleted from
1942 634961366cdc (svn r2448) General cleanup of rail related code, more to follow. matthijs parents: 1928 diff changeset	942	* @param p1 track to remove signal from (Track enum)
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	943	*/
1227 3552f20fcfcb (svn r1731) - Fix: [ 1106930 ] BugFix: placing signals with 2x1 drags workaround is completely rewritten. Also features checks for hacked/modified clients. Thanks a lot Hackykid! darkvater parents: 1209 diff changeset	944	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	945	{
1980 9ea0c89fbb58 (svn r2486) Turn TILE_FROM_XY into an inline function and rename it to TileVirtXY tron parents: 1977 diff changeset	946	TileIndex tile = TileVirtXY(x, y);
1942 634961366cdc (svn r2448) General cleanup of rail related code, more to follow. matthijs parents: 1928 diff changeset	947	Track track = (Track)(p1 & 0x7);
1518 ade7a74ac31a (svn r2022) Revise CmdRemoveSingleSignal: Check parameters for validity and simplify the function tron parents: 1477 diff changeset	948
1775 08ff0f12ccdc (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	949	if (!ValParamTrackOrientation(track) \|\| !IsTileType(tile, MP_RAILWAY) \|\| !EnsureNoVehicle(tile))
1518 ade7a74ac31a (svn r2022) Revise CmdRemoveSingleSignal: Check parameters for validity and simplify the function tron parents: 1477 diff changeset	950	return CMD_ERROR;
ade7a74ac31a (svn r2022) Revise CmdRemoveSingleSignal: Check parameters for validity and simplify the function tron parents: 1477 diff changeset	951
1942 634961366cdc (svn r2448) General cleanup of rail related code, more to follow. matthijs parents: 1928 diff changeset	952	if (!HasSignalOnTrack(tile, track)) // no signals on track?
1518 ade7a74ac31a (svn r2022) Revise CmdRemoveSingleSignal: Check parameters for validity and simplify the function tron parents: 1477 diff changeset	953	return CMD_ERROR;
ade7a74ac31a (svn r2022) Revise CmdRemoveSingleSignal: Check parameters for validity and simplify the function tron parents: 1477 diff changeset	954
1775 08ff0f12ccdc (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	955	/* Only water can remove signals from anyone */
08ff0f12ccdc (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	956	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	957
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	958	SET_EXPENSES_TYPE(EXPENSES_CONSTRUCTION);
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	959
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	960	/* Do it? */
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	961	if (flags & DC_EXEC) {
2049 ad0d49c916d4 (svn r2558) Change the internal map format from 7 arrays to one array of structs, this doesn't change the saved format for now. It's a stepping stone for further changes. tron parents: 2020 diff changeset	962	_m[tile].m3 &= ~SignalOnTrack(track);
201 c40d343115f8 (svn r202) -Codechange: I missed some files with trailing spaces.. this should be truelight parents: 159 diff changeset	963
1066 aad3c6ad147f (svn r1567) -Fix: [110452] On horizontal/vertical tracks you are also charged for building/removing signals on the parallel track on the same tile. Signal updating is also correct. (Hackykid) darkvater parents: 1059 diff changeset	964	/* removed last signal from tile? */
2049 ad0d49c916d4 (svn r2558) Change the internal map format from 7 arrays to one array of structs, this doesn't change the saved format for now. It's a stepping stone for further changes. tron parents: 2020 diff changeset	965	if ((_m[tile].m3 & 0xF0) == 0) {
ad0d49c916d4 (svn r2558) Change the internal map format from 7 arrays to one array of structs, this doesn't change the saved format for now. It's a stepping stone for further changes. tron parents: 2020 diff changeset	966	_m[tile].m5 &= ~RAIL_TYPE_SIGNALS;
ad0d49c916d4 (svn r2558) Change the internal map format from 7 arrays to one array of structs, this doesn't change the saved format for now. It's a stepping stone for further changes. tron parents: 2020 diff changeset	967	_m[tile].m2 &= ~0xF0;
ad0d49c916d4 (svn r2558) Change the internal map format from 7 arrays to one array of structs, this doesn't change the saved format for now. It's a stepping stone for further changes. tron parents: 2020 diff changeset	968	CLRBIT(_m[tile].m4, 3); // remove any possible semaphores
1066 aad3c6ad147f (svn r1567) -Fix: [110452] On horizontal/vertical tracks you are also charged for building/removing signals on the parallel track on the same tile. Signal updating is also correct. (Hackykid) darkvater parents: 1059 diff changeset	969	}
1109 1bab892228cd (svn r1610) Remove trailing whitespace (last time ever, i hope) tron parents: 1095 diff changeset	970
1066 aad3c6ad147f (svn r1567) -Fix: [110452] On horizontal/vertical tracks you are also charged for building/removing signals on the parallel track on the same tile. Signal updating is also correct. (Hackykid) darkvater parents: 1059 diff changeset	971	SetSignalsOnBothDir(tile, track);
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	972
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	973	MarkTileDirtyByTile(tile);
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	974	}
201 c40d343115f8 (svn r202) -Codechange: I missed some files with trailing spaces.. this should be truelight parents: 159 diff changeset	975
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	976	return _price.remove_signals;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	977	}
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	978
1796 cae31916ae54 (svn r2300) - CodeChange: check the last number of commands, now only the refit ones remain, and some server-only commands. Darkvater parents: 1782 diff changeset	979	/** Remove signals on a stretch of track.
cae31916ae54 (svn r2300) - CodeChange: check the last number of commands, now only the refit ones remain, and some server-only commands. Darkvater parents: 1782 diff changeset	980	* Stub for the unified signal builder/remover
cae31916ae54 (svn r2300) - CodeChange: check the last number of commands, now only the refit ones remain, and some server-only commands. Darkvater parents: 1782 diff changeset	981	* @see CmdSignalTrackHelper
cae31916ae54 (svn r2300) - CodeChange: check the last number of commands, now only the refit ones remain, and some server-only commands. Darkvater parents: 1782 diff changeset	982	*/
1227 3552f20fcfcb (svn r1731) - Fix: [ 1106930 ] BugFix: placing signals with 2x1 drags workaround is completely rewritten. Also features checks for hacked/modified clients. Thanks a lot Hackykid! darkvater parents: 1209 diff changeset	983	int32 CmdRemoveSignalTrack(int x, int y, uint32 flags, uint32 p1, uint32 p2)
3552f20fcfcb (svn r1731) - Fix: [ 1106930 ] BugFix: placing signals with 2x1 drags workaround is completely rewritten. Also features checks for hacked/modified clients. Thanks a lot Hackykid! darkvater parents: 1209 diff changeset	984	{
1229 4c965ad79a0b (svn r1733) - Fix: oops "\| 1" is SETBIT(x, 0), not 1 :(. Now you can remove signals again darkvater parents: 1227 diff changeset	985	return CmdSignalTrackHelper(x, y, flags, p1, SETBIT(p2, 0));
1227 3552f20fcfcb (svn r1731) - Fix: [ 1106930 ] BugFix: placing signals with 2x1 drags workaround is completely rewritten. Also features checks for hacked/modified clients. Thanks a lot Hackykid! darkvater parents: 1209 diff changeset	986	}
3552f20fcfcb (svn r1731) - Fix: [ 1106930 ] BugFix: placing signals with 2x1 drags workaround is completely rewritten. Also features checks for hacked/modified clients. Thanks a lot Hackykid! darkvater parents: 1209 diff changeset	987
1977 4392ae3d8e31 (svn r2483) Replace almost 500 "uint tile" (and variants) with "TileIndex tile" tron parents: 1963 diff changeset	988	typedef int32 DoConvertRailProc(TileIndex tile, uint totype, bool exec);
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	989
1977 4392ae3d8e31 (svn r2483) Replace almost 500 "uint tile" (and variants) with "TileIndex tile" tron parents: 1963 diff changeset	990	static int32 DoConvertRail(TileIndex tile, uint totype, bool exec)
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	991	{
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	992	if (!CheckTileOwnership(tile) \|\| !EnsureNoVehicle(tile))
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	993	return CMD_ERROR;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	994
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	995	// tile is already of requested type?
1942 634961366cdc (svn r2448) General cleanup of rail related code, more to follow. matthijs parents: 1928 diff changeset	996	if ( GetRailType(tile) == totype)
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	997	return CMD_ERROR;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	998
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	999	// change type.
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1000	if (exec) {
2049 ad0d49c916d4 (svn r2558) Change the internal map format from 7 arrays to one array of structs, this doesn't change the saved format for now. It's a stepping stone for further changes. tron parents: 2020 diff changeset	1001	_m[tile].m3 = (_m[tile].m3 & 0xF0) + totype;
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1002	MarkTileDirtyByTile(tile);
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1003	}
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1004
1942 634961366cdc (svn r2448) General cleanup of rail related code, more to follow. matthijs parents: 1928 diff changeset	1005	return _price.build_rail / 2;
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1006	}
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1007
1977 4392ae3d8e31 (svn r2483) Replace almost 500 "uint tile" (and variants) with "TileIndex tile" tron parents: 1963 diff changeset	1008	extern int32 DoConvertStationRail(TileIndex tile, uint totype, bool exec);
4392ae3d8e31 (svn r2483) Replace almost 500 "uint tile" (and variants) with "TileIndex tile" tron parents: 1963 diff changeset	1009	extern int32 DoConvertStreetRail(TileIndex tile, uint totype, bool exec);
4392ae3d8e31 (svn r2483) Replace almost 500 "uint tile" (and variants) with "TileIndex tile" tron parents: 1963 diff changeset	1010	extern int32 DoConvertTunnelBridgeRail(TileIndex tile, uint totype, bool exec);
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1011
1782 0ac16ff36293 (svn r2286) - CodeChange: paramcheck the next batch of commands. Darkvater parents: 1781 diff changeset	1012	/** Convert one rail type to the other. You can convert normal rail to
0ac16ff36293 (svn r2286) - CodeChange: paramcheck the next batch of commands. Darkvater parents: 1781 diff changeset	1013	* monorail/maglev easily or vice-versa.
0ac16ff36293 (svn r2286) - CodeChange: paramcheck the next batch of commands. Darkvater parents: 1781 diff changeset	1014	* @param ex,ey end tile of rail conversion drag
0ac16ff36293 (svn r2286) - CodeChange: paramcheck the next batch of commands. Darkvater parents: 1781 diff changeset	1015	* @param p1 start tile of drag
0ac16ff36293 (svn r2286) - CodeChange: paramcheck the next batch of commands. Darkvater parents: 1781 diff changeset	1016	* @param p2 new railtype to convert to
0ac16ff36293 (svn r2286) - CodeChange: paramcheck the next batch of commands. Darkvater parents: 1781 diff changeset	1017	*/
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1018	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	1019	{
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1020	int32 ret, cost, money;
1782 0ac16ff36293 (svn r2286) - CodeChange: paramcheck the next batch of commands. Darkvater parents: 1781 diff changeset	1021	int sx, sy, x, y;
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1022
889 7f8630bfea41 (svn r1375) -Fix: [1050990] Buying trains sometimes accounted for incorrectly. Was the result of the cost getting reset in a recursive call of docommand. That is fixed. In addition all cost-commands are typed explicitely. Please do not forget to do so or your costs will be credited to construction if you are unlucky. darkvater parents: 826 diff changeset	1023	SET_EXPENSES_TYPE(EXPENSES_CONSTRUCTION);
7f8630bfea41 (svn r1375) -Fix: [1050990] Buying trains sometimes accounted for incorrectly. Was the result of the cost getting reset in a recursive call of docommand. That is fixed. In addition all cost-commands are typed explicitely. Please do not forget to do so or your costs will be credited to construction if you are unlucky. darkvater parents: 826 diff changeset	1024
1782 0ac16ff36293 (svn r2286) - CodeChange: paramcheck the next batch of commands. Darkvater parents: 1781 diff changeset	1025	if (!ValParamRailtype(p2)) return CMD_ERROR;
0ac16ff36293 (svn r2286) - CodeChange: paramcheck the next batch of commands. Darkvater parents: 1781 diff changeset	1026	if (p1 > MapSize()) return CMD_ERROR;
0ac16ff36293 (svn r2286) - CodeChange: paramcheck the next batch of commands. Darkvater parents: 1781 diff changeset	1027
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1028	// make sure sx,sy are smaller than ex,ey
1942 634961366cdc (svn r2448) General cleanup of rail related code, more to follow. matthijs parents: 1928 diff changeset	1029	sx = TileX(p1) * TILE_SIZE;
634961366cdc (svn r2448) General cleanup of rail related code, more to follow. matthijs parents: 1928 diff changeset	1030	sy = TileY(p1) * TILE_SIZE;
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1031	if (ex < sx) intswap(ex, sx);
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1032	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	1033
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1034	money = GetAvailableMoneyForCommand();
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1035	cost = 0;
201 c40d343115f8 (svn r202) -Codechange: I missed some files with trailing spaces.. this should be truelight parents: 159 diff changeset	1036
1942 634961366cdc (svn r2448) General cleanup of rail related code, more to follow. matthijs parents: 1928 diff changeset	1037	for (x = sx; x <= ex; x += TILE_SIZE) {
634961366cdc (svn r2448) General cleanup of rail related code, more to follow. matthijs parents: 1928 diff changeset	1038	for (y = sy; y <= ey; y += TILE_SIZE) {
1980 9ea0c89fbb58 (svn r2486) Turn TILE_FROM_XY into an inline function and rename it to TileVirtXY tron parents: 1977 diff changeset	1039	TileIndex tile = TileVirtXY(x, y);
1782 0ac16ff36293 (svn r2286) - CodeChange: paramcheck the next batch of commands. Darkvater parents: 1781 diff changeset	1040	DoConvertRailProc *proc;
0ac16ff36293 (svn r2286) - CodeChange: paramcheck the next batch of commands. Darkvater parents: 1781 diff changeset	1041
0ac16ff36293 (svn r2286) - CodeChange: paramcheck the next batch of commands. Darkvater parents: 1781 diff changeset	1042	if (IsTileType(tile, MP_RAILWAY)) proc = DoConvertRail;
0ac16ff36293 (svn r2286) - CodeChange: paramcheck the next batch of commands. Darkvater parents: 1781 diff changeset	1043	else if (IsTileType(tile, MP_STATION)) proc = DoConvertStationRail;
0ac16ff36293 (svn r2286) - CodeChange: paramcheck the next batch of commands. Darkvater parents: 1781 diff changeset	1044	else if (IsTileType(tile, MP_STREET)) proc = DoConvertStreetRail;
0ac16ff36293 (svn r2286) - CodeChange: paramcheck the next batch of commands. Darkvater parents: 1781 diff changeset	1045	else if (IsTileType(tile, MP_TUNNELBRIDGE)) proc = DoConvertTunnelBridgeRail;
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1046	else continue;
201 c40d343115f8 (svn r202) -Codechange: I missed some files with trailing spaces.. this should be truelight parents: 159 diff changeset	1047
1782 0ac16ff36293 (svn r2286) - CodeChange: paramcheck the next batch of commands. Darkvater parents: 1781 diff changeset	1048	ret = proc(tile, p2, false);
0ac16ff36293 (svn r2286) - CodeChange: paramcheck the next batch of commands. Darkvater parents: 1781 diff changeset	1049	if (CmdFailed(ret)) continue;
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1050	cost += ret;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1051
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1052	if (flags & DC_EXEC) {
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1053	if ( (money -= ret) < 0) { _additional_cash_required = ret; return cost - ret; }
1782 0ac16ff36293 (svn r2286) - CodeChange: paramcheck the next batch of commands. Darkvater parents: 1781 diff changeset	1054	proc(tile, p2, true);
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1055	}
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	}
1782 0ac16ff36293 (svn r2286) - CodeChange: paramcheck the next batch of commands. Darkvater parents: 1781 diff changeset	1058
0ac16ff36293 (svn r2286) - CodeChange: paramcheck the next batch of commands. Darkvater parents: 1781 diff changeset	1059	return (cost == 0) ? CMD_ERROR : cost;
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1060	}
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1061
1977 4392ae3d8e31 (svn r2483) Replace almost 500 "uint tile" (and variants) with "TileIndex tile" tron parents: 1963 diff changeset	1062	static int32 RemoveTrainDepot(TileIndex tile, uint32 flags)
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1063	{
149 5f7d4b21df01 (svn r150) -Fix: [1010833] Turning on the magic bulldozer removes oil rigs darkvater parents: 84 diff changeset	1064	if (!CheckTileOwnership(tile) && _current_player != OWNER_WATER)
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1065	return CMD_ERROR;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1066
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1067	if (!EnsureNoVehicle(tile))
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1068	return CMD_ERROR;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1069
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1070	if (flags & DC_EXEC) {
1942 634961366cdc (svn r2448) General cleanup of rail related code, more to follow. matthijs parents: 1928 diff changeset	1071	int track = TrackdirToTrack(DiagdirToDiagTrackdir(GetDepotDirection(tile, TRANSPORT_RAIL)));
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1072
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1073	DoDeleteDepot(tile);
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1074	SetSignalsOnBothDir(tile, track);
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1075	}
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1076
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1077	return _price.remove_train_depot;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1078	}
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1079
1534 2f7388d38291 (svn r2038) -Fix: A player only received the money for one rail when clearing a tile with 2 rails and signals tron parents: 1518 diff changeset	1080	static int32 ClearTile_Track(TileIndex tile, byte flags)
2f7388d38291 (svn r2038) -Fix: A player only received the money for one rail when clearing a tile with 2 rails and signals tron parents: 1518 diff changeset	1081	{
2f7388d38291 (svn r2038) -Fix: A player only received the money for one rail when clearing a tile with 2 rails and signals tron parents: 1518 diff changeset	1082	int32 cost;
2f7388d38291 (svn r2038) -Fix: A player only received the money for one rail when clearing a tile with 2 rails and signals tron parents: 1518 diff changeset	1083	int32 ret;
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1084	byte m5;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1085
2049 ad0d49c916d4 (svn r2558) Change the internal map format from 7 arrays to one array of structs, this doesn't change the saved format for now. It's a stepping stone for further changes. tron parents: 2020 diff changeset	1086	m5 = _m[tile].m5;
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1087
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1088	if (flags & DC_AUTO) {
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1089	if (m5 & RAIL_TYPE_SPECIAL)
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1090	return_cmd_error(STR_2004_BUILDING_MUST_BE_DEMOLISHED);
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1091
1901 fb05044cf5c3 (svn r2407) Use {Get,Is}TileOwner to get/check the owner of a tile and fix some bogus reads of _map_owner tron parents: 1891 diff changeset	1092	if (!IsTileOwner(tile, _current_player))
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1093	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	1094
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1095	return_cmd_error(STR_1008_MUST_REMOVE_RAILROAD_TRACK);
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1096	}
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1097
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1098	cost = 0;
201 c40d343115f8 (svn r202) -Codechange: I missed some files with trailing spaces.. this should be truelight parents: 159 diff changeset	1099
1942 634961366cdc (svn r2448) General cleanup of rail related code, more to follow. matthijs parents: 1928 diff changeset	1100	switch (GetRailTileType(tile)) {
1534 2f7388d38291 (svn r2038) -Fix: A player only received the money for one rail when clearing a tile with 2 rails and signals tron parents: 1518 diff changeset	1101	case RAIL_TYPE_SIGNALS:
2049 ad0d49c916d4 (svn r2558) Change the internal map format from 7 arrays to one array of structs, this doesn't change the saved format for now. It's a stepping stone for further changes. tron parents: 2020 diff changeset	1102	if (_m[tile].m3 & _signals_table_both[0]) {
1534 2f7388d38291 (svn r2038) -Fix: A player only received the money for one rail when clearing a tile with 2 rails and signals tron parents: 1518 diff changeset	1103	ret = DoCommandByTile(tile, 0, 0, flags, CMD_REMOVE_SIGNALS);
2f7388d38291 (svn r2038) -Fix: A player only received the money for one rail when clearing a tile with 2 rails and signals tron parents: 1518 diff changeset	1104	if (ret == CMD_ERROR) return CMD_ERROR;
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1105	cost += ret;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1106	}
2049 ad0d49c916d4 (svn r2558) Change the internal map format from 7 arrays to one array of structs, this doesn't change the saved format for now. It's a stepping stone for further changes. tron parents: 2020 diff changeset	1107	if (_m[tile].m3 & _signals_table_both[3]) {
1534 2f7388d38291 (svn r2038) -Fix: A player only received the money for one rail when clearing a tile with 2 rails and signals tron parents: 1518 diff changeset	1108	ret = DoCommandByTile(tile, 3, 0, flags, CMD_REMOVE_SIGNALS);
2f7388d38291 (svn r2038) -Fix: A player only received the money for one rail when clearing a tile with 2 rails and signals tron parents: 1518 diff changeset	1109	if (ret == CMD_ERROR) return CMD_ERROR;
2f7388d38291 (svn r2038) -Fix: A player only received the money for one rail when clearing a tile with 2 rails and signals tron parents: 1518 diff changeset	1110	cost += ret;
2f7388d38291 (svn r2038) -Fix: A player only received the money for one rail when clearing a tile with 2 rails and signals tron parents: 1518 diff changeset	1111	}
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1112
1942 634961366cdc (svn r2448) General cleanup of rail related code, more to follow. matthijs parents: 1928 diff changeset	1113	m5 &= TRACK_BIT_MASK;
1598 4425f756c19b (svn r2102) Fix bug introduced in r2038, which gave you money for clearing occupied railway tiles ([1171926]) tron parents: 1591 diff changeset	1114	if (!(flags & DC_EXEC)) {
4425f756c19b (svn r2102) Fix bug introduced in r2038, which gave you money for clearing occupied railway tiles ([1171926]) tron parents: 1591 diff changeset	1115	for (; m5 != 0; m5 >>= 1) if (m5 & 1) cost += _price.remove_rail;
4425f756c19b (svn r2102) Fix bug introduced in r2038, which gave you money for clearing occupied railway tiles ([1171926]) tron parents: 1591 diff changeset	1116	return cost;
4425f756c19b (svn r2102) Fix bug introduced in r2038, which gave you money for clearing occupied railway tiles ([1171926]) tron parents: 1591 diff changeset	1117	}
1534 2f7388d38291 (svn r2038) -Fix: A player only received the money for one rail when clearing a tile with 2 rails and signals tron parents: 1518 diff changeset	1118	/* FALLTHROUGH */
1109 1bab892228cd (svn r1610) Remove trailing whitespace (last time ever, i hope) tron parents: 1095 diff changeset	1119
1534 2f7388d38291 (svn r2038) -Fix: A player only received the money for one rail when clearing a tile with 2 rails and signals tron parents: 1518 diff changeset	1120	case RAIL_TYPE_NORMAL: {
2f7388d38291 (svn r2038) -Fix: A player only received the money for one rail when clearing a tile with 2 rails and signals tron parents: 1518 diff changeset	1121	uint i;
2f7388d38291 (svn r2038) -Fix: A player only received the money for one rail when clearing a tile with 2 rails and signals tron parents: 1518 diff changeset	1122
2f7388d38291 (svn r2038) -Fix: A player only received the money for one rail when clearing a tile with 2 rails and signals tron parents: 1518 diff changeset	1123	for (i = 0; m5 != 0; i++, m5 >>= 1) {
2f7388d38291 (svn r2038) -Fix: A player only received the money for one rail when clearing a tile with 2 rails and signals tron parents: 1518 diff changeset	1124	if (m5 & 1) {
1598 4425f756c19b (svn r2102) Fix bug introduced in r2038, which gave you money for clearing occupied railway tiles ([1171926]) tron parents: 1591 diff changeset	1125	ret = DoCommandByTile(tile, 0, i, flags, CMD_REMOVE_SINGLE_RAIL);
4425f756c19b (svn r2102) Fix bug introduced in r2038, which gave you money for clearing occupied railway tiles ([1171926]) tron parents: 1591 diff changeset	1126	if (ret == CMD_ERROR) return CMD_ERROR;
1534 2f7388d38291 (svn r2038) -Fix: A player only received the money for one rail when clearing a tile with 2 rails and signals tron parents: 1518 diff changeset	1127	cost += ret;
2f7388d38291 (svn r2038) -Fix: A player only received the money for one rail when clearing a tile with 2 rails and signals tron parents: 1518 diff changeset	1128	}
2f7388d38291 (svn r2038) -Fix: A player only received the money for one rail when clearing a tile with 2 rails and signals tron parents: 1518 diff changeset	1129	}
2f7388d38291 (svn r2038) -Fix: A player only received the money for one rail when clearing a tile with 2 rails and signals tron parents: 1518 diff changeset	1130	return cost;
2f7388d38291 (svn r2038) -Fix: A player only received the money for one rail when clearing a tile with 2 rails and signals tron parents: 1518 diff changeset	1131	}
2f7388d38291 (svn r2038) -Fix: A player only received the money for one rail when clearing a tile with 2 rails and signals tron parents: 1518 diff changeset	1132
1942 634961366cdc (svn r2448) General cleanup of rail related code, more to follow. matthijs parents: 1928 diff changeset	1133	case RAIL_TYPE_DEPOT_WAYPOINT:
1534 2f7388d38291 (svn r2038) -Fix: A player only received the money for one rail when clearing a tile with 2 rails and signals tron parents: 1518 diff changeset	1134	switch (m5 & RAIL_SUBTYPE_MASK) {
2f7388d38291 (svn r2038) -Fix: A player only received the money for one rail when clearing a tile with 2 rails and signals tron parents: 1518 diff changeset	1135	case RAIL_SUBTYPE_DEPOT:
2f7388d38291 (svn r2038) -Fix: A player only received the money for one rail when clearing a tile with 2 rails and signals tron parents: 1518 diff changeset	1136	return RemoveTrainDepot(tile, flags);
2f7388d38291 (svn r2038) -Fix: A player only received the money for one rail when clearing a tile with 2 rails and signals tron parents: 1518 diff changeset	1137
2f7388d38291 (svn r2038) -Fix: A player only received the money for one rail when clearing a tile with 2 rails and signals tron parents: 1518 diff changeset	1138	case RAIL_SUBTYPE_WAYPOINT:
2f7388d38291 (svn r2038) -Fix: A player only received the money for one rail when clearing a tile with 2 rails and signals tron parents: 1518 diff changeset	1139	return RemoveTrainWaypoint(tile, flags, false);
2f7388d38291 (svn r2038) -Fix: A player only received the money for one rail when clearing a tile with 2 rails and signals tron parents: 1518 diff changeset	1140
2f7388d38291 (svn r2038) -Fix: A player only received the money for one rail when clearing a tile with 2 rails and signals tron parents: 1518 diff changeset	1141	default:
2f7388d38291 (svn r2038) -Fix: A player only received the money for one rail when clearing a tile with 2 rails and signals tron parents: 1518 diff changeset	1142	return CMD_ERROR;
2f7388d38291 (svn r2038) -Fix: A player only received the money for one rail when clearing a tile with 2 rails and signals tron parents: 1518 diff changeset	1143	}
2f7388d38291 (svn r2038) -Fix: A player only received the money for one rail when clearing a tile with 2 rails and signals tron parents: 1518 diff changeset	1144
2f7388d38291 (svn r2038) -Fix: A player only received the money for one rail when clearing a tile with 2 rails and signals tron parents: 1518 diff changeset	1145	default:
2f7388d38291 (svn r2038) -Fix: A player only received the money for one rail when clearing a tile with 2 rails and signals tron parents: 1518 diff changeset	1146	return CMD_ERROR;
2f7388d38291 (svn r2038) -Fix: A player only received the money for one rail when clearing a tile with 2 rails and signals tron parents: 1518 diff changeset	1147	}
0 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
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
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1152	#include "table/track_land.h"
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1153
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1154	// used for presignals
1993 7410864cfac8 (svn r2499) -Codechange: Moved the semaphore bit from bit 2 to bit 3 in _map_hi for rails, in order to make way for pbs celestar parents: 1986 diff changeset	1155	static const SpriteID _signal_base_sprites[32] = {
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1156	0x4FB,
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1157	0x1323,
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1158	0x1333,
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1159	0x1343,
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1160
2008 c9d6585c96c8 (svn r2516) - Feature: [pbs] Implement path-based-signalling. This allows multiple trains within the same signal block, provided their paths dont intersect. For this the block must have all exit and entry signals be pbs signals. Place these by ctrl-clicking 4 times on a normal signal. hackykid parents: 2007 diff changeset	1161	// pbs signals
c9d6585c96c8 (svn r2516) - Feature: [pbs] Implement path-based-signalling. This allows multiple trains within the same signal block, provided their paths dont intersect. For this the block must have all exit and entry signals be pbs signals. Place these by ctrl-clicking 4 times on a normal signal. hackykid parents: 2007 diff changeset	1162	0x1393,
c9d6585c96c8 (svn r2516) - Feature: [pbs] Implement path-based-signalling. This allows multiple trains within the same signal block, provided their paths dont intersect. For this the block must have all exit and entry signals be pbs signals. Place these by ctrl-clicking 4 times on a normal signal. hackykid parents: 2007 diff changeset	1163	0x13A3, // not used (yet?)
c9d6585c96c8 (svn r2516) - Feature: [pbs] Implement path-based-signalling. This allows multiple trains within the same signal block, provided their paths dont intersect. For this the block must have all exit and entry signals be pbs signals. Place these by ctrl-clicking 4 times on a normal signal. hackykid parents: 2007 diff changeset	1164	0x13B3, // not used (yet?)
c9d6585c96c8 (svn r2516) - Feature: [pbs] Implement path-based-signalling. This allows multiple trains within the same signal block, provided their paths dont intersect. For this the block must have all exit and entry signals be pbs signals. Place these by ctrl-clicking 4 times on a normal signal. hackykid parents: 2007 diff changeset	1165	0x13C3, // not used (yet?)
1993 7410864cfac8 (svn r2499) -Codechange: Moved the semaphore bit from bit 2 to bit 3 in _map_hi for rails, in order to make way for pbs celestar parents: 1986 diff changeset	1166
2008 c9d6585c96c8 (svn r2516) - Feature: [pbs] Implement path-based-signalling. This allows multiple trains within the same signal block, provided their paths dont intersect. For this the block must have all exit and entry signals be pbs signals. Place these by ctrl-clicking 4 times on a normal signal. hackykid parents: 2007 diff changeset	1167	// semaphores
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1168	0x1353,
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1169	0x1363,
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1170	0x1373,
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1171	0x1383,
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1172
2008 c9d6585c96c8 (svn r2516) - Feature: [pbs] Implement path-based-signalling. This allows multiple trains within the same signal block, provided their paths dont intersect. For this the block must have all exit and entry signals be pbs signals. Place these by ctrl-clicking 4 times on a normal signal. hackykid parents: 2007 diff changeset	1173	// pbs semaphores
c9d6585c96c8 (svn r2516) - Feature: [pbs] Implement path-based-signalling. This allows multiple trains within the same signal block, provided their paths dont intersect. For this the block must have all exit and entry signals be pbs signals. Place these by ctrl-clicking 4 times on a normal signal. hackykid parents: 2007 diff changeset	1174	0x13D3,
c9d6585c96c8 (svn r2516) - Feature: [pbs] Implement path-based-signalling. This allows multiple trains within the same signal block, provided their paths dont intersect. For this the block must have all exit and entry signals be pbs signals. Place these by ctrl-clicking 4 times on a normal signal. hackykid parents: 2007 diff changeset	1175	0x13E3, // not used (yet?)
c9d6585c96c8 (svn r2516) - Feature: [pbs] Implement path-based-signalling. This allows multiple trains within the same signal block, provided their paths dont intersect. For this the block must have all exit and entry signals be pbs signals. Place these by ctrl-clicking 4 times on a normal signal. hackykid parents: 2007 diff changeset	1176	0x13F3, // not used (yet?)
c9d6585c96c8 (svn r2516) - Feature: [pbs] Implement path-based-signalling. This allows multiple trains within the same signal block, provided their paths dont intersect. For this the block must have all exit and entry signals be pbs signals. Place these by ctrl-clicking 4 times on a normal signal. hackykid parents: 2007 diff changeset	1177	0x1403, // not used (yet?)
c9d6585c96c8 (svn r2516) - Feature: [pbs] Implement path-based-signalling. This allows multiple trains within the same signal block, provided their paths dont intersect. For this the block must have all exit and entry signals be pbs signals. Place these by ctrl-clicking 4 times on a normal signal. hackykid parents: 2007 diff changeset	1178
1993 7410864cfac8 (svn r2499) -Codechange: Moved the semaphore bit from bit 2 to bit 3 in _map_hi for rails, in order to make way for pbs celestar parents: 1986 diff changeset	1179
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1180	// mirrored versions
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1181	0x4FB,
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1182	0x1323,
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1183	0x1333,
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1184	0x1343,
201 c40d343115f8 (svn r202) -Codechange: I missed some files with trailing spaces.. this should be truelight parents: 159 diff changeset	1185
2008 c9d6585c96c8 (svn r2516) - Feature: [pbs] Implement path-based-signalling. This allows multiple trains within the same signal block, provided their paths dont intersect. For this the block must have all exit and entry signals be pbs signals. Place these by ctrl-clicking 4 times on a normal signal. hackykid parents: 2007 diff changeset	1186	// pbs signals
c9d6585c96c8 (svn r2516) - Feature: [pbs] Implement path-based-signalling. This allows multiple trains within the same signal block, provided their paths dont intersect. For this the block must have all exit and entry signals be pbs signals. Place these by ctrl-clicking 4 times on a normal signal. hackykid parents: 2007 diff changeset	1187	0x1393,
c9d6585c96c8 (svn r2516) - Feature: [pbs] Implement path-based-signalling. This allows multiple trains within the same signal block, provided their paths dont intersect. For this the block must have all exit and entry signals be pbs signals. Place these by ctrl-clicking 4 times on a normal signal. hackykid parents: 2007 diff changeset	1188	0x13A3, // not used (yet?)
c9d6585c96c8 (svn r2516) - Feature: [pbs] Implement path-based-signalling. This allows multiple trains within the same signal block, provided their paths dont intersect. For this the block must have all exit and entry signals be pbs signals. Place these by ctrl-clicking 4 times on a normal signal. hackykid parents: 2007 diff changeset	1189	0x13B3, // not used (yet?)
c9d6585c96c8 (svn r2516) - Feature: [pbs] Implement path-based-signalling. This allows multiple trains within the same signal block, provided their paths dont intersect. For this the block must have all exit and entry signals be pbs signals. Place these by ctrl-clicking 4 times on a normal signal. hackykid parents: 2007 diff changeset	1190	0x13C3, // not used (yet?)
1993 7410864cfac8 (svn r2499) -Codechange: Moved the semaphore bit from bit 2 to bit 3 in _map_hi for rails, in order to make way for pbs celestar parents: 1986 diff changeset	1191
2008 c9d6585c96c8 (svn r2516) - Feature: [pbs] Implement path-based-signalling. This allows multiple trains within the same signal block, provided their paths dont intersect. For this the block must have all exit and entry signals be pbs signals. Place these by ctrl-clicking 4 times on a normal signal. hackykid parents: 2007 diff changeset	1192	// semaphores
c9d6585c96c8 (svn r2516) - Feature: [pbs] Implement path-based-signalling. This allows multiple trains within the same signal block, provided their paths dont intersect. For this the block must have all exit and entry signals be pbs signals. Place these by ctrl-clicking 4 times on a normal signal. hackykid parents: 2007 diff changeset	1193	0x1446,
c9d6585c96c8 (svn r2516) - Feature: [pbs] Implement path-based-signalling. This allows multiple trains within the same signal block, provided their paths dont intersect. For this the block must have all exit and entry signals be pbs signals. Place these by ctrl-clicking 4 times on a normal signal. hackykid parents: 2007 diff changeset	1194	0x1456,
c9d6585c96c8 (svn r2516) - Feature: [pbs] Implement path-based-signalling. This allows multiple trains within the same signal block, provided their paths dont intersect. For this the block must have all exit and entry signals be pbs signals. Place these by ctrl-clicking 4 times on a normal signal. hackykid parents: 2007 diff changeset	1195	0x1466,
c9d6585c96c8 (svn r2516) - Feature: [pbs] Implement path-based-signalling. This allows multiple trains within the same signal block, provided their paths dont intersect. For this the block must have all exit and entry signals be pbs signals. Place these by ctrl-clicking 4 times on a normal signal. hackykid parents: 2007 diff changeset	1196	0x1476,
1993 7410864cfac8 (svn r2499) -Codechange: Moved the semaphore bit from bit 2 to bit 3 in _map_hi for rails, in order to make way for pbs celestar parents: 1986 diff changeset	1197
2008 c9d6585c96c8 (svn r2516) - Feature: [pbs] Implement path-based-signalling. This allows multiple trains within the same signal block, provided their paths dont intersect. For this the block must have all exit and entry signals be pbs signals. Place these by ctrl-clicking 4 times on a normal signal. hackykid parents: 2007 diff changeset	1198	// pbs semaphores
c9d6585c96c8 (svn r2516) - Feature: [pbs] Implement path-based-signalling. This allows multiple trains within the same signal block, provided their paths dont intersect. For this the block must have all exit and entry signals be pbs signals. Place these by ctrl-clicking 4 times on a normal signal. hackykid parents: 2007 diff changeset	1199	0x14C6,
c9d6585c96c8 (svn r2516) - Feature: [pbs] Implement path-based-signalling. This allows multiple trains within the same signal block, provided their paths dont intersect. For this the block must have all exit and entry signals be pbs signals. Place these by ctrl-clicking 4 times on a normal signal. hackykid parents: 2007 diff changeset	1200	0x14D6, // not used (yet?)
c9d6585c96c8 (svn r2516) - Feature: [pbs] Implement path-based-signalling. This allows multiple trains within the same signal block, provided their paths dont intersect. For this the block must have all exit and entry signals be pbs signals. Place these by ctrl-clicking 4 times on a normal signal. hackykid parents: 2007 diff changeset	1201	0x14E6, // not used (yet?)
c9d6585c96c8 (svn r2516) - Feature: [pbs] Implement path-based-signalling. This allows multiple trains within the same signal block, provided their paths dont intersect. For this the block must have all exit and entry signals be pbs signals. Place these by ctrl-clicking 4 times on a normal signal. hackykid parents: 2007 diff changeset	1202	0x14F6, // not used (yet?)
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1203	};
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1204
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1205	// 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	1206	static const byte _signal_position[24] = {
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1207	/* original: left side position */
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1208	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	1209	/* patch: ride side position */
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1210	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	1211	};
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1212
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1213	static 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	1214	{
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1215	bool otherside = _opt.road_side & _patches.signal_side;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1216
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1217	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	1218	uint x = ti->x \| (v&0xF);
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1219	uint y = ti->y \| (v>>4);
2049 ad0d49c916d4 (svn r2558) Change the internal map format from 7 arrays to one array of structs, this doesn't change the saved format for now. It's a stepping stone for further changes. tron parents: 2020 diff changeset	1220	uint sprite = _signal_base_sprites[(_m[ti->tile].m4 & 0xF) + (otherside ? 0x10 : 0)] + (image_and_pos>>4) + ((condition != 0) ? 1 : 0);
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1221	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	1222	}
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1223
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1224	static uint32 _drawtile_track_palette;
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_NW(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	uint32 image = 0x515;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1230	if (ti->tileh != 0) {
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1231	image = 0x519;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1232	if (!(ti->tileh & 2)) {
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1233	image = 0x51B;
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	}
201 c40d343115f8 (svn r202) -Codechange: I missed some files with trailing spaces.. this should be truelight parents: 159 diff changeset	1236	AddSortableSpriteToDraw(image \| _drawtile_track_palette,
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1237	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	1238	}
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1239
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1240	static void DrawTrackFence_SE(TileInfo *ti)
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1241	{
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1242	uint32 image = 0x515;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1243	if (ti->tileh != 0) {
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1244	image = 0x519;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1245	if (!(ti->tileh & 2)) {
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1246	image = 0x51B;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1247	}
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1248	}
201 c40d343115f8 (svn r202) -Codechange: I missed some files with trailing spaces.. this should be truelight parents: 159 diff changeset	1249	AddSortableSpriteToDraw(image \| _drawtile_track_palette,
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1250	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	1251	}
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	static void DrawTrackFence_NW_SE(TileInfo *ti)
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1254	{
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1255	DrawTrackFence_NW(ti);
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1256	DrawTrackFence_SE(ti);
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1257	}
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1258
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1259	static void DrawTrackFence_NE(TileInfo *ti)
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1260	{
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1261	uint32 image = 0x516;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1262	if (ti->tileh != 0) {
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1263	image = 0x51A;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1264	if (!(ti->tileh & 2)) {
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1265	image = 0x51C;
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	}
201 c40d343115f8 (svn r202) -Codechange: I missed some files with trailing spaces.. this should be truelight parents: 159 diff changeset	1268	AddSortableSpriteToDraw(image \| _drawtile_track_palette,
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1269	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	1270	}
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1271
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1272	static void DrawTrackFence_SW(TileInfo *ti)
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1273	{
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1274	uint32 image = 0x516;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1275	if (ti->tileh != 0) {
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1276	image = 0x51A;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1277	if (!(ti->tileh & 2)) {
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1278	image = 0x51C;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1279	}
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1280	}
201 c40d343115f8 (svn r202) -Codechange: I missed some files with trailing spaces.. this should be truelight parents: 159 diff changeset	1281	AddSortableSpriteToDraw(image \| _drawtile_track_palette,
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1282	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	1283	}
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1284
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1285	static void DrawTrackFence_NE_SW(TileInfo *ti)
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1286	{
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1287	DrawTrackFence_NE(ti);
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1288	DrawTrackFence_SW(ti);
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1289	}
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1290
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1291	static void DrawTrackFence_NS_1(TileInfo *ti)
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1292	{
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1293	int z = ti->z;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1294	if (ti->tileh & 1)
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1295	z += 8;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1296	AddSortableSpriteToDraw(0x517 \| _drawtile_track_palette,
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1297	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	1298	}
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1299
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1300	static void DrawTrackFence_NS_2(TileInfo *ti)
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1301	{
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1302	int z = ti->z;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1303	if (ti->tileh & 4)
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1304	z += 8;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1305	AddSortableSpriteToDraw(0x517 \| _drawtile_track_palette,
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1306	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	1307	}
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1308
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1309	static void DrawTrackFence_WE_1(TileInfo *ti)
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	int z = ti->z;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1312	if (ti->tileh & 8)
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1313	z += 8;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1314	AddSortableSpriteToDraw(0x518 \| _drawtile_track_palette,
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1315	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	1316	}
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1317
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1318	static void DrawTrackFence_WE_2(TileInfo *ti)
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1319	{
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1320	int z = ti->z;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1321	if (ti->tileh & 2)
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1322	z += 8;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1323	AddSortableSpriteToDraw(0x518 \| _drawtile_track_palette,
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1324	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	1325	}
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1326
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1327	static void DetTrackDrawProc_Null(TileInfo *ti)
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1328	{
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1329	/* nothing should be here */
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1330	}
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1331
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1332	typedef void DetailedTrackProc(TileInfo *ti);
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1333	DetailedTrackProc * const _detailed_track_proc[16] = {
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1334	DetTrackDrawProc_Null,
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1335	DetTrackDrawProc_Null,
201 c40d343115f8 (svn r202) -Codechange: I missed some files with trailing spaces.. this should be truelight parents: 159 diff changeset	1336
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1337	DrawTrackFence_NW,
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1338	DrawTrackFence_SE,
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1339	DrawTrackFence_NW_SE,
201 c40d343115f8 (svn r202) -Codechange: I missed some files with trailing spaces.. this should be truelight parents: 159 diff changeset	1340
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1341	DrawTrackFence_NE,
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1342	DrawTrackFence_SW,
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1343	DrawTrackFence_NE_SW,
201 c40d343115f8 (svn r202) -Codechange: I missed some files with trailing spaces.. this should be truelight parents: 159 diff changeset	1344
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1345	DrawTrackFence_NS_1,
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1346	DrawTrackFence_NS_2,
201 c40d343115f8 (svn r202) -Codechange: I missed some files with trailing spaces.. this should be truelight parents: 159 diff changeset	1347
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1348	DrawTrackFence_WE_1,
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1349	DrawTrackFence_WE_2,
201 c40d343115f8 (svn r202) -Codechange: I missed some files with trailing spaces.. this should be truelight parents: 159 diff changeset	1350
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1351	DetTrackDrawProc_Null,
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1352	DetTrackDrawProc_Null,
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1353	DetTrackDrawProc_Null,
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1354	DetTrackDrawProc_Null,
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
2254 72f8883ff3ac (svn r2774) -Codechange: Removed TRACKTYPE_SPRITE_PITCH globally and replaced it by a member of RailtypeInfo celestar parents: 2236 diff changeset	1357	static void DrawSpecialBuilding(uint32 image, uint32 offset,
389 2d394eeba5e5 (svn r581) -newgrf: Basic support for new stations - only waypoints supported now and only celestar parents: 337 diff changeset	1358	TileInfo *ti,
2d394eeba5e5 (svn r581) -newgrf: Basic support for new stations - only waypoints supported now and only celestar parents: 337 diff changeset	1359	byte x, byte y, byte z,
2d394eeba5e5 (svn r581) -newgrf: Basic support for new stations - only waypoints supported now and only celestar parents: 337 diff changeset	1360	byte xsize, byte ysize, byte zsize)
2d394eeba5e5 (svn r581) -newgrf: Basic support for new stations - only waypoints supported now and only celestar parents: 337 diff changeset	1361	{
2187 2a51f8925eeb (svn r2702) -Codechange: Cleaned up the sprite code and replaced many magic numbers celestar parents: 2186 diff changeset	1362	if (image & PALETTE_MODIFIER_COLOR)
389 2d394eeba5e5 (svn r581) -newgrf: Basic support for new stations - only waypoints supported now and only celestar parents: 337 diff changeset	1363	image \|= _drawtile_track_palette;
2254 72f8883ff3ac (svn r2774) -Codechange: Removed TRACKTYPE_SPRITE_PITCH globally and replaced it by a member of RailtypeInfo celestar parents: 2236 diff changeset	1364	image += offset;
497 2d6d31173813 (svn r787) Invert the sense of the DO_TRANS_BUILDINGS flag to be consistent with its own name and all other DO_* flags. tron parents: 473 diff changeset	1365	if (_display_opt & DO_TRANS_BUILDINGS) // show transparent depots
2148 47ba4a1b1c3b (svn r2658) -Codechange: Use MAKE_TRANSPARENT to display a transparented sprite celestar parents: 2140 diff changeset	1366	MAKE_TRANSPARENT(image);
389 2d394eeba5e5 (svn r581) -newgrf: Basic support for new stations - only waypoints supported now and only celestar parents: 337 diff changeset	1367	AddSortableSpriteToDraw(image, ti->x + x, ti->y + y, xsize, ysize, zsize, ti->z + z);
2d394eeba5e5 (svn r581) -newgrf: Basic support for new stations - only waypoints supported now and only celestar parents: 337 diff changeset	1368	}
2d394eeba5e5 (svn r581) -newgrf: Basic support for new stations - only waypoints supported now and only celestar parents: 337 diff changeset	1369
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1370	static void DrawTile_Track(TileInfo *ti)
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1371	{
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1372	byte m5;
2233 146e2e405ec1 (svn r2753) -Codechange: Introduced a new struct "RailtypeInfo" to store rail type specific information. Begun populating it with a bunch of sprites, more to come later. This should result in cleaner, more compact code which allows easy introduction of new railtypes. celestar parents: 2187 diff changeset	1373	const RailtypeInfo *rti = GetRailTypeInfo(GetRailType(ti->tile));
2007 b3bdf698ee26 (svn r2515) -Codechange: Removed a good deal of magic sprite numbers in the rail drawing code, and placed neatly into arrays and enums. This also makes way to implement more railtypes without having to do tons of ugly hacks. celestar parents: 1999 diff changeset	1374	uint32 image; //XXX ok why the hell is SpriteID 16 bit when all the drawing routines need 32?
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1375
1901 fb05044cf5c3 (svn r2407) Use {Get,Is}TileOwner to get/check the owner of a tile and fix some bogus reads of _map_owner tron parents: 1891 diff changeset	1376	_drawtile_track_palette = SPRITE_PALETTE(PLAYER_SPRITE_COLOR(GetTileOwner(ti->tile)));
0 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	m5 = (byte)ti->map5;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1379	if (!(m5 & RAIL_TYPE_SPECIAL)) {
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1380	bool special;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1381
1942 634961366cdc (svn r2448) General cleanup of rail related code, more to follow. matthijs parents: 1928 diff changeset	1382	m5 &= TRACK_BIT_MASK;
201 c40d343115f8 (svn r202) -Codechange: I missed some files with trailing spaces.. this should be truelight parents: 159 diff changeset	1383
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1384	special = false;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1385
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1386	// select the sprite to use based on the map5 byte.
2233 146e2e405ec1 (svn r2753) -Codechange: Introduced a new struct "RailtypeInfo" to store rail type specific information. Begun populating it with a bunch of sprites, more to come later. This should result in cleaner, more compact code which allows easy introduction of new railtypes. celestar parents: 2187 diff changeset	1387	(image = rti->base_sprites.track_y, m5 == TRACK_BIT_DIAG2) \|\|
1942 634961366cdc (svn r2448) General cleanup of rail related code, more to follow. matthijs parents: 1928 diff changeset	1388	(image++, m5 == TRACK_BIT_DIAG1) \|\|
634961366cdc (svn r2448) General cleanup of rail related code, more to follow. matthijs parents: 1928 diff changeset	1389	(image++, m5 == TRACK_BIT_UPPER) \|\|
634961366cdc (svn r2448) General cleanup of rail related code, more to follow. matthijs parents: 1928 diff changeset	1390	(image++, m5 == TRACK_BIT_LOWER) \|\|
634961366cdc (svn r2448) General cleanup of rail related code, more to follow. matthijs parents: 1928 diff changeset	1391	(image++, m5 == TRACK_BIT_RIGHT) \|\|
634961366cdc (svn r2448) General cleanup of rail related code, more to follow. matthijs parents: 1928 diff changeset	1392	(image++, m5 == TRACK_BIT_LEFT) \|\|
634961366cdc (svn r2448) General cleanup of rail related code, more to follow. matthijs parents: 1928 diff changeset	1393	(image++, m5 == (TRACK_BIT_DIAG1\|TRACK_BIT_DIAG2)) \|\|
201 c40d343115f8 (svn r202) -Codechange: I missed some files with trailing spaces.. this should be truelight parents: 159 diff changeset	1394
2233 146e2e405ec1 (svn r2753) -Codechange: Introduced a new struct "RailtypeInfo" to store rail type specific information. Begun populating it with a bunch of sprites, more to come later. This should result in cleaner, more compact code which allows easy introduction of new railtypes. celestar parents: 2187 diff changeset	1395	(image = rti->base_sprites.track_ns, m5 == (TRACK_BIT_UPPER\|TRACK_BIT_LOWER)) \|\|
1942 634961366cdc (svn r2448) General cleanup of rail related code, more to follow. matthijs parents: 1928 diff changeset	1396	(image++, m5 == (TRACK_BIT_LEFT\|TRACK_BIT_RIGHT)) \|\|
201 c40d343115f8 (svn r202) -Codechange: I missed some files with trailing spaces.. this should be truelight parents: 159 diff changeset	1397
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1398	(special=true, false) \|\|
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1399
2233 146e2e405ec1 (svn r2753) -Codechange: Introduced a new struct "RailtypeInfo" to store rail type specific information. Begun populating it with a bunch of sprites, more to come later. This should result in cleaner, more compact code which allows easy introduction of new railtypes. celestar parents: 2187 diff changeset	1400	(image = rti->base_sprites.ground, !(m5 & (TRACK_BIT_RIGHT\|TRACK_BIT_UPPER\|TRACK_BIT_DIAG1))) \|\|
1942 634961366cdc (svn r2448) General cleanup of rail related code, more to follow. matthijs parents: 1928 diff changeset	1401	(image++, !(m5 & (TRACK_BIT_LEFT\|TRACK_BIT_LOWER\|TRACK_BIT_DIAG1))) \|\|
634961366cdc (svn r2448) General cleanup of rail related code, more to follow. matthijs parents: 1928 diff changeset	1402	(image++, !(m5 & (TRACK_BIT_LEFT\|TRACK_BIT_UPPER\|TRACK_BIT_DIAG2))) \|\|
634961366cdc (svn r2448) General cleanup of rail related code, more to follow. matthijs parents: 1928 diff changeset	1403	(image++, !(m5 & (TRACK_BIT_RIGHT\|TRACK_BIT_LOWER\|TRACK_BIT_DIAG2))) \|\|
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1404	(image++, true);
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	if (ti->tileh != 0) {
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1407	int f = GetRailFoundation(ti->tileh, ti->map5 & 0x3F);
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1408	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	1409
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1410	// default sloped sprites..
2233 146e2e405ec1 (svn r2753) -Codechange: Introduced a new struct "RailtypeInfo" to store rail type specific information. Begun populating it with a bunch of sprites, more to come later. This should result in cleaner, more compact code which allows easy introduction of new railtypes. celestar parents: 2187 diff changeset	1411	if (ti->tileh != 0) image = _track_sloped_sprites[ti->tileh - 1] + rti->base_sprites.track_y;
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1412	}
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1413
2254 72f8883ff3ac (svn r2774) -Codechange: Removed TRACKTYPE_SPRITE_PITCH globally and replaced it by a member of RailtypeInfo celestar parents: 2236 diff changeset	1414	if ((_m[ti->tile].m2 & RAIL_MAP2LO_GROUND_MASK) == RAIL_GROUND_BROWN) {
2187 2a51f8925eeb (svn r2702) -Codechange: Cleaned up the sprite code and replaced many magic numbers celestar parents: 2186 diff changeset	1415	image = (image & SPRITE_MASK) \| PALETTE_TO_BARE_LAND; // use a brown palette
2254 72f8883ff3ac (svn r2774) -Codechange: Removed TRACKTYPE_SPRITE_PITCH globally and replaced it by a member of RailtypeInfo celestar parents: 2236 diff changeset	1416	} else if ((_m[ti->tile].m2 & RAIL_MAP2LO_GROUND_MASK) == RAIL_GROUND_ICE_DESERT) {
2233 146e2e405ec1 (svn r2753) -Codechange: Introduced a new struct "RailtypeInfo" to store rail type specific information. Begun populating it with a bunch of sprites, more to come later. This should result in cleaner, more compact code which allows easy introduction of new railtypes. celestar parents: 2187 diff changeset	1417	image += rti->snow_offset;
2007 b3bdf698ee26 (svn r2515) -Codechange: Removed a good deal of magic sprite numbers in the rail drawing code, and placed neatly into arrays and enums. This also makes way to implement more railtypes without having to do tons of ugly hacks. celestar parents: 1999 diff changeset	1418	}
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1419
2007 b3bdf698ee26 (svn r2515) -Codechange: Removed a good deal of magic sprite numbers in the rail drawing code, and placed neatly into arrays and enums. This also makes way to implement more railtypes without having to do tons of ugly hacks. celestar parents: 1999 diff changeset	1420	DrawGroundSprite(image);
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1421
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1422	if (special) {
2233 146e2e405ec1 (svn r2753) -Codechange: Introduced a new struct "RailtypeInfo" to store rail type specific information. Begun populating it with a bunch of sprites, more to come later. This should result in cleaner, more compact code which allows easy introduction of new railtypes. celestar parents: 2187 diff changeset	1423	if (m5 & TRACK_BIT_DIAG1) DrawGroundSprite(rti->base_sprites.single_y);
146e2e405ec1 (svn r2753) -Codechange: Introduced a new struct "RailtypeInfo" to store rail type specific information. Begun populating it with a bunch of sprites, more to come later. This should result in cleaner, more compact code which allows easy introduction of new railtypes. celestar parents: 2187 diff changeset	1424	if (m5 & TRACK_BIT_DIAG2) DrawGroundSprite(rti->base_sprites.single_x);
146e2e405ec1 (svn r2753) -Codechange: Introduced a new struct "RailtypeInfo" to store rail type specific information. Begun populating it with a bunch of sprites, more to come later. This should result in cleaner, more compact code which allows easy introduction of new railtypes. celestar parents: 2187 diff changeset	1425	if (m5 & TRACK_BIT_UPPER) DrawGroundSprite(rti->base_sprites.single_n);
146e2e405ec1 (svn r2753) -Codechange: Introduced a new struct "RailtypeInfo" to store rail type specific information. Begun populating it with a bunch of sprites, more to come later. This should result in cleaner, more compact code which allows easy introduction of new railtypes. celestar parents: 2187 diff changeset	1426	if (m5 & TRACK_BIT_LOWER) DrawGroundSprite(rti->base_sprites.single_s);
146e2e405ec1 (svn r2753) -Codechange: Introduced a new struct "RailtypeInfo" to store rail type specific information. Begun populating it with a bunch of sprites, more to come later. This should result in cleaner, more compact code which allows easy introduction of new railtypes. celestar parents: 2187 diff changeset	1427	if (m5 & TRACK_BIT_LEFT) DrawGroundSprite(rti->base_sprites.single_w);
146e2e405ec1 (svn r2753) -Codechange: Introduced a new struct "RailtypeInfo" to store rail type specific information. Begun populating it with a bunch of sprites, more to come later. This should result in cleaner, more compact code which allows easy introduction of new railtypes. celestar parents: 2187 diff changeset	1428	if (m5 & TRACK_BIT_RIGHT) DrawGroundSprite(rti->base_sprites.single_e);
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1429	}
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1430
2008 c9d6585c96c8 (svn r2516) - Feature: [pbs] Implement path-based-signalling. This allows multiple trains within the same signal block, provided their paths dont intersect. For this the block must have all exit and entry signals be pbs signals. Place these by ctrl-clicking 4 times on a normal signal. hackykid parents: 2007 diff changeset	1431	if (_debug_pbs_level >= 1) {
c9d6585c96c8 (svn r2516) - Feature: [pbs] Implement path-based-signalling. This allows multiple trains within the same signal block, provided their paths dont intersect. For this the block must have all exit and entry signals be pbs signals. Place these by ctrl-clicking 4 times on a normal signal. hackykid parents: 2007 diff changeset	1432	byte pbs = PBSTileReserved(ti->tile);
2233 146e2e405ec1 (svn r2753) -Codechange: Introduced a new struct "RailtypeInfo" to store rail type specific information. Begun populating it with a bunch of sprites, more to come later. This should result in cleaner, more compact code which allows easy introduction of new railtypes. celestar parents: 2187 diff changeset	1433	if (pbs & TRACK_BIT_DIAG1) DrawGroundSprite(rti->base_sprites.single_y \| PALETTE_CRASH);
146e2e405ec1 (svn r2753) -Codechange: Introduced a new struct "RailtypeInfo" to store rail type specific information. Begun populating it with a bunch of sprites, more to come later. This should result in cleaner, more compact code which allows easy introduction of new railtypes. celestar parents: 2187 diff changeset	1434	if (pbs & TRACK_BIT_DIAG2) DrawGroundSprite(rti->base_sprites.single_x \| PALETTE_CRASH);
146e2e405ec1 (svn r2753) -Codechange: Introduced a new struct "RailtypeInfo" to store rail type specific information. Begun populating it with a bunch of sprites, more to come later. This should result in cleaner, more compact code which allows easy introduction of new railtypes. celestar parents: 2187 diff changeset	1435	if (pbs & TRACK_BIT_UPPER) DrawGroundSprite(rti->base_sprites.single_n \| PALETTE_CRASH);
146e2e405ec1 (svn r2753) -Codechange: Introduced a new struct "RailtypeInfo" to store rail type specific information. Begun populating it with a bunch of sprites, more to come later. This should result in cleaner, more compact code which allows easy introduction of new railtypes. celestar parents: 2187 diff changeset	1436	if (pbs & TRACK_BIT_LOWER) DrawGroundSprite(rti->base_sprites.single_s \| PALETTE_CRASH);
146e2e405ec1 (svn r2753) -Codechange: Introduced a new struct "RailtypeInfo" to store rail type specific information. Begun populating it with a bunch of sprites, more to come later. This should result in cleaner, more compact code which allows easy introduction of new railtypes. celestar parents: 2187 diff changeset	1437	if (pbs & TRACK_BIT_LEFT) DrawGroundSprite(rti->base_sprites.single_w \| PALETTE_CRASH);
146e2e405ec1 (svn r2753) -Codechange: Introduced a new struct "RailtypeInfo" to store rail type specific information. Begun populating it with a bunch of sprites, more to come later. This should result in cleaner, more compact code which allows easy introduction of new railtypes. celestar parents: 2187 diff changeset	1438	if (pbs & TRACK_BIT_RIGHT) DrawGroundSprite(rti->base_sprites.single_e \| PALETTE_CRASH);
2008 c9d6585c96c8 (svn r2516) - Feature: [pbs] Implement path-based-signalling. This allows multiple trains within the same signal block, provided their paths dont intersect. For this the block must have all exit and entry signals be pbs signals. Place these by ctrl-clicking 4 times on a normal signal. hackykid parents: 2007 diff changeset	1439	}
c9d6585c96c8 (svn r2516) - Feature: [pbs] Implement path-based-signalling. This allows multiple trains within the same signal block, provided their paths dont intersect. For this the block must have all exit and entry signals be pbs signals. Place these by ctrl-clicking 4 times on a normal signal. hackykid parents: 2007 diff changeset	1440
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1441	if (_display_opt & DO_FULL_DETAIL) {
2049 ad0d49c916d4 (svn r2558) Change the internal map format from 7 arrays to one array of structs, this doesn't change the saved format for now. It's a stepping stone for further changes. tron parents: 2020 diff changeset	1442	_detailed_track_proc[_m[ti->tile].m2 & RAIL_MAP2LO_GROUND_MASK](ti);
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1443	}
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1444
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1445	/* draw signals also? */
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1446	if (!(ti->map5 & RAIL_TYPE_SIGNALS))
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1447	return;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1448
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1449	{
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1450	byte m23;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1451
2049 ad0d49c916d4 (svn r2558) Change the internal map format from 7 arrays to one array of structs, this doesn't change the saved format for now. It's a stepping stone for further changes. tron parents: 2020 diff changeset	1452	m23 = (_m[ti->tile].m3 >> 4) \| (_m[ti->tile].m2 & 0xF0);
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1453
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1454	#define HAS_SIGNAL(x) (m23 & (byte)(0x1 << (x)))
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1455	#define ISON_SIGNAL(x) (m23 & (byte)(0x10 << (x)))
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1456	#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	1457
1942 634961366cdc (svn r2448) General cleanup of rail related code, more to follow. matthijs parents: 1928 diff changeset	1458	if (!(m5 & TRACK_BIT_DIAG2)) {
634961366cdc (svn r2448) General cleanup of rail related code, more to follow. matthijs parents: 1928 diff changeset	1459	if (!(m5 & TRACK_BIT_DIAG1)) {
634961366cdc (svn r2448) General cleanup of rail related code, more to follow. matthijs parents: 1928 diff changeset	1460	if (m5 & TRACK_BIT_LEFT) {
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1461	MAYBE_DRAW_SIGNAL(2, 0x509, 0);
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1462	MAYBE_DRAW_SIGNAL(3, 0x507, 1);
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1463	}
1942 634961366cdc (svn r2448) General cleanup of rail related code, more to follow. matthijs parents: 1928 diff changeset	1464	if (m5 & TRACK_BIT_RIGHT) {
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1465	MAYBE_DRAW_SIGNAL(0, 0x509, 2);
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1466	MAYBE_DRAW_SIGNAL(1, 0x507, 3);
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1467	}
1942 634961366cdc (svn r2448) General cleanup of rail related code, more to follow. matthijs parents: 1928 diff changeset	1468	if (m5 & TRACK_BIT_UPPER) {
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1469	MAYBE_DRAW_SIGNAL(3, 0x505, 4);
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1470	MAYBE_DRAW_SIGNAL(2, 0x503, 5);
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1471	}
1942 634961366cdc (svn r2448) General cleanup of rail related code, more to follow. matthijs parents: 1928 diff changeset	1472	if (m5 & TRACK_BIT_LOWER) {
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1473	MAYBE_DRAW_SIGNAL(1, 0x505, 6);
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1474	MAYBE_DRAW_SIGNAL(0, 0x503, 7);
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1475	}
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1476	} else {
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1477	MAYBE_DRAW_SIGNAL(3, 0x4FB, 8);
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1478	MAYBE_DRAW_SIGNAL(2, 0x4FD, 9);
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	} else {
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1481	MAYBE_DRAW_SIGNAL(3, 0x4FF, 10);
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1482	MAYBE_DRAW_SIGNAL(2, 0x501, 11);
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	}
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1485	} else {
395 4c990f33dab7 (svn r587) -newgrf: Rename all /Checkpoint/i tokens to 'Waypoint's. The name actually makes some sense and is also compatible with TTDPatch (pasky). darkvater parents: 393 diff changeset	1486	/* draw depots / waypoints */
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1487	const DrawTrackSeqStruct *drss;
395 4c990f33dab7 (svn r587) -newgrf: Rename all /Checkpoint/i tokens to 'Waypoint's. The name actually makes some sense and is also compatible with TTDPatch (pasky). darkvater parents: 393 diff changeset	1488	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	1489
1942 634961366cdc (svn r2448) General cleanup of rail related code, more to follow. matthijs parents: 1928 diff changeset	1490	if (!(m5 & (RAIL_TILE_TYPE_MASK&~RAIL_TYPE_SPECIAL)))
634961366cdc (svn r2448) General cleanup of rail related code, more to follow. matthijs parents: 1928 diff changeset	1491	/* XXX: There used to be "return;" here, but since I could not find out
634961366cdc (svn r2448) General cleanup of rail related code, more to follow. matthijs parents: 1928 diff changeset	1492	* why this would ever occur, I put assert(0) here. Let's see if someone
634961366cdc (svn r2448) General cleanup of rail related code, more to follow. matthijs parents: 1928 diff changeset	1493	* complains about it. If not, we'll remove this check. (Matthijs). */
634961366cdc (svn r2448) General cleanup of rail related code, more to follow. matthijs parents: 1928 diff changeset	1494	assert(0);
201 c40d343115f8 (svn r202) -Codechange: I missed some files with trailing spaces.. this should be truelight parents: 159 diff changeset	1495
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1496	if (ti->tileh != 0) { DrawFoundation(ti, ti->tileh); }
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1497
2254 72f8883ff3ac (svn r2774) -Codechange: Removed TRACKTYPE_SPRITE_PITCH globally and replaced it by a member of RailtypeInfo celestar parents: 2236 diff changeset	1498	if (IsRailWaypoint(m5) && HASBIT(_m[ti->tile].m3, 4)) {
389 2d394eeba5e5 (svn r581) -newgrf: Basic support for new stations - only waypoints supported now and only celestar parents: 337 diff changeset	1499	// look for customization
2049 ad0d49c916d4 (svn r2558) Change the internal map format from 7 arrays to one array of structs, this doesn't change the saved format for now. It's a stepping stone for further changes. tron parents: 2020 diff changeset	1500	StationSpec *stat = GetCustomStation(STAT_CLASS_WAYP, _m[ti->tile].m4);
389 2d394eeba5e5 (svn r581) -newgrf: Basic support for new stations - only waypoints supported now and only celestar parents: 337 diff changeset	1501
403 bfb365c74e80 (svn r600) -newgrf: Relocation offset for custom station sprites is now stored separately, making it possible to show different sprites in waypoint selection dialog (pasky). darkvater parents: 399 diff changeset	1502	if (stat) {
389 2d394eeba5e5 (svn r581) -newgrf: Basic support for new stations - only waypoints supported now and only celestar parents: 337 diff changeset	1503	DrawTileSeqStruct const *seq;
403 bfb365c74e80 (svn r600) -newgrf: Relocation offset for custom station sprites is now stored separately, making it possible to show different sprites in waypoint selection dialog (pasky). darkvater parents: 399 diff changeset	1504	// emulate station tile - open with building
bfb365c74e80 (svn r600) -newgrf: Relocation offset for custom station sprites is now stored separately, making it possible to show different sprites in waypoint selection dialog (pasky). darkvater parents: 399 diff changeset	1505	DrawTileSprites *cust = &stat->renderdata[2 + (m5 & 0x1)];
413 36afcda97345 (svn r610) -newgrf: Support for some basic deterministical spritegroups regarding stations. Waypoints look changes based on year now :^) (pasky). darkvater parents: 412 diff changeset	1506	uint32 relocation = GetCustomStationRelocation(stat, ComposeWaypointStation(ti->tile), 0);
389 2d394eeba5e5 (svn r581) -newgrf: Basic support for new stations - only waypoints supported now and only celestar parents: 337 diff changeset	1507
447 aaf1f59a8957 (svn r657) Do not touch 0x8000 bit in sprite index for custom waypoints. (pasky) celestar parents: 438 diff changeset	1508	/* We don't touch the 0x8000 bit. In all this
aaf1f59a8957 (svn r657) Do not touch 0x8000 bit in sprite index for custom waypoints. (pasky) celestar parents: 438 diff changeset	1509	* waypoint code, it is used to indicate that
aaf1f59a8957 (svn r657) Do not touch 0x8000 bit in sprite index for custom waypoints. (pasky) celestar parents: 438 diff changeset	1510	* we should offset by railtype, but we always
aaf1f59a8957 (svn r657) Do not touch 0x8000 bit in sprite index for custom waypoints. (pasky) celestar parents: 438 diff changeset	1511	* do that for custom ground sprites and never
aaf1f59a8957 (svn r657) Do not touch 0x8000 bit in sprite index for custom waypoints. (pasky) celestar parents: 438 diff changeset	1512	* for station sprites. And in the drawing
aaf1f59a8957 (svn r657) Do not touch 0x8000 bit in sprite index for custom waypoints. (pasky) celestar parents: 438 diff changeset	1513	* code, it is used to indicate that the sprite
aaf1f59a8957 (svn r657) Do not touch 0x8000 bit in sprite index for custom waypoints. (pasky) celestar parents: 438 diff changeset	1514	* should be drawn in company colors, and it's
aaf1f59a8957 (svn r657) Do not touch 0x8000 bit in sprite index for custom waypoints. (pasky) celestar parents: 438 diff changeset	1515	* up to the GRF file to decide that. */
aaf1f59a8957 (svn r657) Do not touch 0x8000 bit in sprite index for custom waypoints. (pasky) celestar parents: 438 diff changeset	1516
417 0c63a94557a5 (svn r614) [newgrf] Some minor code fixes dominik parents: 415 diff changeset	1517	image = cust->ground_sprite;
2254 72f8883ff3ac (svn r2774) -Codechange: Removed TRACKTYPE_SPRITE_PITCH globally and replaced it by a member of RailtypeInfo celestar parents: 2236 diff changeset	1518	image += (image < _custom_sprites_base) ? rti->total_offset : GetRailType(ti->tile);
415 423de36034b8 (svn r612) [newgrf] Fix: custom waypoints on monorail/maglev are displayed correctly dominik parents: 413 diff changeset	1519
389 2d394eeba5e5 (svn r581) -newgrf: Basic support for new stations - only waypoints supported now and only celestar parents: 337 diff changeset	1520	DrawGroundSprite(image);
2d394eeba5e5 (svn r581) -newgrf: Basic support for new stations - only waypoints supported now and only celestar parents: 337 diff changeset	1521
2d394eeba5e5 (svn r581) -newgrf: Basic support for new stations - only waypoints supported now and only celestar parents: 337 diff changeset	1522	foreach_draw_tile_seq(seq, cust->seq) {
403 bfb365c74e80 (svn r600) -newgrf: Relocation offset for custom station sprites is now stored separately, making it possible to show different sprites in waypoint selection dialog (pasky). darkvater parents: 399 diff changeset	1523	uint32 image = seq->image + relocation;
447 aaf1f59a8957 (svn r657) Do not touch 0x8000 bit in sprite index for custom waypoints. (pasky) celestar parents: 438 diff changeset	1524	DrawSpecialBuilding(image, 0, ti,
389 2d394eeba5e5 (svn r581) -newgrf: Basic support for new stations - only waypoints supported now and only celestar parents: 337 diff changeset	1525	seq->delta_x, seq->delta_y, seq->delta_z,
2d394eeba5e5 (svn r581) -newgrf: Basic support for new stations - only waypoints supported now and only celestar parents: 337 diff changeset	1526	seq->width, seq->height, seq->unk);
2d394eeba5e5 (svn r581) -newgrf: Basic support for new stations - only waypoints supported now and only celestar parents: 337 diff changeset	1527	}
2d394eeba5e5 (svn r581) -newgrf: Basic support for new stations - only waypoints supported now and only celestar parents: 337 diff changeset	1528	return;
2d394eeba5e5 (svn r581) -newgrf: Basic support for new stations - only waypoints supported now and only celestar parents: 337 diff changeset	1529	}
2d394eeba5e5 (svn r581) -newgrf: Basic support for new stations - only waypoints supported now and only celestar parents: 337 diff changeset	1530	}
2d394eeba5e5 (svn r581) -newgrf: Basic support for new stations - only waypoints supported now and only celestar parents: 337 diff changeset	1531
1399 4503bd2bfb82 (svn r1903) Replace some casts and macro magic with proper typing, similar to r1902 tron parents: 1363 diff changeset	1532	drss = _track_depot_layout_table[type];
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1533
1399 4503bd2bfb82 (svn r1903) Replace some casts and macro magic with proper typing, similar to r1902 tron parents: 1363 diff changeset	1534	image = drss++->image;
2254 72f8883ff3ac (svn r2774) -Codechange: Removed TRACKTYPE_SPRITE_PITCH globally and replaced it by a member of RailtypeInfo celestar parents: 2236 diff changeset	1535	/* @note This is kind of an ugly hack, as the PALETTE_MODIFIER_COLOR indicates
72f8883ff3ac (svn r2774) -Codechange: Removed TRACKTYPE_SPRITE_PITCH globally and replaced it by a member of RailtypeInfo celestar parents: 2236 diff changeset	1536	* whether the sprite is railtype dependent. Rewrite this asap */
72f8883ff3ac (svn r2774) -Codechange: Removed TRACKTYPE_SPRITE_PITCH globally and replaced it by a member of RailtypeInfo celestar parents: 2236 diff changeset	1537	if (image & PALETTE_MODIFIER_COLOR) image = (image & SPRITE_MASK) + rti->total_offset;
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1538
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1539	// adjust ground tile for desert
283 c1a99d78e5a3 (svn r289) Fix: Checkpoints on snow have correct ground now dominik parents: 282 diff changeset	1540	// (don't adjust for arctic depots, because snow in depots looks weird)
2254 72f8883ff3ac (svn r2774) -Codechange: Removed TRACKTYPE_SPRITE_PITCH globally and replaced it by a member of RailtypeInfo celestar parents: 2236 diff changeset	1541	// type >= 4 means waypoints
72f8883ff3ac (svn r2774) -Codechange: Removed TRACKTYPE_SPRITE_PITCH globally and replaced it by a member of RailtypeInfo celestar parents: 2236 diff changeset	1542	if ((_m[ti->tile].m2 & RAIL_MAP2LO_GROUND_MASK) == RAIL_GROUND_ICE_DESERT && (_opt.landscape == LT_DESERT \|\| type >= 4)) {
72f8883ff3ac (svn r2774) -Codechange: Removed TRACKTYPE_SPRITE_PITCH globally and replaced it by a member of RailtypeInfo celestar parents: 2236 diff changeset	1543	if (image != SPR_FLAT_GRASS_TILE)
72f8883ff3ac (svn r2774) -Codechange: Removed TRACKTYPE_SPRITE_PITCH globally and replaced it by a member of RailtypeInfo celestar parents: 2236 diff changeset	1544	image += rti->snow_offset; // tile with tracks
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1545	else
2254 72f8883ff3ac (svn r2774) -Codechange: Removed TRACKTYPE_SPRITE_PITCH globally and replaced it by a member of RailtypeInfo celestar parents: 2236 diff changeset	1546	image = SPR_FLAT_SNOWY_TILE; // flat ground
0 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
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1549	DrawGroundSprite(image);
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1550
2008 c9d6585c96c8 (svn r2516) - Feature: [pbs] Implement path-based-signalling. This allows multiple trains within the same signal block, provided their paths dont intersect. For this the block must have all exit and entry signals be pbs signals. Place these by ctrl-clicking 4 times on a normal signal. hackykid parents: 2007 diff changeset	1551	if (_debug_pbs_level >= 1) {
c9d6585c96c8 (svn r2516) - Feature: [pbs] Implement path-based-signalling. This allows multiple trains within the same signal block, provided their paths dont intersect. For this the block must have all exit and entry signals be pbs signals. Place these by ctrl-clicking 4 times on a normal signal. hackykid parents: 2007 diff changeset	1552	byte pbs = PBSTileReserved(ti->tile);
2254 72f8883ff3ac (svn r2774) -Codechange: Removed TRACKTYPE_SPRITE_PITCH globally and replaced it by a member of RailtypeInfo celestar parents: 2236 diff changeset	1553	if (pbs & TRACK_BIT_DIAG1) DrawGroundSprite(rti->base_sprites.single_y \| PALETTE_CRASH);
72f8883ff3ac (svn r2774) -Codechange: Removed TRACKTYPE_SPRITE_PITCH globally and replaced it by a member of RailtypeInfo celestar parents: 2236 diff changeset	1554	if (pbs & TRACK_BIT_DIAG2) DrawGroundSprite(rti->base_sprites.single_x \| PALETTE_CRASH);
72f8883ff3ac (svn r2774) -Codechange: Removed TRACKTYPE_SPRITE_PITCH globally and replaced it by a member of RailtypeInfo celestar parents: 2236 diff changeset	1555	if (pbs & TRACK_BIT_UPPER) DrawGroundSprite(rti->base_sprites.single_n \| PALETTE_CRASH);
72f8883ff3ac (svn r2774) -Codechange: Removed TRACKTYPE_SPRITE_PITCH globally and replaced it by a member of RailtypeInfo celestar parents: 2236 diff changeset	1556	if (pbs & TRACK_BIT_LOWER) DrawGroundSprite(rti->base_sprites.single_s \| PALETTE_CRASH);
72f8883ff3ac (svn r2774) -Codechange: Removed TRACKTYPE_SPRITE_PITCH globally and replaced it by a member of RailtypeInfo celestar parents: 2236 diff changeset	1557	if (pbs & TRACK_BIT_LEFT) DrawGroundSprite(rti->base_sprites.single_w \| PALETTE_CRASH);
72f8883ff3ac (svn r2774) -Codechange: Removed TRACKTYPE_SPRITE_PITCH globally and replaced it by a member of RailtypeInfo celestar parents: 2236 diff changeset	1558	if (pbs & TRACK_BIT_RIGHT) DrawGroundSprite(rti->base_sprites.single_e \| PALETTE_CRASH);
2008 c9d6585c96c8 (svn r2516) - Feature: [pbs] Implement path-based-signalling. This allows multiple trains within the same signal block, provided their paths dont intersect. For this the block must have all exit and entry signals be pbs signals. Place these by ctrl-clicking 4 times on a normal signal. hackykid parents: 2007 diff changeset	1559	}
c9d6585c96c8 (svn r2516) - Feature: [pbs] Implement path-based-signalling. This allows multiple trains within the same signal block, provided their paths dont intersect. For this the block must have all exit and entry signals be pbs signals. Place these by ctrl-clicking 4 times on a normal signal. hackykid parents: 2007 diff changeset	1560
2254 72f8883ff3ac (svn r2774) -Codechange: Removed TRACKTYPE_SPRITE_PITCH globally and replaced it by a member of RailtypeInfo celestar parents: 2236 diff changeset	1561	while ((image = drss->image) != 0) {
72f8883ff3ac (svn r2774) -Codechange: Removed TRACKTYPE_SPRITE_PITCH globally and replaced it by a member of RailtypeInfo celestar parents: 2236 diff changeset	1562	DrawSpecialBuilding(image, type < 4 ? rti->total_offset : 0, ti,
389 2d394eeba5e5 (svn r581) -newgrf: Basic support for new stations - only waypoints supported now and only celestar parents: 337 diff changeset	1563	drss->subcoord_x, drss->subcoord_y, 0,
2d394eeba5e5 (svn r581) -newgrf: Basic support for new stations - only waypoints supported now and only celestar parents: 337 diff changeset	1564	drss->width, drss->height, 0x17);
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1565	drss++;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1566	}
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1567	}
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1568	}
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1569
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1570	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	1571	{
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1572	uint32 ormod, img;
2254 72f8883ff3ac (svn r2774) -Codechange: Removed TRACKTYPE_SPRITE_PITCH globally and replaced it by a member of RailtypeInfo celestar parents: 2236 diff changeset	1573	const RailtypeInfo *rti = GetRailTypeInfo(railtype);
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1574	const DrawTrackSeqStruct *dtss;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1575
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1576	ormod = PLAYER_SPRITE_COLOR(_local_player);
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1577
1399 4503bd2bfb82 (svn r1903) Replace some casts and macro magic with proper typing, similar to r1902 tron parents: 1363 diff changeset	1578	dtss = _track_depot_layout_table[image];
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1579
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1580	x+=33;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1581	y+=17;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1582
1399 4503bd2bfb82 (svn r1903) Replace some casts and macro magic with proper typing, similar to r1902 tron parents: 1363 diff changeset	1583	img = dtss++->image;
2254 72f8883ff3ac (svn r2774) -Codechange: Removed TRACKTYPE_SPRITE_PITCH globally and replaced it by a member of RailtypeInfo celestar parents: 2236 diff changeset	1584	/* @note This is kind of an ugly hack, as the PALETTE_MODIFIER_COLOR indicates
72f8883ff3ac (svn r2774) -Codechange: Removed TRACKTYPE_SPRITE_PITCH globally and replaced it by a member of RailtypeInfo celestar parents: 2236 diff changeset	1585	* whether the sprite is railtype dependent. Rewrite this asap */
72f8883ff3ac (svn r2774) -Codechange: Removed TRACKTYPE_SPRITE_PITCH globally and replaced it by a member of RailtypeInfo celestar parents: 2236 diff changeset	1586	if (img & PALETTE_MODIFIER_COLOR) img = (img & SPRITE_MASK) + rti->total_offset;
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1587	DrawSprite(img, x, y);
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1588
1399 4503bd2bfb82 (svn r1903) Replace some casts and macro magic with proper typing, similar to r1902 tron parents: 1363 diff changeset	1589	for (; dtss->image != 0; dtss++) {
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1590	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	1591	image = dtss->image;
2187 2a51f8925eeb (svn r2702) -Codechange: Cleaned up the sprite code and replaced many magic numbers celestar parents: 2186 diff changeset	1592	if (image & PALETTE_MODIFIER_COLOR) image \|= ormod;
2254 72f8883ff3ac (svn r2774) -Codechange: Removed TRACKTYPE_SPRITE_PITCH globally and replaced it by a member of RailtypeInfo celestar parents: 2236 diff changeset	1593	DrawSprite(image + rti->total_offset, x + pt.x, y + pt.y);
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1594	}
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1595	}
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1596
2261 3f78323707bb (svn r2781) Fix some of the issues with variables in .h files. ludde parents: 2254 diff changeset	1597	void DrawDefaultWaypointSprite(int x, int y, int railtype)
3f78323707bb (svn r2781) Fix some of the issues with variables in .h files. ludde parents: 2254 diff changeset	1598	{
3f78323707bb (svn r2781) Fix some of the issues with variables in .h files. ludde parents: 2254 diff changeset	1599	const DrawTrackSeqStruct *dtss = _track_depot_layout_table[4];
3f78323707bb (svn r2781) Fix some of the issues with variables in .h files. ludde parents: 2254 diff changeset	1600	const RailtypeInfo *rti = GetRailTypeInfo(railtype);
3f78323707bb (svn r2781) Fix some of the issues with variables in .h files. ludde parents: 2254 diff changeset	1601	uint32 img;
3f78323707bb (svn r2781) Fix some of the issues with variables in .h files. ludde parents: 2254 diff changeset	1602
3f78323707bb (svn r2781) Fix some of the issues with variables in .h files. ludde parents: 2254 diff changeset	1603	img = dtss++->image;
3f78323707bb (svn r2781) Fix some of the issues with variables in .h files. ludde parents: 2254 diff changeset	1604	if (img & PALETTE_MODIFIER_COLOR) img = (img & SPRITE_MASK) + rti->total_offset;
3f78323707bb (svn r2781) Fix some of the issues with variables in .h files. ludde parents: 2254 diff changeset	1605	DrawSprite(img, x, y);
3f78323707bb (svn r2781) Fix some of the issues with variables in .h files. ludde parents: 2254 diff changeset	1606
3f78323707bb (svn r2781) Fix some of the issues with variables in .h files. ludde parents: 2254 diff changeset	1607	for (; dtss->image != 0; dtss++) {
3f78323707bb (svn r2781) Fix some of the issues with variables in .h files. ludde parents: 2254 diff changeset	1608	Point pt = RemapCoords(dtss->subcoord_x, dtss->subcoord_y, 0);
3f78323707bb (svn r2781) Fix some of the issues with variables in .h files. ludde parents: 2254 diff changeset	1609	img = dtss->image;
3f78323707bb (svn r2781) Fix some of the issues with variables in .h files. ludde parents: 2254 diff changeset	1610	if (img & PALETTE_MODIFIER_COLOR) img \|= PLAYER_SPRITE_COLOR(_local_player);
3f78323707bb (svn r2781) Fix some of the issues with variables in .h files. ludde parents: 2254 diff changeset	1611	DrawSprite(img, x + pt.x, y + pt.y);
3f78323707bb (svn r2781) Fix some of the issues with variables in .h files. ludde parents: 2254 diff changeset	1612	}
3f78323707bb (svn r2781) Fix some of the issues with variables in .h files. ludde parents: 2254 diff changeset	1613	}
3f78323707bb (svn r2781) Fix some of the issues with variables in .h files. ludde parents: 2254 diff changeset	1614
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1615	typedef struct SetSignalsData {
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1616	int cur;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1617	int cur_stack;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1618	bool stop;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1619	bool has_presignal;
201 c40d343115f8 (svn r202) -Codechange: I missed some files with trailing spaces.. this should be truelight parents: 159 diff changeset	1620
2008 c9d6585c96c8 (svn r2516) - Feature: [pbs] Implement path-based-signalling. This allows multiple trains within the same signal block, provided their paths dont intersect. For this the block must have all exit and entry signals be pbs signals. Place these by ctrl-clicking 4 times on a normal signal. hackykid parents: 2007 diff changeset	1621	bool has_pbssignal;
c9d6585c96c8 (svn r2516) - Feature: [pbs] Implement path-based-signalling. This allows multiple trains within the same signal block, provided their paths dont intersect. For this the block must have all exit and entry signals be pbs signals. Place these by ctrl-clicking 4 times on a normal signal. hackykid parents: 2007 diff changeset	1622	// lowest 2 bits = amount of pbs signals in the block, clamped at 2
c9d6585c96c8 (svn r2516) - Feature: [pbs] Implement path-based-signalling. This allows multiple trains within the same signal block, provided their paths dont intersect. For this the block must have all exit and entry signals be pbs signals. Place these by ctrl-clicking 4 times on a normal signal. hackykid parents: 2007 diff changeset	1623	// bit 2 = there is a pbs entry signal in this block
c9d6585c96c8 (svn r2516) - Feature: [pbs] Implement path-based-signalling. This allows multiple trains within the same signal block, provided their paths dont intersect. For this the block must have all exit and entry signals be pbs signals. Place these by ctrl-clicking 4 times on a normal signal. hackykid parents: 2007 diff changeset	1624	// bit 3 = there is a pbs exit signal in this block
c9d6585c96c8 (svn r2516) - Feature: [pbs] Implement path-based-signalling. This allows multiple trains within the same signal block, provided their paths dont intersect. For this the block must have all exit and entry signals be pbs signals. Place these by ctrl-clicking 4 times on a normal signal. hackykid parents: 2007 diff changeset	1625
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1626	// presignal info
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1627	int presignal_exits;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1628	int presignal_exits_free;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1629
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1630	// 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	1631	byte bit[NUM_SSD_ENTRY];
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1632	TileIndex tile[NUM_SSD_ENTRY];
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1633
2008 c9d6585c96c8 (svn r2516) - Feature: [pbs] Implement path-based-signalling. This allows multiple trains within the same signal block, provided their paths dont intersect. For this the block must have all exit and entry signals be pbs signals. Place these by ctrl-clicking 4 times on a normal signal. hackykid parents: 2007 diff changeset	1634	int pbs_cur;
c9d6585c96c8 (svn r2516) - Feature: [pbs] Implement path-based-signalling. This allows multiple trains within the same signal block, provided their paths dont intersect. For this the block must have all exit and entry signals be pbs signals. Place these by ctrl-clicking 4 times on a normal signal. hackykid parents: 2007 diff changeset	1635	// these are used to keep track of all signals in the block
c9d6585c96c8 (svn r2516) - Feature: [pbs] Implement path-based-signalling. This allows multiple trains within the same signal block, provided their paths dont intersect. For this the block must have all exit and entry signals be pbs signals. Place these by ctrl-clicking 4 times on a normal signal. hackykid parents: 2007 diff changeset	1636	TileIndex pbs_tile[NUM_SSD_ENTRY];
c9d6585c96c8 (svn r2516) - Feature: [pbs] Implement path-based-signalling. This allows multiple trains within the same signal block, provided their paths dont intersect. For this the block must have all exit and entry signals be pbs signals. Place these by ctrl-clicking 4 times on a normal signal. hackykid parents: 2007 diff changeset	1637
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1638	// 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	1639	TileIndex next_tile[NUM_SSD_STACK];
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1640	byte next_dir[NUM_SSD_STACK];
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1641
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1642	} SetSignalsData;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1643
1977 4392ae3d8e31 (svn r2483) Replace almost 500 "uint tile" (and variants) with "TileIndex tile" tron parents: 1963 diff changeset	1644	static bool SetSignalsEnumProc(TileIndex tile, SetSignalsData ssd, int track, uint length, byte state)
0 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	// the tile has signals?
1035 0a170deb6e33 (svn r1536) Move GET_TILEHEIGHT, GET_TILETYPE and IS_TILETYPE to map.h, turn them into inline functions and add some asserts tron parents: 1024 diff changeset	1647	if (IsTileType(tile, MP_RAILWAY)) {
1942 634961366cdc (svn r2448) General cleanup of rail related code, more to follow. matthijs parents: 1928 diff changeset	1648	if (HasSignalOnTrack(tile, TrackdirToTrack(track))) {
2049 ad0d49c916d4 (svn r2558) Change the internal map format from 7 arrays to one array of structs, this doesn't change the saved format for now. It's a stepping stone for further changes. tron parents: 2020 diff changeset	1649	if ((_m[tile].m3 & _signals_table[track]) != 0) {
1942 634961366cdc (svn r2448) General cleanup of rail related code, more to follow. matthijs parents: 1928 diff changeset	1650	// yes, add the signal to the list of signals
634961366cdc (svn r2448) General cleanup of rail related code, more to follow. matthijs parents: 1928 diff changeset	1651	if (ssd->cur != NUM_SSD_ENTRY) {
634961366cdc (svn r2448) General cleanup of rail related code, more to follow. matthijs parents: 1928 diff changeset	1652	ssd->tile[ssd->cur] = tile; // remember the tile index
634961366cdc (svn r2448) General cleanup of rail related code, more to follow. matthijs parents: 1928 diff changeset	1653	ssd->bit[ssd->cur] = track; // and the controlling bit number
634961366cdc (svn r2448) General cleanup of rail related code, more to follow. matthijs parents: 1928 diff changeset	1654	ssd->cur++;
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1655	}
201 c40d343115f8 (svn r202) -Codechange: I missed some files with trailing spaces.. this should be truelight parents: 159 diff changeset	1656
2008 c9d6585c96c8 (svn r2516) - Feature: [pbs] Implement path-based-signalling. This allows multiple trains within the same signal block, provided their paths dont intersect. For this the block must have all exit and entry signals be pbs signals. Place these by ctrl-clicking 4 times on a normal signal. hackykid parents: 2007 diff changeset	1657	if (PBSIsPbsSignal(tile, ReverseTrackdir(track)))
c9d6585c96c8 (svn r2516) - Feature: [pbs] Implement path-based-signalling. This allows multiple trains within the same signal block, provided their paths dont intersect. For this the block must have all exit and entry signals be pbs signals. Place these by ctrl-clicking 4 times on a normal signal. hackykid parents: 2007 diff changeset	1658	SETBIT(ssd->has_pbssignal, 2);
c9d6585c96c8 (svn r2516) - Feature: [pbs] Implement path-based-signalling. This allows multiple trains within the same signal block, provided their paths dont intersect. For this the block must have all exit and entry signals be pbs signals. Place these by ctrl-clicking 4 times on a normal signal. hackykid parents: 2007 diff changeset	1659
1942 634961366cdc (svn r2448) General cleanup of rail related code, more to follow. matthijs parents: 1928 diff changeset	1660	// remember if this block has a presignal.
2049 ad0d49c916d4 (svn r2558) Change the internal map format from 7 arrays to one array of structs, this doesn't change the saved format for now. It's a stepping stone for further changes. tron parents: 2020 diff changeset	1661	ssd->has_presignal \|= (_m[tile].m4&1);
1942 634961366cdc (svn r2448) General cleanup of rail related code, more to follow. matthijs parents: 1928 diff changeset	1662	}
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1663
2008 c9d6585c96c8 (svn r2516) - Feature: [pbs] Implement path-based-signalling. This allows multiple trains within the same signal block, provided their paths dont intersect. For this the block must have all exit and entry signals be pbs signals. Place these by ctrl-clicking 4 times on a normal signal. hackykid parents: 2007 diff changeset	1664	if (PBSIsPbsSignal(tile, ReverseTrackdir(track)) \|\| PBSIsPbsSignal(tile, track)) {
c9d6585c96c8 (svn r2516) - Feature: [pbs] Implement path-based-signalling. This allows multiple trains within the same signal block, provided their paths dont intersect. For this the block must have all exit and entry signals be pbs signals. Place these by ctrl-clicking 4 times on a normal signal. hackykid parents: 2007 diff changeset	1665	byte num = ssd->has_pbssignal & 3;
c9d6585c96c8 (svn r2516) - Feature: [pbs] Implement path-based-signalling. This allows multiple trains within the same signal block, provided their paths dont intersect. For this the block must have all exit and entry signals be pbs signals. Place these by ctrl-clicking 4 times on a normal signal. hackykid parents: 2007 diff changeset	1666	num = clamp(num + 1, 0, 2);
c9d6585c96c8 (svn r2516) - Feature: [pbs] Implement path-based-signalling. This allows multiple trains within the same signal block, provided their paths dont intersect. For this the block must have all exit and entry signals be pbs signals. Place these by ctrl-clicking 4 times on a normal signal. hackykid parents: 2007 diff changeset	1667	ssd->has_pbssignal &= ~3;
c9d6585c96c8 (svn r2516) - Feature: [pbs] Implement path-based-signalling. This allows multiple trains within the same signal block, provided their paths dont intersect. For this the block must have all exit and entry signals be pbs signals. Place these by ctrl-clicking 4 times on a normal signal. hackykid parents: 2007 diff changeset	1668	ssd->has_pbssignal \|= num;
c9d6585c96c8 (svn r2516) - Feature: [pbs] Implement path-based-signalling. This allows multiple trains within the same signal block, provided their paths dont intersect. For this the block must have all exit and entry signals be pbs signals. Place these by ctrl-clicking 4 times on a normal signal. hackykid parents: 2007 diff changeset	1669	}
c9d6585c96c8 (svn r2516) - Feature: [pbs] Implement path-based-signalling. This allows multiple trains within the same signal block, provided their paths dont intersect. For this the block must have all exit and entry signals be pbs signals. Place these by ctrl-clicking 4 times on a normal signal. hackykid parents: 2007 diff changeset	1670
2049 ad0d49c916d4 (svn r2558) Change the internal map format from 7 arrays to one array of structs, this doesn't change the saved format for now. It's a stepping stone for further changes. tron parents: 2020 diff changeset	1671	if ((_m[tile].m3 & _signals_table_both[track]) != 0) {
2008 c9d6585c96c8 (svn r2516) - Feature: [pbs] Implement path-based-signalling. This allows multiple trains within the same signal block, provided their paths dont intersect. For this the block must have all exit and entry signals be pbs signals. Place these by ctrl-clicking 4 times on a normal signal. hackykid parents: 2007 diff changeset	1672	ssd->pbs_tile[ssd->pbs_cur] = tile; // remember the tile index
c9d6585c96c8 (svn r2516) - Feature: [pbs] Implement path-based-signalling. This allows multiple trains within the same signal block, provided their paths dont intersect. For this the block must have all exit and entry signals be pbs signals. Place these by ctrl-clicking 4 times on a normal signal. hackykid parents: 2007 diff changeset	1673	ssd->pbs_cur++;
c9d6585c96c8 (svn r2516) - Feature: [pbs] Implement path-based-signalling. This allows multiple trains within the same signal block, provided their paths dont intersect. For this the block must have all exit and entry signals be pbs signals. Place these by ctrl-clicking 4 times on a normal signal. hackykid parents: 2007 diff changeset	1674	}
c9d6585c96c8 (svn r2516) - Feature: [pbs] Implement path-based-signalling. This allows multiple trains within the same signal block, provided their paths dont intersect. For this the block must have all exit and entry signals be pbs signals. Place these by ctrl-clicking 4 times on a normal signal. hackykid parents: 2007 diff changeset	1675
2049 ad0d49c916d4 (svn r2558) Change the internal map format from 7 arrays to one array of structs, this doesn't change the saved format for now. It's a stepping stone for further changes. tron parents: 2020 diff changeset	1676	if (_m[tile].m3&_signals_table_other[track]) {
ad0d49c916d4 (svn r2558) Change the internal map format from 7 arrays to one array of structs, this doesn't change the saved format for now. It's a stepping stone for further changes. tron parents: 2020 diff changeset	1677	if (_m[tile].m4&2) {
2008 c9d6585c96c8 (svn r2516) - Feature: [pbs] Implement path-based-signalling. This allows multiple trains within the same signal block, provided their paths dont intersect. For this the block must have all exit and entry signals be pbs signals. Place these by ctrl-clicking 4 times on a normal signal. hackykid parents: 2007 diff changeset	1678	// this is an exit signal that points out from the segment
c9d6585c96c8 (svn r2516) - Feature: [pbs] Implement path-based-signalling. This allows multiple trains within the same signal block, provided their paths dont intersect. For this the block must have all exit and entry signals be pbs signals. Place these by ctrl-clicking 4 times on a normal signal. hackykid parents: 2007 diff changeset	1679	ssd->presignal_exits++;
2049 ad0d49c916d4 (svn r2558) Change the internal map format from 7 arrays to one array of structs, this doesn't change the saved format for now. It's a stepping stone for further changes. tron parents: 2020 diff changeset	1680	if ((_m[tile].m2&_signals_table_other[track]) != 0)
2008 c9d6585c96c8 (svn r2516) - Feature: [pbs] Implement path-based-signalling. This allows multiple trains within the same signal block, provided their paths dont intersect. For this the block must have all exit and entry signals be pbs signals. Place these by ctrl-clicking 4 times on a normal signal. hackykid parents: 2007 diff changeset	1681	ssd->presignal_exits_free++;
c9d6585c96c8 (svn r2516) - Feature: [pbs] Implement path-based-signalling. This allows multiple trains within the same signal block, provided their paths dont intersect. For this the block must have all exit and entry signals be pbs signals. Place these by ctrl-clicking 4 times on a normal signal. hackykid parents: 2007 diff changeset	1682	}
c9d6585c96c8 (svn r2516) - Feature: [pbs] Implement path-based-signalling. This allows multiple trains within the same signal block, provided their paths dont intersect. For this the block must have all exit and entry signals be pbs signals. Place these by ctrl-clicking 4 times on a normal signal. hackykid parents: 2007 diff changeset	1683	if (PBSIsPbsSignal(tile, track))
c9d6585c96c8 (svn r2516) - Feature: [pbs] Implement path-based-signalling. This allows multiple trains within the same signal block, provided their paths dont intersect. For this the block must have all exit and entry signals be pbs signals. Place these by ctrl-clicking 4 times on a normal signal. hackykid parents: 2007 diff changeset	1684	SETBIT(ssd->has_pbssignal, 3);
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1685	}
1942 634961366cdc (svn r2448) General cleanup of rail related code, more to follow. matthijs parents: 1928 diff changeset	1686
634961366cdc (svn r2448) General cleanup of rail related code, more to follow. matthijs parents: 1928 diff changeset	1687	return true;
634961366cdc (svn r2448) General cleanup of rail related code, more to follow. matthijs parents: 1928 diff changeset	1688	} else if (IsTileDepotType(tile, TRANSPORT_RAIL))
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1689	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	1690	}
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1691	return false;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1692	}
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1693
1555 c7e5bb32f536 (svn r2059) -Codechange: rewrote SetSignalsAfterProc so now the tiles from the PF truelight parents: 1542 diff changeset	1694	/* Struct to parse data from VehicleFromPos to SignalVehicleCheckProc */
c7e5bb32f536 (svn r2059) -Codechange: rewrote SetSignalsAfterProc so now the tiles from the PF truelight parents: 1542 diff changeset	1695	typedef struct SignalVehicleCheckStruct {
c7e5bb32f536 (svn r2059) -Codechange: rewrote SetSignalsAfterProc so now the tiles from the PF truelight parents: 1542 diff changeset	1696	TileIndex tile;
c7e5bb32f536 (svn r2059) -Codechange: rewrote SetSignalsAfterProc so now the tiles from the PF truelight parents: 1542 diff changeset	1697	uint track;
c7e5bb32f536 (svn r2059) -Codechange: rewrote SetSignalsAfterProc so now the tiles from the PF truelight parents: 1542 diff changeset	1698	} SignalVehicleCheckStruct;
c7e5bb32f536 (svn r2059) -Codechange: rewrote SetSignalsAfterProc so now the tiles from the PF truelight parents: 1542 diff changeset	1699
c7e5bb32f536 (svn r2059) -Codechange: rewrote SetSignalsAfterProc so now the tiles from the PF truelight parents: 1542 diff changeset	1700	static void SignalVehicleCheckProc(Vehicle v, void *data)
c7e5bb32f536 (svn r2059) -Codechange: rewrote SetSignalsAfterProc so now the tiles from the PF truelight parents: 1542 diff changeset	1701	{
c7e5bb32f536 (svn r2059) -Codechange: rewrote SetSignalsAfterProc so now the tiles from the PF truelight parents: 1542 diff changeset	1702	SignalVehicleCheckStruct *dest = data;
c7e5bb32f536 (svn r2059) -Codechange: rewrote SetSignalsAfterProc so now the tiles from the PF truelight parents: 1542 diff changeset	1703	TileIndex tile;
c7e5bb32f536 (svn r2059) -Codechange: rewrote SetSignalsAfterProc so now the tiles from the PF truelight parents: 1542 diff changeset	1704
1609 b4d11170cbb5 (svn r2113) -Fix: first check if a vehicle is a train, before accessing u.rail truelight parents: 1598 diff changeset	1705	if (v->type != VEH_Train)
b4d11170cbb5 (svn r2113) -Fix: first check if a vehicle is a train, before accessing u.rail truelight parents: 1598 diff changeset	1706	return NULL;
b4d11170cbb5 (svn r2113) -Fix: first check if a vehicle is a train, before accessing u.rail truelight parents: 1598 diff changeset	1707
1555 c7e5bb32f536 (svn r2059) -Codechange: rewrote SetSignalsAfterProc so now the tiles from the PF truelight parents: 1542 diff changeset	1708	/* Find the tile outside the tunnel, for signalling */
1609 b4d11170cbb5 (svn r2113) -Fix: first check if a vehicle is a train, before accessing u.rail truelight parents: 1598 diff changeset	1709	if (v->u.rail.track == 0x40)
1555 c7e5bb32f536 (svn r2059) -Codechange: rewrote SetSignalsAfterProc so now the tiles from the PF truelight parents: 1542 diff changeset	1710	tile = GetVehicleOutOfTunnelTile(v);
1609 b4d11170cbb5 (svn r2113) -Fix: first check if a vehicle is a train, before accessing u.rail truelight parents: 1598 diff changeset	1711	else
1555 c7e5bb32f536 (svn r2059) -Codechange: rewrote SetSignalsAfterProc so now the tiles from the PF truelight parents: 1542 diff changeset	1712	tile = v->tile;
c7e5bb32f536 (svn r2059) -Codechange: rewrote SetSignalsAfterProc so now the tiles from the PF truelight parents: 1542 diff changeset	1713
c7e5bb32f536 (svn r2059) -Codechange: rewrote SetSignalsAfterProc so now the tiles from the PF truelight parents: 1542 diff changeset	1714	/* Wrong tile, or no train? Not a match */
1609 b4d11170cbb5 (svn r2113) -Fix: first check if a vehicle is a train, before accessing u.rail truelight parents: 1598 diff changeset	1715	if (tile != dest->tile)
1555 c7e5bb32f536 (svn r2059) -Codechange: rewrote SetSignalsAfterProc so now the tiles from the PF truelight parents: 1542 diff changeset	1716	return NULL;
c7e5bb32f536 (svn r2059) -Codechange: rewrote SetSignalsAfterProc so now the tiles from the PF truelight parents: 1542 diff changeset	1717
c7e5bb32f536 (svn r2059) -Codechange: rewrote SetSignalsAfterProc so now the tiles from the PF truelight parents: 1542 diff changeset	1718	/* Are we on the same piece of track? */
c7e5bb32f536 (svn r2059) -Codechange: rewrote SetSignalsAfterProc so now the tiles from the PF truelight parents: 1542 diff changeset	1719	if (dest->track & (v->u.rail.track + (v->u.rail.track<<8)))
c7e5bb32f536 (svn r2059) -Codechange: rewrote SetSignalsAfterProc so now the tiles from the PF truelight parents: 1542 diff changeset	1720	return v;
c7e5bb32f536 (svn r2059) -Codechange: rewrote SetSignalsAfterProc so now the tiles from the PF truelight parents: 1542 diff changeset	1721
c7e5bb32f536 (svn r2059) -Codechange: rewrote SetSignalsAfterProc so now the tiles from the PF truelight parents: 1542 diff changeset	1722	return NULL;
c7e5bb32f536 (svn r2059) -Codechange: rewrote SetSignalsAfterProc so now the tiles from the PF truelight parents: 1542 diff changeset	1723	}
c7e5bb32f536 (svn r2059) -Codechange: rewrote SetSignalsAfterProc so now the tiles from the PF truelight parents: 1542 diff changeset	1724
c7e5bb32f536 (svn r2059) -Codechange: rewrote SetSignalsAfterProc so now the tiles from the PF truelight parents: 1542 diff changeset	1725	/* Special check for SetSignalsAfterProc, to see if there is a vehicle on this tile */
c7e5bb32f536 (svn r2059) -Codechange: rewrote SetSignalsAfterProc so now the tiles from the PF truelight parents: 1542 diff changeset	1726	bool SignalVehicleCheck(TileIndex tile, uint track)
c7e5bb32f536 (svn r2059) -Codechange: rewrote SetSignalsAfterProc so now the tiles from the PF truelight parents: 1542 diff changeset	1727	{
c7e5bb32f536 (svn r2059) -Codechange: rewrote SetSignalsAfterProc so now the tiles from the PF truelight parents: 1542 diff changeset	1728	SignalVehicleCheckStruct dest;
c7e5bb32f536 (svn r2059) -Codechange: rewrote SetSignalsAfterProc so now the tiles from the PF truelight parents: 1542 diff changeset	1729
c7e5bb32f536 (svn r2059) -Codechange: rewrote SetSignalsAfterProc so now the tiles from the PF truelight parents: 1542 diff changeset	1730	dest.tile = tile;
c7e5bb32f536 (svn r2059) -Codechange: rewrote SetSignalsAfterProc so now the tiles from the PF truelight parents: 1542 diff changeset	1731	dest.track = track;
c7e5bb32f536 (svn r2059) -Codechange: rewrote SetSignalsAfterProc so now the tiles from the PF truelight parents: 1542 diff changeset	1732
1818 88ab405a9dfc (svn r2322) - CodeChange: doxygen commented the tunnel-crash fix. Also if (bla) {return;} else {return;} is not proper code. It's if (bla) {return;} return; ;) Darkvater parents: 1816 diff changeset	1733	/** @todo "Hackish" fix for the tunnel problems. This is needed because a tunnel
88ab405a9dfc (svn r2322) - CodeChange: doxygen commented the tunnel-crash fix. Also if (bla) {return;} else {return;} is not proper code. It's if (bla) {return;} return; ;) Darkvater parents: 1816 diff changeset	1734	* is some kind of invisible black hole, and there is some special magic going
88ab405a9dfc (svn r2322) - CodeChange: doxygen commented the tunnel-crash fix. Also if (bla) {return;} else {return;} is not proper code. It's if (bla) {return;} return; ;) Darkvater parents: 1816 diff changeset	1735	* on in there. This 'workaround' can be removed once the maprewrite is done.
88ab405a9dfc (svn r2322) - CodeChange: doxygen commented the tunnel-crash fix. Also if (bla) {return;} else {return;} is not proper code. It's if (bla) {return;} return; ;) Darkvater parents: 1816 diff changeset	1736	*/
2049 ad0d49c916d4 (svn r2558) Change the internal map format from 7 arrays to one array of structs, this doesn't change the saved format for now. It's a stepping stone for further changes. tron parents: 2020 diff changeset	1737	if (GetTileType(tile)==MP_TUNNELBRIDGE && ((_m[tile].m5 & 0xF0)==0)) {
1816 e96c4a8136bf (svn r2320) - Fix: [ 1185176 ] Train in tunnel is not properly detected by signal code (Hackykid) matthijs parents: 1813 diff changeset	1738	// It is a tunnel we're checking, we need to do some special stuff
e96c4a8136bf (svn r2320) - Fix: [ 1185176 ] Train in tunnel is not properly detected by signal code (Hackykid) matthijs parents: 1813 diff changeset	1739	// because VehicleFromPos will not find the vihicle otherwise
2049 ad0d49c916d4 (svn r2558) Change the internal map format from 7 arrays to one array of structs, this doesn't change the saved format for now. It's a stepping stone for further changes. tron parents: 2020 diff changeset	1740	byte direction = _m[tile].m5 & 3;
1816 e96c4a8136bf (svn r2320) - Fix: [ 1185176 ] Train in tunnel is not properly detected by signal code (Hackykid) matthijs parents: 1813 diff changeset	1741	FindLengthOfTunnelResult flotr;
e96c4a8136bf (svn r2320) - Fix: [ 1185176 ] Train in tunnel is not properly detected by signal code (Hackykid) matthijs parents: 1813 diff changeset	1742	flotr = FindLengthOfTunnel(tile, direction);
e96c4a8136bf (svn r2320) - Fix: [ 1185176 ] Train in tunnel is not properly detected by signal code (Hackykid) matthijs parents: 1813 diff changeset	1743	dest.track = 1 << (direction & 1); // get the trackbit the vehicle would have if it has not entered the tunnel yet (ie is still visible)
e96c4a8136bf (svn r2320) - Fix: [ 1185176 ] Train in tunnel is not properly detected by signal code (Hackykid) matthijs parents: 1813 diff changeset	1744
e96c4a8136bf (svn r2320) - Fix: [ 1185176 ] Train in tunnel is not properly detected by signal code (Hackykid) matthijs parents: 1813 diff changeset	1745	// check for a vehicle with that trackdir on the start tile of the tunnel
1818 88ab405a9dfc (svn r2322) - CodeChange: doxygen commented the tunnel-crash fix. Also if (bla) {return;} else {return;} is not proper code. It's if (bla) {return;} return; ;) Darkvater parents: 1816 diff changeset	1746	if (VehicleFromPos(tile, &dest, SignalVehicleCheckProc) != NULL) return true;
1816 e96c4a8136bf (svn r2320) - Fix: [ 1185176 ] Train in tunnel is not properly detected by signal code (Hackykid) matthijs parents: 1813 diff changeset	1747
e96c4a8136bf (svn r2320) - Fix: [ 1185176 ] Train in tunnel is not properly detected by signal code (Hackykid) matthijs parents: 1813 diff changeset	1748	// check for a vehicle with that trackdir on the end tile of the tunnel
1818 88ab405a9dfc (svn r2322) - CodeChange: doxygen commented the tunnel-crash fix. Also if (bla) {return;} else {return;} is not proper code. It's if (bla) {return;} return; ;) Darkvater parents: 1816 diff changeset	1749	if (VehicleFromPos(flotr.tile, &dest, SignalVehicleCheckProc) != NULL) return true;
1816 e96c4a8136bf (svn r2320) - Fix: [ 1185176 ] Train in tunnel is not properly detected by signal code (Hackykid) matthijs parents: 1813 diff changeset	1750
e96c4a8136bf (svn r2320) - Fix: [ 1185176 ] Train in tunnel is not properly detected by signal code (Hackykid) matthijs parents: 1813 diff changeset	1751	// now check all tiles from start to end for a "hidden" vehicle
e96c4a8136bf (svn r2320) - Fix: [ 1185176 ] Train in tunnel is not properly detected by signal code (Hackykid) matthijs parents: 1813 diff changeset	1752	// NOTE: the hashes for tiles may overlap, so this could maybe be optimised a bit by not checking every tile?
e96c4a8136bf (svn r2320) - Fix: [ 1185176 ] Train in tunnel is not properly detected by signal code (Hackykid) matthijs parents: 1813 diff changeset	1753	dest.track = 0x40; // trackbit for vehicles "hidden" inside a tunnel
e96c4a8136bf (svn r2320) - Fix: [ 1185176 ] Train in tunnel is not properly detected by signal code (Hackykid) matthijs parents: 1813 diff changeset	1754	for (; tile != flotr.tile; tile += TileOffsByDir(direction)) {
e96c4a8136bf (svn r2320) - Fix: [ 1185176 ] Train in tunnel is not properly detected by signal code (Hackykid) matthijs parents: 1813 diff changeset	1755	if (VehicleFromPos(tile, &dest, SignalVehicleCheckProc) != NULL)
e96c4a8136bf (svn r2320) - Fix: [ 1185176 ] Train in tunnel is not properly detected by signal code (Hackykid) matthijs parents: 1813 diff changeset	1756	return true;
e96c4a8136bf (svn r2320) - Fix: [ 1185176 ] Train in tunnel is not properly detected by signal code (Hackykid) matthijs parents: 1813 diff changeset	1757	}
e96c4a8136bf (svn r2320) - Fix: [ 1185176 ] Train in tunnel is not properly detected by signal code (Hackykid) matthijs parents: 1813 diff changeset	1758
e96c4a8136bf (svn r2320) - Fix: [ 1185176 ] Train in tunnel is not properly detected by signal code (Hackykid) matthijs parents: 1813 diff changeset	1759	// no vehicle found
e96c4a8136bf (svn r2320) - Fix: [ 1185176 ] Train in tunnel is not properly detected by signal code (Hackykid) matthijs parents: 1813 diff changeset	1760	return false;
1818 88ab405a9dfc (svn r2322) - CodeChange: doxygen commented the tunnel-crash fix. Also if (bla) {return;} else {return;} is not proper code. It's if (bla) {return;} return; ;) Darkvater parents: 1816 diff changeset	1761	}
88ab405a9dfc (svn r2322) - CodeChange: doxygen commented the tunnel-crash fix. Also if (bla) {return;} else {return;} is not proper code. It's if (bla) {return;} return; ;) Darkvater parents: 1816 diff changeset	1762
88ab405a9dfc (svn r2322) - CodeChange: doxygen commented the tunnel-crash fix. Also if (bla) {return;} else {return;} is not proper code. It's if (bla) {return;} return; ;) Darkvater parents: 1816 diff changeset	1763	return VehicleFromPos(tile, &dest, SignalVehicleCheckProc) != NULL;
1555 c7e5bb32f536 (svn r2059) -Codechange: rewrote SetSignalsAfterProc so now the tiles from the PF truelight parents: 1542 diff changeset	1764	}
c7e5bb32f536 (svn r2059) -Codechange: rewrote SetSignalsAfterProc so now the tiles from the PF truelight parents: 1542 diff changeset	1765
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1766	static void SetSignalsAfterProc(TrackPathFinder *tpf)
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1767	{
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1768	SetSignalsData *ssd = tpf->userdata;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1769	TrackPathFinderLink *link;
1555 c7e5bb32f536 (svn r2059) -Codechange: rewrote SetSignalsAfterProc so now the tiles from the PF truelight parents: 1542 diff changeset	1770	uint offs;
c7e5bb32f536 (svn r2059) -Codechange: rewrote SetSignalsAfterProc so now the tiles from the PF truelight parents: 1542 diff changeset	1771	uint i;
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1772
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1773	ssd->stop = false;
201 c40d343115f8 (svn r202) -Codechange: I missed some files with trailing spaces.. this should be truelight parents: 159 diff changeset	1774
1555 c7e5bb32f536 (svn r2059) -Codechange: rewrote SetSignalsAfterProc so now the tiles from the PF truelight parents: 1542 diff changeset	1775	/* Go through all the PF tiles */
c7e5bb32f536 (svn r2059) -Codechange: rewrote SetSignalsAfterProc so now the tiles from the PF truelight parents: 1542 diff changeset	1776	for (i = 0; i < lengthof(tpf->hash_head); i++) {
c7e5bb32f536 (svn r2059) -Codechange: rewrote SetSignalsAfterProc so now the tiles from the PF truelight parents: 1542 diff changeset	1777	/* Empty hash item */
c7e5bb32f536 (svn r2059) -Codechange: rewrote SetSignalsAfterProc so now the tiles from the PF truelight parents: 1542 diff changeset	1778	if (tpf->hash_head[i] == 0)
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1779	continue;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1780
1555 c7e5bb32f536 (svn r2059) -Codechange: rewrote SetSignalsAfterProc so now the tiles from the PF truelight parents: 1542 diff changeset	1781	/* If 0x8000 is not set, there is only 1 item */
c7e5bb32f536 (svn r2059) -Codechange: rewrote SetSignalsAfterProc so now the tiles from the PF truelight parents: 1542 diff changeset	1782	if (!(tpf->hash_head[i] & 0x8000)) {
c7e5bb32f536 (svn r2059) -Codechange: rewrote SetSignalsAfterProc so now the tiles from the PF truelight parents: 1542 diff changeset	1783	/* Check if there is a vehicle on this tile */
c7e5bb32f536 (svn r2059) -Codechange: rewrote SetSignalsAfterProc so now the tiles from the PF truelight parents: 1542 diff changeset	1784	if (SignalVehicleCheck(tpf->hash_tile[i], tpf->hash_head[i])) {
c7e5bb32f536 (svn r2059) -Codechange: rewrote SetSignalsAfterProc so now the tiles from the PF truelight parents: 1542 diff changeset	1785	ssd->stop = true;
c7e5bb32f536 (svn r2059) -Codechange: rewrote SetSignalsAfterProc so now the tiles from the PF truelight parents: 1542 diff changeset	1786	return;
c7e5bb32f536 (svn r2059) -Codechange: rewrote SetSignalsAfterProc so now the tiles from the PF truelight parents: 1542 diff changeset	1787	}
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1788	} else {
1555 c7e5bb32f536 (svn r2059) -Codechange: rewrote SetSignalsAfterProc so now the tiles from the PF truelight parents: 1542 diff changeset	1789	/* There are multiple items, where hash_tile points to the first item in the list */
c7e5bb32f536 (svn r2059) -Codechange: rewrote SetSignalsAfterProc so now the tiles from the PF truelight parents: 1542 diff changeset	1790	offs = tpf->hash_tile[i];
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1791	do {
1555 c7e5bb32f536 (svn r2059) -Codechange: rewrote SetSignalsAfterProc so now the tiles from the PF truelight parents: 1542 diff changeset	1792	/* Find the next item */
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1793	link = PATHFIND_GET_LINK_PTR(tpf, offs);
1555 c7e5bb32f536 (svn r2059) -Codechange: rewrote SetSignalsAfterProc so now the tiles from the PF truelight parents: 1542 diff changeset	1794	/* Check if there is a vehicle on this tile */
c7e5bb32f536 (svn r2059) -Codechange: rewrote SetSignalsAfterProc so now the tiles from the PF truelight parents: 1542 diff changeset	1795	if (SignalVehicleCheck(link->tile, link->flags)) {
c7e5bb32f536 (svn r2059) -Codechange: rewrote SetSignalsAfterProc so now the tiles from the PF truelight parents: 1542 diff changeset	1796	ssd->stop = true;
c7e5bb32f536 (svn r2059) -Codechange: rewrote SetSignalsAfterProc so now the tiles from the PF truelight parents: 1542 diff changeset	1797	return;
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1798	}
1555 c7e5bb32f536 (svn r2059) -Codechange: rewrote SetSignalsAfterProc so now the tiles from the PF truelight parents: 1542 diff changeset	1799	/* Goto the next item */
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1800	} while ((offs=link->next) != 0xFFFF);
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1801	}
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1802	}
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1803	}
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	static const byte _dir_from_track[14] = {
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1806	0,1,0,1,2,1, 0,0,
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1807	2,3,3,2,3,0,
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1808	};
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
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1811	static void ChangeSignalStates(SetSignalsData *ssd)
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	int i;
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	// thinking about presignals...
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1816	// the presignal is green if,
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1817	// if no train is in the segment AND
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1818	// there is at least one green exit signal OR
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1819	// there are no exit signals in the segment
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1820
2008 c9d6585c96c8 (svn r2516) - Feature: [pbs] Implement path-based-signalling. This allows multiple trains within the same signal block, provided their paths dont intersect. For this the block must have all exit and entry signals be pbs signals. Place these by ctrl-clicking 4 times on a normal signal. hackykid parents: 2007 diff changeset	1821	// convert the block to pbs, if needed
c9d6585c96c8 (svn r2516) - Feature: [pbs] Implement path-based-signalling. This allows multiple trains within the same signal block, provided their paths dont intersect. For this the block must have all exit and entry signals be pbs signals. Place these by ctrl-clicking 4 times on a normal signal. hackykid parents: 2007 diff changeset	1822	if (_patches.auto_pbs_placement && !(ssd->stop) && (ssd->has_pbssignal == 0xE) && !ssd->has_presignal && (ssd->presignal_exits == 0)) // 0xE means at least 2 pbs signals, and at least 1 entry and 1 exit, see comments ssd->has_pbssignal
c9d6585c96c8 (svn r2516) - Feature: [pbs] Implement path-based-signalling. This allows multiple trains within the same signal block, provided their paths dont intersect. For this the block must have all exit and entry signals be pbs signals. Place these by ctrl-clicking 4 times on a normal signal. hackykid parents: 2007 diff changeset	1823	for(i=0; i!=ssd->pbs_cur; i++) {
c9d6585c96c8 (svn r2516) - Feature: [pbs] Implement path-based-signalling. This allows multiple trains within the same signal block, provided their paths dont intersect. For this the block must have all exit and entry signals be pbs signals. Place these by ctrl-clicking 4 times on a normal signal. hackykid parents: 2007 diff changeset	1824	TileIndex tile = ssd->pbs_tile[i];
2049 ad0d49c916d4 (svn r2558) Change the internal map format from 7 arrays to one array of structs, this doesn't change the saved format for now. It's a stepping stone for further changes. tron parents: 2020 diff changeset	1825	_m[tile].m4 &= ~0x07;
ad0d49c916d4 (svn r2558) Change the internal map format from 7 arrays to one array of structs, this doesn't change the saved format for now. It's a stepping stone for further changes. tron parents: 2020 diff changeset	1826	_m[tile].m4 \|= 0x04;
2008 c9d6585c96c8 (svn r2516) - Feature: [pbs] Implement path-based-signalling. This allows multiple trains within the same signal block, provided their paths dont intersect. For this the block must have all exit and entry signals be pbs signals. Place these by ctrl-clicking 4 times on a normal signal. hackykid parents: 2007 diff changeset	1827	MarkTileDirtyByTile(tile);
c9d6585c96c8 (svn r2516) - Feature: [pbs] Implement path-based-signalling. This allows multiple trains within the same signal block, provided their paths dont intersect. For this the block must have all exit and entry signals be pbs signals. Place these by ctrl-clicking 4 times on a normal signal. hackykid parents: 2007 diff changeset	1828	};
c9d6585c96c8 (svn r2516) - Feature: [pbs] Implement path-based-signalling. This allows multiple trains within the same signal block, provided their paths dont intersect. For this the block must have all exit and entry signals be pbs signals. Place these by ctrl-clicking 4 times on a normal signal. hackykid parents: 2007 diff changeset	1829
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1830	// then mark the signals in the segment accordingly
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1831	for(i=0; i!=ssd->cur; i++) {
1977 4392ae3d8e31 (svn r2483) Replace almost 500 "uint tile" (and variants) with "TileIndex tile" tron parents: 1963 diff changeset	1832	TileIndex tile = ssd->tile[i];
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1833	byte bit = _signals_table[ssd->bit[i]];
2049 ad0d49c916d4 (svn r2558) Change the internal map format from 7 arrays to one array of structs, this doesn't change the saved format for now. It's a stepping stone for further changes. tron parents: 2020 diff changeset	1834	uint16 m2 = _m[tile].m2;
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1835
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1836	// presignals don't turn green if there is at least one presignal exit and none are free
2049 ad0d49c916d4 (svn r2558) Change the internal map format from 7 arrays to one array of structs, this doesn't change the saved format for now. It's a stepping stone for further changes. tron parents: 2020 diff changeset	1837	if (_m[tile].m4 & 1) {
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1838	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	1839
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1840	// subtract for dual combo signals so they don't count themselves
2049 ad0d49c916d4 (svn r2558) Change the internal map format from 7 arrays to one array of structs, this doesn't change the saved format for now. It's a stepping stone for further changes. tron parents: 2020 diff changeset	1841	if (_m[tile].m4&2 && _m[tile].m3&_signals_table_other[ssd->bit[i]]) {
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1842	ex--;
2049 ad0d49c916d4 (svn r2558) Change the internal map format from 7 arrays to one array of structs, this doesn't change the saved format for now. It's a stepping stone for further changes. tron parents: 2020 diff changeset	1843	if ((_m[tile].m2&_signals_table_other[ssd->bit[i]]) != 0) exfree--;
0 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
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1846	// 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	1847	if (ex && !exfree) goto make_red;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1848	}
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1849
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1850	// check if the signal is unaffected.
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1851	if (ssd->stop) {
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1852	make_red:
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1853	// turn red
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1854	if ( (bit&m2) == 0 )
201 c40d343115f8 (svn r202) -Codechange: I missed some files with trailing spaces.. this should be truelight parents: 159 diff changeset	1855	continue;
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1856	} else {
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1857	// turn green
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1858	if ( (bit&m2) != 0 )
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1859	continue;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1860	}
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1861
1813 a4b17980b9e4 (svn r2317) - Fix: [ 1193048 ] Pre-signal stays red when there is only a single exit signal (dinno) Darkvater parents: 1796 diff changeset	1862	/* Update signals on the other side of this exit-combo signal; it changed. */
2049 ad0d49c916d4 (svn r2558) Change the internal map format from 7 arrays to one array of structs, this doesn't change the saved format for now. It's a stepping stone for further changes. tron parents: 2020 diff changeset	1863	if (_m[tile].m4 & 2 ) {
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1864	if (ssd->cur_stack != NUM_SSD_STACK) {
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1865	ssd->next_tile[ssd->cur_stack] = tile;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1866	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	1867	ssd->cur_stack++;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1868	} else {
1813 a4b17980b9e4 (svn r2317) - Fix: [ 1193048 ] Pre-signal stays red when there is only a single exit signal (dinno) Darkvater parents: 1796 diff changeset	1869	printf("NUM_SSD_STACK too small\n"); /// @todo WTF is this???
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1870	}
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1871	}
201 c40d343115f8 (svn r202) -Codechange: I missed some files with trailing spaces.. this should be truelight parents: 159 diff changeset	1872
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1873	// it changed, so toggle it
2049 ad0d49c916d4 (svn r2558) Change the internal map format from 7 arrays to one array of structs, this doesn't change the saved format for now. It's a stepping stone for further changes. tron parents: 2020 diff changeset	1874	_m[tile].m2 = m2 ^ bit;
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1875	MarkTileDirtyByTile(tile);
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1876	}
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1877	}
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1878
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1879
1977 4392ae3d8e31 (svn r2483) Replace almost 500 "uint tile" (and variants) with "TileIndex tile" tron parents: 1963 diff changeset	1880	bool UpdateSignalsOnSegment(TileIndex tile, byte direction)
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1881	{
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1882	SetSignalsData ssd;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1883	int result = -1;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1884
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1885	ssd.cur_stack = 0;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1886	direction>>=1;
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	for(;;) {
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1889	// go through one segment and update all signals pointing into that segment.
2008 c9d6585c96c8 (svn r2516) - Feature: [pbs] Implement path-based-signalling. This allows multiple trains within the same signal block, provided their paths dont intersect. For this the block must have all exit and entry signals be pbs signals. Place these by ctrl-clicking 4 times on a normal signal. hackykid parents: 2007 diff changeset	1890	ssd.cur = ssd.pbs_cur = ssd.presignal_exits = ssd.presignal_exits_free = 0;
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1891	ssd.has_presignal = false;
2008 c9d6585c96c8 (svn r2516) - Feature: [pbs] Implement path-based-signalling. This allows multiple trains within the same signal block, provided their paths dont intersect. For this the block must have all exit and entry signals be pbs signals. Place these by ctrl-clicking 4 times on a normal signal. hackykid parents: 2007 diff changeset	1892	ssd.has_pbssignal = false;
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1893
159 139cf78bfb28 (svn r160) -Codechange: made GetTileTrackStatus more readable (blathijs) truelight parents: 149 diff changeset	1894	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	1895	ChangeSignalStates(&ssd);
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	// remember the result only for the first iteration.
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1898	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	1899
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1900	// 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	1901	if(!ssd.cur_stack)
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1902	break;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1903
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1904	// 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	1905	tile = ssd.next_tile[--ssd.cur_stack];
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1906	direction = ssd.next_dir[ssd.cur_stack];
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1907	}
201 c40d343115f8 (svn r202) -Codechange: I missed some files with trailing spaces.. this should be truelight parents: 159 diff changeset	1908
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1909	return (bool)result;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1910	}
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1911
1977 4392ae3d8e31 (svn r2483) Replace almost 500 "uint tile" (and variants) with "TileIndex tile" tron parents: 1963 diff changeset	1912	void SetSignalsOnBothDir(TileIndex tile, byte track)
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1913	{
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1914	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	1915	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	1916
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1917	UpdateSignalsOnSegment(tile, _search_dir_1[track]);
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1918	UpdateSignalsOnSegment(tile, _search_dir_2[track]);
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1919	}
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1920
410 8de2aaf20800 (svn r607) -Patch: [ 985102 ] static cleanup tron parents: 408 diff changeset	1921	static uint GetSlopeZ_Track(TileInfo *ti)
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1922	{
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1923	uint z = ti->z;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1924	int th = ti->tileh;
13 3e7c1f74a996 (svn r14) Fix: railroad crossings on slopes are now possible dominik parents: 0 diff changeset	1925
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1926	// check if it's a foundation
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1927	if (ti->tileh != 0) {
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1928	if ((ti->map5 & 0x80) == 0) {
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1929	uint f = GetRailFoundation(ti->tileh, ti->map5 & 0x3F);
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1930	if (f != 0) {
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1931	if (f < 15) {
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1932	// leveled foundation
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1933	return z + 8;
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	// inclined foundation
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1936	th = _inclined_tileh[f - 15];
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1937	}
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1938	} else if ((ti->map5 & 0xC0) == 0xC0) {
395 4c990f33dab7 (svn r587) -newgrf: Rename all /Checkpoint/i tokens to 'Waypoint's. The name actually makes some sense and is also compatible with TTDPatch (pasky). darkvater parents: 393 diff changeset	1939	// depot or waypoint
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1940	return z + 8;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1941	}
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1942	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	1943	}
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1944	return z;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1945	}
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1946
1095 90220990fd7c (svn r1596) Add some more statics tron parents: 1093 diff changeset	1947	static uint GetSlopeTileh_Track(TileInfo *ti)
39 d177340ed556 (svn r40) Final slope graphics fix dominik parents: 22 diff changeset	1948	{
d177340ed556 (svn r40) Final slope graphics fix dominik parents: 22 diff changeset	1949	// check if it's a foundation
d177340ed556 (svn r40) Final slope graphics fix dominik parents: 22 diff changeset	1950	if (ti->tileh != 0) {
d177340ed556 (svn r40) Final slope graphics fix dominik parents: 22 diff changeset	1951	if ((ti->map5 & 0x80) == 0) {
d177340ed556 (svn r40) Final slope graphics fix dominik parents: 22 diff changeset	1952	uint f = GetRailFoundation(ti->tileh, ti->map5 & 0x3F);
d177340ed556 (svn r40) Final slope graphics fix dominik parents: 22 diff changeset	1953	if (f != 0) {
d177340ed556 (svn r40) Final slope graphics fix dominik parents: 22 diff changeset	1954	if (f < 15) {
d177340ed556 (svn r40) Final slope graphics fix dominik parents: 22 diff changeset	1955	// leveled foundation
d177340ed556 (svn r40) Final slope graphics fix dominik parents: 22 diff changeset	1956	return 0;
d177340ed556 (svn r40) Final slope graphics fix dominik parents: 22 diff changeset	1957	}
d177340ed556 (svn r40) Final slope graphics fix dominik parents: 22 diff changeset	1958	// inclined foundation
d177340ed556 (svn r40) Final slope graphics fix dominik parents: 22 diff changeset	1959	return _inclined_tileh[f - 15];
d177340ed556 (svn r40) Final slope graphics fix dominik parents: 22 diff changeset	1960	}
d177340ed556 (svn r40) Final slope graphics fix dominik parents: 22 diff changeset	1961	} else if ((ti->map5 & 0xC0) == 0xC0) {
395 4c990f33dab7 (svn r587) -newgrf: Rename all /Checkpoint/i tokens to 'Waypoint's. The name actually makes some sense and is also compatible with TTDPatch (pasky). darkvater parents: 393 diff changeset	1962	// depot or waypoint
39 d177340ed556 (svn r40) Final slope graphics fix dominik parents: 22 diff changeset	1963	return 0;
d177340ed556 (svn r40) Final slope graphics fix dominik parents: 22 diff changeset	1964	}
d177340ed556 (svn r40) Final slope graphics fix dominik parents: 22 diff changeset	1965	}
d177340ed556 (svn r40) Final slope graphics fix dominik parents: 22 diff changeset	1966	return ti->tileh;
d177340ed556 (svn r40) Final slope graphics fix dominik parents: 22 diff changeset	1967	}
d177340ed556 (svn r40) Final slope graphics fix dominik parents: 22 diff changeset	1968
1977 4392ae3d8e31 (svn r2483) Replace almost 500 "uint tile" (and variants) with "TileIndex tile" tron parents: 1963 diff changeset	1969	static void GetAcceptedCargo_Track(TileIndex tile, AcceptedCargo ac)
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1970	{
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1971	/* not used */
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1972	}
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1973
1977 4392ae3d8e31 (svn r2483) Replace almost 500 "uint tile" (and variants) with "TileIndex tile" tron parents: 1963 diff changeset	1974	static void AnimateTile_Track(TileIndex tile)
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1975	{
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1976	/* not used */
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1977	}
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1978
1977 4392ae3d8e31 (svn r2483) Replace almost 500 "uint tile" (and variants) with "TileIndex tile" tron parents: 1963 diff changeset	1979	static void TileLoop_Track(TileIndex tile)
0 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	byte a2;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1982	byte rail;
817 4f9377b7fd2b (svn r1288) -Codechange: changed _map2 to an uint16. It is still saved and loaded as truelight parents: 679 diff changeset	1983	uint16 m2;
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1984	byte owner;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1985
2049 ad0d49c916d4 (svn r2558) Change the internal map format from 7 arrays to one array of structs, this doesn't change the saved format for now. It's a stepping stone for further changes. tron parents: 2020 diff changeset	1986	m2 = _m[tile].m2 & 0xF;
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1987
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1988	/* special code for alps landscape */
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1989	if (_opt.landscape == LT_HILLY) {
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1990	/* convert into snow? */
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1991	if (GetTileZ(tile) > _opt.snow_line) {
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1992	a2 = RAIL_GROUND_ICE_DESERT;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1993	goto modify_me;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1994	}
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1995
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1996	/* special code for desert landscape */
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1997	} else if (_opt.landscape == LT_DESERT) {
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1998	/* convert into desert? */
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1999	if (GetMapExtraBits(tile) == 1) {
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	2000	a2 = RAIL_GROUND_ICE_DESERT;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	2001	goto modify_me;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	2002	}
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	2003	}
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	2004
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	2005	// Don't continue tile loop for depots
2049 ad0d49c916d4 (svn r2558) Change the internal map format from 7 arrays to one array of structs, this doesn't change the saved format for now. It's a stepping stone for further changes. tron parents: 2020 diff changeset	2006	if (_m[tile].m5 & RAIL_TYPE_SPECIAL)
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	2007	return;
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	a2 = RAIL_GROUND_GREEN;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	2010
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	2011	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	2012	/* determine direction of fence */
2049 ad0d49c916d4 (svn r2558) Change the internal map format from 7 arrays to one array of structs, this doesn't change the saved format for now. It's a stepping stone for further changes. tron parents: 2020 diff changeset	2013	rail = _m[tile].m5 & TRACK_BIT_MASK;
201 c40d343115f8 (svn r202) -Codechange: I missed some files with trailing spaces.. this should be truelight parents: 159 diff changeset	2014
1942 634961366cdc (svn r2448) General cleanup of rail related code, more to follow. matthijs parents: 1928 diff changeset	2015	if (rail == TRACK_BIT_UPPER) {
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	2016	a2 = RAIL_GROUND_FENCE_HORIZ1;
1942 634961366cdc (svn r2448) General cleanup of rail related code, more to follow. matthijs parents: 1928 diff changeset	2017	} else if (rail == TRACK_BIT_LOWER) {
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	2018	a2 = RAIL_GROUND_FENCE_HORIZ2;
1942 634961366cdc (svn r2448) General cleanup of rail related code, more to follow. matthijs parents: 1928 diff changeset	2019	} else if (rail == TRACK_BIT_LEFT) {
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	2020	a2 = RAIL_GROUND_FENCE_VERT1;
1942 634961366cdc (svn r2448) General cleanup of rail related code, more to follow. matthijs parents: 1928 diff changeset	2021	} else if (rail == TRACK_BIT_RIGHT) {
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	2022	a2 = RAIL_GROUND_FENCE_VERT2;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	2023	} else {
1901 fb05044cf5c3 (svn r2407) Use {Get,Is}TileOwner to get/check the owner of a tile and fix some bogus reads of _map_owner tron parents: 1891 diff changeset	2024	owner = GetTileOwner(tile);
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	2025
1942 634961366cdc (svn r2448) General cleanup of rail related code, more to follow. matthijs parents: 1928 diff changeset	2026	if ( (!(rail&(TRACK_BIT_DIAG2\|TRACK_BIT_UPPER\|TRACK_BIT_LEFT)) && (rail&TRACK_BIT_DIAG1)) \|\| rail==(TRACK_BIT_LOWER\|TRACK_BIT_RIGHT)) {
1981 de031d2aed47 (svn r2487) Replace TILE_XY by TileXY/TileDiffXY tron parents: 1980 diff changeset	2027	if (!IsTileType(tile + TileDiffXY(0, -1), MP_RAILWAY) \|\|
de031d2aed47 (svn r2487) Replace TILE_XY by TileXY/TileDiffXY tron parents: 1980 diff changeset	2028	!IsTileOwner(tile + TileDiffXY(0, -1), owner) \|\|
2049 ad0d49c916d4 (svn r2558) Change the internal map format from 7 arrays to one array of structs, this doesn't change the saved format for now. It's a stepping stone for further changes. tron parents: 2020 diff changeset	2029	(_m[tile + TileDiffXY(0, -1)].m5 == TRACK_BIT_UPPER \|\| _m[tile + TileDiffXY(0, -1)].m5 == TRACK_BIT_LEFT))
201 c40d343115f8 (svn r202) -Codechange: I missed some files with trailing spaces.. this should be truelight parents: 159 diff changeset	2030	a2 = RAIL_GROUND_FENCE_NW;
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	2031	}
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	2032
1942 634961366cdc (svn r2448) General cleanup of rail related code, more to follow. matthijs parents: 1928 diff changeset	2033	if ( (!(rail&(TRACK_BIT_DIAG2\|TRACK_BIT_LOWER\|TRACK_BIT_RIGHT)) && (rail&TRACK_BIT_DIAG1)) \|\| rail==(TRACK_BIT_UPPER\|TRACK_BIT_LEFT)) {
1981 de031d2aed47 (svn r2487) Replace TILE_XY by TileXY/TileDiffXY tron parents: 1980 diff changeset	2034	if (!IsTileType(tile + TileDiffXY(0, 1), MP_RAILWAY) \|\|
de031d2aed47 (svn r2487) Replace TILE_XY by TileXY/TileDiffXY tron parents: 1980 diff changeset	2035	!IsTileOwner(tile + TileDiffXY(0, 1), owner) \|\|
2049 ad0d49c916d4 (svn r2558) Change the internal map format from 7 arrays to one array of structs, this doesn't change the saved format for now. It's a stepping stone for further changes. tron parents: 2020 diff changeset	2036	(_m[tile + TileDiffXY(0, 1)].m5 == TRACK_BIT_LOWER \|\| _m[tile + TileDiffXY(0, 1)].m5 == TRACK_BIT_RIGHT))
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	2037	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	2038	}
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	2039
1942 634961366cdc (svn r2448) General cleanup of rail related code, more to follow. matthijs parents: 1928 diff changeset	2040	if ( (!(rail&(TRACK_BIT_DIAG1\|TRACK_BIT_UPPER\|TRACK_BIT_RIGHT)) && (rail&TRACK_BIT_DIAG2)) \|\| rail==(TRACK_BIT_LOWER\|TRACK_BIT_LEFT)) {
1981 de031d2aed47 (svn r2487) Replace TILE_XY by TileXY/TileDiffXY tron parents: 1980 diff changeset	2041	if (!IsTileType(tile + TileDiffXY(-1, 0), MP_RAILWAY) \|\|
de031d2aed47 (svn r2487) Replace TILE_XY by TileXY/TileDiffXY tron parents: 1980 diff changeset	2042	!IsTileOwner(tile + TileDiffXY(-1, 0), owner) \|\|
2049 ad0d49c916d4 (svn r2558) Change the internal map format from 7 arrays to one array of structs, this doesn't change the saved format for now. It's a stepping stone for further changes. tron parents: 2020 diff changeset	2043	(_m[tile + TileDiffXY(-1, 0)].m5 == TRACK_BIT_UPPER \|\| _m[tile + TileDiffXY(-1, 0)].m5 == TRACK_BIT_RIGHT))
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	2044	a2 = RAIL_GROUND_FENCE_NE;
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
1942 634961366cdc (svn r2448) General cleanup of rail related code, more to follow. matthijs parents: 1928 diff changeset	2047	if ( (!(rail&(TRACK_BIT_DIAG1\|TRACK_BIT_LOWER\|TRACK_BIT_LEFT)) && (rail&TRACK_BIT_DIAG2)) \|\| rail==(TRACK_BIT_UPPER\|TRACK_BIT_RIGHT)) {
1981 de031d2aed47 (svn r2487) Replace TILE_XY by TileXY/TileDiffXY tron parents: 1980 diff changeset	2048	if (!IsTileType(tile + TileDiffXY(1, 0), MP_RAILWAY) \|\|
de031d2aed47 (svn r2487) Replace TILE_XY by TileXY/TileDiffXY tron parents: 1980 diff changeset	2049	!IsTileOwner(tile + TileDiffXY(1, 0), owner) \|\|
2049 ad0d49c916d4 (svn r2558) Change the internal map format from 7 arrays to one array of structs, this doesn't change the saved format for now. It's a stepping stone for further changes. tron parents: 2020 diff changeset	2050	(_m[tile + TileDiffXY(1, 0)].m5 == TRACK_BIT_LOWER \|\| _m[tile + TileDiffXY(1, 0)].m5 == TRACK_BIT_LEFT))
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	2051	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	2052	}
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	2053	}
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	2054	}
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	2055
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	2056	modify_me:;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	2057	/* tile changed? */
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	2058	if ( m2 != a2) {
2049 ad0d49c916d4 (svn r2558) Change the internal map format from 7 arrays to one array of structs, this doesn't change the saved format for now. It's a stepping stone for further changes. tron parents: 2020 diff changeset	2059	_m[tile].m2 = (_m[tile].m2 & ~RAIL_MAP2LO_GROUND_MASK) \| a2;
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	2060	MarkTileDirtyByTile(tile);
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	2061	}
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	2062	}
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	2063
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	2064
1977 4392ae3d8e31 (svn r2483) Replace almost 500 "uint tile" (and variants) with "TileIndex tile" tron parents: 1963 diff changeset	2065	static uint32 GetTileTrackStatus_Track(TileIndex tile, TransportType mode)
4392ae3d8e31 (svn r2483) Replace almost 500 "uint tile" (and variants) with "TileIndex tile" tron parents: 1963 diff changeset	2066	{
817 4f9377b7fd2b (svn r1288) -Codechange: changed _map2 to an uint16. It is still saved and loaded as truelight parents: 679 diff changeset	2067	byte m5, a;
4f9377b7fd2b (svn r1288) -Codechange: changed _map2 to an uint16. It is still saved and loaded as truelight parents: 679 diff changeset	2068	uint16 b;
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	2069	uint32 ret;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	2070
159 139cf78bfb28 (svn r160) -Codechange: made GetTileTrackStatus more readable (blathijs) truelight parents: 149 diff changeset	2071	if (mode != TRANSPORT_RAIL)
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	2072	return 0;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	2073
2049 ad0d49c916d4 (svn r2558) Change the internal map format from 7 arrays to one array of structs, this doesn't change the saved format for now. It's a stepping stone for further changes. tron parents: 2020 diff changeset	2074	m5 = _m[tile].m5;
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	2075
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	2076	if (!(m5 & RAIL_TYPE_SPECIAL)) {
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	2077	ret = (m5 \| (m5 << 8)) & 0x3F3F;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	2078	if (!(m5 & RAIL_TYPE_SIGNALS)) {
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	2079	if ( (ret & 0xFF) == 3)
22 fe6f35cc987b (svn r23) -Some omments on the code (blathijs) darkvater parents: 13 diff changeset	2080	/* Diagonal crossing? */
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	2081	ret \|= 0x40;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	2082	} else {
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	2083	/* has_signals */
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	2084
2049 ad0d49c916d4 (svn r2558) Change the internal map format from 7 arrays to one array of structs, this doesn't change the saved format for now. It's a stepping stone for further changes. tron parents: 2020 diff changeset	2085	a = _m[tile].m3;
ad0d49c916d4 (svn r2558) Change the internal map format from 7 arrays to one array of structs, this doesn't change the saved format for now. It's a stepping stone for further changes. tron parents: 2020 diff changeset	2086	b = _m[tile].m2;
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	2087
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	2088	b &= a;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	2089
22 fe6f35cc987b (svn r23) -Some omments on the code (blathijs) darkvater parents: 13 diff changeset	2090	/* When signals are not present (in neither
fe6f35cc987b (svn r23) -Some omments on the code (blathijs) darkvater parents: 13 diff changeset	2091	* direction), we pretend them to be green. (So if
fe6f35cc987b (svn r23) -Some omments on the code (blathijs) darkvater parents: 13 diff changeset	2092	* signals are only one way, the other way will
fe6f35cc987b (svn r23) -Some omments on the code (blathijs) darkvater parents: 13 diff changeset	2093	* implicitely become `red' */
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	2094	if ((a & 0xC0) == 0) { b \|= 0xC0; }
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	2095	if ((a & 0x30) == 0) { b \|= 0x30; }
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	2096
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	2097	if ( (b & 0x80) == 0) ret \|= 0x10070000;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	2098	if ( (b & 0x40) == 0) ret \|= 0x7100000;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	2099	if ( (b & 0x20) == 0) ret \|= 0x20080000;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	2100	if ( (b & 0x10) == 0) ret \|= 0x8200000;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	2101	}
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	2102	} else if (m5 & 0x40) {
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	2103	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	2104	m5 = _train_spec_tracks[m5 & 0x3F];
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	2105	ret = (m5 << 8) + m5;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	2106	} else
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	2107	return 0;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	2108	return ret;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	2109	}
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	2110
1977 4392ae3d8e31 (svn r2483) Replace almost 500 "uint tile" (and variants) with "TileIndex tile" tron parents: 1963 diff changeset	2111	static void ClickTile_Track(TileIndex tile)
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	2112	{
1942 634961366cdc (svn r2448) General cleanup of rail related code, more to follow. matthijs parents: 1928 diff changeset	2113	if (IsTileDepotType(tile, TRANSPORT_RAIL))
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	2114	ShowTrainDepotWindow(tile);
2049 ad0d49c916d4 (svn r2558) Change the internal map format from 7 arrays to one array of structs, this doesn't change the saved format for now. It's a stepping stone for further changes. tron parents: 2020 diff changeset	2115	else if (IsRailWaypoint(_m[tile].m5))
1542 2ca6d1624e6d (svn r2046) -Codechange: moved all waypoint code to waypoint.c/waypoint.h truelight parents: 1536 diff changeset	2116	ShowRenameWaypointWindow(GetWaypointByTile(tile));
201 c40d343115f8 (svn r202) -Codechange: I missed some files with trailing spaces.. this should be truelight parents: 159 diff changeset	2117
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	2118	}
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	2119
1590 4e39d1da10c7 (svn r2094) In GetTileDesc_Track(): uint -> TileIndex, use enums, if () cascade -> switch tron parents: 1555 diff changeset	2120	static void GetTileDesc_Track(TileIndex tile, TileDesc *td)
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	2121	{
1901 fb05044cf5c3 (svn r2407) Use {Get,Is}TileOwner to get/check the owner of a tile and fix some bogus reads of _map_owner tron parents: 1891 diff changeset	2122	td->owner = GetTileOwner(tile);
1942 634961366cdc (svn r2448) General cleanup of rail related code, more to follow. matthijs parents: 1928 diff changeset	2123	switch (GetRailTileType(tile)) {
1590 4e39d1da10c7 (svn r2094) In GetTileDesc_Track(): uint -> TileIndex, use enums, if () cascade -> switch tron parents: 1555 diff changeset	2124	case RAIL_TYPE_NORMAL:
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	2125	td->str = STR_1021_RAILROAD_TRACK;
1590 4e39d1da10c7 (svn r2094) In GetTileDesc_Track(): uint -> TileIndex, use enums, if () cascade -> switch tron parents: 1555 diff changeset	2126	break;
4e39d1da10c7 (svn r2094) In GetTileDesc_Track(): uint -> TileIndex, use enums, if () cascade -> switch tron parents: 1555 diff changeset	2127
4e39d1da10c7 (svn r2094) In GetTileDesc_Track(): uint -> TileIndex, use enums, if () cascade -> switch tron parents: 1555 diff changeset	2128	case RAIL_TYPE_SIGNALS: {
2020 392890f32338 (svn r2529) - Fix: PBS signals showed up as normal signals with the query tool Darkvater parents: 2008 diff changeset	2129	const StringID signal_type[7] = {
1590 4e39d1da10c7 (svn r2094) In GetTileDesc_Track(): uint -> TileIndex, use enums, if () cascade -> switch tron parents: 1555 diff changeset	2130	STR_RAILROAD_TRACK_WITH_NORMAL_SIGNALS,
4e39d1da10c7 (svn r2094) In GetTileDesc_Track(): uint -> TileIndex, use enums, if () cascade -> switch tron parents: 1555 diff changeset	2131	STR_RAILROAD_TRACK_WITH_PRESIGNALS,
4e39d1da10c7 (svn r2094) In GetTileDesc_Track(): uint -> TileIndex, use enums, if () cascade -> switch tron parents: 1555 diff changeset	2132	STR_RAILROAD_TRACK_WITH_EXITSIGNALS,
2020 392890f32338 (svn r2529) - Fix: PBS signals showed up as normal signals with the query tool Darkvater parents: 2008 diff changeset	2133	STR_RAILROAD_TRACK_WITH_COMBOSIGNALS,
392890f32338 (svn r2529) - Fix: PBS signals showed up as normal signals with the query tool Darkvater parents: 2008 diff changeset	2134	STR_RAILROAD_TRACK_WITH_PBSSIGNALS,
392890f32338 (svn r2529) - Fix: PBS signals showed up as normal signals with the query tool Darkvater parents: 2008 diff changeset	2135	STR_NULL, STR_NULL
1590 4e39d1da10c7 (svn r2094) In GetTileDesc_Track(): uint -> TileIndex, use enums, if () cascade -> switch tron parents: 1555 diff changeset	2136	};
4e39d1da10c7 (svn r2094) In GetTileDesc_Track(): uint -> TileIndex, use enums, if () cascade -> switch tron parents: 1555 diff changeset	2137
2049 ad0d49c916d4 (svn r2558) Change the internal map format from 7 arrays to one array of structs, this doesn't change the saved format for now. It's a stepping stone for further changes. tron parents: 2020 diff changeset	2138	td->str = signal_type[_m[tile].m4 & 0x7];
1590 4e39d1da10c7 (svn r2094) In GetTileDesc_Track(): uint -> TileIndex, use enums, if () cascade -> switch tron parents: 1555 diff changeset	2139	break;
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	2140	}
1590 4e39d1da10c7 (svn r2094) In GetTileDesc_Track(): uint -> TileIndex, use enums, if () cascade -> switch tron parents: 1555 diff changeset	2141
1942 634961366cdc (svn r2448) General cleanup of rail related code, more to follow. matthijs parents: 1928 diff changeset	2142	case RAIL_TYPE_DEPOT_WAYPOINT:
1590 4e39d1da10c7 (svn r2094) In GetTileDesc_Track(): uint -> TileIndex, use enums, if () cascade -> switch tron parents: 1555 diff changeset	2143	default:
2049 ad0d49c916d4 (svn r2558) Change the internal map format from 7 arrays to one array of structs, this doesn't change the saved format for now. It's a stepping stone for further changes. tron parents: 2020 diff changeset	2144	td->str = ((_m[tile].m5 & RAIL_SUBTYPE_MASK) == RAIL_SUBTYPE_DEPOT) ?
1590 4e39d1da10c7 (svn r2094) In GetTileDesc_Track(): uint -> TileIndex, use enums, if () cascade -> switch tron parents: 1555 diff changeset	2145	STR_1023_RAILROAD_TRAIN_DEPOT : STR_LANDINFO_WAYPOINT;
4e39d1da10c7 (svn r2094) In GetTileDesc_Track(): uint -> TileIndex, use enums, if () cascade -> switch tron parents: 1555 diff changeset	2146	break;
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	2147	}
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	2148	}
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	2149
1977 4392ae3d8e31 (svn r2483) Replace almost 500 "uint tile" (and variants) with "TileIndex tile" tron parents: 1963 diff changeset	2150	static void ChangeTileOwner_Track(TileIndex tile, byte old_player, byte new_player)
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	2151	{
1901 fb05044cf5c3 (svn r2407) Use {Get,Is}TileOwner to get/check the owner of a tile and fix some bogus reads of _map_owner tron parents: 1891 diff changeset	2152	if (!IsTileOwner(tile, old_player)) return;
201 c40d343115f8 (svn r202) -Codechange: I missed some files with trailing spaces.. this should be truelight parents: 159 diff changeset	2153
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	2154	if (new_player != 255) {
1902 5d653da1abb7 (svn r2408) Introduce SetTileOwner() and use it tron parents: 1901 diff changeset	2155	SetTileOwner(tile, new_player);
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	2156	} else {
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	2157	DoCommandByTile(tile, 0, 0, DC_EXEC, CMD_LANDSCAPE_CLEAR);
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	2158	}
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	2159	}
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	2160
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	2161	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	2162	static const byte _fractcoords_enter[4] = { 0x8A, 0x48, 0x84, 0xA8 };
1922 797081e56d13 (svn r2428) - Feature: [newgrf] Implement shorter train vehicles (Therax), and the callback that goes with it. hackykid parents: 1903 diff changeset	2163	static const byte _deltacoord_leaveoffset[8] = {
797081e56d13 (svn r2428) - Feature: [newgrf] Implement shorter train vehicles (Therax), and the callback that goes with it. hackykid parents: 1903 diff changeset	2164	-1, 0, 1, 0, /* x */
797081e56d13 (svn r2428) - Feature: [newgrf] Implement shorter train vehicles (Therax), and the callback that goes with it. hackykid parents: 1903 diff changeset	2165	0, 1, 0, -1 /* y */
797081e56d13 (svn r2428) - Feature: [newgrf] Implement shorter train vehicles (Therax), and the callback that goes with it. hackykid parents: 1903 diff changeset	2166	};
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	2167	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	2168	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	2169	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	2170
1977 4392ae3d8e31 (svn r2483) Replace almost 500 "uint tile" (and variants) with "TileIndex tile" tron parents: 1963 diff changeset	2171	static uint32 VehicleEnter_Track(Vehicle *v, TileIndex tile, int x, int y)
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	2172	{
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	2173	byte fract_coord;
1922 797081e56d13 (svn r2428) - Feature: [newgrf] Implement shorter train vehicles (Therax), and the callback that goes with it. hackykid parents: 1903 diff changeset	2174	byte fract_coord_leave;
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	2175	int dir;
1922 797081e56d13 (svn r2428) - Feature: [newgrf] Implement shorter train vehicles (Therax), and the callback that goes with it. hackykid parents: 1903 diff changeset	2176	int length;
201 c40d343115f8 (svn r202) -Codechange: I missed some files with trailing spaces.. this should be truelight parents: 159 diff changeset	2177
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	2178	// this routine applies only to trains in depot tiles
1942 634961366cdc (svn r2448) General cleanup of rail related code, more to follow. matthijs parents: 1928 diff changeset	2179	if (v->type != VEH_Train \|\| !IsTileDepotType(tile, TRANSPORT_RAIL))
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	2180	return 0;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	2181
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	2182	/* depot direction */
1942 634961366cdc (svn r2448) General cleanup of rail related code, more to follow. matthijs parents: 1928 diff changeset	2183	dir = GetDepotDirection(tile, TRANSPORT_RAIL);
201 c40d343115f8 (svn r202) -Codechange: I missed some files with trailing spaces.. this should be truelight parents: 159 diff changeset	2184
1922 797081e56d13 (svn r2428) - Feature: [newgrf] Implement shorter train vehicles (Therax), and the callback that goes with it. hackykid parents: 1903 diff changeset	2185	/* calculate the point where the following wagon should be activated */
797081e56d13 (svn r2428) - Feature: [newgrf] Implement shorter train vehicles (Therax), and the callback that goes with it. hackykid parents: 1903 diff changeset	2186	/* this depends on the length of the current vehicle */
797081e56d13 (svn r2428) - Feature: [newgrf] Implement shorter train vehicles (Therax), and the callback that goes with it. hackykid parents: 1903 diff changeset	2187	length = v->u.rail.cached_veh_length;
797081e56d13 (svn r2428) - Feature: [newgrf] Implement shorter train vehicles (Therax), and the callback that goes with it. hackykid parents: 1903 diff changeset	2188
797081e56d13 (svn r2428) - Feature: [newgrf] Implement shorter train vehicles (Therax), and the callback that goes with it. hackykid parents: 1903 diff changeset	2189	fract_coord_leave =
797081e56d13 (svn r2428) - Feature: [newgrf] Implement shorter train vehicles (Therax), and the callback that goes with it. hackykid parents: 1903 diff changeset	2190	((_fractcoords_enter[dir] & 0x0F) + // x
797081e56d13 (svn r2428) - Feature: [newgrf] Implement shorter train vehicles (Therax), and the callback that goes with it. hackykid parents: 1903 diff changeset	2191	(length + 1) * _deltacoord_leaveoffset[dir]) +
797081e56d13 (svn r2428) - Feature: [newgrf] Implement shorter train vehicles (Therax), and the callback that goes with it. hackykid parents: 1903 diff changeset	2192	(((_fractcoords_enter[dir] >> 4) + // y
797081e56d13 (svn r2428) - Feature: [newgrf] Implement shorter train vehicles (Therax), and the callback that goes with it. hackykid parents: 1903 diff changeset	2193	((length + 1) * _deltacoord_leaveoffset[dir+4])) << 4);
797081e56d13 (svn r2428) - Feature: [newgrf] Implement shorter train vehicles (Therax), and the callback that goes with it. hackykid parents: 1903 diff changeset	2194
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	2195	fract_coord = (x & 0xF) + ((y & 0xF) << 4);
1922 797081e56d13 (svn r2428) - Feature: [newgrf] Implement shorter train vehicles (Therax), and the callback that goes with it. hackykid parents: 1903 diff changeset	2196
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	2197	if (_fractcoords_behind[dir] == fract_coord) {
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	2198	/* 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	2199	return 8;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	2200	} else if (_fractcoords_enter[dir] == fract_coord) {
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	2201	if (_enter_directions[dir] == v->direction) {
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	2202	/* enter the depot */
2008 c9d6585c96c8 (svn r2516) - Feature: [pbs] Implement path-based-signalling. This allows multiple trains within the same signal block, provided their paths dont intersect. For this the block must have all exit and entry signals be pbs signals. Place these by ctrl-clicking 4 times on a normal signal. hackykid parents: 2007 diff changeset	2203	if (v->next == NULL)
c9d6585c96c8 (svn r2516) - Feature: [pbs] Implement path-based-signalling. This allows multiple trains within the same signal block, provided their paths dont intersect. For this the block must have all exit and entry signals be pbs signals. Place these by ctrl-clicking 4 times on a normal signal. hackykid parents: 2007 diff changeset	2204	PBSClearTrack(v->tile, FIND_FIRST_BIT(v->u.rail.track));
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	2205	v->u.rail.track = 0x80,
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	2206	v->vehstatus \|= VS_HIDDEN; /* hide it */
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	2207	v->direction ^= 4;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	2208	if (v->next == NULL)
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	2209	TrainEnterDepot(v, tile);
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	2210	v->tile = tile;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	2211	InvalidateWindow(WC_VEHICLE_DEPOT, tile);
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	2212	return 4;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	2213	}
1922 797081e56d13 (svn r2428) - Feature: [newgrf] Implement shorter train vehicles (Therax), and the callback that goes with it. hackykid parents: 1903 diff changeset	2214	} else if (fract_coord_leave == fract_coord) {
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	2215	if (_leave_directions[dir] == v->direction) {
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	2216	/* leave the depot? */
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	2217	if ((v=v->next) != NULL) {
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	2218	v->vehstatus &= ~VS_HIDDEN;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	2219	v->u.rail.track = _depot_track_mask[dir];
1330 8a67d04016ce (svn r1834) - Fix: NPF does not check the owner of its target, busses try to enter other players' depots. TODO matthijs parents: 1328 diff changeset	2220	assert(v->u.rail.track);
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	2221	}
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	2222	}
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	2223	}
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	2224
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	2225	return 0;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	2226	}
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	2227
1093 e8d26c7dc42f (svn r1594) Convert all undefined parameter lists to (void) and add the appropriate warning flags in the Makefile tron parents: 1084 diff changeset	2228	void InitializeRail(void)
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	2229	{
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	2230	_last_built_train_depot_tile = 0;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	2231	}
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	2232
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	2233	const TileTypeProcs _tile_type_rail_procs = {
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	2234	DrawTile_Track, /* draw_tile_proc */
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	2235	GetSlopeZ_Track, /* get_slope_z_proc */
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	2236	ClearTile_Track, /* clear_tile_proc */
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	2237	GetAcceptedCargo_Track, /* get_accepted_cargo_proc */
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	2238	GetTileDesc_Track, /* get_tile_desc_proc */
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	2239	GetTileTrackStatus_Track, /* get_tile_track_status_proc */
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	2240	ClickTile_Track, /* click_tile_proc */
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	2241	AnimateTile_Track, /* animate_tile_proc */
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	2242	TileLoop_Track, /* tile_loop_clear */
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	2243	ChangeTileOwner_Track, /* change_tile_owner_clear */
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	2244	NULL, /* get_produced_cargo_proc */
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	2245	VehicleEnter_Track, /* vehicle_enter_tile_proc */
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	2246	NULL, /* vehicle_leave_tile_proc */
39 d177340ed556 (svn r40) Final slope graphics fix dominik parents: 22 diff changeset	2247	GetSlopeTileh_Track, /* get_slope_tileh_proc */
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	2248	};

author	ludde
	Mon, 01 Aug 2005 16:31:19 +0000
changeset 2261	3f78323707bb
parent 2254	72f8883ff3ac
child 2364	5ac6c8d6e031
permissions	-rw-r--r--