Skip to content

Commit

Permalink
Update/XPMP2: relOp.txt, Multicast fixes
Browse files Browse the repository at this point in the history
  • Loading branch information
TwinFan committed Jan 16, 2024
1 parent b0b029e commit acc815f
Show file tree
Hide file tree
Showing 4 changed files with 75 additions and 3 deletions.
1 change: 1 addition & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions XPMP2-Sample.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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", "" },
};
Expand Down Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
@@ -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>
2 changes: 1 addition & 1 deletion lib/XPMP2
Submodule XPMP2 updated 91 files
+1 −1 CMakeLists.txt
+145 −3,163 Resources/Doc8643.txt
+3 −2 Resources/XPMP2.example.prf
+13 −0 Resources/relOp.txt
+1 −1 Resources/related.txt
+5 −3 XPMP2.xcodeproj/project.pbxproj
+2 −0 docs/Deploying.md
+1 −0 docs/HowTo.md
+23 −11 docs/Matching.md
+3 −3 docs/html/AIMultiplayer_8h_source.html
+2 −2 docs/html/Aircraft_8h_source.html
+6 −5 docs/html/CSLModels_8cpp.html
+1 −1 docs/html/CSLModels_8h.html
+183 −168 docs/html/CSLModels_8h_source.html
+1 −1 docs/html/Network_8h_source.html
+20 −14 docs/html/RelatedDoc8643_8cpp.html
+30 −11 docs/html/RelatedDoc8643_8h.html
+102 −90 docs/html/RelatedDoc8643_8h_source.html
+16 −16 docs/html/Remote_8h_source.html
+49 −47 docs/html/SoundFMOD_8h_source.html
+128 −118 docs/html/Sound_8h_source.html
+3 −1 docs/html/Utilities_8h.html
+284 −282 docs/html/Utilities_8h_source.html
+2 −2 docs/html/XPCAircraft_8h_source.html
+11 −12 docs/html/XPMP2_8h_source.html
+32 −32 docs/html/XPMPAircraft_8h_source.html
+39 −39 docs/html/XPMPMultiplayer_8h_source.html
+3 −3 docs/html/XPMPPlaneRenderer_8h_source.html
+15 −15 docs/html/XPMPRemote_8h_source.html
+1 −1 docs/html/annotated.html
+1 −1 docs/html/classXPCAircraft.html
+2 −2 docs/html/classXPMP2_1_1Aircraft.html
+2 −2 docs/html/classXPMP2_1_1CSLModel.html
+1 −1 docs/html/classXPMP2_1_1LegacyAircraft.html
+5 −3 docs/html/classXPMP2_1_1SoundChannel-members.html
+49 −0 docs/html/classXPMP2_1_1SoundChannel.html
+3 −2 docs/html/classXPMP2_1_1SoundSystem-members.html
+33 −0 docs/html/classXPMP2_1_1SoundSystem.html
+5 −4 docs/html/classXPMP2_1_1SoundSystemFMOD-members.html
+33 −0 docs/html/classXPMP2_1_1SoundSystemFMOD.html
+5 −4 docs/html/classXPMP2_1_1SoundSystemXP-members.html
+34 −0 docs/html/classXPMP2_1_1SoundSystemXP.html
+2 −2 docs/html/classXPMP2_1_1TCPConnection.html
+1 −1 docs/html/dir_68267d1309a1af8e8297ef4c3efbcdba.html
+1 −1 docs/html/files.html
+6 −0 docs/html/functions_func_g.html
+6 −0 docs/html/functions_func_s.html
+5 −0 docs/html/functions_func_u.html
+6 −0 docs/html/functions_g.html
+1 −1 docs/html/functions_m.html
+3 −0 docs/html/functions_n.html
+1 −1 docs/html/functions_p.html
+3 −0 docs/html/functions_r.html
+6 −0 docs/html/functions_s.html
+5 −0 docs/html/functions_u.html
+1 −1 docs/html/functions_vars_m.html
+3 −0 docs/html/functions_vars_n.html
+1 −1 docs/html/functions_vars_p.html
+3 −0 docs/html/functions_vars_r.html
+1 −1 docs/html/hierarchy.html
+1 −0 docs/html/md_docs_Deploying.html
+1 −0 docs/html/md_docs_HowTo.html
+7 −2 docs/html/md_docs_Matching.html
+129 −18 docs/html/namespaceXPMP2.html
+3 −0 docs/html/namespacemembers_enum.html
+9 −0 docs/html/namespacemembers_eval.html
+2 −2 docs/html/namespacemembers_func.html
+17 −2 docs/html/namespacemembers_r.html
+3 −0 docs/html/namespacemembers_vars.html
+1 −1 docs/html/namespaces.html
+3 −3 docs/html/structXPMP2_1_1CSLModelInfo__t.html
+5 −1 docs/html/structXPMP2_1_1CSLModel_1_1MatchCritTy-members.html
+133 −3 docs/html/structXPMP2_1_1CSLModel_1_1MatchCritTy.html
+2 −2 docs/html/structXPMP2_1_1GlobVars-members.html
+14 −14 docs/html/structXPMP2_1_1GlobVars.html
+8 −10 src/AIMultiplayer.cpp
+4 −3 src/Aircraft.cpp
+34 −24 src/CSLModels.cpp
+12 −2 src/CSLModels.h
+522 −175 src/Network.cpp
+81 −13 src/Network.h
+52 −14 src/RelatedDoc8643.cpp
+24 −8 src/RelatedDoc8643.h
+22 −13 src/Remote.cpp
+34 −5 src/Sound.cpp
+10 −0 src/Sound.h
+14 −1 src/SoundFMOD.cpp
+2 −0 src/SoundFMOD.h
+1 −0 src/Utilities.h
+6 −5 src/XPMP2.h
+5 −2 src/XPMPMultiplayer.cpp

0 comments on commit acc815f

Please sign in to comment.