Merge branch 'master' into jgrpp

# Conflicts: # src/linkgraph/mcf.cpp
2020-01-10 18:46:20 +00:00
parent 278ddc1f58 8b0e4bb101
commit c50ee4efec
3 changed files with 5 additions and 5 deletions
--- a/src/group_gui.cpp
+++ b/src/group_gui.cpp
@@ -321,7 +321,7 @@ private:
 			spr = SPR_PROFIT_NA;
 		} else if (profit_last_year < 0) {
 			spr = SPR_PROFIT_NEGATIVE;
-		} else if (profit_last_year < (Money)10000 * num_profit_vehicle) { // TODO magic number
+		} else if (profit_last_year < VEHICLE_PROFIT_THRESHOLD * num_profit_vehicle) {
 			spr = SPR_PROFIT_SOME;
 		} else {
 			spr = SPR_PROFIT_LOT;