(svn r14422) -Codechange: also reflect the changes of r14421 in the filenames.

src/ai/ai.cpp

@@ -8,8 +8,8 @@
 #include "../command_func.h"
 #include "../network/network.h"
 #include "../core/alloc_func.hpp"
-#include "../player_func.h"
-#include "../player_base.h"
+#include "../company_func.h"
+#include "../company_base.h"
 #include "ai.h"
 #include "default/default.h"
 #include "trolly/trolly.h"

src/ai/default/default.cpp

@@ -26,8 +26,8 @@
 #include "../../vehicle_func.h"
 #include "../../functions.h"
 #include "../../saveload.h"
-#include "../../player_func.h"
-#include "../../player_base.h"
+#include "../../company_func.h"
+#include "../../company_base.h"
 #include "../../settings_type.h"
 #include "default.h"
 #include "../../tunnelbridge.h"

src/ai/trolly/build.cpp

@@ -14,8 +14,8 @@
 #include "../../bridge.h"
 #include "../../vehicle_func.h"
 #include "../../vehicle_base.h"
-#include "../../player_base.h"
-#include "../../player_func.h"
+#include "../../company_base.h"
+#include "../../company_func.h"
 #include "../ai.h"
 #include "../../tunnelbridge.h"
 

src/ai/trolly/pathfinder.cpp

@@ -13,8 +13,8 @@
 #include "../../tunnelbridge_map.h"
 #include "../ai.h"
 #include "../../variables.h"
-#include "../../player_base.h"
-#include "../../player_func.h"
+#include "../../company_base.h"
+#include "../../company_func.h"
 #include "../../tunnelbridge.h"
 
 

src/ai/trolly/shared.cpp

@@ -7,7 +7,7 @@
 #include "../../debug.h"
 #include "../../map_func.h"
 #include "../../vehicle_base.h"
-#include "../../player_base.h"
+#include "../../company_base.h"
 #include "trolly.h"
 
 int AiNew_GetRailDirection(TileIndex tile_a, TileIndex tile_b, TileIndex tile_c)

src/ai/trolly/trolly.cpp

@@ -38,8 +38,8 @@
 #include "../../vehicle_func.h"
 #include "../../date_func.h"
 #include "../ai.h"
-#include "../../player_base.h"
-#include "../../player_func.h"
+#include "../../company_base.h"
+#include "../../company_func.h"
 
 #include "table/strings.h"
 

src/ai/trolly/trolly.h

@@ -6,7 +6,7 @@
 #define AI_TROLLY_H
 
 #include "../../aystar.h"
-#include "../../player_type.h"
+#include "../../company_type.h"
 #include "../../vehicle_type.h"
 #include "../../date_type.h"
 #include "../../engine_type.h"

src/aircraft_cmd.cpp

@@ -33,7 +33,7 @@
 #include "autoreplace_func.h"
 #include "autoreplace_gui.h"
 #include "gfx_func.h"
-#include "player_func.h"
+#include "company_func.h"
 #include "settings_type.h"
 #include "order_func.h"
 #include "effectvehicle_func.h"

src/airport_gui.cpp

@@ -16,11 +16,11 @@
 #include "settings_type.h"
 #include "viewport_func.h"
 #include "gfx_func.h"
-#include "player_func.h"
+#include "company_func.h"
 #include "order_func.h"
 #include "station_type.h"
 #include "tilehighlight_func.h"
-#include "player_base.h"
+#include "company_base.h"
 
 #include "table/sprites.h"
 #include "table/strings.h"

src/autoreplace_cmd.cpp

@@ -4,7 +4,7 @@
 
 #include "stdafx.h"
 #include "openttd.h"
-#include "player_func.h"
+#include "company_func.h"
 #include "debug.h"
 #include "vehicle_gui.h"
 #include "train.h"

src/autoreplace_func.h

@@ -6,7 +6,7 @@
 #define AUTOREPLACE_FUNC_H
 
 #include "autoreplace_type.h"
-#include "player_base.h"
+#include "company_base.h"
 
 /**
  * Remove all engine replacement settings for the company.

src/autoreplace_gui.cpp

@@ -17,7 +17,7 @@
 #include "vehicle_func.h"
 #include "autoreplace_func.h"
 #include "gfx_func.h"
-#include "player_func.h"
+#include "company_func.h"
 #include "widgets/dropdown_type.h"
 #include "widgets/dropdown_func.h"
 #include "engine_func.h"

src/autoslope.h

@@ -6,7 +6,7 @@
 #define AUTOSLOPE_H
 
 #include "settings_type.h"
-#include "player_func.h"
+#include "company_func.h"
 #include "depot_func.h"
 
 /**

src/build_vehicle_gui.cpp

@@ -13,7 +13,7 @@
 #include "articulated_vehicles.h"
 #include "textbuf_gui.h"
 #include "command_func.h"
-#include "player_func.h"
+#include "company_func.h"
 #include "airport.h"
 #include "vehicle_gui.h"
 #include "newgrf_engine.h"

src/cheat_gui.cpp

@@ -6,8 +6,8 @@
 #include "openttd.h"
 #include "command_func.h"
 #include "cheat_func.h"
-#include "player_base.h"
-#include "player_func.h"
+#include "company_base.h"
+#include "company_func.h"
 #include "gfx_func.h"
 #include "date_func.h"
 #include "saveload.h"
@@ -18,7 +18,7 @@
 #include "window_func.h"
 #include "rail_gui.h"
 #include "gui.h"
-#include "player_gui.h"
+#include "company_gui.h"
 #include "gamelog.h"
 
 #include "table/strings.h"

src/command.cpp

@@ -18,8 +18,8 @@
 #include "town.h"
 #include "date_func.h"
 #include "debug.h"
-#include "player_func.h"
-#include "player_base.h"
+#include "company_func.h"
+#include "company_base.h"
 #include "signal_func.h"
 
 #include "table/strings.h"

src/company_base.h

@@ -5,7 +5,7 @@
 #ifndef COMPANY_BASE_H
 #define COMPANY_BASE_H
 
-#include "player_type.h"
+#include "company_type.h"
 #include "oldpool.h"
 #include "road_type.h"
 #include "rail_type.h"

src/company_cmd.cpp

@@ -6,8 +6,8 @@
 #include "openttd.h"
 #include "engine_func.h"
 #include "engine_base.h"
-#include "player_func.h"
-#include "player_gui.h"
+#include "company_func.h"
+#include "company_gui.h"
 #include "town.h"
 #include "news_func.h"
 #include "saveload.h"
@@ -17,7 +17,7 @@
 #include "variables.h"
 #include "cheat_func.h"
 #include "ai/ai.h"
-#include "player_face.h"
+#include "company_manager_face.h"
 #include "group.h"
 #include "window_func.h"
 #include "tile_map.h"

src/company_func.h

@@ -6,7 +6,7 @@
 #define COMPANY_FUNC_H
 
 #include "core/math_func.hpp"
-#include "player_type.h"
+#include "company_type.h"
 #include "tile_type.h"
 #include "strings_type.h"
 

src/company_gui.cpp

@@ -9,8 +9,8 @@
 #include "textbuf_gui.h"
 #include "viewport_func.h"
 #include "gfx_func.h"
-#include "player_func.h"
-#include "player_base.h"
+#include "company_func.h"
+#include "company_base.h"
 #include "command_func.h"
 #include "network/network.h"
 #include "network/network_gui.h"
@@ -19,7 +19,7 @@
 #include "train.h"
 #include "aircraft.h"
 #include "newgrf.h"
-#include "player_face.h"
+#include "company_manager_face.h"
 #include "strings_func.h"
 #include "functions.h"
 #include "window_func.h"

src/company_gui.h

@@ -5,7 +5,7 @@
 #ifndef COMPANY_GUI_H
 #define COMPANY_GUI_H
 
-#include "player_type.h"
+#include "company_type.h"
 
 uint16 GetDrawStringCompanyColor(CompanyID company);
 void DrawCompanyIcon(CompanyID p, int x, int y);

src/console_cmds.cpp

@@ -26,8 +26,8 @@
 #include "date_func.h"
 #include "vehicle_func.h"
 #include "string_func.h"
-#include "player_func.h"
-#include "player_base.h"
+#include "company_func.h"
+#include "company_base.h"
 #include "settings_type.h"
 #include "gamelog.h"
 

src/core/random_func.cpp

@@ -37,7 +37,7 @@ void SetRandomSeed(uint32 seed)
 #ifdef RANDOM_DEBUG
 #include "../network/network_data.h"
 #include "../variables.h" /* _frame_counter */
-#include "../player_func.h"
+#include "../company_func.h"
 
 uint32 DoRandom(int line, const char *file)
 {

src/depot_gui.cpp

@@ -21,7 +21,7 @@
 #include "strings_func.h"
 #include "window_func.h"
 #include "vehicle_func.h"
-#include "player_func.h"
+#include "company_func.h"
 #include "order_func.h"
 #include "depot_base.h"
 #include "tilehighlight_func.h"

src/disaster_cmd.cpp

@@ -29,7 +29,7 @@
 #include "waypoint.h"
 #include "town.h"
 #include "industry.h"
-#include "player_func.h"
+#include "company_func.h"
 #include "airport.h"
 #include "variables.h"
 #include "settings_type.h"

src/dock_gui.cpp

@@ -18,10 +18,10 @@
 #include "sound_func.h"
 #include "viewport_func.h"
 #include "gfx_func.h"
-#include "player_func.h"
+#include "company_func.h"
 #include "slope_func.h"
 #include "tilehighlight_func.h"
-#include "player_base.h"
+#include "company_base.h"
 
 #include "table/sprites.h"
 #include "table/strings.h"

src/economy.cpp

@@ -6,8 +6,8 @@
 #include "openttd.h"
 #include "currency.h"
 #include "landscape.h"
-#include "player_base.h"
-#include "player_func.h"
+#include "company_base.h"
+#include "company_func.h"
 #include "command_func.h"
 #include "saveload.h"
 #include "industry.h"
@@ -44,7 +44,7 @@
 #include "signal_func.h"
 #include "gfx_func.h"
 #include "autoreplace_func.h"
-#include "player_gui.h"
+#include "company_gui.h"
 #include "signs_base.h"
 
 #include "table/strings.h"

src/economy_func.h

@@ -12,7 +12,7 @@
 #include "tile_type.h"
 #include "town_type.h"
 #include "industry_type.h"
-#include "player_type.h"
+#include "company_type.h"
 #include "station_type.h"
 
 void ResetPriceBaseMultipliers();

src/effectvehicle.cpp

@@ -16,7 +16,7 @@
 #include "news_func.h"
 #include "command_func.h"
 #include "saveload.h"
-#include "player_func.h"
+#include "company_func.h"
 #include "debug.h"
 #include "vehicle_gui.h"
 #include "rail_type.h"

src/elrail.cpp

@@ -64,7 +64,7 @@
 #include "transparency.h"
 #include "tunnelbridge_map.h"
 #include "vehicle_func.h"
-#include "player_base.h"
+#include "company_base.h"
 #include "tunnelbridge.h"
 #include "engine_func.h"
 #include "elrail_func.h"

src/engine.cpp

@@ -5,8 +5,8 @@
 #include "stdafx.h"
 #include "openttd.h"
 #include "debug.h"
-#include "player_base.h"
-#include "player_func.h"
+#include "company_base.h"
+#include "company_func.h"
 #include "command_func.h"
 #include "news_func.h"
 #include "saveload.h"

src/engine_type.h

@@ -11,7 +11,7 @@
 #include "gfx_type.h"
 #include "date_type.h"
 #include "sound_type.h"
-#include "player_type.h"
+#include "company_type.h"
 #include "strings_type.h"
 
 typedef uint16 EngineID;

src/genworld.cpp

@@ -5,7 +5,7 @@
 #include "stdafx.h"
 #include "openttd.h"
 #include "landscape.h"
-#include "player_func.h"
+#include "company_func.h"
 #include "variables.h"
 #include "thread.h"
 #include "command_func.h"

src/genworld.h

@@ -5,7 +5,7 @@
 #ifndef GENWORLD_H
 #define GENWORLD_H
 
-#include "player_type.h"
+#include "company_type.h"
 
 /*
  * Order of these enums has to be the same as in lang/english.txt

src/graph_gui.cpp

@@ -6,8 +6,8 @@
 #include "openttd.h"
 #include "gui.h"
 #include "window_gui.h"
-#include "player_base.h"
-#include "player_gui.h"
+#include "company_base.h"
+#include "company_gui.h"
 #include "economy_func.h"
 #include "variables.h"
 #include "cargotype.h"

src/group.h

@@ -7,7 +7,7 @@
 
 #include "group_type.h"
 #include "oldpool.h"
-#include "player_type.h"
+#include "company_type.h"
 #include "vehicle_type.h"
 #include "engine_type.h"
 

src/group_cmd.cpp

@@ -19,7 +19,7 @@
 #include "autoreplace_base.h"
 #include "autoreplace_func.h"
 #include "string_func.h"
-#include "player_func.h"
+#include "company_func.h"
 #include "order_func.h"
 #include "oldpool_func.h"
 #include "core/alloc_func.hpp"

src/group_gui.cpp

@@ -21,7 +21,7 @@
 #include "string_func.h"
 #include "viewport_func.h"
 #include "gfx_func.h"
-#include "player_func.h"
+#include "company_func.h"
 #include "widgets/dropdown_type.h"
 #include "widgets/dropdown_func.h"
 #include "tilehighlight_func.h"

src/industry_gui.cpp

@@ -22,13 +22,13 @@
 #include "newgrf_text.h"
 #include "strings_func.h"
 #include "map_func.h"
-#include "player_func.h"
+#include "company_func.h"
 #include "settings_type.h"
 #include "tilehighlight_func.h"
 #include "string_func.h"
 #include "sortlist_type.h"
 #include "widgets/dropdown_func.h"
-#include "player_base.h"
+#include "company_base.h"
 
 #include "table/strings.h"
 #include "table/sprites.h"

src/livery.h

@@ -5,7 +5,7 @@
 #ifndef LIVERY_H
 #define LIVERY_H
 
-#include "player_type.h"
+#include "company_type.h"
 
 /* List of different livery schemes. */
 enum LiveryScheme {

src/main_gui.cpp

@@ -24,9 +24,9 @@
 #include "strings_func.h"
 #include "zoom_func.h"
 #include "string_func.h"
-#include "player_base.h"
-#include "player_func.h"
-#include "player_gui.h"
+#include "company_base.h"
+#include "company_func.h"
+#include "company_gui.h"
 #include "settings_type.h"
 #include "toolbar_gui.h"
 #include "statusbar_gui.h"

src/misc_cmd.cpp

@@ -12,15 +12,15 @@
 #include "network/network.h"
 #include "variables.h"
 #include "livery.h"
-#include "player_face.h"
+#include "company_manager_face.h"
 #include "strings_func.h"
 #include "gfx_func.h"
 #include "functions.h"
 #include "vehicle_func.h"
 #include "string_func.h"
-#include "player_func.h"
-#include "player_base.h"
-#include "player_gui.h"
+#include "company_func.h"
+#include "company_base.h"
+#include "company_gui.h"
 #include "settings_type.h"
 
 #include "table/strings.h"

src/misc_gui.cpp

@@ -19,8 +19,8 @@
 #include "gfx_func.h"
 #include "station_func.h"
 #include "command_func.h"
-#include "player_func.h"
-#include "player_base.h"
+#include "company_func.h"
+#include "company_base.h"
 #include "town.h"
 #include "network/network.h"
 #include "variables.h"
@@ -28,7 +28,7 @@
 #include "train.h"
 #include "tgp.h"
 #include "cargotype.h"
-#include "player_face.h"
+#include "company_manager_face.h"
 #include "strings_func.h"
 #include "fileio_func.h"
 #include "fios.h"
@@ -39,13 +39,13 @@
 #include "date_func.h"
 #include "sound_func.h"
 #include "string_func.h"
-#include "player_gui.h"
+#include "company_gui.h"
 #include "settings_type.h"
 #include "newgrf_cargo.h"
 #include "rail_gui.h"
 #include "tilehighlight_func.h"
 #include "querystring_gui.h"
-#include "player_base.h"
+#include "company_base.h"
 
 #include "table/sprites.h"
 #include "table/strings.h"

src/network/network.cpp

@@ -3,7 +3,7 @@
 /** @file network.cpp Base functions for networking support. */
 
 #include "../stdafx.h"
-#include "../player_type.h"
+#include "../company_type.h"
 
 #ifdef ENABLE_NETWORK
 
@@ -32,7 +32,7 @@
 #include "../core/random_func.hpp"
 #include "../window_func.h"
 #include "../string_func.h"
-#include "../player_func.h"
+#include "../company_func.h"
 #include "../settings_type.h"
 #include "../landscape_type.h"
 #include "../rev.h"
@@ -40,7 +40,7 @@
 	#include "../core/alloc_func.hpp"
 #endif /* DEBUG_DUMP_COMMANDS */
 #include "table/strings.h"
-#include "../player_base.h"
+#include "../company_base.h"
 
 bool _network_server;     ///< network-server is active
 bool _network_available;  ///< is network mode available?

src/network/network.h

@@ -5,7 +5,7 @@
 #ifndef NETWORK_H
 #define NETWORK_H
 
-#include "../player_type.h"
+#include "../company_type.h"
 
 #ifdef ENABLE_NETWORK
 

src/network/network_client.cpp

@@ -23,9 +23,9 @@
 #include "../strings_func.h"
 #include "../window_func.h"
 #include "../string_func.h"
-#include "../player_func.h"
-#include "../player_base.h"
-#include "../player_gui.h"
+#include "../company_func.h"
+#include "../company_base.h"
+#include "../company_gui.h"
 #include "../rev.h"
 
 #include "table/strings.h"

src/network/network_data.cpp

@@ -13,7 +13,7 @@
 #include "../core/alloc_func.hpp"
 #include "../string_func.h"
 #include "../date_func.h"
-#include "../player_func.h"
+#include "../company_func.h"
 
 // Add a command to the local command queue
 void NetworkAddCommandQueue(NetworkTCPSocketHandler *cs, CommandPacket *cp)

src/network/network_gui.cpp

@@ -24,12 +24,12 @@
 #include "../core/alloc_func.hpp"
 #include "../string_func.h"
 #include "../gfx_func.h"
-#include "../player_func.h"
+#include "../company_func.h"
 #include "../settings_type.h"
 #include "../widgets/dropdown_func.h"
 #include "../querystring_gui.h"
 #include "../sortlist_type.h"
-#include "../player_base.h"
+#include "../company_base.h"
 
 #include "table/strings.h"
 #include "../table/sprites.h"

src/network/network_server.cpp

@@ -24,9 +24,9 @@
 #include "../core/alloc_func.hpp"
 #include "../fileio_func.h"
 #include "../string_func.h"
-#include "../player_base.h"
-#include "../player_func.h"
-#include "../player_gui.h"
+#include "../company_base.h"
+#include "../company_func.h"
+#include "../company_gui.h"
 #include "../settings_type.h"
 
 #include "table/strings.h"

src/network/network_type.h

@@ -7,7 +7,7 @@
 
 #ifdef ENABLE_NETWORK
 
-#include "../player_type.h"
+#include "../company_type.h"
 #include "../economy_type.h"
 #include "core/config.h"
 #include "core/game.h"

src/network/network_udp.cpp

@@ -21,8 +21,8 @@
 #include "../newgrf_config.h"
 #include "../core/endian_func.hpp"
 #include "../string_func.h"
-#include "../player_base.h"
-#include "../player_func.h"
+#include "../company_base.h"
+#include "../company_func.h"
 #include "../settings_type.h"
 #include "../rev.h"
 

src/newgrf.cpp

@@ -44,7 +44,7 @@
 #include "sound_func.h"
 #include "string_func.h"
 #include "road_func.h"
-#include "player_base.h"
+#include "company_base.h"
 #include "settings_type.h"
 #include "network/network.h"
 #include "map_func.h"

src/newgrf_engine.cpp

@@ -9,8 +9,8 @@
 #include "engine_func.h"
 #include "engine_base.h"
 #include "train.h"
-#include "player_func.h"
-#include "player_base.h"
+#include "company_func.h"
+#include "company_base.h"
 #include "station_base.h"
 #include "airport.h"
 #include "newgrf.h"

src/newgrf_house.cpp

@@ -20,10 +20,10 @@
 #include "newgrf_commons.h"
 #include "transparency.h"
 #include "functions.h"
-#include "player_func.h"
+#include "company_func.h"
 #include "animated_tile_func.h"
 #include "date_func.h"
-#include "player_base.h"
+#include "company_base.h"
 
 #include "table/strings.h"
 #include "table/sprites.h"

src/newgrf_industries.cpp

@@ -19,8 +19,8 @@
 #include "newgrf_town.h"
 #include "window_func.h"
 #include "town.h"
-#include "player_func.h"
-#include "player_base.h"
+#include "company_func.h"
+#include "company_base.h"
 #include "command_func.h"
 
 #include "table/strings.h"

src/newgrf_station.cpp

@@ -22,7 +22,7 @@
 #include "newgrf_town.h"
 #include "gfx_func.h"
 #include "date_func.h"
-#include "player_func.h"
+#include "company_func.h"
 #include "animated_tile_func.h"
 #include "functions.h"
 #include "tunnelbridge_map.h"

src/news_gui.cpp

@@ -19,7 +19,7 @@
 #include "widgets/dropdown_func.h"
 #include "map_func.h"
 #include "statusbar_gui.h"
-#include "player_face.h"
+#include "company_manager_face.h"
 
 #include "table/sprites.h"
 #include "table/strings.h"

src/npf.h

@@ -8,7 +8,7 @@
 #include "aystar.h"
 #include "station_type.h"
 #include "rail_type.h"
-#include "player_type.h"
+#include "company_type.h"
 #include "vehicle_type.h"
 #include "tile_type.h"
 #include "track_type.h"

src/oldloader.cpp

@@ -7,8 +7,8 @@
 #include "station_map.h"
 #include "town.h"
 #include "industry.h"
-#include "player_func.h"
-#include "player_base.h"
+#include "company_func.h"
+#include "company_base.h"
 #include "aircraft.h"
 #include "roadveh.h"
 #include "ship.h"

src/openttd.cpp

@@ -27,8 +27,8 @@
 #include "debug.h"
 #include "saveload.h"
 #include "landscape.h"
-#include "player_func.h"
-#include "player_base.h"
+#include "company_func.h"
+#include "company_base.h"
 #include "command_func.h"
 #include "town.h"
 #include "industry.h"
@@ -49,7 +49,7 @@
 #include "yapf/yapf.h"
 #include "settings_func.h"
 #include "genworld.h"
-#include "player_face.h"
+#include "company_manager_face.h"
 #include "group.h"
 #include "strings_func.h"
 #include "date_func.h"

src/order_cmd.cpp

@@ -10,7 +10,7 @@
 #include "order_base.h"
 #include "waypoint.h"
 #include "command_func.h"
-#include "player_func.h"
+#include "company_func.h"
 #include "news_func.h"
 #include "saveload.h"
 #include "vehicle_gui.h"

src/order_gui.cpp

@@ -24,7 +24,7 @@
 #include "window_func.h"
 #include "vehicle_func.h"
 #include "settings_type.h"
-#include "player_func.h"
+#include "company_func.h"
 #include "newgrf_cargo.h"
 #include "widgets/dropdown_func.h"
 #include "textbuf_gui.h"

src/rail.cpp

@@ -11,8 +11,8 @@
 #include "tunnelbridge_map.h"
 #include "settings_type.h"
 #include "date_func.h"
-#include "player_func.h"
-#include "player_base.h"
+#include "company_func.h"
+#include "company_base.h"
 #include "engine_func.h"
 #include "engine_base.h"
 

src/rail_gui.cpp

@@ -26,7 +26,7 @@
 #include "window_func.h"
 #include "date_func.h"
 #include "sound_func.h"
-#include "player_func.h"
+#include "company_func.h"
 #include "settings_type.h"
 #include "widgets/dropdown_type.h"
 #include "widgets/dropdown_func.h"

src/road.cpp

@@ -9,8 +9,8 @@
 #include "road_internal.h"
 #include "water_map.h"
 #include "genworld.h"
-#include "player_func.h"
-#include "player_base.h"
+#include "company_func.h"
+#include "company_base.h"
 #include "engine_func.h"
 #include "engine_base.h"
 #include "settings_type.h"

src/road_func.h

@@ -8,7 +8,7 @@
 #include "core/bitmath_func.hpp"
 #include "road_type.h"
 #include "direction_func.h"
-#include "player_type.h"
+#include "company_type.h"
 
 /**
  * Whether the given roadtype is valid.

src/road_gui.cpp

@@ -20,11 +20,11 @@
 #include "window_func.h"
 #include "vehicle_func.h"
 #include "sound_func.h"
-#include "player_func.h"
+#include "company_func.h"
 #include "settings_type.h"
 #include "tunnelbridge.h"
 #include "tilehighlight_func.h"
-#include "player_base.h"
+#include "company_base.h"
 
 #include "table/sprites.h"
 #include "table/strings.h"

src/roadveh_cmd.cpp

@@ -15,8 +15,8 @@
 #include "news_func.h"
 #include "pathfind.h"
 #include "npf.h"
-#include "player_func.h"
-#include "player_base.h"
+#include "company_func.h"
+#include "company_base.h"
 #include "bridge.h"
 #include "tunnel_map.h"
 #include "bridge_map.h"

src/screenshot.cpp

@@ -18,7 +18,7 @@
 #include "core/endian_func.hpp"
 #include "map_func.h"
 #include "date_func.h"
-#include "player_func.h"
+#include "company_func.h"
 
 #include "table/strings.h"
 

src/settings.cpp

@@ -43,7 +43,7 @@
 #include "vehicle_func.h"
 #include "sound_func.h"
 #include "core/alloc_func.hpp"
-#include "player_func.h"
+#include "company_func.h"
 #include "rev.h"
 #ifdef WITH_FREETYPE
 #include "fontcache.h"

src/ship_cmd.cpp

@@ -15,8 +15,8 @@
 #include "news_func.h"
 #include "engine_func.h"
 #include "engine_base.h"
-#include "player_func.h"
-#include "player_base.h"
+#include "company_func.h"
+#include "company_base.h"
 #include "npf.h"
 #include "depot_base.h"
 #include "depot_func.h"

src/signal.cpp

@@ -17,7 +17,7 @@
 #include "track_type.h"
 #include "track_func.h"
 #include "signal_func.h"
-#include "player_func.h"
+#include "company_func.h"
 
 
 /** these are the maximums used for updating signal blocks */

src/signal_func.h

@@ -9,7 +9,7 @@
 #include "tile_type.h"
 #include "direction_type.h"
 #include "track_type.h"
-#include "player_type.h"
+#include "company_type.h"
 
 /**
  * Maps a trackdir to the bit that stores its status in the map arrays, in the

src/signs.cpp

@@ -5,7 +5,7 @@
 #include "stdafx.h"
 #include "openttd.h"
 #include "landscape.h"
-#include "player_func.h"
+#include "company_func.h"
 #include "signs_base.h"
 #include "signs_func.h"
 #include "saveload.h"

src/signs_gui.cpp

@@ -7,8 +7,8 @@
 #include "gui.h"
 #include "textbuf_gui.h"
 #include "window_gui.h"
-#include "player_gui.h"
-#include "player_func.h"
+#include "company_gui.h"
+#include "company_func.h"
 #include "signs_base.h"
 #include "signs_func.h"
 #include "debug.h"

src/smallmap_gui.cpp

@@ -16,7 +16,7 @@
 #include "tunnel_map.h"
 #include "viewport_func.h"
 #include "gfx_func.h"
-#include "player_base.h"
+#include "company_base.h"
 #include "town.h"
 #include "variables.h"
 #include "blitter/factory.hpp"

src/station.cpp

@@ -10,7 +10,7 @@
 #include "station_base.h"
 #include "town.h"
 #include "saveload.h"
-#include "player_func.h"
+#include "company_func.h"
 #include "airport.h"
 #include "sprite.h"
 #include "train.h"

src/station_base.h

@@ -14,7 +14,7 @@
 #include "strings_type.h"
 #include "date_type.h"
 #include "vehicle_type.h"
-#include "player_type.h"
+#include "company_type.h"
 #include "core/geometry_type.hpp"
 #include "viewport_type.h"
 #include <list>

src/station_gui.cpp

@@ -9,7 +9,7 @@
 #include "window_gui.h"
 #include "textbuf_gui.h"
 #include "station_base.h"
-#include "player_func.h"
+#include "company_func.h"
 #include "economy_func.h"
 #include "town.h"
 #include "command_func.h"
@@ -26,7 +26,7 @@
 #include "widgets/dropdown_func.h"
 #include "newgrf_cargo.h"
 #include "string_func.h"
-#include "player_base.h"
+#include "company_base.h"
 #include "sortlist_type.h"
 
 #include "table/strings.h"

src/statusbar_gui.cpp

@@ -8,13 +8,13 @@
 #include "date_func.h"
 #include "gfx_func.h"
 #include "news_func.h"
-#include "player_func.h"
+#include "company_func.h"
 #include "string_func.h"
 #include "strings_func.h"
-#include "player_base.h"
+#include "company_base.h"
 #include "tilehighlight_func.h"
 #include "news_gui.h"
-#include "player_gui.h"
+#include "company_gui.h"
 #include "window_gui.h"
 #include "variables.h"
 #include "window_func.h"

src/strings.cpp

@@ -32,8 +32,8 @@
 #include "date_func.h"
 #include "vehicle_base.h"
 #include "string_func.h"
-#include "player_func.h"
-#include "player_base.h"
+#include "company_func.h"
+#include "company_base.h"
 #include "fios.h"
 #include "settings_type.h"
 #include "video/video_driver.hpp"

src/terraform_gui.cpp

@@ -6,8 +6,8 @@
 #include "openttd.h"
 #include "bridge_map.h"
 #include "clear_map.h"
-#include "player_func.h"
-#include "player_base.h"
+#include "company_func.h"
+#include "company_base.h"
 #include "gui.h"
 #include "window_gui.h"
 #include "viewport_func.h"

src/tile_cmd.h

@@ -12,7 +12,7 @@
 #include "cargo_type.h"
 #include "strings_type.h"
 #include "date_type.h"
-#include "player_type.h"
+#include "company_type.h"
 #include "direction_type.h"
 #include "track_type.h"
 #include "transport_type.h"

src/tile_map.h

@@ -7,7 +7,7 @@
 
 #include "tile_type.h"
 #include "slope_type.h"
-#include "player_type.h"
+#include "company_type.h"
 #include "map_func.h"
 #include "core/bitmath_func.hpp"
 

src/timetable_gui.cpp

@@ -14,7 +14,7 @@
 #include "vehicle_base.h"
 #include "string_func.h"
 #include "gfx_func.h"
-#include "player_func.h"
+#include "company_func.h"
 #include "order_func.h"
 #include "settings_type.h"
 

src/toolbar_gui.cpp

@@ -21,9 +21,9 @@
 #include "terraform_gui.h"
 #include "transparency.h"
 #include "strings_func.h"
-#include "player_base.h"
-#include "player_func.h"
-#include "player_gui.h"
+#include "company_base.h"
+#include "company_func.h"
+#include "company_gui.h"
 #include "settings_type.h"
 #include "toolbar_gui.h"
 #include "vehicle_base.h"

src/town.h

@@ -12,7 +12,7 @@
 #include "tile_type.h"
 #include "date_type.h"
 #include "town_type.h"
-#include "player_type.h"
+#include "company_type.h"
 #include "settings_type.h"
 #include "strings_type.h"
 #include "viewport_type.h"

src/town_cmd.cpp

@@ -16,7 +16,7 @@
 #include "command_func.h"
 #include "industry.h"
 #include "station_base.h"
-#include "player_base.h"
+#include "company_base.h"
 #include "news_func.h"
 #include "saveload.h"
 #include "gui.h"

src/town_gui.cpp

@@ -12,9 +12,9 @@
 #include "window_gui.h"
 #include "textbuf_gui.h"
 #include "command_func.h"
-#include "player_func.h"
-#include "player_base.h"
-#include "player_gui.h"
+#include "company_func.h"
+#include "company_base.h"
+#include "company_gui.h"
 #include "network/network.h"
 #include "variables.h"
 #include "strings_func.h"

src/town_type.h

@@ -43,9 +43,9 @@ enum {
 	RATING_TREE_UP_STEP   = 7,
 	RATING_TREE_MAXIMUM   = 220,
 
-	RATING_GROWTH_UP_STEP    =   5, ///< when a town grows, all players have rating increased a bit ...
+	RATING_GROWTH_UP_STEP    =   5, ///< when a town grows, all companies have rating increased a bit ...
 	RATING_GROWTH_MAXIMUM    = RATING_MEDIOCRE, ///< ... up to RATING_MEDIOCRE
-	RATING_STATION_UP_STEP   =  12, ///< when a town grows, player gains reputation for all well serviced stations ...
+	RATING_STATION_UP_STEP   =  12, ///< when a town grows, company gains reputation for all well serviced stations ...
 	RATING_STATION_DOWN_STEP = -15, ///< ... but loses for bad serviced stations
 
 	RATING_TUNNEL_BRIDGE_DOWN_STEP = -250,

src/train_cmd.cpp

@@ -19,8 +19,8 @@
 #include "news_func.h"
 #include "engine_func.h"
 #include "engine_base.h"
-#include "player_func.h"
-#include "player_base.h"
+#include "company_func.h"
+#include "company_base.h"
 #include "depot_base.h"
 #include "depot_func.h"
 #include "waypoint.h"

src/tree_cmd.cpp

@@ -17,13 +17,13 @@
 #include "genworld.h"
 #include "transparency.h"
 #include "functions.h"
-#include "player_func.h"
+#include "company_func.h"
 #include "sound_func.h"
 #include "settings_type.h"
 #include "water_map.h"
 #include "water.h"
 #include "landscape_type.h"
-#include "player_base.h"
+#include "company_base.h"
 
 #include "table/strings.h"
 #include "table/sprites.h"

src/tree_gui.cpp

@@ -7,8 +7,8 @@
 #include "window_gui.h"
 #include "gfx_func.h"
 #include "tilehighlight_func.h"
-#include "player_func.h"
-#include "player_base.h"
+#include "company_func.h"
+#include "company_base.h"
 #include "command_func.h"
 #include "sound_func.h"
 #include "settings_type.h"

src/tunnelbridge_cmd.cpp

@@ -33,7 +33,7 @@
 #include "sound_func.h"
 #include "signal_func.h"
 #include "tunnelbridge.h"
-#include "player_base.h"
+#include "company_base.h"
 #include "engine_func.h"
 #include "engine_base.h"
 #include "economy_func.h"

src/unmovable_cmd.cpp

@@ -8,8 +8,8 @@
 #include "landscape.h"
 #include "command_func.h"
 #include "viewport_func.h"
-#include "player_func.h"
-#include "player_base.h"
+#include "company_func.h"
+#include "company_base.h"
 #include "gui.h"
 #include "town.h"
 #include "sprite.h"
@@ -23,7 +23,7 @@
 #include "functions.h"
 #include "window_func.h"
 #include "vehicle_func.h"
-#include "player_gui.h"
+#include "company_gui.h"
 #include "station_type.h"
 #include "economy_func.h"
 #include "cheat_func.h"

src/vehicle.cpp

@@ -16,7 +16,7 @@
 #include "news_func.h"
 #include "command_func.h"
 #include "saveload.h"
-#include "player_func.h"
+#include "company_func.h"
 #include "debug.h"
 #include "vehicle_gui.h"
 #include "rail_type.h"

src/vehicle_base.h

@@ -14,8 +14,8 @@
 #include "gfx_type.h"
 #include "command_type.h"
 #include "date_type.h"
-#include "player_base.h"
-#include "player_type.h"
+#include "company_base.h"
+#include "company_type.h"
 #include "oldpool.h"
 #include "order_base.h"
 #include "cargopacket.h"

src/vehicle_gui.cpp

@@ -5,7 +5,7 @@
 #include "stdafx.h"
 #include "openttd.h"
 #include "debug.h"
-#include "player_func.h"
+#include "company_func.h"
 #include "gui.h"
 #include "window_gui.h"
 #include "textbuf_gui.h"