cpp/openttd-patchpack/source Changeset - r3450:279b1b5bdf8b

Changeset - r3450:279b1b5bdf8b

Parent rev.

Child rev.

[Not reviewed]

master

0 1 0

celestar - 19 years ago 2006-04-05 08:45:29
celestar@openttd.org

(svn r4282) -Cleanup: Re-arranged the ignore groups into a more readable arrangement

1 file changed with 45 insertions and 44 deletions:

table/elrail_data.h

0 comments (0 inline, 0 general)

table/elrail_data.h

➞

Show inline comments

@@ @@ -97,79 +97,80 @@ static byte PreferredPPPofTrackBitAtPCP[ @@
 };
 #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 */
-<< DIR_N  | 1 << DIR_S,
+			IGNORE_NONE,
 << DIR_NE | 1 << DIR_SW,
 << DIR_NW | 1 << DIR_SE,
-<< DIR_W  | 1 << DIR_E
+			IGNORE_NONE
 		}, { /* X even, Y odd  */
 xFF,
 << DIR_E  | 1 << DIR_W,
 			IGNORE_NONE,
 			IGNORE_NONE,
 << DIR_NW | 1 << DIR_SE,
 << DIR_NE | 1 << DIR_SW
 		}, { /* X odd,  Y even */
 << DIR_NW | 1 << DIR_SE,
 << DIR_NE | 1 << DIR_SW,
 << DIR_N  | 1 << DIR_S ,
 xFF
 			IGNORE_NONE,
 			IGNORE_NONE
 		}, { /* X odd,  Y odd  */
 << DIR_NW | 1 << DIR_SE,
 xFF,
 xFF,
 			IGNORE_NONE,
 			IGNORE_NONE,
 << DIR_NE | 1 << DIR_SW
+		}
 	},
 	{   /* Ignore group 2 */
+	{   /* Ignore group 2, LEFT and RIGHT tracks */
+		{
 << DIR_E | 1 << DIR_W,
 << DIR_N | 1 << DIR_S,
 xFF,
 			IGNORE_NONE,
 			IGNORE_NONE,
 << DIR_E | 1 << DIR_W
 		}, {
 xFF,
 xFF,
 			IGNORE_NONE,
 << DIR_E | 1 << DIR_W,
 << DIR_E | 1 << DIR_W,
 			IGNORE_NONE
 		}, {
 			IGNORE_NONE,
 << DIR_E | 1 << DIR_W,
 << DIR_E | 1 << DIR_W,
 			IGNORE_NONE
 		}, {
 << DIR_E | 1 << DIR_W,
 			IGNORE_NONE,
 			IGNORE_NONE,
 << DIR_E | 1 << DIR_W
+		}
 	},
 	{   /* Ignore group 3, UPPER and LOWER tracks */
+		{
 << DIR_N | 1 << DIR_S,
 << DIR_N | 1 << DIR_S,
 			IGNORE_NONE,
 			IGNORE_NONE
 		}, {
 			IGNORE_NONE,
 			IGNORE_NONE,
 << DIR_N | 1 << DIR_S,
 << DIR_N | 1 << DIR_S
 		}, {
 xFF,
 << DIR_E | 1 << DIR_W,
 << DIR_E | 1 << DIR_W,
 			IGNORE_NONE,
 			IGNORE_NONE,
 << DIR_N | 1 << DIR_S ,
 << DIR_N | 1 << DIR_S
 		}, {
 << DIR_N | 1 << DIR_S,
 << DIR_N | 1 << DIR_S,
 xFF,
 << DIR_E | 1 << DIR_W
+		}
 	},
 	{   /* Ignore group 3 */
+		{
 xFF,
 xFF,
 xFF,
 xFF
 		}, {
 xFF,
 xFF,
 << DIR_E | 1 << DIR_W,
 xFF
 		}, {
 xFF,
 xFF,
 xFF,
 xFF
 		}, {
 << DIR_E | 1 << DIR_W,
 xFF,
 xFF,
 xFF
 			IGNORE_NONE,
 			IGNORE_NONE
+		}
+	}
 };

0 comments (0 inline, 0 general)