Skip to content
This repository has been archived by the owner on Sep 24, 2020. It is now read-only.

Commit

Permalink
Fixed the Traffic++ detection code. No longer disables the
Browse files Browse the repository at this point in the history
Lane Changer and Traffic Remover features errantly.
  • Loading branch information
seiggy committed Jul 23, 2015
1 parent 402fe93 commit ea5a76d
Show file tree
Hide file tree
Showing 6 changed files with 911 additions and 801 deletions.
3 changes: 2 additions & 1 deletion TLM/TLM.sln.DotSettings
Original file line number Diff line number Diff line change
@@ -1,2 +1,3 @@
<wpf:ResourceDictionary xml:space="preserve" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:s="clr-namespace:System;assembly=mscorlib" xmlns:ss="urn:shemas-jetbrains-com:settings-storage-xaml" xmlns:wpf="http://schemas.microsoft.com/winfx/2006/xaml/presentation">
<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=AI/@EntryIndexedValue">AI</s:String></wpf:ResourceDictionary>
<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=AI/@EntryIndexedValue">AI</s:String>
<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=GUI/@EntryIndexedValue">GUI</s:String></wpf:ResourceDictionary>
4 changes: 2 additions & 2 deletions TLM/TLM/SegmentRestrictions.cs
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@ class SegmentRestrictions

public SegmentRestrictions(int segmentid, List<int> segmentGroup )
{
this._segmentId = segmentid;
this.SegmentGroup = new List<int>(segmentGroup);
_segmentId = segmentid;
SegmentGroup = new List<int>(segmentGroup);
}

public void AddLane(uint lane, int lanenum, NetInfo.Direction dir)
Expand Down
2 changes: 1 addition & 1 deletion TLM/TLM/SerializableDataExtension.cs
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ public void OnLoadData()
}
}

private static void OnLoadDataTimed(Object source, ElapsedEventArgs e)
private static void OnLoadDataTimed(object source, ElapsedEventArgs e)
{
byte[] data = SerializableData.LoadData(DataId);

Expand Down
2 changes: 1 addition & 1 deletion TLM/TLM/ThreadingExtension.cs
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ public override void OnUpdate(float realTimeDelta, float simulationTimeDelta)
null),
typeof (CustomHumanAI).GetMethod("CustomCheckTrafficLights"));

if (!LoadingExtension.IsPathManagerCompatibile)
if (LoadingExtension.IsPathManagerCompatibile)
{
Debug.Log("Traffic++ Not detected. Loading Pathfinder.");
Debug.Log("Redirecting CarAI Simulation Step Calls");
Expand Down
Loading

0 comments on commit ea5a76d

Please sign in to comment.