(svn r16706) -Fix (r16694): acquiring a subsidy resulted in an assertion.

This commit is contained in:
rubidium
2009-07-01 09:45:30 +00:00
parent 50827afb71
commit e189037662
3 changed files with 4 additions and 4 deletions

View File

@@ -284,7 +284,7 @@ no_add:;
InvalidateWindow(WC_SUBSIDIES_LIST, 0);
}
bool CheckSubsidised(const Station *from, const Station *to, CargoID cargo_type)
bool CheckSubsidised(const Station *from, const Station *to, CargoID cargo_type, CompanyID company)
{
Subsidy *s;
TileIndex xy;
@@ -336,7 +336,7 @@ bool CheckSubsidised(const Station *from, const Station *to, CargoID cargo_type)
InjectDParam(1);
char *company_name = MallocT<char>(MAX_LENGTH_COMPANY_NAME_BYTES);
SetDParam(0, _current_company);
SetDParam(0, company);
GetString(company_name, STR_COMPANY_NAME, company_name + MAX_LENGTH_COMPANY_NAME_BYTES - 1);
SetDParamStr(0, company_name);