mirror
/
OpenTTD
mirror of https://github.com/OpenTTD/OpenTTD
1
0
Fork 0
Code Issues

(svn r23844) -Fix (r23414): Infrastructure count for stations wasn't updated properly on company takeover. And don't count buoys while loading a game either.

release/1.2
michi_cc 2012-01-22 22:21:21 +00:00
parent b888027ddd
commit 52b951ca6f
3 changed files with 38 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/economy.cpp
View File

@ -471,6 +471,9 @@ void ChangeOwnershipOfCompanyItems(Owner old_owner, Owner new_owner)
UpdateSignalsInBuffer(); UpdateSignalsInBuffer();
} }
/* Add airport infrastructure count of the old company to the new one. */
if (new_owner != INVALID_OWNER) Company::Get(new_owner)->infrastructure.airport += Company::Get(old_owner)->infrastructure.airport;
/* convert owner of stations (including deleted ones, but excluding buoys) */ /* convert owner of stations (including deleted ones, but excluding buoys) */
Station *st; Station *st;
FOR_ALL_STATIONS(st) { FOR_ALL_STATIONS(st) {

2
src/saveload/company_sl.cpp
View File

@ -139,7 +139,7 @@ void AfterLoadCompanyStats()
case MP_STATION: case MP_STATION:
c = Company::GetIfValid(GetTileOwner(tile)); c = Company::GetIfValid(GetTileOwner(tile));
if (c != NULL && GetStationType(tile) != STATION_AIRPORT) c->infrastructure.station++; if (c != NULL && GetStationType(tile) != STATION_AIRPORT && !IsBuoy(tile)) c->infrastructure.station++;
switch (GetStationType(tile)) { switch (GetStationType(tile)) {
case STATION_RAIL: case STATION_RAIL:

43
src/station_cmd.cpp
View File

@ -3612,16 +3612,41 @@ static void ChangeTileOwner_Station(TileIndex tile, Owner old_owner, Owner new_o
Company *old_company = Company::Get(old_owner); Company *old_company = Company::Get(old_owner);
Company *new_company = Company::Get(new_owner); Company *new_company = Company::Get(new_owner);
if ((IsRailWaypoint(tile) || IsRailStation(tile)) && !IsStationTileBlocked(tile)) { /* Update counts for underlying infrastructure. */
old_company->infrastructure.rail[GetRailType(tile)]--; switch (GetStationType(tile)) {
new_company->infrastructure.rail[GetRailType(tile)]++; case STATION_RAIL:
case STATION_WAYPOINT:
if (!IsStationTileBlocked(tile)) {
old_company->infrastructure.rail[GetRailType(tile)]--;
new_company->infrastructure.rail[GetRailType(tile)]++;
}
break;
case STATION_BUS:
case STATION_TRUCK:
if (!IsDriveThroughStopTile(tile)) {
/* Drive-through stops were already handled above. */
old_company->infrastructure.road[FIND_FIRST_BIT(GetRoadTypes(tile))] -= 2;
new_company->infrastructure.road[FIND_FIRST_BIT(GetRoadTypes(tile))] += 2;
}
break;
case STATION_BUOY:
case STATION_DOCK:
if (GetWaterClass(tile) == WATER_CLASS_CANAL) {
old_company->infrastructure.water--;
new_company->infrastructure.water++;
}
break;
default:
break;
} }
if (IsRoadStop(tile) && !IsDriveThroughStopTile(tile)) {
RoadType rt; /* Update station tile count. */
FOR_EACH_SET_ROADTYPE(rt, GetRoadTypes(tile)) { if (!IsBuoy(tile) && !IsAirport(tile)) {
old_company->infrastructure.road[rt] -= 2; old_company->infrastructure.station--;
new_company->infrastructure.road[rt] += 2; new_company->infrastructure.station++;
}
} }
/* for buoys, owner of tile is owner of water, st->owner == OWNER_NONE */ /* for buoys, owner of tile is owner of water, st->owner == OWNER_NONE */