Merge branch 'master' into jgrpp
This commit is contained in:
@@ -2020,22 +2020,6 @@ static char *GetSpecialNameString(char *buff, int ind, StringParameters *args, c
|
||||
return strecpy(buff, " Transport", last);
|
||||
}
|
||||
|
||||
/* language name? */
|
||||
if (IsInsideMM(ind, (SPECSTR_LANGUAGE_START - 0x70E4), (SPECSTR_LANGUAGE_END - 0x70E4) + 1)) {
|
||||
int i = ind - (SPECSTR_LANGUAGE_START - 0x70E4);
|
||||
return strecpy(buff,
|
||||
&_languages[i] == _current_language ? _current_language->own_name : _languages[i].name, last);
|
||||
}
|
||||
|
||||
/* resolution size? */
|
||||
if (IsInsideBS(ind, (SPECSTR_RESOLUTION_START - 0x70E4), _resolutions.size())) {
|
||||
int i = ind - (SPECSTR_RESOLUTION_START - 0x70E4);
|
||||
buff += seprintf(
|
||||
buff, last, "%ux%u", _resolutions[i].width, _resolutions[i].height
|
||||
);
|
||||
return buff;
|
||||
}
|
||||
|
||||
NOT_REACHED();
|
||||
}
|
||||
|
||||
|
Reference in New Issue
Block a user