diff options
| author | rubidium <rubidium@openttd.org> | 2009-07-22 08:59:57 +0000 |
|---|---|---|
| committer | rubidium <rubidium@openttd.org> | 2009-07-22 08:59:57 +0000 |
| commit | 68ead6b84f56ad3c93d05ad3e09b7fbb8173cf26 (patch) | |
| tree | ee33bd19b96a138530a84e86e7ffd60c0700f9d9 /src/strings.cpp | |
| parent | 2646a99d29535a44c5998f080131cbca2e85bdcf (diff) | |
| download | openttd-68ead6b84f56ad3c93d05ad3e09b7fbb8173cf26.tar.xz | |
(svn r16909) -Fix [FS#2996]: NewGRF stations would be triggering assertions all over the place when using the more advanced station types.
-Change: make (rail) waypoints sub classes of 'base stations', make buoys waypoints and unify code between them where possible.
Diffstat (limited to 'src/strings.cpp')
| -rw-r--r-- | src/strings.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/strings.cpp b/src/strings.cpp index 25c116607..4e48f74f1 100644 --- a/src/strings.cpp +++ b/src/strings.cpp @@ -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; |