mirror of
https://github.com/OpenTTD/OpenTTD.git
synced 2025-08-30 09:59:10 +00:00
(svn r14623) -Codechange: a sprinkle of coding style.
This commit is contained in:
@@ -576,15 +576,15 @@ static char* FormatString(char* buff, const char* str, const int64* argv, uint c
|
||||
break;
|
||||
}
|
||||
|
||||
case SCC_CURRENCY_COMPACT: /* {CURRCOMPACT} */
|
||||
case SCC_CURRENCY_COMPACT: // {CURRCOMPACT}
|
||||
buff = FormatGenericCurrency(buff, _currency, GetInt64(&argv), true, last);
|
||||
break;
|
||||
|
||||
case SCC_REVISION: /* {REV} */
|
||||
case SCC_REVISION: // {REV}
|
||||
buff = strecpy(buff, _openttd_revision, last);
|
||||
break;
|
||||
|
||||
case SCC_CARGO_SHORT: { /* {SHORTCARGO} */
|
||||
case SCC_CARGO_SHORT: { // {SHORTCARGO}
|
||||
/* Short description of cargotypes. Layout:
|
||||
* 8-bit = cargo type
|
||||
* 16-bit = cargo count */
|
||||
@@ -622,7 +622,7 @@ static char* FormatString(char* buff, const char* str, const int64* argv, uint c
|
||||
}
|
||||
} break;
|
||||
|
||||
case SCC_STRING1: { /* {STRING1} */
|
||||
case SCC_STRING1: { // {STRING1}
|
||||
/* String that consumes ONE argument */
|
||||
uint str = modifier + GetInt32(&argv);
|
||||
buff = GetStringWithArgs(buff, str, GetArgvPtr(&argv, 1), last);
|
||||
@@ -630,7 +630,7 @@ static char* FormatString(char* buff, const char* str, const int64* argv, uint c
|
||||
break;
|
||||
}
|
||||
|
||||
case SCC_STRING2: { /* {STRING2} */
|
||||
case SCC_STRING2: { // {STRING2}
|
||||
/* String that consumes TWO arguments */
|
||||
uint str = modifier + GetInt32(&argv);
|
||||
buff = GetStringWithArgs(buff, str, GetArgvPtr(&argv, 2), last);
|
||||
@@ -638,7 +638,7 @@ static char* FormatString(char* buff, const char* str, const int64* argv, uint c
|
||||
break;
|
||||
}
|
||||
|
||||
case SCC_STRING3: { /* {STRING3} */
|
||||
case SCC_STRING3: { // {STRING3}
|
||||
/* String that consumes THREE arguments */
|
||||
uint str = modifier + GetInt32(&argv);
|
||||
buff = GetStringWithArgs(buff, str, GetArgvPtr(&argv, 3), last);
|
||||
@@ -646,7 +646,7 @@ static char* FormatString(char* buff, const char* str, const int64* argv, uint c
|
||||
break;
|
||||
}
|
||||
|
||||
case SCC_STRING4: { /* {STRING4} */
|
||||
case SCC_STRING4: { // {STRING4}
|
||||
/* String that consumes FOUR arguments */
|
||||
uint str = modifier + GetInt32(&argv);
|
||||
buff = GetStringWithArgs(buff, str, GetArgvPtr(&argv, 4), last);
|
||||
@@ -654,7 +654,7 @@ static char* FormatString(char* buff, const char* str, const int64* argv, uint c
|
||||
break;
|
||||
}
|
||||
|
||||
case SCC_STRING5: { /* {STRING5} */
|
||||
case SCC_STRING5: { // {STRING5}
|
||||
/* String that consumes FIVE arguments */
|
||||
uint str = modifier + GetInt32(&argv);
|
||||
buff = GetStringWithArgs(buff, str, GetArgvPtr(&argv, 5), last);
|
||||
@@ -662,12 +662,12 @@ static char* FormatString(char* buff, const char* str, const int64* argv, uint c
|
||||
break;
|
||||
}
|
||||
|
||||
case SCC_STATION_FEATURES: { /* {STATIONFEATURES} */
|
||||
case SCC_STATION_FEATURES: { // {STATIONFEATURES}
|
||||
buff = StationGetSpecialString(buff, GetInt32(&argv), last);
|
||||
break;
|
||||
}
|
||||
|
||||
case SCC_INDUSTRY_NAME: { /* {INDUSTRY} */
|
||||
case SCC_INDUSTRY_NAME: { // {INDUSTRY}
|
||||
const Industry *i = GetIndustry(GetInt32(&argv));
|
||||
int64 args[2];
|
||||
|
||||
@@ -1487,9 +1487,9 @@ void CheckForMissingGlyphsInLoadedLanguagePack()
|
||||
* automatically choose another font. This resets that choice. */
|
||||
UninitFreeType();
|
||||
InitFreeType();
|
||||
bool retry = false;
|
||||
#endif
|
||||
|
||||
bool retry = false;
|
||||
for (;;) {
|
||||
const Sprite *question_mark = GetGlyph(FS_NORMAL, '?');
|
||||
|
||||
|
Reference in New Issue
Block a user