equal
deleted
inserted
replaced
35 |
35 |
36 uint num = 0; |
36 uint num = 0; |
37 for (const Subsidy *s = _subsidies; s != endof(_subsidies); s++) { |
37 for (const Subsidy *s = _subsidies; s != endof(_subsidies); s++) { |
38 if (s->cargo_type != CT_INVALID && s->age < 12) { |
38 if (s->cargo_type != CT_INVALID && s->age < 12) { |
39 y -= 10; |
39 y -= 10; |
40 if (y < 0) this->HandleClick(s); |
40 if (y < 0) { |
|
41 this->HandleClick(s); |
|
42 return; |
|
43 } |
41 num++; |
44 num++; |
42 } |
45 } |
43 } |
46 } |
44 |
47 |
45 if (num == 0) { |
48 if (num == 0) { |
46 y -= 10; |
49 y -= 10; /* "None" */ |
47 if (y < 0) return; |
50 if (y < 0) return; |
48 } |
51 } |
49 |
52 |
50 y -= 11; |
53 y -= 11; /* "Services already subsidised:" */ |
51 if (y < 0) return; |
54 if (y < 0) return; |
52 |
55 |
53 for (const Subsidy *s = _subsidies; s != endof(_subsidies); s++) { |
56 for (const Subsidy *s = _subsidies; s != endof(_subsidies); s++) { |
54 if (s->cargo_type != CT_INVALID && s->age >= 12) { |
57 if (s->cargo_type != CT_INVALID && s->age >= 12) { |
55 y -= 10; |
58 y -= 10; |
56 if (y < 0) this->HandleClick(s); |
59 if (y < 0) { |
|
60 this->HandleClick(s); |
|
61 return; |
|
62 } |
57 } |
63 } |
58 } |
64 } |
59 } |
65 } |
60 |
66 |
61 void HandleClick(const Subsidy *s) |
67 void HandleClick(const Subsidy *s) |