dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

(svn r23441) -Fix [FS#4764]: some airport functions didn't take the layout into account resulting in wrong noise levels or nearests towns (patch by Zuu)

Browse Source
This commit is contained in:
rubidium
2011-12-06 21:02:57 +00:00
parent f90dcddd3f
commit bff33e348c
2 changed files with 30 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/script/api/script_airport.cpp
View File

@@ -127,16 +127,16 @@
/* static */ int ScriptAirport::GetNoiseLevelIncrease(TileIndex tile, AirportType type)
{
extern Town *AirportGetNearestTown(const AirportSpec *as, TileIndex airport_tile);
extern uint8 GetAirportNoiseLevelForTown(const AirportSpec *as, TileIndex town_tile, TileIndex tile);
extern Town *AirportGetNearestTown(const AirportSpec *as, byte layout, TileIndex airport_tile);
extern uint8 GetAirportNoiseLevelForTown(const AirportSpec *as, byte layout, TileIndex town_tile, TileIndex tile);
if (!::IsValidTile(tile)) return -1;
if (!IsAirportInformationAvailable(type)) return -1;
if (_settings_game.economy.station_noise_level) {
const AirportSpec *as = ::AirportSpec::Get(type);
const Town *t = AirportGetNearestTown(as, tile);
return GetAirportNoiseLevelForTown(as, t->xy, tile);
const Town *t = AirportGetNearestTown(as, 0, tile);
return GetAirportNoiseLevelForTown(as, 0, t->xy, tile);
}
return 1;
@@ -144,12 +144,12 @@
/* static */ TownID ScriptAirport::GetNearestTown(TileIndex tile, AirportType type)
{
extern Town *AirportGetNearestTown(const AirportSpec *as, TileIndex airport_tile);
extern Town *AirportGetNearestTown(const AirportSpec *as, byte layout, TileIndex airport_tile);
if (!::IsValidTile(tile)) return INVALID_TOWN;
if (!IsAirportInformationAvailable(type)) return INVALID_TOWN;
return AirportGetNearestTown(AirportSpec::Get(type), tile)->index;
return AirportGetNearestTown(AirportSpec::Get(type), 0, tile)->index;
}
/* static */ uint16 ScriptAirport::GetMaintenanceCostFactor(AirportType type)