Improve formatting of CompanyInfrastructure::Dump

This commit is contained in:
Jonathan G Rennison
2019-09-17 21:14:58 +01:00
parent 4bd33c6bd0
commit 0ce032339e

View File

@@ -1211,15 +1211,18 @@ uint32 CompanyInfrastructure::GetTramTotal() const
char *CompanyInfrastructure::Dump(char *buffer, const char *last) const char *CompanyInfrastructure::Dump(char *buffer, const char *last) const
{ {
uint rail_total = 0;
for (RailType rt = RAILTYPE_BEGIN; rt != RAILTYPE_END; rt++) { for (RailType rt = RAILTYPE_BEGIN; rt != RAILTYPE_END; rt++) {
if (rail[rt]) buffer += seprintf(buffer, last, "Rail: %s: %u\n", GetStringPtr(GetRailTypeInfo(rt)->strings.name), rail[rt]); if (rail[rt]) buffer += seprintf(buffer, last, "Rail: %s: %u\n", GetStringPtr(GetRailTypeInfo(rt)->strings.name), rail[rt]);
rail_total += rail[rt];
} }
buffer += seprintf(buffer, last, "Total Rail: %u\n", rail_total);
buffer += seprintf(buffer, last, "Signal: %u\n", signal);
for (RoadType rt = ROADTYPE_BEGIN; rt != ROADTYPE_END; rt++) { for (RoadType rt = ROADTYPE_BEGIN; rt != ROADTYPE_END; rt++) {
if (road[rt]) buffer += seprintf(buffer, last, "%s: %s: %u\n", RoadTypeIsTram(rt) ? "Tram" : "Road", GetStringPtr(GetRoadTypeInfo(rt)->strings.name), road[rt]); if (road[rt]) buffer += seprintf(buffer, last, "%s: %s: %u\n", RoadTypeIsTram(rt) ? "Tram" : "Road", GetStringPtr(GetRoadTypeInfo(rt)->strings.name), road[rt]);
} }
buffer += seprintf(buffer, last, "Signal: %u\n", signal); buffer += seprintf(buffer, last, "Total Road: %u\n", this->GetRoadTotal());
buffer += seprintf(buffer, last, "Road: %u\n", road[ROADTYPE_ROAD]); buffer += seprintf(buffer, last, "Total Tram: %u\n", this->GetTramTotal());
buffer += seprintf(buffer, last, "Tram: %u\n", road[ROADTYPE_TRAM]);
buffer += seprintf(buffer, last, "Water: %u\n", water); buffer += seprintf(buffer, last, "Water: %u\n", water);
buffer += seprintf(buffer, last, "Station: %u\n", station); buffer += seprintf(buffer, last, "Station: %u\n", station);
buffer += seprintf(buffer, last, "Airport: %u\n", airport); buffer += seprintf(buffer, last, "Airport: %u\n", airport);