# HG changeset patch
# User rubidium <rubidium@openttd.org>
# Date 2009-07-01 09:45:30
# Node ID 1653fc3a5444c8d407485f7b4bdba0c20ea0e9f5
# Parent  a95eb380675363492940297ba6ee59327c4653ae

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

diff --git a/src/economy.cpp b/src/economy.cpp
--- a/src/economy.cpp
+++ b/src/economy.cpp
@@ -1085,7 +1085,7 @@ static Money DeliverGoods(int num_pieces
 		const Station *s_from = Station::Get(source);
 
 		/* Check if a subsidy applies. */
-		subsidised = CheckSubsidised(s_from, s_to, cargo_type);
+		subsidised = CheckSubsidised(s_from, s_to, cargo_type, company->index);
 	}
 
 	/* Increase town's counter for some special goods types */
diff --git a/src/subsidy.cpp b/src/subsidy.cpp
--- 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
 			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);
diff --git a/src/subsidy_func.h b/src/subsidy_func.h
--- a/src/subsidy_func.h
+++ b/src/subsidy_func.h
@@ -16,7 +16,7 @@ Pair SetupSubsidyDecodeParam(const Subsi
 void DeleteSubsidyWithTown(TownID index);
 void DeleteSubsidyWithIndustry(IndustryID index);
 void DeleteSubsidyWithStation(StationID index);
-bool CheckSubsidised(const Station *from, const Station *to, CargoID cargo_type);
+bool CheckSubsidised(const Station *from, const Station *to, CargoID cargo_type, CompanyID company);
 void SubsidyMonthlyHandler();
 
 #endif /* SUBSIDY_FUNC_H */