Fix TCAS aircraft count

fpw · Jan 26, 2021 · 56ece3a · 56ece3a · mjh65 · Feb 1, 2021
1 parent a5e80fd
commit 56ece3a
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 7 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -1,5 +1,5 @@
 cmake_minimum_required(VERSION 3.9)
-project(AviTab VERSION 0.4.5 DESCRIPTION "AviTab X-Plane plugin")
+project(AviTab VERSION 0.4.6 DESCRIPTION "AviTab X-Plane plugin")
 
 if (NOT "$ENV{NAVIGRAPH_SECRET}" STREQUAL "")
     set(NAVIGRAPH_SECRET "$ENV{NAVIGRAPH_SECRET}" CACHE INTERNAL "Copied from environment variable")

diff --git a/src/environment/xplane/XPlaneEnvironment.cpp b/src/environment/xplane/XPlaneEnvironment.cpp
@@ -271,12 +271,17 @@ float XPlaneEnvironment::onFlightLoop(float elapsedSinceLastCall, float elapseSi
 
     updatePlaneCount();
     for (AircraftID i = 0; i <= otherAircraftCount; ++i) {
-        Location loc;
-        loc.latitude = dataCache.getLocationData(i, 0).doubleValue;
-        loc.longitude = dataCache.getLocationData(i, 1).doubleValue;
-        loc.elevation = dataCache.getLocationData(i, 2).doubleValue;
-        loc.heading = dataCache.getLocationData(i, 3).floatValue;
-        activeAircraftLocations.push_back(loc);
+        try {
+            Location loc;
+            loc.latitude = dataCache.getLocationData(i, 0).doubleValue;
+            loc.longitude = dataCache.getLocationData(i, 1).doubleValue;
+            loc.elevation = dataCache.getLocationData(i, 2).doubleValue;
+            loc.heading = dataCache.getLocationData(i, 3).floatValue;
+            activeAircraftLocations.push_back(loc);
+        } catch (const std::exception &e) {
+            // silently ignore to avoid flooding the log
+            // can fail with TCAS override, more than 19 AI aircraft
+        }
     }
 
     {
@@ -389,6 +394,9 @@ void XPlaneEnvironment::updatePlaneCount() {
     XPLMCountAircraft(&tmp1, &active, &tmp2);
     if (active > 0) {
         otherAircraftCount = active - 1;
+        if (otherAircraftCount > MAX_AI_AIRCRAFT) {
+            otherAircraftCount = MAX_AI_AIRCRAFT;
+        }
     } else {
         otherAircraftCount = 0;
     }