(svn r942) -Merged branch/network back into the trunk

This commit is contained in:
truelight
2004-12-04 17:54:56 +00:00
parent c90bba35a2
commit d6a1f3e412
76 changed files with 7839 additions and 2850 deletions

View File

@@ -2415,7 +2415,7 @@ int32 CmdRenameStation(int x, int y, uint32 flags, uint32 p1, uint32 p2)
StringID str,old_str;
Station *st;
str = AllocateName((byte*)_decode_parameters, 6);
str = AllocateNameUnique((byte*)_decode_parameters, 6);
if (str == 0)
return CMD_ERROR;
@@ -2654,7 +2654,7 @@ static int32 ClearTile_Station(uint tile, byte flags) {
void InitializeStations()
{
int i;
memset(_stations, 0, sizeof(_stations));
for(i = 0; i != lengthof(_stations); i++)
_stations[i].index=i;