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

refs #707, renamed to FSInn / FSInnData

Browse Source
This commit is contained in:
Klaus Basan
2016-07-12 03:12:38 +02:00
parent caa6947ff9
commit 64fa88da72
5 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/blackcore/network.h
View File

@@ -514,7 +514,7 @@ namespace BlackCore
/*! /*!
* We received an FSInn custom packet. * We received an FSInn custom packet.
*/ */
void customFSinnPacketReceived(const BlackMisc::Aviation::CCallsign &callsign, const QString &airlineDesignator, void customFSInnPacketReceived(const BlackMisc::Aviation::CCallsign &callsign, const QString &airlineDesignator,
const QString &aircraftDesignator, const QString &combinedType, const QString &modelString); const QString &aircraftDesignator, const QString &combinedType, const QString &modelString);
//! We received a aircraft config packet //! We received a aircraft config packet

4
src/blackcore/vatsim/networkvatlib.cpp
View File

@@ -909,7 +909,7 @@ namespace BlackCore
{ {
// It doesn't matter whether it was a query or response. The information // It doesn't matter whether it was a query or response. The information
// is the same for both. // is the same for both.
emit customFSinnPacketReceived(callsign, data[1], data[2], data[7], data[8]); emit customFSInnPacketReceived(callsign, data[1], data[2], data[7], data[8]);
} }
} }
else if (packetId.compare("FSIPIR", Qt::CaseInsensitive) == 0) else if (packetId.compare("FSIPIR", Qt::CaseInsensitive) == 0)
@@ -923,7 +923,7 @@ namespace BlackCore
sendCustomFsinnReponse(callsign); sendCustomFsinnReponse(callsign);
// It doesn't matter whether it was a query or response. The information // It doesn't matter whether it was a query or response. The information
// is the same for both. // is the same for both.
emit customFSinnPacketReceived(callsign, data[1], data[2], data[7], data[8]); emit customFSInnPacketReceived(callsign, data[1], data[2], data[7], data[8]);
} }
} }
} }

4
src/blackgui/components/modelmatchercomponent.cpp
View File

@@ -169,10 +169,10 @@ namespace BlackGui
const CLivery l(liveryCombinedCode.isEmpty() ? CLivery::getStandardCode(al) : liveryCombinedCode, const CLivery l(liveryCombinedCode.isEmpty() ? CLivery::getStandardCode(al) : liveryCombinedCode,
al, al,
"Standard"); "Standard");
CAircraftModel m(modelString, CAircraftModel::TypeFsdData); CAircraftModel m(modelString, CAircraftModel::TypeFSInnData);
m.setLivery(l); m.setLivery(l);
m.setCallsign(cs); m.setCallsign(cs);
m.setModelType(CAircraftModel::TypeFsdData); m.setModelType(CAircraftModel::TypeFSInnData);
CSimulatedAircraft sa(m); CSimulatedAircraft sa(m);
sa.setPilot(pilot); sa.setPilot(pilot);
sa.setAircraftIcaoCode(icao); sa.setAircraftIcaoCode(icao);

4
src/blackmisc/simulation/aircraftmodel.cpp
View File

@@ -106,7 +106,7 @@ namespace BlackMisc
bool CAircraftModel::canInitializeFromFsd() const bool CAircraftModel::canInitializeFromFsd() const
{ {
const bool nw = this->getModelType() == CAircraftModel::TypeQueriedFromNetwork || const bool nw = this->getModelType() == CAircraftModel::TypeQueriedFromNetwork ||
this->getModelType() == CAircraftModel::TypeFsdData || this->getModelType() == CAircraftModel::TypeFSInnData ||
this->getModelType() == CAircraftModel::TypeUnknown; this->getModelType() == CAircraftModel::TypeUnknown;
return nw; return nw;
} }
@@ -493,7 +493,7 @@ namespace BlackMisc
case TypeModelMatchingDefaultModel: return "map. default"; case TypeModelMatchingDefaultModel: return "map. default";
case TypeOwnSimulatorModel: return "own simulator"; case TypeOwnSimulatorModel: return "own simulator";
case TypeManuallySet: return "set"; case TypeManuallySet: return "set";
case TypeFsdData: return "FSD"; case TypeFSInnData: return "FSInn";
case TypeUnknown: case TypeUnknown:
default: return "unknown"; default: return "unknown";
} }

2
src/blackmisc/simulation/aircraftmodel.h
View File

@@ -61,7 +61,7 @@ namespace BlackMisc
{ {
TypeUnknown, TypeUnknown,
TypeQueriedFromNetwork, //!< model was queried by network protocol TypeQueriedFromNetwork, //!< model was queried by network protocol
TypeFsdData, //!< model based on FSD ICAO data TypeFSInnData, //!< model based on FSD ICAO data
TypeModelMatching, //!< model is result of model matching TypeModelMatching, //!< model is result of model matching
TypeModelMatchingDefaultModel, //!< a default model assigned by model matching TypeModelMatchingDefaultModel, //!< a default model assigned by model matching
TypeDatabaseEntry, //!< used along with mapping definition TypeDatabaseEntry, //!< used along with mapping definition