Skip to content

Commit 1f64f02

Browse files
committed
Improve warning message for signal location mismatch.
This is a warning logged for the BNSF starter route.
1 parent 5522fc5 commit 1f64f02

File tree

1 file changed

+4
-1
lines changed
  • Source/Orts.Simulation/Simulation/Signalling

1 file changed

+4
-1
lines changed

Source/Orts.Simulation/Simulation/Signalling/Signals.cs

+4-1
Original file line numberDiff line numberDiff line change
@@ -444,23 +444,26 @@ private void BuildSignalWorld(Simulator simulator, SignalConfigurationFile sigcf
444444

445445
//check if signalheads are on same or adjacent tile as signal itself - otherwise there is an invalid match
446446
uint? BadSignal = null;
447+
string badSignalMsg = "";
447448
foreach (var si in thisWorldObject.SignalUnits.Units)
448449
{
449450
if (this.trackDB.TrItemTable == null || si.TrItem >= this.trackDB.TrItemTable.Count())
450451
{
451452
BadSignal = si.TrItem;
453+
badSignalMsg = "not present in .tdb file";
452454
break;
453455
}
454456
var item = this.trackDB.TrItemTable[si.TrItem];
455457
if (Math.Abs(item.TileX - WFile.TileX) > 1 || Math.Abs(item.TileZ - WFile.TileZ) > 1)
456458
{
457459
BadSignal = si.TrItem;
460+
badSignalMsg = String.Format("not matching .tdb tile location {0} {1}", item.TileX, item.TileZ);
458461
break;
459462
}
460463
}
461464
if (BadSignal.HasValue)
462465
{
463-
Trace.TraceWarning("Signal referenced in .w file {0} {1} as TrItem {2} not present in .tdb file ", WFile.TileX, WFile.TileZ, BadSignal.Value);
466+
Trace.TraceWarning("Signal referenced in .w file {0} {1} as TrItem {2} {3} ", WFile.TileX, WFile.TileZ, BadSignal.Value, badSignalMsg);
464467
continue;
465468
}
466469

0 commit comments

Comments
 (0)