summaryrefslogtreecommitdiff
path: root/src/economy.cpp
diff options
context:
space:
mode:
authortruelight <truelight@openttd.org>2007-11-04 22:47:34 +0000
committertruelight <truelight@openttd.org>2007-11-04 22:47:34 +0000
commitf1df43ec2154c513942469f146e3da1618837d36 (patch)
tree3f3cf6fdd8b19411c70fc99e7dc1456cbc7f798e /src/economy.cpp
parent74ee13aba89f78df25066ee15c46fa682d6a1408 (diff)
downloadopenttd-f1df43ec2154c513942469f146e3da1618837d36.tar.xz
(svn r11382) -Codechange: renamed COUNTBITS to CountBits, as it is no longer a macro (skidd13)
Diffstat (limited to 'src/economy.cpp')
-rw-r--r--src/economy.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/economy.cpp b/src/economy.cpp
index 793c0b960..216622c6c 100644
--- a/src/economy.cpp
+++ b/src/economy.cpp
@@ -69,7 +69,7 @@ Money CalculateCompanyValue(const Player* p)
uint num = 0;
FOR_ALL_STATIONS(st) {
- if (st->owner == owner) num += COUNTBITS(st->facilities);
+ if (st->owner == owner) num += CountBits(st->facilities);
}
value += num * _price.station_value * 25;
@@ -141,7 +141,7 @@ int UpdateCompanyRatingAndValue(Player *p, bool update)
const Station* st;
FOR_ALL_STATIONS(st) {
- if (st->owner == owner) num += COUNTBITS(st->facilities);
+ if (st->owner == owner) num += CountBits(st->facilities);
}
_score_part[owner][SCORE_STATIONS] = num;
}
@@ -186,7 +186,7 @@ int UpdateCompanyRatingAndValue(Player *p, bool update)
/* Generate score for variety of cargo */
{
- uint num = COUNTBITS(p->cargo_types);
+ uint num = CountBits(p->cargo_types);
_score_part[owner][SCORE_CARGO] = num;
if (update) p->cargo_types = 0;
}