Skip to content

Commit 2a997c5

Browse files
committed
Fixes or removes conflicting overrides involving Viaduct AVE T-Ints.
1 parent 1afc93c commit 2a997c5

2 files changed

Lines changed: 2 additions & 4 deletions

File tree

Controller/RUL2/06_Road_Viaducts/Sec6a_L1.txt

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9639,9 +9639,7 @@
96399639
0x04006500,0,0,0x5C080000,1,0=0x04007100,2,0,0x5C080000,1,0
96409640
0x04006500,1,0,0x5C080000,3,1=0x04007100,0,1,0x5C080000,3,1
96419641
0x04007100,0,0,0x04006300,2,0=0x04007100,0,0,0x04007100,0,1
9642-
0x04007100,2,1,0x04006300,0,1=0x04007100,2,1,0x04007100,0,1; conflicting-override
96439642
0x04007100,1,0,0x04006300,0,1=0x04007100,1,0,0x04009000,2,0
9644-
0x04007100,3,1,0x04006300,2,0=0x04007100,3,1,0x04009000,3,0; conflicting-override
96459643
0x04006400,1,0,0x04009000,2,0=0x04009000,1,0,0x04009000,2,0; conflicting-override
96469644
0x04006400,2,0,0x04009000,3,0=0x04009000,0,0,0x04009000,3,0
96479645
0x04007100,1,1,0x57700000,1,0=0x04009000,2,0,0x5C080000,1,0

Controller/RUL2/06_Road_Viaducts/Sec6b_L2.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10209,8 +10209,8 @@
1020910209
0x5C050000,1,0,0x04008200,3,0=0x5C050000,1,0,0x5C053120,3,0
1021010210
0x5C050000,3,0,0x04008200,1,0=0x5C050000,3,0,0x5C053120,1,0
1021110211
;Long
10212-
0x5C050000,1,0,0x04008800,3,0=0x5C050000,1,0,0x5C053115,3,0; conflicting-override; missing_paths
10213-
0x5C050000,3,0,0x04008800,1,0=0x5C050000,3,0,0x5C053115,1,0; conflicting-override; missing_paths
10212+
0x5C050000,1,0,0x04008800,3,0=0x5C050000,1,0,0x5C053125,3,0; conflicting-override; missing_paths
10213+
0x5C050000,3,0,0x04008800,1,0=0x5C050000,3,0,0x5C053125,1,0; conflicting-override; missing_paths
1021410214
;One-Way Road T (Avenue End)
1021510215
0x5C050000,1,0,0x091a5500,1,1=0x5C050000,1,0,0x5C043320,1,1
1021610216
0x5C050000,3,0,0x091a5500,3,0=0x5C050000,3,0,0x5C043320,3,0

0 commit comments

Comments
 (0)