(svn r11818) -Codechange: split player.h into smaller pieces.

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"
 

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"

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?

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);

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

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

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)

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];
 

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