summaryrefslogtreecommitdiff
path: root/src/station_cmd.cpp
diff options
context:
space:
mode:
authorsmatz <smatz@openttd.org>2009-01-10 15:54:07 +0000
committersmatz <smatz@openttd.org>2009-01-10 15:54:07 +0000
commit0cd41d1dc62386d15960b5a6f990207caf8d9834 (patch)
tree28a83cc48e100e71049922e32b22f54c82c409fb /src/station_cmd.cpp
parent07d1c28025749c97473371d3944a4b5be9fb2751 (diff)
downloadopenttd-0cd41d1dc62386d15960b5a6f990207caf8d9834.tar.xz
(svn r14958) -Codechange [FS#1923]: when checking for unique names, compare only with manually set names
There are situations that aren't solvable (because of different language files), so if the user really wants to have duplicated name, allow him to do so. It solves desyncs between server and clients using different languages. It behaves the same in SP and MP, so users won't see the different behaviour as a bug (and even checking in SP could be worked around by the user).
Diffstat (limited to 'src/station_cmd.cpp')
-rw-r--r--src/station_cmd.cpp5
1 files changed, 1 insertions, 4 deletions
diff --git a/src/station_cmd.cpp b/src/station_cmd.cpp
index ca641577b..f9d8d2bdd 100644
--- a/src/station_cmd.cpp
+++ b/src/station_cmd.cpp
@@ -2895,12 +2895,9 @@ static void UpdateStationWaiting(Station *st, CargoID type, uint amount)
static bool IsUniqueStationName(const char *name)
{
const Station *st;
- char buf[512];
FOR_ALL_STATIONS(st) {
- SetDParam(0, st->index);
- GetString(buf, STR_STATION, lastof(buf));
- if (strcmp(buf, name) == 0) return false;
+ if (st->name != NULL && strcmp(st->name, name) == 0) return false;
}
return true;