From f56e630e5cb839b307f04bf52465c4db4d1ad904 Mon Sep 17 00:00:00 2001 From: rubidium Date: Tue, 30 Sep 2008 20:39:50 +0000 Subject: (svn r14421) -Codechange: rename all player variables/types to company *or* client so it is immediatelly clear which one you are working with. --- src/genworld.cpp | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'src/genworld.cpp') diff --git a/src/genworld.cpp b/src/genworld.cpp index dcbe15dbc..edccdbfc8 100644 --- a/src/genworld.cpp +++ b/src/genworld.cpp @@ -36,7 +36,7 @@ bool GenerateTowns(); void GenerateTrees(); void StartupEconomy(); -void StartupPlayers(); +void StartupCompanies(); void StartupDisasters(); void InitializeGame(uint size_x, uint size_y, bool reset_date); @@ -126,7 +126,7 @@ static void _GenerateWorld(void *arg) /* These are probably pointless when inside the scenario editor. */ SetGeneratingWorldProgress(GWP_GAME_INIT, 3); - StartupPlayers(); + StartupCompanies(); IncreaseGeneratingWorldProgress(GWP_GAME_INIT); StartupEngines(); IncreaseGeneratingWorldProgress(GWP_GAME_INIT); @@ -145,7 +145,7 @@ static void _GenerateWorld(void *arg) } ResetObjectToPlace(); - _local_player = _gw.lp; + _local_company = _gw.lc; SetGeneratingWorldProgress(GWP_GAME_START, 1); /* Call any callback */ @@ -259,15 +259,15 @@ void GenerateWorld(GenerateWorldMode mode, uint size_x, uint size_y) _gw.active = true; _gw.abort = false; _gw.abortp = NULL; - _gw.lp = _local_player; + _gw.lc = _local_company; _gw.wait_for_draw = false; _gw.quit_thread = false; _gw.threaded = true; /* This disables some commands and stuff */ - SetLocalPlayer(PLAYER_SPECTATOR); + SetLocalCompany(COMPANY_SPECTATOR); /* Make sure everything is done via OWNER_NONE */ - _current_player = OWNER_NONE; + _current_company = OWNER_NONE; /* Set the date before loading sprites as some newgrfs check it */ SetDate(ConvertYMDToDate(_settings_game.game_creation.starting_year, 0, 1)); -- cgit v1.2.3-54-g00ecf