mirrors
/
OpenTTD
mirror of https://github.com/OpenTTD/OpenTTD.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

(svn r22707) -Codechange: Simplify applying the difficulty settings to prices, and reduce computational errors. (Eddi)

This commit is contained in:
frosch 2011-07-31 14:13:01 +00:00
parent ae8f53a403
commit 536fc42461
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/economy.cpp
View File

@ -652,17 +652,18 @@ void RecomputePrices()
default: break;
}
if (mod < 1) {
price = price * 3 >> 2;
} else if (mod > 1) {
price = price * 9 >> 3;
switch (mod) {
case 0: price *= 6; break;
case 1: price *= 8; break; // normalised to 1 below
case 2: price *= 9; break;
default: NOT_REACHED();
}
/* Apply inflation */
price = (int64)price * _economy.inflation_prices;
/* Apply newgrf modifiers, and remove fractional part of inflation */
int shift = _price_base_multiplier[i] - 16;
/* Apply newgrf modifiers, remove fractional part of inflation, and normalise on medium difficulty. */
int shift = _price_base_multiplier[i] - 16 - 3;
if (shift >= 0) {
price <<= shift;
} else {