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

(svn r14623) -Codechange: a sprinkle of coding style.

release/0.7
rubidium 2008-11-24 20:51:55 +00:00
parent b7c6872903
commit 5466d8e959
1 changed files with 35 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/strings.cpp
View File

@ -576,15 +576,15 @@ static char* FormatString(char* buff, const char* str, const int64* argv, uint c
break; break;
} }
case SCC_CURRENCY_COMPACT: /* {CURRCOMPACT} */ case SCC_CURRENCY_COMPACT: // {CURRCOMPACT}
buff = FormatGenericCurrency(buff, _currency, GetInt64(&argv), true, last); buff = FormatGenericCurrency(buff, _currency, GetInt64(&argv), true, last);
break; break;
case SCC_REVISION: /* {REV} */ case SCC_REVISION: // {REV}
buff = strecpy(buff, _openttd_revision, last); buff = strecpy(buff, _openttd_revision, last);
break; break;
case SCC_CARGO_SHORT: { /* {SHORTCARGO} */ case SCC_CARGO_SHORT: { // {SHORTCARGO}
/* Short description of cargotypes. Layout: /* Short description of cargotypes. Layout:
* 8-bit = cargo type * 8-bit = cargo type
* 16-bit = cargo count */ * 16-bit = cargo count */
@ -622,7 +622,7 @@ static char* FormatString(char* buff, const char* str, const int64* argv, uint c
} }
} break; } break;
case SCC_STRING1: { /* {STRING1} */ case SCC_STRING1: { // {STRING1}
/* String that consumes ONE argument */ /* String that consumes ONE argument */
uint str = modifier + GetInt32(&argv); uint str = modifier + GetInt32(&argv);
buff = GetStringWithArgs(buff, str, GetArgvPtr(&argv, 1), last); 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; break;
} }
case SCC_STRING2: { /* {STRING2} */ case SCC_STRING2: { // {STRING2}
/* String that consumes TWO arguments */ /* String that consumes TWO arguments */
uint str = modifier + GetInt32(&argv); uint str = modifier + GetInt32(&argv);
buff = GetStringWithArgs(buff, str, GetArgvPtr(&argv, 2), last); 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; break;
} }
case SCC_STRING3: { /* {STRING3} */ case SCC_STRING3: { // {STRING3}
/* String that consumes THREE arguments */ /* String that consumes THREE arguments */
uint str = modifier + GetInt32(&argv); uint str = modifier + GetInt32(&argv);
buff = GetStringWithArgs(buff, str, GetArgvPtr(&argv, 3), last); 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; break;
} }
case SCC_STRING4: { /* {STRING4} */ case SCC_STRING4: { // {STRING4}
/* String that consumes FOUR arguments */ /* String that consumes FOUR arguments */
uint str = modifier + GetInt32(&argv); uint str = modifier + GetInt32(&argv);
buff = GetStringWithArgs(buff, str, GetArgvPtr(&argv, 4), last); 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; break;
} }
case SCC_STRING5: { /* {STRING5} */ case SCC_STRING5: { // {STRING5}
/* String that consumes FIVE arguments */ /* String that consumes FIVE arguments */
uint str = modifier + GetInt32(&argv); uint str = modifier + GetInt32(&argv);
buff = GetStringWithArgs(buff, str, GetArgvPtr(&argv, 5), last); 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; break;
} }
case SCC_STATION_FEATURES: { /* {STATIONFEATURES} */ case SCC_STATION_FEATURES: { // {STATIONFEATURES}
buff = StationGetSpecialString(buff, GetInt32(&argv), last); buff = StationGetSpecialString(buff, GetInt32(&argv), last);
break; break;
} }
case SCC_INDUSTRY_NAME: { /* {INDUSTRY} */ case SCC_INDUSTRY_NAME: { // {INDUSTRY}
const Industry *i = GetIndustry(GetInt32(&argv)); const Industry *i = GetIndustry(GetInt32(&argv));
int64 args[2]; int64 args[2];
@ -1487,9 +1487,9 @@ void CheckForMissingGlyphsInLoadedLanguagePack()
* automatically choose another font. This resets that choice. */ * automatically choose another font. This resets that choice. */
UninitFreeType(); UninitFreeType();
InitFreeType(); InitFreeType();
bool retry = false;
#endif #endif
bool retry = false;
for (;;) { for (;;) {
const Sprite *question_mark = GetGlyph(FS_NORMAL, '?'); const Sprite *question_mark = GetGlyph(FS_NORMAL, '?');