From 4231154bb45342287e73f6543ebec82bd04bff49 Mon Sep 17 00:00:00 2001
From: glx <glx@openttd.org>
Date: Wed, 24 Nov 2010 01:08:49 +0000
Subject: (svn r21309) -Fix: second parameter of SetupSubsidyDecodeParam() is a
 bool, so use a bool when calling the function

---
 src/subsidy.cpp     | 8 ++++----
 src/subsidy_gui.cpp | 4 ++--
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/subsidy.cpp b/src/subsidy.cpp
index 997443d9e..e83da0ab2 100644
--- a/src/subsidy.cpp
+++ b/src/subsidy.cpp
@@ -45,7 +45,7 @@ void Subsidy::AwardTo(CompanyID company)
 	GetString(company_name, STR_COMPANY_NAME, company_name + MAX_LENGTH_COMPANY_NAME_BYTES - 1);
 
 	/* Add a news item */
-	Pair reftype = SetupSubsidyDecodeParam(this, 0);
+	Pair reftype = SetupSubsidyDecodeParam(this, false);
 	InjectDParam(1);
 
 	SetDParamStr(0, company_name);
@@ -278,12 +278,12 @@ void SubsidyMonthlyLoop()
 	FOR_ALL_SUBSIDIES(s) {
 		if (--s->remaining == 0) {
 			if (!s->IsAwarded()) {
-				Pair reftype = SetupSubsidyDecodeParam(s, 1);
+				Pair reftype = SetupSubsidyDecodeParam(s, true);
 				AddNewsItem(STR_NEWS_OFFER_OF_SUBSIDY_EXPIRED, NS_SUBSIDIES, (NewsReferenceType)reftype.a, s->src, (NewsReferenceType)reftype.b, s->dst);
 				AI::BroadcastNewEvent(new AIEventSubsidyOfferExpired(s->index));
 			} else {
 				if (s->awarded == _local_company) {
-					Pair reftype = SetupSubsidyDecodeParam(s, 1);
+					Pair reftype = SetupSubsidyDecodeParam(s, true);
 					AddNewsItem(STR_NEWS_SUBSIDY_WITHDRAWN_SERVICE, NS_SUBSIDIES, (NewsReferenceType)reftype.a, s->src, (NewsReferenceType)reftype.b, s->dst);
 				}
 				AI::BroadcastNewEvent(new AIEventSubsidyExpired(s->index));
@@ -304,7 +304,7 @@ void SubsidyMonthlyLoop()
 			if (s != NULL) {
 				s->remaining = SUBSIDY_OFFER_MONTHS;
 				s->awarded = INVALID_COMPANY;
-				Pair reftype = SetupSubsidyDecodeParam(s, 0);
+				Pair reftype = SetupSubsidyDecodeParam(s, false);
 				AddNewsItem(STR_NEWS_SERVICE_SUBSIDY_OFFERED, NS_SUBSIDIES, (NewsReferenceType)reftype.a, s->src, (NewsReferenceType)reftype.b, s->dst);
 				SetPartOfSubsidyFlag(s->src_type, s->src, POS_SRC);
 				SetPartOfSubsidyFlag(s->dst_type, s->dst, POS_DST);
diff --git a/src/subsidy_gui.cpp b/src/subsidy_gui.cpp
index c96fdf6a8..d6fed1c3e 100644
--- a/src/subsidy_gui.cpp
+++ b/src/subsidy_gui.cpp
@@ -174,7 +174,7 @@ struct SubsidyListWindow : Window {
 			if (!s->IsAwarded()) {
 				if (IsInsideMM(pos, 0, cap)) {
 					/* Displays the two offered towns */
-					SetupSubsidyDecodeParam(s, 1);
+					SetupSubsidyDecodeParam(s, true);
 					SetDParam(7, _date - ymd.day + s->remaining * 32);
 					DrawString(x, right, y + pos * FONT_HEIGHT_NORMAL, STR_SUBSIDIES_OFFERED_FROM_TO);
 				}
@@ -197,7 +197,7 @@ struct SubsidyListWindow : Window {
 		FOR_ALL_SUBSIDIES(s) {
 			if (s->IsAwarded()) {
 				if (IsInsideMM(pos, 0, cap)) {
-					SetupSubsidyDecodeParam(s, 1);
+					SetupSubsidyDecodeParam(s, true);
 					SetDParam(7, s->awarded);
 					SetDParam(8, _date - ymd.day + s->remaining * 32);
 
-- 
cgit v1.2.3-70-g09d2