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

Fix implicit conversion warning

Browse Source
This commit is contained in:
Roland Winklmeier
2018-08-24 14:52:59 +02:00
parent 29e50ee516
commit 3267d1ec38
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/blackmisc/aviation/livery.cpp
View File

@@ -412,7 +412,7 @@ namespace BlackMisc
// 0..25 based on color distance // 0..25 based on color distance
// 0..10 based on mil.flag // 0..10 based on mil.flag
// same ICAO at least means 30, max 50 // same ICAO at least means 30, max 50
score = 0.5 * this->getAirlineIcaoCode().calculateScore(otherLivery.getAirlineIcaoCode(), log); score = this->getAirlineIcaoCode().calculateScore(otherLivery.getAirlineIcaoCode(), log) / 2;
score += 25 * colorMultiplier; score += 25 * colorMultiplier;
CMatchingUtils::addLogDetailsToList(log, *this, QString("2 airline liveries, color multiplier %1: %2").arg(colorMultiplier).arg(score)); CMatchingUtils::addLogDetailsToList(log, *this, QString("2 airline liveries, color multiplier %1: %2").arg(colorMultiplier).arg(score));
if (this->isMilitary() == otherLivery.isMilitary()) if (this->isMilitary() == otherLivery.isMilitary())

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

@@ -629,7 +629,7 @@ namespace BlackMisc
const int icaoScore = this->getAircraftIcaoCode().calculateScore(compareModel.getAircraftIcaoCode(), log); const int icaoScore = this->getAircraftIcaoCode().calculateScore(compareModel.getAircraftIcaoCode(), log);
const int liveryScore = this->getLivery().calculateScore(compareModel.getLivery(), preferColorLiveries, log); const int liveryScore = this->getLivery().calculateScore(compareModel.getLivery(), preferColorLiveries, log);
CMatchingUtils::addLogDetailsToList(log, this->getCallsign(), QString("ICAO score: %1 | livery score: %2").arg(icaoScore).arg(liveryScore)); CMatchingUtils::addLogDetailsToList(log, this->getCallsign(), QString("ICAO score: %1 | livery score: %2").arg(icaoScore).arg(liveryScore));
return 0.5 * (icaoScore + liveryScore); return (icaoScore + liveryScore) / 2;
} }
CStatusMessageList CAircraftModel::validate(bool withNestedObjects) const CStatusMessageList CAircraftModel::validate(bool withNestedObjects) const