Resolved differences between XSB xivap and Martin's subversion repository

This commit is contained in:
Wade Williams
2012-05-25 09:17:15 -05:00
parent 93ca1fca6d
commit 6db62cb34f
10 changed files with 223 additions and 130 deletions

View File

@@ -94,19 +94,19 @@ typedef struct {
* with a random number by the application. This number will be used to have strobes
* flashing at different times.
*/
union xpmp_LightStatus {
unsigned int lightFlags;
struct {
unsigned int timeOffset : 16;
unsigned int landLights : 1;
unsigned int bcnLights : 1;
unsigned int strbLights : 1;
unsigned int navLights : 1;
unsigned int flashPattern : 4;
};
};
union xpmp_LightStatus {
unsigned int lightFlags;
struct {
unsigned int timeOffset : 16;
unsigned int landLights : 1;
unsigned int bcnLights : 1;
unsigned int strbLights : 1;
unsigned int navLights : 1;
unsigned int flashPattern : 4;
};
};
/*
* Light flash patterns
@@ -137,9 +137,9 @@ typedef struct {
float slatRatio;
float wingSweep;
float thrust;
float yolkPitch;
float yolkHeading;
float yolkRoll;
float yokePitch;
float yokeHeading;
float yokeRoll;
xpmp_LightStatus lights;
} XPMPPlaneSurfaces_t;
@@ -193,7 +193,7 @@ typedef int XPMPPlaneDataType;
*/
enum {
xpmpData_Unavailable = 0, /* The information has never been specified. */
xpmpData_Unchanged = 1, /* The information from the last time the plug-in was aksed. */
xpmpData_Unchanged = 1, /* The information from the last time the plug-in was asked. */
xpmpData_NewData = 2 /* The information has changed this sim cycle. */
};
typedef int XPMPPlaneCallbackResult;
@@ -463,6 +463,19 @@ typedef void (* XPMPRenderPlanes_f)(
*/
void XPMPDumpOneCycle(void);
/*
* XPMPEnableAircraftLabels
* XPMPDisableAircraftLabels
*
* These functions enable and disable the drawing of aircraft labels above the aircraft
*
*/
void XPMPEnableAircraftLabels(void);
void XPMPDisableAircraftLabels(void);
bool XPMPDrawingAircraftLabels(void);
#ifdef __cplusplus
}
#endif