diff options
| author | smatz <smatz@openttd.org> | 2010-12-19 20:15:32 +0000 |
|---|---|---|
| committer | smatz <smatz@openttd.org> | 2010-12-19 20:15:32 +0000 |
| commit | 79681051c8e139b3358b92cbdd2d6741fe74b4fd (patch) | |
| tree | 175c7c2c2bd9e426daf1842c5f59fd56ed6d3562 | |
| parent | 3b46cf50b9b14148c0ebea98699edd11ef1ed662 (diff) | |
| download | openttd-79681051c8e139b3358b92cbdd2d6741fe74b4fd.tar.xz | |
(svn r21541) -Add: {DATE_SHORT} and {DATE_LONG} can now have cases
| -rw-r--r-- | src/strings.cpp | 12 | ||||
| -rw-r--r-- | src/table/strgen_tables.h | 8 |
2 files changed, 10 insertions, 10 deletions
diff --git a/src/strings.cpp b/src/strings.cpp index 775bd80ae..661afeec3 100644 --- a/src/strings.cpp +++ b/src/strings.cpp @@ -320,22 +320,22 @@ static char *FormatBytes(char *buff, int64 number, const char *last) return buff; } -static char *FormatYmdString(char *buff, Date date, const char *last) +static char *FormatYmdString(char *buff, Date date, uint modifier, const char *last) { YearMonthDay ymd; ConvertDateToYMD(date, &ymd); int64 args[3] = { ymd.day + STR_ORDINAL_NUMBER_1ST - 1, STR_MONTH_ABBREV_JAN + ymd.month, ymd.year }; - return FormatString(buff, GetStringPtr(STR_FORMAT_DATE_LONG), args, endof(args), 0, last); + return FormatString(buff, GetStringPtr(STR_FORMAT_DATE_LONG), args, endof(args), modifier >> 24, last); } -static char *FormatMonthAndYear(char *buff, Date date, const char *last) +static char *FormatMonthAndYear(char *buff, Date date, uint modifier, const char *last) { YearMonthDay ymd; ConvertDateToYMD(date, &ymd); int64 args[2] = { STR_MONTH_JAN + ymd.month, ymd.year }; - return FormatString(buff, GetStringPtr(STR_FORMAT_DATE_SHORT), args, endof(args), 0, last); + return FormatString(buff, GetStringPtr(STR_FORMAT_DATE_SHORT), args, endof(args), modifier >> 24, last); } static char *FormatTinyOrISODate(char *buff, Date date, StringID str, const char *last) @@ -680,11 +680,11 @@ static char *FormatString(char *buff, const char *str, int64 *argv, const int64 } case SCC_DATE_LONG: // {DATE_LONG} - buff = FormatYmdString(buff, GetInt32(&argv, argve, &argt, SCC_DATE_LONG), last); + buff = FormatYmdString(buff, GetInt32(&argv, argve, &argt, SCC_DATE_LONG), modifier, last); break; case SCC_DATE_SHORT: // {DATE_SHORT} - buff = FormatMonthAndYear(buff, GetInt32(&argv, argve, &argt, SCC_DATE_SHORT), last); + buff = FormatMonthAndYear(buff, GetInt32(&argv, argve, &argt, SCC_DATE_SHORT), modifier, last); break; case SCC_VELOCITY: { // {VELOCITY} diff --git a/src/table/strgen_tables.h b/src/table/strgen_tables.h index aeebfb903..ecc3bbedd 100644 --- a/src/table/strgen_tables.h +++ b/src/table/strgen_tables.h @@ -68,8 +68,8 @@ static const CmdStruct _cmd_structs[] = { {"STRING5", EmitSingleChar, SCC_STRING5, 6, C_CASE | C_GENDER}, // included string that consumes the string id and FIVE arguments {"STATIONFEATURES", EmitSingleChar, SCC_STATION_FEATURES, 1, C_NONE}, // station features string, icons of the features - {"INDUSTRY", EmitSingleChar, SCC_INDUSTRY_NAME, 1, C_GENDER | C_CASE}, // industry, takes an industry #, can have cases - {"CARGO", EmitSingleChar, SCC_CARGO, 2, C_GENDER}, + {"INDUSTRY", EmitSingleChar, SCC_INDUSTRY_NAME, 1, C_CASE | C_GENDER}, // industry, takes an industry #, can have cases + {"CARGO", EmitSingleChar, SCC_CARGO, 2, C_NONE | C_GENDER}, {"POWER", EmitSingleChar, SCC_POWER, 1, C_NONE}, {"VOLUME", EmitSingleChar, SCC_VOLUME, 1, C_NONE}, {"VOLUME_S", EmitSingleChar, SCC_VOLUME_SHORT, 1, C_NONE}, @@ -83,8 +83,8 @@ static const CmdStruct _cmd_structs[] = { {"G", EmitGender, 0, 0, C_DONTCOUNT}, // gender specifier {"DATE_TINY", EmitSingleChar, SCC_DATE_TINY, 1, C_NONE}, - {"DATE_SHORT", EmitSingleChar, SCC_DATE_SHORT, 1, C_NONE}, - {"DATE_LONG", EmitSingleChar, SCC_DATE_LONG, 1, C_NONE}, + {"DATE_SHORT", EmitSingleChar, SCC_DATE_SHORT, 1, C_CASE}, + {"DATE_LONG", EmitSingleChar, SCC_DATE_LONG, 1, C_CASE}, {"DATE_ISO", EmitSingleChar, SCC_DATE_ISO, 1, C_NONE}, {"STRING", EmitSingleChar, SCC_STRING, 1, C_CASE | C_GENDER}, |