|
@@ -258,13 +258,13 @@ public:
|
|
|
byte p = 0;
|
|
|
SetDParam(0, STR_JUST_NOTHING);
|
|
|
SetDParam(1, STR_EMPTY);
|
|
|
for (byte j = 0; j < lengthof(indsp->accepts_cargo); j++) {
|
|
|
if (indsp->accepts_cargo[j] == CT_INVALID) continue;
|
|
|
if (p > 0) str++;
|
|
|
SetDParam(p++, GetCargo(indsp->accepts_cargo[j])->name);
|
|
|
SetDParam(p++, CargoSpec::Get(indsp->accepts_cargo[j])->name);
|
|
|
SetDParam(p++, GetCargoSuffix(j, CST_FUND, NULL, this->selected_type, indsp));
|
|
|
}
|
|
|
DrawString(x_str, right, y_str, str);
|
|
|
y_str += 11;
|
|
|
|
|
|
/* Draw the produced cargos, if any. Otherwhise, will print "Nothing" */
|
|
@@ -272,13 +272,13 @@ public:
|
|
|
p = 0;
|
|
|
SetDParam(0, STR_JUST_NOTHING);
|
|
|
SetDParam(1, STR_EMPTY);
|
|
|
for (byte j = 0; j < lengthof(indsp->produced_cargo); j++) {
|
|
|
if (indsp->produced_cargo[j] == CT_INVALID) continue;
|
|
|
if (p > 0) str++;
|
|
|
SetDParam(p++, GetCargo(indsp->produced_cargo[j])->name);
|
|
|
SetDParam(p++, CargoSpec::Get(indsp->produced_cargo[j])->name);
|
|
|
SetDParam(p++, GetCargoSuffix(j + 3, CST_FUND, NULL, this->selected_type, indsp));
|
|
|
}
|
|
|
DrawString(x_str, right, y_str, str);
|
|
|
y_str += 11;
|
|
|
|
|
|
/* Get the additional purchase info text, if it has not already been */
|
|
@@ -519,13 +519,13 @@ public:
|
|
|
StringID str = STR_INDUSTRY_VIEW_REQUIRES_CARGO;
|
|
|
byte p = 0;
|
|
|
for (byte j = 0; j < lengthof(i->accepts_cargo); j++) {
|
|
|
if (i->accepts_cargo[j] == CT_INVALID) continue;
|
|
|
has_accept = true;
|
|
|
if (p > 0) str++;
|
|
|
SetDParam(p++, GetCargo(i->accepts_cargo[j])->name);
|
|
|
SetDParam(p++, CargoSpec::Get(i->accepts_cargo[j])->name);
|
|
|
SetDParam(p++, GetCargoSuffix(j, CST_VIEW, i, i->type, ind));
|
|
|
}
|
|
|
if (has_accept) {
|
|
|
DrawString(2, this->widget[IVW_INFO].right, y, str);
|
|
|
y += 10;
|
|
|
}
|