equal
deleted
inserted
replaced
139 SetDParam(1, t->index); |
139 SetDParam(1, t->index); |
140 } |
140 } |
141 GetString(_landinfo_data[4], STR_01A8_LOCAL_AUTHORITY, lastof(_landinfo_data[4])); |
141 GetString(_landinfo_data[4], STR_01A8_LOCAL_AUTHORITY, lastof(_landinfo_data[4])); |
142 |
142 |
143 { |
143 { |
144 int i; |
|
145 char *p = GetString(_landinfo_data[5], STR_01CE_CARGO_ACCEPTED, lastof(_landinfo_data[5])); |
144 char *p = GetString(_landinfo_data[5], STR_01CE_CARGO_ACCEPTED, lastof(_landinfo_data[5])); |
146 bool found = false; |
145 bool found = false; |
147 |
146 |
148 for (i = 0; i < NUM_CARGO; ++i) { |
147 for (CargoID i = 0; i < NUM_CARGO; ++i) { |
149 if (ac[i] > 0) { |
148 if (ac[i] > 0) { |
150 /* Add a comma between each item. */ |
149 /* Add a comma between each item. */ |
151 if (found) { |
150 if (found) { |
152 *p++ = ','; |
151 *p++ = ','; |
153 *p++ = ' '; |
152 *p++ = ' '; |
730 static void DrawStationCoverageText(const AcceptedCargo accepts, |
729 static void DrawStationCoverageText(const AcceptedCargo accepts, |
731 int str_x, int str_y, uint mask) |
730 int str_x, int str_y, uint mask) |
732 { |
731 { |
733 char *b = _userstring; |
732 char *b = _userstring; |
734 bool first = true; |
733 bool first = true; |
735 int i; |
|
736 |
734 |
737 b = InlineString(b, STR_000D_ACCEPTS); |
735 b = InlineString(b, STR_000D_ACCEPTS); |
738 |
736 |
739 for (i = 0; i != NUM_CARGO; i++, mask >>= 1) { |
737 for (CargoID i = 0; i < NUM_CARGO; i++, mask >>= 1) { |
740 if (b >= lastof(_userstring) - 5) break; |
738 if (b >= lastof(_userstring) - 5) break; |
741 if (accepts[i] >= 8 && mask & 1) { |
739 if (accepts[i] >= 8 && mask & 1) { |
742 if (first) { |
740 if (first) { |
743 first = false; |
741 first = false; |
744 } else { |
742 } else { |