Debug: Avoid compiler warnings in debug window cargo class printing

This commit is contained in:
Jonathan G Rennison
2022-11-29 17:58:51 +00:00
parent e97781608f
commit afd3004ea0

View File

@@ -967,7 +967,7 @@ class NIHCargo : public NIHelper {
spec->label >> 24, spec->label >> 16, spec->label >> 8, spec->label,
spec->callback_mask);
output.print(buffer);
char *b = buffer + seprintf(buffer, lastof(buffer), " Cargo class: %s%s%s%s%s%s%s%s%s%s%s",
int written = seprintf(buffer, lastof(buffer), " Cargo class: %s%s%s%s%s%s%s%s%s%s%s",
(spec->classes & CC_PASSENGERS) != 0 ? "passenger, " : "",
(spec->classes & CC_MAIL) != 0 ? "mail, " : "",
(spec->classes & CC_EXPRESS) != 0 ? "express, " : "",
@@ -979,7 +979,7 @@ class NIHCargo : public NIHelper {
(spec->classes & CC_HAZARDOUS) != 0 ? "hazardous, " : "",
(spec->classes & CC_COVERED) != 0 ? "covered/sheltered, " : "",
(spec->classes & CC_SPECIAL) != 0 ? "special, " : "");
if (b[-2] == ',') b[-2] = 0;
if (written >= 2 && buffer[written - 2] == ',') buffer[written - 2] = 0;
output.print(buffer);
seprintf(buffer, lastof(buffer), " Weight: %u, Capacity multiplier: %u", spec->weight, spec->multiplier);