|
@@ -231,28 +231,28 @@ public:
|
|
|
for (CargoID i = 0; i < NUM_CARGO; ++i) {
|
|
|
if (acceptance[i] > 0) {
|
|
|
/* Add a comma between each item. */
|
|
|
if (found) {
|
|
|
*strp++ = ',';
|
|
|
*strp++ = ' ';
|
|
|
}
|
|
|
found = true;
|
|
|
|
|
|
/* If the accepted value is less than 8, show it in 1/8:ths */
|
|
|
if (acceptance[i] < 8) {
|
|
|
SetDParam(0, acceptance[i]);
|
|
|
SetDParam(1, GetCargo(i)->name);
|
|
|
SetDParam(1, CargoSpec::Get(i)->name);
|
|
|
strp = GetString(strp, STR_LAND_AREA_INFORMATION_CARGO_EIGHTS, lastof(this->landinfo_data[LAND_INFO_MULTICENTER_LINE]));
|
|
|
} else {
|
|
|
strp = GetString(strp, GetCargo(i)->name, lastof(this->landinfo_data[LAND_INFO_MULTICENTER_LINE]));
|
|
|
strp = GetString(strp, CargoSpec::Get(i)->name, lastof(this->landinfo_data[LAND_INFO_MULTICENTER_LINE]));
|
|
|
}
|
|
|
}
|
|
|
}
|
|
|
if (!found) this->landinfo_data[LAND_INFO_MULTICENTER_LINE][0] = '\0';
|
|
|
|
|
|
if (found) line_nr += 2;
|
|
|
|
|
|
if (line_nr > 6) ResizeWindow(this, 0, 12 * (line_nr - 6));
|
|
|
|
|
|
this->FindWindowPlacementAndResize(&_land_info_desc);
|
|
|
|
|
|
#if defined(_DEBUG)
|
|
@@ -825,25 +825,25 @@ static int DrawStationCoverageText(const
|
|
|
case SCT_NON_PASSENGERS_ONLY: if (IsCargoInClass(i, CC_PASSENGERS)) continue; break;
|
|
|
case SCT_ALL: break;
|
|
|
default: NOT_REACHED();
|
|
|
}
|
|
|
if (cargos[i] >= (supplies ? 1U : 8U)) {
|
|
|
if (first) {
|
|
|
first = false;
|
|
|
} else {
|
|
|
/* Add a comma if this is not the first item */
|
|
|
*b++ = ',';
|
|
|
*b++ = ' ';
|
|
|
}
|
|
|
b = InlineString(b, GetCargo(i)->name);
|
|
|
b = InlineString(b, CargoSpec::Get(i)->name);
|
|
|
}
|
|
|
}
|
|
|
|
|
|
/* If first is still true then no cargo is accepted */
|
|
|
if (first) b = InlineString(b, STR_JUST_NOTHING);
|
|
|
|
|
|
*b = '\0';
|
|
|
|
|
|
/* Make sure we detect any buffer overflow */
|
|
|
assert(b < endof(string));
|
|
|
|
|
|
SetDParamStr(0, string);
|