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

Cleanup: Remove questionable syntax in station rating calculation

This commit is contained in:
Johannes E. Krause 2019-03-12 13:09:33 +01:00 committed by PeterN
parent dea7f078f4
commit ba3d7122df
1 changed files with 13 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
src/station_cmd.cpp
View File

@ -3375,27 +3375,25 @@ static void UpdateStationRating(Station *st)
byte waittime = ge->time_since_pickup; byte waittime = ge->time_since_pickup;
if (st->last_vehicle_type == VEH_SHIP) waittime >>= 2; if (st->last_vehicle_type == VEH_SHIP) waittime >>= 2;
(waittime > 21) || if (waittime <= 21) rating += 25;
(rating += 25, waittime > 12) || if (waittime <= 12) rating += 25;
(rating += 25, waittime > 6) || if (waittime <= 6) rating += 45;
(rating += 45, waittime > 3) || if (waittime <= 3) rating += 35;
(rating += 35, true);
(rating -= 90, ge->max_waiting_cargo > 1500) || rating -= 90;
(rating += 55, ge->max_waiting_cargo > 1000) || if (ge->max_waiting_cargo <= 1500) rating += 55;
(rating += 35, ge->max_waiting_cargo > 600) || if (ge->max_waiting_cargo <= 1000) rating += 35;
(rating += 10, ge->max_waiting_cargo > 300) || if (ge->max_waiting_cargo <= 600) rating += 10;
(rating += 20, ge->max_waiting_cargo > 100) || if (ge->max_waiting_cargo <= 300) rating += 20;
(rating += 10, true); if (ge->max_waiting_cargo <= 100) rating += 10;
} }
if (Company::IsValidID(st->owner) && HasBit(st->town->statues, st->owner)) rating += 26; if (Company::IsValidID(st->owner) && HasBit(st->town->statues, st->owner)) rating += 26;
byte age = ge->last_age; byte age = ge->last_age;
(age >= 3) || if (age < 3) rating += 10;
(rating += 10, age >= 2) || if (age < 2) rating += 10;
(rating += 10, age >= 1) || if (age < 1) rating += 13;
(rating += 13, true);
{ {
int or_ = ge->rating; // old rating int or_ = ge->rating; // old rating