mirrors
/
OpenTTD
mirror of https://github.com/OpenTTD/OpenTTD.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

(svn r10320) -Fix [FS#278]: one could only build a limited number of stations before one had to rename them.

This commit is contained in:
rubidium 2007-06-25 10:22:48 +00:00
parent 1904f8e838
commit 5c6106cbcf
3 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/lang/english.txt
View File

@ -2082,6 +2082,7 @@ STR_SV_STNAME_UPPER :Upper {STRING1}
STR_SV_STNAME_LOWER :Lower {STRING1}
STR_SV_STNAME_HELIPORT :{STRING1} Heliport
STR_SV_STNAME_FOREST :{STRING1} Forest
STR_SV_STNAME_FALLBACK :{STRING1} Station #{NUM}
############ end of savegame specific region!

6
src/station_cmd.cpp
View File

@ -285,11 +285,7 @@ static bool GenerateStationName(Station *st, TileIndex tile, int flag)
}
tmp = free_names & ((1 << 1) | (1 << 2) | (1 << 3) | (1 << 4) | (1 << 6) | (1 << 7) | (1 << 12) | (1 << 26) | (1 << 27) | (1 << 28) | (1 << 29) | (1 << 30));
if (tmp == 0) {
_error_message = STR_3007_TOO_MANY_STATIONS_LOADING;
return false;
}
found = FindFirstBit(tmp);
found = (tmp == 0) ? M(STR_SV_STNAME_FALLBACK) : FindFirstBit(tmp);
done:
st->string_id = found + STR_SV_STNAME;

3
src/strings.cpp
View File

@ -817,9 +817,10 @@ static char* FormatString(char* buff, const char* str, const int64* argv, uint c
if (!st->IsValid()) { // station doesn't exist anymore
buff = GetStringWithArgs(buff, STR_UNKNOWN_DESTINATION, NULL, last);
} else {
int64 temp[2];
int64 temp[3];
temp[0] = STR_TOWN;
temp[1] = st->town->index;
temp[2] = st->index;
buff = GetStringWithArgs(buff, st->string_id, temp, last);
}
break;