summaryrefslogtreecommitdiff
path: root/src/ai
diff options
context:
space:
mode:
authorrubidium <rubidium@openttd.org>2008-01-12 14:10:35 +0000
committerrubidium <rubidium@openttd.org>2008-01-12 14:10:35 +0000
commitac528411df2e42e066ab301517bd85743162f356 (patch)
treedd717901825d2b9701f42a6a4bedb895deb3017a /src/ai
parentcbbc53e8f84067cae60c6f2e8e00682c968430a7 (diff)
downloadopenttd-ac528411df2e42e066ab301517bd85743162f356.tar.xz
(svn r11818) -Codechange: split player.h into smaller pieces.
Diffstat (limited to 'src/ai')
-rw-r--r--src/ai/ai.cpp3
-rw-r--r--src/ai/ai.h1
-rw-r--r--src/ai/default/default.cpp3
-rw-r--r--src/ai/default/default.h2
-rw-r--r--src/ai/trolly/build.cpp2
-rw-r--r--src/ai/trolly/pathfinder.cpp2
-rw-r--r--src/ai/trolly/shared.cpp1
-rw-r--r--src/ai/trolly/trolly.cpp2
-rw-r--r--src/ai/trolly/trolly.h4
9 files changed, 16 insertions, 4 deletions
diff --git a/src/ai/ai.cpp b/src/ai/ai.cpp
index 0654fcaa1..07b31f77d 100644
--- a/src/ai/ai.cpp
+++ b/src/ai/ai.cpp
@@ -2,11 +2,12 @@
#include "../stdafx.h"
#include "../openttd.h"
-#include "../player.h"
#include "../variables.h"
#include "../command_func.h"
#include "../network/network.h"
#include "../core/alloc_func.hpp"
+#include "../player_func.h"
+#include "../player_base.h"
#include "ai.h"
#include "default/default.h"
diff --git a/src/ai/ai.h b/src/ai/ai.h
index 96e25ef54..7ecc97571 100644
--- a/src/ai/ai.h
+++ b/src/ai/ai.h
@@ -4,7 +4,6 @@
#define AI_H
#include "../network/network.h"
-#include "../player.h"
#include "../command_type.h"
#include "../core/random_func.hpp"
#include "../settings_type.h"
diff --git a/src/ai/default/default.cpp b/src/ai/default/default.cpp
index 6d72f2043..b9d0f2f92 100644
--- a/src/ai/default/default.cpp
+++ b/src/ai/default/default.cpp
@@ -10,7 +10,6 @@
#include "../../road_map.h"
#include "../../roadveh.h"
#include "../../station_map.h"
-#include "../../player.h"
#include "../../tunnel_map.h"
#include "../../engine.h"
#include "../../command_func.h"
@@ -28,6 +27,8 @@
#include "../../vehicle_func.h"
#include "../../functions.h"
#include "../../saveload.h"
+#include "../../player_func.h"
+#include "../../player_base.h"
#include "default.h"
// remove some day perhaps?
diff --git a/src/ai/default/default.h b/src/ai/default/default.h
index 934f96f22..bbe84770f 100644
--- a/src/ai/default/default.h
+++ b/src/ai/default/default.h
@@ -4,6 +4,8 @@
#define DEFAULT_H
#include "../../direction_type.h"
+#include "../../vehicle_type.h"
+#include "../../rail_type.h"
void AiDoGameLoop(Player*);
void SaveLoad_AI(PlayerID id);
diff --git a/src/ai/trolly/build.cpp b/src/ai/trolly/build.cpp
index 388a40b66..44e03cb07 100644
--- a/src/ai/trolly/build.cpp
+++ b/src/ai/trolly/build.cpp
@@ -12,6 +12,8 @@
#include "../../bridge.h"
#include "../../vehicle_func.h"
#include "../../vehicle_base.h"
+#include "../../player_base.h"
+#include "../../player_func.h"
#include "../ai.h"
// Build HQ
diff --git a/src/ai/trolly/pathfinder.cpp b/src/ai/trolly/pathfinder.cpp
index 945691675..d3dcc96c2 100644
--- a/src/ai/trolly/pathfinder.cpp
+++ b/src/ai/trolly/pathfinder.cpp
@@ -12,6 +12,8 @@
#include "../../tunnelbridge_map.h"
#include "../ai.h"
#include "../../variables.h"
+#include "../../player_base.h"
+#include "../../player_func.h"
#define TEST_STATION_NO_DIR 0xFF
diff --git a/src/ai/trolly/shared.cpp b/src/ai/trolly/shared.cpp
index 8e0860432..7773934d3 100644
--- a/src/ai/trolly/shared.cpp
+++ b/src/ai/trolly/shared.cpp
@@ -5,6 +5,7 @@
#include "../../debug.h"
#include "../../map_func.h"
#include "../../vehicle_base.h"
+#include "../../player_base.h"
#include "trolly.h"
int AiNew_GetRailDirection(TileIndex tile_a, TileIndex tile_b, TileIndex tile_c)
diff --git a/src/ai/trolly/trolly.cpp b/src/ai/trolly/trolly.cpp
index 3f0cf58ba..8a863142e 100644
--- a/src/ai/trolly/trolly.cpp
+++ b/src/ai/trolly/trolly.cpp
@@ -36,6 +36,8 @@
#include "../../date_func.h"
#include "../ai.h"
#include "../../order.h"
+#include "../../player_base.h"
+#include "../../player_func.h"
PlayerAiNew _players_ainew[MAX_PLAYERS];
diff --git a/src/ai/trolly/trolly.h b/src/ai/trolly/trolly.h
index c367867f5..43966f423 100644
--- a/src/ai/trolly/trolly.h
+++ b/src/ai/trolly/trolly.h
@@ -4,7 +4,9 @@
#define AI_TROLLY_H
#include "../../aystar.h"
-#include "../../player.h"
+#include "../../player_type.h"
+#include "../../vehicle_type.h"
+#include "../../date_type.h"
/*
* These defines can be altered to change the behavoir of the AI