petern/OpenTTD
1
0
Fork 0
forked from mirror/OpenTTD
Code Pull Requests Activity

(svn r15480) -Feature(tte): Show the cargo subtype in the vehicle details window.

Browse Source
This commit is contained in:
michi_cc
2009-02-14 18:42:03 +00:00
parent b123756c9f
commit 84deeecc5b
56 changed files with 292 additions and 270 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/roadveh_gui.cpp
View File

@@ -27,12 +27,18 @@ void DrawRoadVehDetails(const Vehicle *v, int x, int y)
if (RoadVehHasArticPart(v)) {
AcceptedCargo max_cargo;
StringID subtype_text[NUM_CARGO];
char capacity[512];
memset(max_cargo, 0, sizeof(max_cargo));
memset(subtype_text, 0, sizeof(subtype_text));
for (const Vehicle *u = v; u != NULL; u = u->Next()) {
max_cargo[u->cargo_type] += u->cargo_cap;
if (u->cargo_cap > 0) {
StringID text = GetCargoSubtypeText(u);
if (text != STR_EMPTY) subtype_text[u->cargo_type] = text;
}
}
GetString(capacity, STR_ARTICULATED_RV_CAPACITY, lastof(capacity));
@@ -48,6 +54,12 @@ void DrawRoadVehDetails(const Vehicle *v, int x, int y)
if (!first) strecat(capacity, ", ", lastof(capacity));
strecat(capacity, buffer, lastof(capacity));
if (subtype_text[i] != 0) {
GetString(buffer, subtype_text[i], lastof(buffer));
strecat(capacity, buffer, lastof(capacity));
}
first = false;
}
}
@@ -75,6 +87,7 @@ void DrawRoadVehDetails(const Vehicle *v, int x, int y)
} else {
SetDParam(0, v->cargo_type);
SetDParam(1, v->cargo_cap);
SetDParam(2, GetCargoSubtypeText(v));
DrawString(x, y + 10 + y_offset, STR_9012_CAPACITY, TC_FROMSTRING);
str = STR_8812_EMPTY;