mirror
/
OpenTTD
mirror of https://github.com/OpenTTD/OpenTTD
1
0
Fork 0
Code Issues

(svn r14670) -Codechange: use better readable (I hope) and branchless (for some archs/compilers) code for cargo value computation

release/0.7
smatz 2008-12-13 16:16:44 +00:00
parent 3cd2957544
commit 28028cf755
1 changed files with 3 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/economy.cpp
View File

@ -1213,7 +1213,8 @@ Money GetTransportedGoodsIncome(uint num_pieces, uint dist, byte transit_days, C
const int days1 = cs->transit_days[0]; const int days1 = cs->transit_days[0];
const int days2 = cs->transit_days[1]; const int days2 = cs->transit_days[1];
const int days_over_days1 = transit_days - days1; const int days_over_days1 = max( transit_days - days1, 0);
const int days_over_days2 = max(days_over_days1 - days2, 0);
/* /*
* The time factor is calculated based on the time it took * The time factor is calculated based on the time it took
@ -1225,16 +1226,7 @@ Money GetTransportedGoodsIncome(uint num_pieces, uint dist, byte transit_days, C
* - linear decreasing with time with a slope of -2 for slow transports * - linear decreasing with time with a slope of -2 for slow transports
* *
*/ */
int time_factor; const int time_factor = max(MAX_TIME_FACTOR - days_over_days1 - days_over_days2, MIN_TIME_FACTOR);
if (days_over_days1 <= 0) {
time_factor = MAX_TIME_FACTOR;
} else if (days_over_days1 <= days2) {
time_factor = MAX_TIME_FACTOR - days_over_days1;
} else {
time_factor = MAX_TIME_FACTOR - 2 * days_over_days1 + days2;
}
if (time_factor < MIN_TIME_FACTOR) time_factor = MIN_TIME_FACTOR;
return BigMulS(dist * time_factor * num_pieces, _cargo_payment_rates[cargo_type], 21); return BigMulS(dist * time_factor * num_pieces, _cargo_payment_rates[cargo_type], 21);
} }