(svn r23384) -Remove: no longer allow a binary to be without AI support; the parts some compilers failed at, are integrated in other parts of the code now too

This commit is contained in:
truebrain
2011-12-01 12:03:34 +00:00
parent 0c2bbdde5c
commit cc12942d70
23 changed files with 33 additions and 198 deletions

View File

@@ -572,7 +572,6 @@ void StartupCompanies()
_next_competitor_start = 0;
}
#ifdef ENABLE_AI
/** Start a new competitor company if possible. */
static void MaybeStartNewCompany()
{
@@ -594,7 +593,6 @@ static void MaybeStartNewCompany()
DoCommandP(0, 1 | INVALID_COMPANY << 16, 0, CMD_COMPANY_CTRL);
}
}
#endif /* ENABLE_AI */
/** Initialize the pool of companies. */
void InitializeCompanies()
@@ -693,7 +691,6 @@ void OnTick_Companies()
if (c->bankrupt_asked != 0) HandleBankruptcyTakeover(c);
}
#ifdef ENABLE_AI
if (_next_competitor_start == 0) {
_next_competitor_start = AI::GetStartNextTime() * DAY_TICKS;
}
@@ -701,7 +698,6 @@ void OnTick_Companies()
if (AI::CanStartNew() && _game_mode != GM_MENU && --_next_competitor_start == 0) {
MaybeStartNewCompany();
}
#endif /* ENABLE_AI */
_cur_company_tick_index = (_cur_company_tick_index + 1) % MAX_COMPANIES;
}