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

(svn r10252) -Fix: never overflow when applying exchange rates before drawing the amount of money.

release/0.6
rubidium 2007-06-21 15:57:14 +00:00
parent 3fe19238b2
commit 02154f38b8
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/strings.cpp
View File

@ -340,15 +340,17 @@ static char *FormatTinyDate(char *buff, Date date, const char* last)
return FormatString(buff, GetStringPtr(STR_DATE_TINY), args, 0, last); return FormatString(buff, GetStringPtr(STR_DATE_TINY), args, 0, last);
} }
static char *FormatGenericCurrency(char *buff, const CurrencySpec *spec, int64 number, bool compact, const char* last) static char *FormatGenericCurrency(char *buff, const CurrencySpec *spec, Money number, bool compact, const char* last)
{ {
const char* multiplier = ""; const char* multiplier = "";
char buf[40]; char buf[40];
char* p; char* p;
int j; int j;
/* multiply by exchange rate */ /* Multiply by exchange rate, but do it safely. */
number *= spec->rate; CommandCost cs(number);
cs.MultiplyCost(spec->rate);
number = cs.GetCost();
/* convert from negative */ /* convert from negative */
if (number < 0) { if (number < 0) {