mirror of https://github.com/OpenTTD/OpenTTD
Codechange: use SPECSTR_..._END over _LAST, to prevent + 1 everywhere
parent
bfc8ae6c52
commit
65731bb964
|
@ -405,7 +405,7 @@ static void GenerateCompanyName(Company *c)
|
|||
StringID str;
|
||||
uint32_t strp;
|
||||
std::string name;
|
||||
if (t->name.empty() && IsInsideMM(t->townnametype, SPECSTR_TOWNNAME_START, SPECSTR_TOWNNAME_LAST + 1)) {
|
||||
if (t->name.empty() && IsInsideMM(t->townnametype, SPECSTR_TOWNNAME_START, SPECSTR_TOWNNAME_END)) {
|
||||
str = t->townnametype - SPECSTR_TOWNNAME_START + SPECSTR_COMPANY_NAME_START;
|
||||
strp = t->townnameparts;
|
||||
|
||||
|
|
|
@ -562,7 +562,7 @@ struct PLYRChunkHandler : ChunkHandler {
|
|||
}
|
||||
}
|
||||
|
||||
if (cprops->name.empty() && !IsInsideMM(cprops->name_1, SPECSTR_COMPANY_NAME_START, SPECSTR_COMPANY_NAME_LAST + 1) &&
|
||||
if (cprops->name.empty() && !IsInsideMM(cprops->name_1, SPECSTR_COMPANY_NAME_START, SPECSTR_COMPANY_NAME_END) &&
|
||||
cprops->name_1 != STR_GAME_SAVELOAD_NOT_AVAILABLE && cprops->name_1 != STR_SV_UNNAMED &&
|
||||
cprops->name_1 != SPECSTR_ANDCO_NAME && cprops->name_1 != SPECSTR_PRESIDENT_NAME &&
|
||||
cprops->name_1 != SPECSTR_SILLY_NAME) {
|
||||
|
|
|
@ -303,7 +303,7 @@ struct CITYChunkHandler : ChunkHandler {
|
|||
Town *t = new (index) Town();
|
||||
SlObject(t, slt);
|
||||
|
||||
if (t->townnamegrfid == 0 && !IsInsideMM(t->townnametype, SPECSTR_TOWNNAME_START, SPECSTR_TOWNNAME_LAST + 1) && GetStringTab(t->townnametype) != TEXT_TAB_OLD_CUSTOM) {
|
||||
if (t->townnamegrfid == 0 && !IsInsideMM(t->townnametype, SPECSTR_TOWNNAME_START, SPECSTR_TOWNNAME_END) && GetStringTab(t->townnametype) != TEXT_TAB_OLD_CUSTOM) {
|
||||
SlErrorCorrupt("Invalid town name generator");
|
||||
}
|
||||
}
|
||||
|
|
|
@ -1890,7 +1890,7 @@ static void GetSpecialNameString(StringBuilder &builder, int ind, StringParamete
|
|||
}
|
||||
|
||||
/* town name? */
|
||||
if (IsInsideMM(ind - 6, 0, SPECSTR_TOWNNAME_LAST - SPECSTR_TOWNNAME_START + 1)) {
|
||||
if (IsInsideMM(ind - 6, 0, SPECSTR_TOWNNAME_END - SPECSTR_TOWNNAME_START)) {
|
||||
GetSpecialTownNameString(builder, ind - 6, args.GetNextParameter<uint32_t>());
|
||||
builder += " Transport";
|
||||
return;
|
||||
|
|
|
@ -82,11 +82,11 @@ enum SpecialStrings {
|
|||
SPECSTR_TOWNNAME_TURKISH,
|
||||
SPECSTR_TOWNNAME_ITALIAN,
|
||||
SPECSTR_TOWNNAME_CATALAN,
|
||||
SPECSTR_TOWNNAME_LAST = SPECSTR_TOWNNAME_CATALAN,
|
||||
SPECSTR_TOWNNAME_END = SPECSTR_TOWNNAME_CATALAN + 1,
|
||||
|
||||
/* special strings for company names on the form "TownName transport". */
|
||||
SPECSTR_COMPANY_NAME_START = 0x70EA,
|
||||
SPECSTR_COMPANY_NAME_LAST = SPECSTR_COMPANY_NAME_START + SPECSTR_TOWNNAME_LAST - SPECSTR_TOWNNAME_START,
|
||||
SPECSTR_COMPANY_NAME_END = SPECSTR_COMPANY_NAME_START + SPECSTR_TOWNNAME_END - SPECSTR_TOWNNAME_START,
|
||||
|
||||
SPECSTR_SILLY_NAME = 0x70E5,
|
||||
SPECSTR_ANDCO_NAME = 0x70E6,
|
||||
|
|
|
@ -19,7 +19,7 @@
|
|||
|
||||
typedef std::set<std::string> TownNames;
|
||||
|
||||
static constexpr uint BUILTIN_TOWNNAME_GENERATOR_COUNT = SPECSTR_TOWNNAME_LAST - SPECSTR_TOWNNAME_START + 1; ///< Number of built-in town name generators.
|
||||
static constexpr uint BUILTIN_TOWNNAME_GENERATOR_COUNT = SPECSTR_TOWNNAME_END - SPECSTR_TOWNNAME_START; ///< Number of built-in town name generators.
|
||||
|
||||
/**
|
||||
* Struct holding parameters used to generate town name.
|
||||
|
|
Loading…
Reference in New Issue