From acc815f9b8b116cbe37f01b66acd5b0061961c51 Mon Sep 17 00:00:00 2001
From: TwinFan <twinfan@sonux.net>
Date: Wed, 17 Jan 2024 00:35:24 +0100
Subject: [PATCH] Update/XPMP2: relOp.txt, Multicast fixes

---
 README.md                                     |  1 +
 XPMP2-Sample.cpp                              |  4 +-
 .../xcschemes/XPMP2-Sample.xcscheme           | 71 +++++++++++++++++++
 lib/XPMP2                                     |  2 +-
 4 files changed, 75 insertions(+), 3 deletions(-)
 create mode 100644 XPMP2-Sample.xcodeproj/xcshareddata/xcschemes/XPMP2-Sample.xcscheme

diff --git a/README.md b/README.md
index 6c41d1e..677a45e 100644
--- a/README.md
+++ b/README.md
@@ -78,6 +78,7 @@ XPMP2-Sample/
     MapIcons.png
     Obj8DataRefs.txt
     related.txt
+    relOp.txt
 ```
 
 The individual files listed above under the `Resources` folder, like `Doc8643.txt`, are available
diff --git a/XPMP2-Sample.cpp b/XPMP2-Sample.cpp
index 87f96a5..3758085 100644
--- a/XPMP2-Sample.cpp
+++ b/XPMP2-Sample.cpp
@@ -80,7 +80,7 @@
 /// @see https://www.icao.int/publications/DOC8643/Pages/Search.aspx for ICAO aircraft types
 /// @see https://forums.x-plane.org/index.php?/files/file/37041-bluebell-obj8-csl-packages/ for the Bluebell package, which includes the models named here
 std::string PLANE_MODEL[3][3] = {
-    { "A321", "", "" },         // Not specifying the airline means: XPMP2 will randomly take any airline's model - with every switch of models
+    { "A321", "EUK", "" },         // Don't have A321_EUK, shall find A320_EIN via related.txt and relOp.txt
     { "B06",  "TXB", "" },
     { "DH8D", "BER", "" },
 };
@@ -114,7 +114,7 @@ int CBIntPrefsFunc (const char *, [[maybe_unused]] const char * item, int defaul
     if (!strcmp(item, XPMP_CFG_ITM_CONTR_MULTI)) return 1;
 #if DEBUG
     // in debug version of the plugin we provide most complete log output
-    if (!strcmp(item, XPMP_CFG_ITM_MODELMATCHING)) return 1;
+    if (!strcmp(item, XPMP_CFG_ITM_MODELMATCHING)) return 0;    // though...no model
     if (!strcmp(item, XPMP_CFG_ITM_LOGLEVEL)) return 0;       // DEBUG logging level
 #endif
     // Otherwise we just accept defaults
diff --git a/XPMP2-Sample.xcodeproj/xcshareddata/xcschemes/XPMP2-Sample.xcscheme b/XPMP2-Sample.xcodeproj/xcshareddata/xcschemes/XPMP2-Sample.xcscheme
new file mode 100644
index 0000000..9186b57
--- /dev/null
+++ b/XPMP2-Sample.xcodeproj/xcshareddata/xcschemes/XPMP2-Sample.xcscheme
@@ -0,0 +1,71 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Scheme
+   LastUpgradeVersion = "1420"
+   version = "1.3">
+   <BuildAction
+      parallelizeBuildables = "YES"
+      buildImplicitDependencies = "YES">
+      <BuildActionEntries>
+         <BuildActionEntry
+            buildForTesting = "YES"
+            buildForRunning = "YES"
+            buildForProfiling = "YES"
+            buildForArchiving = "YES"
+            buildForAnalyzing = "YES">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "D607B19809A556E400699BC3"
+               BuildableName = "XPMP2-Sample.xpl"
+               BlueprintName = "XPMP2-Sample"
+               ReferencedContainer = "container:XPMP2-Sample.xcodeproj">
+            </BuildableReference>
+         </BuildActionEntry>
+      </BuildActionEntries>
+   </BuildAction>
+   <TestAction
+      buildConfiguration = "Debug"
+      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      shouldUseLaunchSchemeArgsEnv = "YES">
+      <Testables>
+      </Testables>
+   </TestAction>
+   <LaunchAction
+      buildConfiguration = "Debug"
+      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      launchStyle = "0"
+      useCustomWorkingDirectory = "NO"
+      ignoresPersistentStateOnLaunch = "NO"
+      debugDocumentVersioning = "YES"
+      debugServiceExtension = "internal"
+      allowLocationSimulation = "YES">
+      <PathRunnable
+         runnableDebuggingMode = "0"
+         FilePath = "/Users/birger/Applications/X-Plane/11/X-Plane.app">
+      </PathRunnable>
+   </LaunchAction>
+   <ProfileAction
+      buildConfiguration = "Release"
+      shouldUseLaunchSchemeArgsEnv = "YES"
+      savedToolIdentifier = ""
+      useCustomWorkingDirectory = "NO"
+      debugDocumentVersioning = "YES">
+      <MacroExpansion>
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "D607B19809A556E400699BC3"
+            BuildableName = "XPMP2-Sample.xpl"
+            BlueprintName = "XPMP2-Sample"
+            ReferencedContainer = "container:XPMP2-Sample.xcodeproj">
+         </BuildableReference>
+      </MacroExpansion>
+   </ProfileAction>
+   <AnalyzeAction
+      buildConfiguration = "Debug">
+   </AnalyzeAction>
+   <ArchiveAction
+      buildConfiguration = "Release"
+      revealArchiveInOrganizer = "YES">
+   </ArchiveAction>
+</Scheme>
diff --git a/lib/XPMP2 b/lib/XPMP2
index f6c4090..bf452c7 160000
--- a/lib/XPMP2
+++ b/lib/XPMP2
@@ -1 +1 @@
-Subproject commit f6c40908ac3e66a3b1b75c5e1740efce8277323a
+Subproject commit bf452c7510f181e8e711b408c69933cbc3e90805