Integrate gCurrentAwards

src/addresses.h

@@ -583,6 +583,7 @@
 #define RCT2_ADDRESS_RESEARCHED_SCENERY_ITEMS		0x01357BD0
 
 #define RCT2_ADDRESS_PARK_SIZE						0x013580EA
+#define RCT2_ADDRESS_AWARD_LIST						0x01358760
 #define RCT2_ADDRESS_LAND_COST						0x01358770
 #define RCT2_ADDRESS_CONSTRUCTION_RIGHTS_COST		0x01358772
 #define RCT2_ADDRESS_LOAN_HASH						0x013587C4

src/management/award.c

@@ -14,7 +14,6 @@
  *****************************************************************************/
 #pragma endregion
 
-#include "../addresses.h"
 #include "../config.h"
 #include "../interface/window.h"
 #include "../localisation/localisation.h"
@@ -68,7 +67,7 @@ static const rct_string_id AwardNewsStrings[] = {
 	STR_NEWS_ITEM_BEST_GENTLE_RIDES,
 };
 
-rct_award *gCurrentAwards = RCT2_ADDRESS(RCT2_ADDRESS_AWARD_LIST, rct_award);
+rct_award gCurrentAwards[MAX_AWARDS];
 
 bool award_is_positive(int type)
 {

src/management/award.h

@@ -50,7 +50,7 @@ enum {
 
 #define MAX_AWARDS 4
 
-extern rct_award *gCurrentAwards;
+extern rct_award gCurrentAwards[MAX_AWARDS];
 
 bool award_is_positive(int type);
 void award_reset();

src/rct1/S4Importer.cpp

@@ -967,7 +967,7 @@ void S4Importer::ImportParkFlags()
     }
 
     // Awards
-    for (int i = 0; i < 4; i++)
+    for (int i = 0; i < MAX_AWARDS; i++)
     {
         gCurrentAwards[i] = _s4.awards[i];
     }

src/scenario.h

@@ -243,7 +243,7 @@ typedef struct rct_s6_data {
 	money32 income_from_admissions;
 	money32 company_value;
 	uint8 peep_warning_throttle[16];
-	rct_award awards[4];
+	rct_award awards[MAX_AWARDS];
 	money16 land_price;
 	money16 construction_rights_price;
 	uint16 word_01358774;