diff --git a/src/company_base.h b/src/company_base.h index 24f9051fc2..810c6c90d3 100644 --- a/src/company_base.h +++ b/src/company_base.h @@ -131,7 +131,7 @@ struct CompanyProperties { }; struct Company : CompanyProperties, CompanyPool::PoolItem<&_company_pool> { - Company(uint16_t name_1 = 0, bool is_ai = false); + Company(StringID name_1 = STR_NULL, bool is_ai = false); ~Company(); RailTypes avail_railtypes; ///< Rail types available to this company. diff --git a/src/company_cmd.cpp b/src/company_cmd.cpp index 7f37cc585e..91e2cd70a9 100644 --- a/src/company_cmd.cpp +++ b/src/company_cmd.cpp @@ -63,7 +63,7 @@ INSTANTIATE_POOL_METHODS(Company) * @param name_1 Name of the company. * @param is_ai A computer program is running for this company. */ -Company::Company(uint16_t name_1, bool is_ai) +Company::Company(StringID name_1, bool is_ai) { this->name_1 = name_1; this->location_of_HQ = INVALID_TILE; diff --git a/src/saveload/oldloader_sl.cpp b/src/saveload/oldloader_sl.cpp index a8b7a452e4..fa77ca7df6 100644 --- a/src/saveload/oldloader_sl.cpp +++ b/src/saveload/oldloader_sl.cpp @@ -1025,7 +1025,7 @@ static bool LoadOldCompany(LoadgameState *ls, int num) if (num == 0) { /* If the first company has no name, make sure we call it UNNAMED */ - if (c->name_1 == 0) { + if (c->name_1 == STR_NULL) { c->name_1 = STR_SV_UNNAMED; } } else {