dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

(svn r14598) -Feature: Action0Industries property 24 (industry suuplies default name for nearby station).

Browse Source
This commit is contained in:
rubidium
2008-11-19 23:55:34 +00:00
parent e80a222d31
commit a1853ea27c
6 changed files with 84 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/strings.cpp
View File

@@ -862,11 +862,24 @@ static char* FormatString(char* buff, const char* str, const int64* argv, uint c
if (st->name != NULL) {
buff = strecpy(buff, st->name, last);
} else {
StringID str = st->string_id;
if (st->indtype != IT_INVALID) {
/* Special case where the industry provides the name for the station */
const IndustrySpec *indsp = GetIndustrySpec(st->indtype);
/* Industry GRFs can change which might remove the station name and
* thus cause very strange things. Here we check for that before we
* actually set the station name. */
if (indsp->station_name != STR_NULL && indsp->station_name != STR_UNDEFINED) {
str = indsp->station_name;
}
}
int64 temp[3];
temp[0] = STR_TOWN;
temp[1] = st->town->index;
temp[2] = st->index;
buff = GetStringWithArgs(buff, st->string_id, temp, last);
buff = GetStringWithArgs(buff, str, temp, last);
}
break;
}