mirror
/
OpenTTD
mirror of https://github.com/OpenTTD/OpenTTD
1
0
Fork 0
Code Issues

(svn r14734) -Codechange: type of bankrupt_asked is CompanyMask, not byte

release/0.7
smatz 2008-12-24 00:25:17 +00:00
parent 4a1f4144eb
commit 5b26afbd6b
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/ai/default/default.cpp
View File

@ -3889,10 +3889,10 @@ static void AiHandleTakeover(Company *c)
if (IsHumanCompany(_current_company)) return; if (IsHumanCompany(_current_company)) return;
} }
if (c->bankrupt_asked == 255) return; if (c->bankrupt_asked == MAX_UVALUE(CompanyMask)) return;
{ {
uint asked = c->bankrupt_asked; CompanyMask asked = c->bankrupt_asked;
Company *company, *best_company = NULL; Company *company, *best_company = NULL;
int32 best_val = -1; int32 best_val = -1;
@ -3909,7 +3909,7 @@ static void AiHandleTakeover(Company *c)
// Asked all companies? // Asked all companies?
if (best_val == -1) { if (best_val == -1) {
c->bankrupt_asked = 255; c->bankrupt_asked = MAX_UVALUE(CompanyMask);
return; return;
} }

2
src/company_base.h
View File

@ -65,7 +65,7 @@ struct Company : PoolItem<Company, CompanyByte, &_Company_pool> {
byte num_valid_stat_ent; byte num_valid_stat_ent;
byte quarters_of_bankrupcy; byte quarters_of_bankrupcy;
byte bankrupt_asked; ///< which companies were asked about buying it? CompanyMask bankrupt_asked; ///< which companies were asked about buying it?
int16 bankrupt_timeout; int16 bankrupt_timeout;
Money bankrupt_value; Money bankrupt_value;

2
src/economy.cpp
View File

@ -564,7 +564,7 @@ static void CompanyCheckBankrupt(Company *c)
* is no THE-END, otherwise mark the client as spectator to make sure * is no THE-END, otherwise mark the client as spectator to make sure
* he/she is no long in control of this company */ * he/she is no long in control of this company */
if (!_networking) { if (!_networking) {
c->bankrupt_asked = 0xFF; c->bankrupt_asked = MAX_UVALUE(CompanyMask);
c->bankrupt_timeout = 0x456; c->bankrupt_timeout = 0x456;
break; break;
} }