flightsimulatorplatfrom/pilotclient
1
0
Fork 0
mirror of https://github.com/swift-project/pilotclient.git synced 2026-04-01 05:26:45 +08:00
Code Issues Packages Projects Releases Wiki Activity

[swift] refactored initialization into legacy and nextgen parts

Browse Source
This commit is contained in:
Mathew Sutcliffe
2014-06-24 18:45:15 +01:00
parent 2ecf316d9a
commit 28e2b16607
2 changed files with 84 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
src/XPMPMultiplayer.cpp
View File

@@ -104,7 +104,7 @@ static int XPMPControlPlaneCount(
********************************************************************************/
const char * XPMPMultiplayerInit(
const char * XPMPMultiplayerInitLegacyData(
const char * inCSLFolder, const char * inRelatedPath,
const char * inTexturePath, const char * inDoc8643,
const char * inDefaultPlane,
@@ -114,6 +114,25 @@ const char * XPMPMultiplayerInit(
gDefaultPlane = inDefaultPlane;
gIntPrefsFunc = inIntPrefsFunc;
gFloatPrefsFunc = inFloatPrefsFunc;
bool problem = false;
if (!CSL_LoadCSL(inCSLFolder, inRelatedPath, inDoc8643))
problem = true;
if (!CSL_Init(inTexturePath))
problem = true;
if (problem) return "There were problems initializing XSquawkBox. Please examine X-Plane's error.out file for detailed information.";
else return "";
}
const char * XPMPMultiplayerInit(
int (* inIntPrefsFunc)(const char *, const char *, int),
float (* inFloatPrefsFunc)(const char *, const char *, float))
{
gIntPrefsFunc = inIntPrefsFunc;
gFloatPrefsFunc = inFloatPrefsFunc;
//char myPath[1024];
//char airPath[1024];
//char line[256];
@@ -127,14 +146,8 @@ const char * XPMPMultiplayerInit(
// Initialize our OpenGL Utilities
OGL_UtilsInit();
if (!CSL_LoadCSL(inCSLFolder, inRelatedPath, inDoc8643))
problem = true;
XPMPInitDefaultPlaneRenderer();
if (!CSL_Init(inTexturePath))
problem = true;
// Register the plane control calls.
XPLMRegisterDrawCallback(XPMPControlPlaneCount,
xplm_Phase_Gauges, 0, /* after*/ 0 /* hide planes*/);
@@ -223,6 +236,18 @@ void XPMPMultiplayerDisable(void)
}
const char * XPMPLoadCSLPackage(
const char * inCSLFolder, const char * inRelatedPath, const char * inDoc8643)
{
bool problem = false;
if (!CSL_LoadCSL(inCSLFolder, inRelatedPath, inDoc8643))
problem = true;
if (problem) return "There were problems initializing XSquawkBox. Please examine X-Plane's error.out file for detailed information.";
else return "";
}
// This routine checks plane loading and grabs anyone we're missing.
void XPMPLoadPlanesIfNecessary(void)
{