Fix weather in XP11

fpw · May 7, 2023 · aa5892e · aa5892e
1 parent ee2d74e
commit aa5892e
Show file tree

Hide file tree

Showing 6 changed files with 8 additions and 9 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -1,5 +1,5 @@
 cmake_minimum_required(VERSION 3.9)
-project(AviTab VERSION 0.6.1 DESCRIPTION "AviTab X-Plane plugin")
+project(AviTab VERSION 0.6.2 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/lib/cairo b/lib/cairo
diff --git a/lib/litehtml b/lib/litehtml
diff --git a/lib/pixman b/lib/pixman
diff --git a/src/environment/xplane/XPlaneEnvironment.cpp b/src/environment/xplane/XPlaneEnvironment.cpp
@@ -44,8 +44,9 @@ XPlaneEnvironment::XPlaneEnvironment() {
     XPLMHostApplicationID hostId;
     XPLMGetVersions(&xpVersion, &xplmVersion, &hostId);
     if (xplmVersion >= 400) {
-        isXP12 = true;
         getMetar = (GetMetarPtr) XPLMFindSymbol("XPLMGetMETARForAirport");
+    } else {
+        getMetar = nullptr;
     }
 
     updatePlaneCount();
@@ -363,18 +364,14 @@ double XPlaneEnvironment::getMagneticVariation(double lat, double lon) {
 
 std::string XPlaneEnvironment::getMETARForAirport(const std::string &icao) {
     std::string metar, timestamp;
-    if (isXP12) {
+    if (getMetar) {
         std::promise<std::string> dataPromise;
         auto futureData = dataPromise.get_future();
 
         auto startAt = std::chrono::steady_clock::now();
         runInEnvironment([this, icao, &dataPromise] () {
             XPLMFixedString150_t buf;
-            if (getMetar) {
-                getMetar(icao.c_str(), &buf);
-            } else {
-                strcpy(buf.buffer, "XPLM Error");
-            }
+            getMetar(icao.c_str(), &buf);
             dataPromise.set_value(std::string(buf.buffer));
         });
 

diff --git a/src/environment/xplane/XPlaneEnvironment.h b/src/environment/xplane/XPlaneEnvironment.h
@@ -83,7 +83,6 @@ class XPlaneEnvironment: public Environment {
     Location nullLocation { 0, 0, 0, 0 };
     std::atomic<float> lastDrawTime{};
     std::string aircraftPath;
-    bool isXP12;
 
     // State
     std::mutex stateMutex;