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

Fix #7672: more than 32 resolutions may be available

pull/7680/head
glx 2019-07-28 17:02:41 +02:00 committed by Charles Pigott
parent 425cd3e4ca
commit 8cccb158e9
2 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/strings.cpp
View File

@ -1673,7 +1673,7 @@ static char *GetSpecialNameString(char *buff, int ind, StringParameters *args, c
} }
/* resolution size? */ /* resolution size? */
if (IsInsideMM(ind, (SPECSTR_RESOLUTION_START - 0x70E4), (SPECSTR_RESOLUTION_END - 0x70E4) + 1)) { if (IsInsideBS(ind, (SPECSTR_RESOLUTION_START - 0x70E4), _resolutions.size())) {
int i = ind - (SPECSTR_RESOLUTION_START - 0x70E4); int i = ind - (SPECSTR_RESOLUTION_START - 0x70E4);
buff += seprintf( buff += seprintf(
buff, last, "%ux%u", _resolutions[i].width, _resolutions[i].height buff, last, "%ux%u", _resolutions[i].width, _resolutions[i].height

3
src/strings_type.h
View File

@ -93,9 +93,8 @@ enum SpecialStrings {
SPECSTR_LANGUAGE_START = 0x7100, SPECSTR_LANGUAGE_START = 0x7100,
SPECSTR_LANGUAGE_END = SPECSTR_LANGUAGE_START + MAX_LANG - 1, SPECSTR_LANGUAGE_END = SPECSTR_LANGUAGE_START + MAX_LANG - 1,
/* reserve 32 strings for various screen resolutions */ /* reserve strings for various screen resolutions MUST BE THE LAST VALUE IN THIS ENUM */
SPECSTR_RESOLUTION_START = SPECSTR_LANGUAGE_END + 1, SPECSTR_RESOLUTION_START = SPECSTR_LANGUAGE_END + 1,
SPECSTR_RESOLUTION_END = SPECSTR_RESOLUTION_START + 0x1F,
}; };
#endif /* STRINGS_TYPE_H */ #endif /* STRINGS_TYPE_H */