From 8343340acb5bdb40555e04f40aac567d6e583bb8 Mon Sep 17 00:00:00 2001
From: smatz <smatz@openttd.org>
Date: Wed, 24 Jun 2009 17:39:54 +0000
Subject: (svn r16643) -Codechange: replace GetStationByTile() by
 Station::GetByTile()

---
 src/ai/api/ai_airport.cpp  | 6 +++---
 src/ai/api/ai_industry.cpp | 2 +-
 src/ai/api/ai_marine.cpp   | 2 +-
 src/ai/api/ai_order.cpp    | 2 +-
 src/ai/api/ai_rail.cpp     | 2 +-
 src/ai/api/ai_road.cpp     | 2 +-
 src/ai/api/ai_station.cpp  | 2 +-
 src/ai/api/ai_tilelist.cpp | 2 +-
 8 files changed, 10 insertions(+), 10 deletions(-)

(limited to 'src/ai/api')

diff --git a/src/ai/api/ai_airport.cpp b/src/ai/api/ai_airport.cpp
index 137de54c7..fa7c4e18b 100644
--- a/src/ai/api/ai_airport.cpp
+++ b/src/ai/api/ai_airport.cpp
@@ -4,7 +4,7 @@
 
 #include "ai_airport.hpp"
 #include "ai_station.hpp"
-#include "../../station_map.h"
+#include "../../station_base.h"
 #include "../../company_func.h"
 #include "../../command_type.h"
 #include "../../town.h"
@@ -82,7 +82,7 @@
 	if (!::IsValidTile(tile)) return -1;
 	if (!::IsTileType(tile, MP_STATION)) return -1;
 
-	const Station *st = ::GetStationByTile(tile);
+	const Station *st = ::Station::GetByTile(tile);
 	if (st->owner != _current_company) return -1;
 	if ((st->facilities & FACIL_AIRPORT) == 0) return -1;
 
@@ -95,7 +95,7 @@
 	if (!::IsTileType(tile, MP_STATION)) return INVALID_TILE;
 	if (GetNumHangars(tile) < 1) return INVALID_TILE;
 
-	const Station *st = ::GetStationByTile(tile);
+	const Station *st = ::Station::GetByTile(tile);
 	if (st->owner != _current_company) return INVALID_TILE;
 	if ((st->facilities & FACIL_AIRPORT) == 0) return INVALID_TILE;
 
diff --git a/src/ai/api/ai_industry.cpp b/src/ai/api/ai_industry.cpp
index 005311e19..3d7836cc2 100644
--- a/src/ai/api/ai_industry.cpp
+++ b/src/ai/api/ai_industry.cpp
@@ -8,7 +8,7 @@
 #include "../../tile_type.h"
 #include "../../industry.h"
 #include "../../strings_func.h"
-#include "../../station_map.h"
+#include "../../station_base.h"
 #include "table/strings.h"
 
 /* static */ int32 AIIndustry::GetIndustryCount()
diff --git a/src/ai/api/ai_marine.cpp b/src/ai/api/ai_marine.cpp
index b59307671..54f4e1cdf 100644
--- a/src/ai/api/ai_marine.cpp
+++ b/src/ai/api/ai_marine.cpp
@@ -4,7 +4,7 @@
 
 #include "ai_marine.hpp"
 #include "ai_station.hpp"
-#include "../../station_map.h"
+#include "../../station_base.h"
 #include "../../tile_cmd.h"
 
 
diff --git a/src/ai/api/ai_order.cpp b/src/ai/api/ai_order.cpp
index 56c0a78b7..545d336e3 100644
--- a/src/ai/api/ai_order.cpp
+++ b/src/ai/api/ai_order.cpp
@@ -10,7 +10,7 @@
 #include "../../vehicle_base.h"
 #include "../../roadstop_base.h"
 #include "../../depot_base.h"
-#include "../../station_map.h"
+#include "../../station_base.h"
 #include "../../waypoint.h"
 
 /**
diff --git a/src/ai/api/ai_rail.cpp b/src/ai/api/ai_rail.cpp
index 72905ff5b..5986ad82b 100644
--- a/src/ai/api/ai_rail.cpp
+++ b/src/ai/api/ai_rail.cpp
@@ -6,7 +6,7 @@
 #include "ai_map.hpp"
 #include "ai_station.hpp"
 #include "../../debug.h"
-#include "../../station_map.h"
+#include "../../station_base.h"
 #include "../../company_func.h"
 #include "../../waypoint.h"
 #include "../../newgrf_generic.h"
diff --git a/src/ai/api/ai_road.cpp b/src/ai/api/ai_road.cpp
index 4cbce4a68..fd3ec11d9 100644
--- a/src/ai/api/ai_road.cpp
+++ b/src/ai/api/ai_road.cpp
@@ -6,7 +6,7 @@
 #include "ai_map.hpp"
 #include "ai_station.hpp"
 #include "ai_cargo.hpp"
-#include "../../station_map.h"
+#include "../../station_base.h"
 #include "../../command_type.h"
 #include "../../settings_type.h"
 #include "../../company_func.h"
diff --git a/src/ai/api/ai_station.cpp b/src/ai/api/ai_station.cpp
index 5628ab547..519c1076f 100644
--- a/src/ai/api/ai_station.cpp
+++ b/src/ai/api/ai_station.cpp
@@ -8,7 +8,7 @@
 #include "ai_town.hpp"
 #include "../../command_func.h"
 #include "../../debug.h"
-#include "../../station_map.h"
+#include "../../station_base.h"
 #include "../../roadstop_base.h"
 #include "../../string_func.h"
 #include "../../strings_func.h"
diff --git a/src/ai/api/ai_tilelist.cpp b/src/ai/api/ai_tilelist.cpp
index 5d3039156..8015b96f8 100644
--- a/src/ai/api/ai_tilelist.cpp
+++ b/src/ai/api/ai_tilelist.cpp
@@ -6,7 +6,7 @@
 #include "ai_industry.hpp"
 #include "../../tile_map.h"
 #include "../../industry_map.h"
-#include "../../station_map.h"
+#include "../../station_base.h"
 #include "../../settings_type.h"
 
 void AITileList::FixRectangleSpan(TileIndex &t1, TileIndex &t2)
-- 
cgit v1.2.3-70-g09d2