From 3267d1ec38d2b5af00518e1df9ee803c4d3405f8 Mon Sep 17 00:00:00 2001 From: Roland Winklmeier Date: Fri, 24 Aug 2018 14:52:59 +0200 Subject: [PATCH] Fix implicit conversion warning --- src/blackmisc/aviation/livery.cpp | 2 +- src/blackmisc/simulation/aircraftmodel.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/blackmisc/aviation/livery.cpp b/src/blackmisc/aviation/livery.cpp index f8a50dee6..7a353c668 100644 --- a/src/blackmisc/aviation/livery.cpp +++ b/src/blackmisc/aviation/livery.cpp @@ -412,7 +412,7 @@ namespace BlackMisc // 0..25 based on color distance // 0..10 based on mil.flag // 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; CMatchingUtils::addLogDetailsToList(log, *this, QString("2 airline liveries, color multiplier %1: %2").arg(colorMultiplier).arg(score)); if (this->isMilitary() == otherLivery.isMilitary()) diff --git a/src/blackmisc/simulation/aircraftmodel.cpp b/src/blackmisc/simulation/aircraftmodel.cpp index 014abbeaf..f414b5fa6 100644 --- a/src/blackmisc/simulation/aircraftmodel.cpp +++ b/src/blackmisc/simulation/aircraftmodel.cpp @@ -629,7 +629,7 @@ namespace BlackMisc const int icaoScore = this->getAircraftIcaoCode().calculateScore(compareModel.getAircraftIcaoCode(), 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)); - return 0.5 * (icaoScore + liveryScore); + return (icaoScore + liveryScore) / 2; } CStatusMessageList CAircraftModel::validate(bool withNestedObjects) const