From 8a06e670673e6a01747e29db0d59cc615d003e45 Mon Sep 17 00:00:00 2001 From: smatz Date: Wed, 24 Dec 2008 00:25:17 +0000 Subject: [PATCH] (svn r14734) -Codechange: type of bankrupt_asked is CompanyMask, not byte --- src/ai/default/default.cpp | 6 +++--- src/company_base.h | 2 +- src/economy.cpp | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/ai/default/default.cpp b/src/ai/default/default.cpp index dc9ad189a2..8e5f4a0691 100644 --- a/src/ai/default/default.cpp +++ b/src/ai/default/default.cpp @@ -3889,10 +3889,10 @@ static void AiHandleTakeover(Company *c) 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; int32 best_val = -1; @@ -3909,7 +3909,7 @@ static void AiHandleTakeover(Company *c) // Asked all companies? if (best_val == -1) { - c->bankrupt_asked = 255; + c->bankrupt_asked = MAX_UVALUE(CompanyMask); return; } diff --git a/src/company_base.h b/src/company_base.h index 96603ca7b3..665cfe08aa 100644 --- a/src/company_base.h +++ b/src/company_base.h @@ -65,7 +65,7 @@ struct Company : PoolItem { byte num_valid_stat_ent; 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; Money bankrupt_value; diff --git a/src/economy.cpp b/src/economy.cpp index 95225c0777..cccbf0b932 100644 --- a/src/economy.cpp +++ b/src/economy.cpp @@ -564,7 +564,7 @@ static void CompanyCheckBankrupt(Company *c) * is no THE-END, otherwise mark the client as spectator to make sure * he/she is no long in control of this company */ if (!_networking) { - c->bankrupt_asked = 0xFF; + c->bankrupt_asked = MAX_UVALUE(CompanyMask); c->bankrupt_timeout = 0x456; break; }