cpp/openttd-patchpack/source Changeset - r12279:1653fc3a5444

Changeset - r12279:1653fc3a5444

Parent rev.

Child rev.

[Not reviewed]

master

0 3 0

rubidium - 15 years ago 2009-07-01 09:45:30
rubidium@openttd.org

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

3 files changed with 4 insertions and 4 deletions:

src/economy.cpp

src/subsidy.cpp

src/subsidy_func.h

0 comments (0 inline, 0 general)

src/economy.cpp

➞

Show inline comments

@@ @@ -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 */

src/subsidy.cpp

➞

Show inline comments

@@ @@ -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);

src/subsidy_func.h

➞

Show inline comments

@@ @@ -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 */

0 comments (0 inline, 0 general)