summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorcelestar <celestar@openttd.org>2006-04-05 08:45:29 +0000
committercelestar <celestar@openttd.org>2006-04-05 08:45:29 +0000
commit4ccbf2d80743a43cdd5cb19bad700a1eeb87c0b6 (patch)
treec454ccb001b57d698151226a2da39d5e59c23316
parent4acb8d5364fbd6fbb69468c14beb57b751a7e2e4 (diff)
downloadopenttd-4ccbf2d80743a43cdd5cb19bad700a1eeb87c0b6.tar.xz
(svn r4282) -Cleanup: Re-arranged the ignore groups into a more readable arrangement
-rw-r--r--table/elrail_data.h81
1 files changed, 41 insertions, 40 deletions
diff --git a/table/elrail_data.h b/table/elrail_data.h
index c9965f51d..ac613a0dd 100644
--- a/table/elrail_data.h
+++ b/table/elrail_data.h
@@ -97,79 +97,80 @@ static byte PreferredPPPofTrackBitAtPCP[TRACK_END][DIAGDIR_END] = {
};
#undef PCP_NOT_ON_TRACK
+
#define NUM_IGNORE_GROUPS 3
-#define NO_IGNORE 0xFF
+#define IGNORE_NONE 0xFF
/** In case we have a staight line, we place pylon only every two tiles,
so there are certain tiles which we ignore. A straight line is found if
- we have exactly two preferred points.*/
+ we have exactly two PPPs. */
static byte IgnoredPCP[NUM_IGNORE_GROUPS][TLG_END][DIAGDIR_END] = {
- { /* Ignore group 1 */
+ { /* Ignore group 1, X and Y tracks */
{ /* X even, Y even */
- 1 << DIR_N | 1 << DIR_S,
+ IGNORE_NONE,
1 << DIR_NE | 1 << DIR_SW,
1 << DIR_NW | 1 << DIR_SE,
- 1 << DIR_W | 1 << DIR_E
+ IGNORE_NONE
}, { /* X even, Y odd */
- 0xFF,
- 1 << DIR_E | 1 << DIR_W,
+ IGNORE_NONE,
+ IGNORE_NONE,
1 << DIR_NW | 1 << DIR_SE,
1 << DIR_NE | 1 << DIR_SW
}, { /* X odd, Y even */
1 << DIR_NW | 1 << DIR_SE,
1 << DIR_NE | 1 << DIR_SW,
- 1 << DIR_N | 1 << DIR_S ,
- 0xFF
+ IGNORE_NONE,
+ IGNORE_NONE
}, { /* X odd, Y odd */
1 << DIR_NW | 1 << DIR_SE,
- 0xFF,
- 0xFF,
+ IGNORE_NONE,
+ IGNORE_NONE,
1 << DIR_NE | 1 << DIR_SW
}
},
- { /* Ignore group 2 */
+ { /* Ignore group 2, LEFT and RIGHT tracks */
{
1 << DIR_E | 1 << DIR_W,
- 1 << DIR_N | 1 << DIR_S,
- 0xFF,
+ IGNORE_NONE,
+ IGNORE_NONE,
1 << DIR_E | 1 << DIR_W
}, {
- 0xFF,
- 0xFF,
- 1 << DIR_N | 1 << DIR_S,
- 1 << DIR_N | 1 << DIR_S
+ IGNORE_NONE,
+ 1 << DIR_E | 1 << DIR_W,
+ 1 << DIR_E | 1 << DIR_W,
+ IGNORE_NONE
}, {
- 0xFF,
+ IGNORE_NONE,
1 << DIR_E | 1 << DIR_W,
1 << DIR_E | 1 << DIR_W,
- 1 << DIR_N | 1 << DIR_S
+ IGNORE_NONE
}, {
- 1 << DIR_N | 1 << DIR_S,
- 1 << DIR_N | 1 << DIR_S,
- 0xFF,
+ 1 << DIR_E | 1 << DIR_W,
+ IGNORE_NONE,
+ IGNORE_NONE,
1 << DIR_E | 1 << DIR_W
}
},
- { /* Ignore group 3 */
+ { /* Ignore group 3, UPPER and LOWER tracks */
{
- 0xFF,
- 0xFF,
- 0xFF,
- 0xFF
+ 1 << DIR_N | 1 << DIR_S,
+ 1 << DIR_N | 1 << DIR_S,
+ IGNORE_NONE,
+ IGNORE_NONE
}, {
- 0xFF,
- 0xFF,
- 1 << DIR_E | 1 << DIR_W,
- 0xFF
+ IGNORE_NONE,
+ IGNORE_NONE,
+ 1 << DIR_N | 1 << DIR_S,
+ 1 << DIR_N | 1 << DIR_S
}, {
- 0xFF,
- 0xFF,
- 0xFF,
- 0xFF
+ IGNORE_NONE,
+ IGNORE_NONE,
+ 1 << DIR_N | 1 << DIR_S ,
+ 1 << DIR_N | 1 << DIR_S
}, {
- 1 << DIR_E | 1 << DIR_W,
- 0xFF,
- 0xFF,
- 0xFF
+ 1 << DIR_N | 1 << DIR_S,
+ 1 << DIR_N | 1 << DIR_S,
+ IGNORE_NONE,
+ IGNORE_NONE
}
}
};