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

(svn r16909) -Fix [FS#2996]: NewGRF stations would be triggering assertions all over the place when using the more advanced station types.

Browse Source 
-Change: make (rail) waypoints sub classes of 'base stations', make buoys waypoints and unify code between them where possible.
This commit is contained in:
rubidium
2009-07-22 08:59:57 +00:00
parent 2646a99d29
commit 68ead6b84f
40 changed files with 689 additions and 693 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/strings.cpp
View File

@@ -863,8 +863,8 @@ static char *FormatString(char *buff, const char *str, int64 *argv, uint casei,
int64 temp[2];
temp[0] = wp->town->index;
temp[1] = wp->town_cn + 1;
StringID str = wp->town_cn == 0 ? STR_WAYPOINTNAME_CITY : STR_WAYPOINTNAME_CITY_SERIAL;
StringID str = ((wp->string_id == STR_SV_STNAME_BUOY) ? STR_BUOYNAME_CITY : STR_WAYPOINTNAME_CITY);
if (wp->town_cn != 0) str++;
buff = GetStringWithArgs(buff, str, temp, last);
}
break;