summaryrefslogtreecommitdiff
path: root/table
diff options
context:
space:
mode:
authorcelestar <celestar@openttd.org>2006-04-05 09:17:43 +0000
committercelestar <celestar@openttd.org>2006-04-05 09:17:43 +0000
commit0c3a0c7ec0c38ffbaddc5c9ed3274ff1b01e8781 (patch)
tree7d4c4bab011a53d98d081a0cf8bf36e133838218 /table
parent4ccbf2d80743a43cdd5cb19bad700a1eeb87c0b6 (diff)
downloadopenttd-0c3a0c7ec0c38ffbaddc5c9ed3274ff1b01e8781.tar.xz
(svn r4283) -Cleanup: More elrail housekeeping, remove code dublication, more meaningful variable names, simplify control flow..
Diffstat (limited to 'table')
-rw-r--r--table/elrail_data.h12
1 files changed, 6 insertions, 6 deletions
diff --git a/table/elrail_data.h b/table/elrail_data.h
index ac613a0dd..85a7eea5c 100644
--- a/table/elrail_data.h
+++ b/table/elrail_data.h
@@ -26,7 +26,7 @@ typedef enum {
} TileSource;
enum {
- TRACKS_AT_PCP = 6
+ NUM_TRACKS_AT_PCP = 6
};
/** Which PPPs are possible at all on a given PCP */
@@ -62,7 +62,7 @@ static const DiagDirection PCPpositions[TRACK_END][2] = {
track, plus the point in extension of the track (to mark end-of-track). PCPs
which are not on either end of the track are fully preferred.
@see PCPpositions */
-static byte PreferredPPPofTrackBitAtPCP[TRACK_END][DIAGDIR_END] = {
+static byte PreferredPPPofTrackAtPCP[TRACK_END][DIAGDIR_END] = {
{ /* X */
1 << DIR_NE | 1 << DIR_SE | 1 << DIR_NW, /* NE */
PCP_NOT_ON_TRACK, /* SE */
@@ -178,7 +178,7 @@ static byte IgnoredPCP[NUM_IGNORE_GROUPS][TLG_END][DIAGDIR_END] = {
#undef NO_IGNORE
/** Which pylons can definately NOT be built */
-static byte DisallowedPPPofTrackBitAtPCP[TRACK_END][DIAGDIR_END] = {
+static byte DisallowedPPPofTrackAtPCP[TRACK_END][DIAGDIR_END] = {
{1 << DIR_SW | 1 << DIR_NE, 0, 1 << DIR_SW | 1 << DIR_NE, 0 }, /* X */
{0, 1 << DIR_NW | 1 << DIR_SE, 0, 1 << DIR_NW | 1 << DIR_SE}, /* Y */
{1 << DIR_W | 1 << DIR_E, 0, 0, 1 << DIR_W | 1 << DIR_E }, /* UPPER */
@@ -188,16 +188,16 @@ static byte DisallowedPPPofTrackBitAtPCP[TRACK_END][DIAGDIR_END] = {
};
/* This array stores which track bits can meet at a tile edge */
-static const Track PPPtracks[DIAGDIR_END][TRACKS_AT_PCP] = {
+static const Track TracksAtPCP[DIAGDIR_END][NUM_TRACKS_AT_PCP] = {
{TRACK_X, TRACK_X, TRACK_UPPER, TRACK_LOWER, TRACK_LEFT, TRACK_RIGHT},
{TRACK_Y, TRACK_Y, TRACK_UPPER, TRACK_LOWER, TRACK_LEFT, TRACK_RIGHT},
{TRACK_X, TRACK_X, TRACK_UPPER, TRACK_LOWER, TRACK_LEFT, TRACK_RIGHT},
{TRACK_Y, TRACK_Y, TRACK_UPPER, TRACK_LOWER, TRACK_LEFT, TRACK_RIGHT},
};
-/* takes each of the 8 track bits from the array above and
+/* takes each of the 6 track bits from the array above and
assigns it to the home tile or neighbour tile */
-static const TileSource trackorigin[DIAGDIR_END][TRACKS_AT_PCP] = {
+static const TileSource TrackSourceTile[DIAGDIR_END][NUM_TRACKS_AT_PCP] = {
{TS_HOME, TS_NEIGHBOUR, TS_HOME , TS_NEIGHBOUR, TS_NEIGHBOUR, TS_HOME },
{TS_HOME, TS_NEIGHBOUR, TS_NEIGHBOUR, TS_HOME , TS_NEIGHBOUR, TS_HOME },
{TS_HOME, TS_NEIGHBOUR, TS_NEIGHBOUR, TS_HOME , TS_HOME , TS_NEIGHBOUR},