From d86153e57526b758c6bc9291b1835854adb7dba1 Mon Sep 17 00:00:00 2001
From: Ted John <ted@brambles.org>
Date: Sun, 4 Sep 2016 15:47:56 +0100
Subject: [PATCH] Integrate gMarketingCampaignDaysLeft,
 gMarketingCampaignRideIndex

---
 src/management/marketing.c | 4 ++--
 src/management/marketing.h | 4 ++--
 src/scenario.c             | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/management/marketing.c b/src/management/marketing.c
index 6d36e37528..8a55b36106 100644
--- a/src/management/marketing.c
+++ b/src/management/marketing.c
@@ -37,8 +37,8 @@ const money16 AdvertisingCampaignPricePerWeek[] = {
 
 static const int AdvertisingCampaignGuestGenerationProbabilities[] = { 400, 300, 200, 200, 250, 200 };
 
-uint8 *gMarketingCampaignDaysLeft = RCT2_ADDRESS(0x01358102, uint8);
-uint8 *gMarketingCampaignRideIndex = RCT2_ADDRESS(0x01358116, uint8);
+uint8 gMarketingCampaignDaysLeft[20];
+uint8 gMarketingCampaignRideIndex[22];
 
 int marketing_get_campaign_guest_generation_probability(int campaign)
 {
diff --git a/src/management/marketing.h b/src/management/marketing.h
index 5840e90066..f0af48ddea 100644
--- a/src/management/marketing.h
+++ b/src/management/marketing.h
@@ -41,8 +41,8 @@ enum{
 #define CAMPAIGN_ACTIVE_FLAG (1 << 7)
 
 extern const money16 AdvertisingCampaignPricePerWeek[6];
-extern uint8 *gMarketingCampaignDaysLeft;
-extern uint8 *gMarketingCampaignRideIndex;
+extern uint8 gMarketingCampaignDaysLeft[20];
+extern uint8 gMarketingCampaignRideIndex[22];
 
 int marketing_get_campaign_guest_generation_probability(int campaign);
 void marketing_update();
diff --git a/src/scenario.c b/src/scenario.c
index 985527241a..1539dc2b1c 100644
--- a/src/scenario.c
+++ b/src/scenario.c
@@ -268,7 +268,7 @@ void scenario_begin()
 	park_calculate_size();
 	staff_reset_stats();
 	gLastEntranceStyle = RIDE_ENTRANCE_STYLE_PLAIN;
-	memset(RCT2_ADDRESS(0x001358102, void), 0, 20);
+	memset(gMarketingCampaignDaysLeft, 0, 20);
 	gParkRatingCasualtyPenalty = 0;
 
 	// Open park with free entry when there is no money