diff --git a/src/blackcore/network.h b/src/blackcore/network.h index 86f14d934..444b34f2c 100644 --- a/src/blackcore/network.h +++ b/src/blackcore/network.h @@ -514,7 +514,7 @@ namespace BlackCore /*! * 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); //! We received a aircraft config packet diff --git a/src/blackcore/vatsim/networkvatlib.cpp b/src/blackcore/vatsim/networkvatlib.cpp index 7aff7ad75..073c71a83 100644 --- a/src/blackcore/vatsim/networkvatlib.cpp +++ b/src/blackcore/vatsim/networkvatlib.cpp @@ -909,7 +909,7 @@ namespace BlackCore { // It doesn't matter whether it was a query or response. The information // 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) @@ -923,7 +923,7 @@ namespace BlackCore sendCustomFsinnReponse(callsign); // It doesn't matter whether it was a query or response. The information // 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]); } } } diff --git a/src/blackgui/components/modelmatchercomponent.cpp b/src/blackgui/components/modelmatchercomponent.cpp index fd48edd99..4ff397a57 100644 --- a/src/blackgui/components/modelmatchercomponent.cpp +++ b/src/blackgui/components/modelmatchercomponent.cpp @@ -169,10 +169,10 @@ namespace BlackGui const CLivery l(liveryCombinedCode.isEmpty() ? CLivery::getStandardCode(al) : liveryCombinedCode, al, "Standard"); - CAircraftModel m(modelString, CAircraftModel::TypeFsdData); + CAircraftModel m(modelString, CAircraftModel::TypeFSInnData); m.setLivery(l); m.setCallsign(cs); - m.setModelType(CAircraftModel::TypeFsdData); + m.setModelType(CAircraftModel::TypeFSInnData); CSimulatedAircraft sa(m); sa.setPilot(pilot); sa.setAircraftIcaoCode(icao); diff --git a/src/blackmisc/simulation/aircraftmodel.cpp b/src/blackmisc/simulation/aircraftmodel.cpp index a971f652b..2d00d8bb8 100644 --- a/src/blackmisc/simulation/aircraftmodel.cpp +++ b/src/blackmisc/simulation/aircraftmodel.cpp @@ -106,7 +106,7 @@ namespace BlackMisc bool CAircraftModel::canInitializeFromFsd() const { const bool nw = this->getModelType() == CAircraftModel::TypeQueriedFromNetwork || - this->getModelType() == CAircraftModel::TypeFsdData || + this->getModelType() == CAircraftModel::TypeFSInnData || this->getModelType() == CAircraftModel::TypeUnknown; return nw; } @@ -493,7 +493,7 @@ namespace BlackMisc case TypeModelMatchingDefaultModel: return "map. default"; case TypeOwnSimulatorModel: return "own simulator"; case TypeManuallySet: return "set"; - case TypeFsdData: return "FSD"; + case TypeFSInnData: return "FSInn"; case TypeUnknown: default: return "unknown"; } diff --git a/src/blackmisc/simulation/aircraftmodel.h b/src/blackmisc/simulation/aircraftmodel.h index aaac2821e..9c0120306 100644 --- a/src/blackmisc/simulation/aircraftmodel.h +++ b/src/blackmisc/simulation/aircraftmodel.h @@ -61,7 +61,7 @@ namespace BlackMisc { TypeUnknown, 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 TypeModelMatchingDefaultModel, //!< a default model assigned by model matching TypeDatabaseEntry, //!< used along with mapping definition