diff options
| author | rubidium <rubidium@openttd.org> | 2009-07-01 09:45:30 +0000 |
|---|---|---|
| committer | rubidium <rubidium@openttd.org> | 2009-07-01 09:45:30 +0000 |
| commit | 8e804a4b6c694c75e6dca6d529332541776c73cb (patch) | |
| tree | 20de1f2c38acda2126f2c56cbbd0cd21618d506b /src/subsidy.cpp | |
| parent | e3627dabda09125fa010a5c8eb1618a8ad2d32c0 (diff) | |
| download | openttd-8e804a4b6c694c75e6dca6d529332541776c73cb.tar.xz | |
(svn r16706) -Fix (r16694): acquiring a subsidy resulted in an assertion.
Diffstat (limited to 'src/subsidy.cpp')
| -rw-r--r-- | src/subsidy.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/subsidy.cpp b/src/subsidy.cpp index fbc8c01c6..d444c4d43 100644 --- a/src/subsidy.cpp +++ b/src/subsidy.cpp @@ -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); |