gronod/OpenTTD
1
0
Fork 0
mirror of https://github.com/OpenTTD/OpenTTD.git synced 2025-03-06 14:27:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

(svn r15257) -Cleanup: remove Company::is_noai, it is not needed anymore

Browse Source
This commit is contained in:
smatz 2009-01-24 15:31:48 +00:00
parent 4493bd03e3
commit dbc4a8b331
3 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/company_base.h
View File

@ -70,7 +70,6 @@ struct Company : PoolItem<Company, CompanyByte, &_Company_pool> {
Money bankrupt_value; Money bankrupt_value;
bool is_ai; bool is_ai;
bool is_noai; ///< This is a NoAI player (for loading old savegames properly)
class AIInstance *ai_instance; class AIInstance *ai_instance;
class AIInfo *ai_info; class AIInfo *ai_info;

3
src/company_cmd.cpp
View File

@ -51,8 +51,7 @@ DEFINE_OLD_POOL_GENERIC(Company, Company)
Company::Company(uint16 name_1, bool is_ai) : Company::Company(uint16 name_1, bool is_ai) :
name_1(name_1), name_1(name_1),
location_of_HQ(INVALID_TILE), location_of_HQ(INVALID_TILE),
is_ai(is_ai), is_ai(is_ai)
is_noai(false)
{ {
for (uint j = 0; j < 4; j++) this->share_owners[j] = COMPANY_SPECTATOR; for (uint j = 0; j < 4; j++) this->share_owners[j] = COMPANY_SPECTATOR;
} }

5
src/saveload/company_sl.cpp
View File

@ -130,7 +130,7 @@ static const SaveLoad _company_desc[] = {
SLE_CONDARR(Company, yearly_expenses, SLE_INT64, 3 * 13, 2, SL_MAX_VERSION), SLE_CONDARR(Company, yearly_expenses, SLE_INT64, 3 * 13, 2, SL_MAX_VERSION),
SLE_CONDVAR(Company, is_ai, SLE_BOOL, 2, SL_MAX_VERSION), SLE_CONDVAR(Company, is_ai, SLE_BOOL, 2, SL_MAX_VERSION),
SLE_CONDVAR(Company, is_noai, SLE_BOOL, 107, SL_MAX_VERSION), SLE_CONDNULL(1, 107, 111), ///< is_noai
SLE_CONDNULL(1, 4, 99), SLE_CONDNULL(1, 4, 99),
/* Engine renewal settings */ /* Engine renewal settings */
@ -221,7 +221,7 @@ static void SaveLoad_PLYR(Company *c)
SlObject(c, _company_desc); SlObject(c, _company_desc);
/* Keep backwards compatible for savegames, so load the old AI block */ /* Keep backwards compatible for savegames, so load the old AI block */
if (CheckSavegameVersion(107) && !IsHumanCompany(c->index) && !c->is_noai) { if (CheckSavegameVersion(107) && !IsHumanCompany(c->index)) {
CompanyOldAI old_ai; CompanyOldAI old_ai;
char nothing; char nothing;
@ -275,7 +275,6 @@ static void Load_PLYR()
Company *c = new (index) Company(); Company *c = new (index) Company();
SaveLoad_PLYR(c); SaveLoad_PLYR(c);
_company_colours[index] = c->colour; _company_colours[index] = c->colour;
c->is_noai = true;
} }
} }