Ref T215, use homebase + real name string

This commit is contained in:
Klaus Basan
2018-01-03 20:15:17 +01:00
parent 2fb7bde447
commit 5cfacc6066

View File

@@ -437,12 +437,12 @@ namespace BlackCore
QByteArray callsign = toFSD(m_loginMode == LoginAsObserver ? QByteArray callsign = toFSD(m_loginMode == LoginAsObserver ?
m_ownCallsign.getAsObserverCallsignString() : m_ownCallsign.getAsObserverCallsignString() :
m_ownCallsign.asString()); m_ownCallsign.asString());
QByteArray name = toFSD(m_server.getUser().getRealName()); QByteArray name;
if (m_loginMode == LoginAsObserver) if (m_loginMode == LoginAsObserver)
{ {
// Observer mode // Observer mode
VatAtcConnection info; VatAtcConnection info;
name = toFSD(m_server.getUser().getRealName());
info.name = name.data(); info.name = name.data();
info.rating = vatAtcRatingObserver; info.rating = vatAtcRatingObserver;
info.callsign = callsign.data(); info.callsign = callsign.data();
@@ -456,6 +456,7 @@ namespace BlackCore
// normal scenario, also used in STEALTH // normal scenario, also used in STEALTH
VatPilotConnection info; VatPilotConnection info;
info.callsign = callsign.data(); info.callsign = callsign.data();
name = toFSD(m_server.getUser().getRealNameAndHomeBase());
info.name = name.data(); info.name = name.data();
info.rating = vatPilotRatingStudent; // as documented, expected to be vatPilotRatingStudent only info.rating = vatPilotRatingStudent; // as documented, expected to be vatPilotRatingStudent only
info.simType = convertToSimType(m_simulatorInfo); info.simType = convertToSimType(m_simulatorInfo);
@@ -645,7 +646,7 @@ namespace BlackCore
void CNetworkVatlib::replyToNameQuery(const CCallsign &callsign) // private void CNetworkVatlib::replyToNameQuery(const CCallsign &callsign) // private
{ {
QStringList response { m_server.getUser().getRealName(), "" }; QStringList response { m_server.getUser().getRealNameAndHomeBase(), "" };
Vat_SendClientQueryResponse(m_net.data(), vatClientQueryName, toFSD(callsign), toFSD(response)(), response.size()); Vat_SendClientQueryResponse(m_net.data(), vatClientQueryName, toFSD(callsign), toFSD(response)(), response.size());
} }