cpp/openttd-patchpack/source Changeset - r23463:6a37fd5127b3

Changeset - r23463:6a37fd5127b3

Parent rev.

Child rev.

[Not reviewed]

master

0 1 0

Johannes E. Krause - 5 years ago 2019-03-12 12:09:33
j.k@eclipso.de

Cleanup: Remove questionable syntax in station rating calculation

1 file changed with 14 insertions and 16 deletions:

src/station_cmd.cpp

0 comments (0 inline, 0 general)

src/station_cmd.cpp

➞

Show inline comments

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

0 comments (0 inline, 0 general)