From cd7b8f1de9f4261f51fa1c7164fcbf69ad387c7e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20Janiszewski?= Date: Sun, 4 Sep 2016 19:25:13 +0200 Subject: [PATCH] Remove unneeded check around 0x009AC06C --- src/management/research.c | 25 +++++++++---------------- 1 file changed, 9 insertions(+), 16 deletions(-) diff --git a/src/management/research.c b/src/management/research.c index 580c433fc6..c9c26d43a9 100644 --- a/src/management/research.c +++ b/src/management/research.c @@ -14,7 +14,6 @@ *****************************************************************************/ #pragma endregion -#include "../addresses.h" #include "../config.h" #include "../game.h" #include "../interface/window.h" @@ -218,14 +217,11 @@ void research_finish_item(sint32 entryIndex) } } - // I don't think 0x009AC06C is ever not 0, so probably redundant - if (RCT2_GLOBAL(0x009AC06C, uint8) == 0) { - set_format_arg(0, rct_string_id, ((rideEntry->flags & RIDE_ENTRY_FLAG_SEPARATE_RIDE_NAME)) ? - rideEntry->name : RideNaming[base_ride_type].name); - if (!gSilentResearch) { - if (gConfigNotifications.ride_researched) { - news_item_add_to_queue(NEWS_ITEM_RESEARCH, STR_NEWS_ITEM_RESEARCH_NEW_RIDE_AVAILABLE, entryIndex); - } + set_format_arg(0, rct_string_id, ((rideEntry->flags & RIDE_ENTRY_FLAG_SEPARATE_RIDE_NAME)) ? + rideEntry->name : RideNaming[base_ride_type].name); + if (!gSilentResearch) { + if (gConfigNotifications.ride_researched) { + news_item_add_to_queue(NEWS_ITEM_RESEARCH, STR_NEWS_ITEM_RESEARCH_NEW_RIDE_AVAILABLE, entryIndex); } } @@ -238,13 +234,10 @@ void research_finish_item(sint32 entryIndex) gResearchedSceneryItems[subSceneryEntryIndex >> 5] |= 1UL << (subSceneryEntryIndex & 0x1F); } - // I don't think 0x009AC06C is ever not 0, so probably redundant - if (RCT2_GLOBAL(0x009AC06C, uint8) == 0) { - set_format_arg(0, rct_string_id, scenerySetEntry->name); - if (!gSilentResearch) { - if (gConfigNotifications.ride_researched) { - news_item_add_to_queue(NEWS_ITEM_RESEARCH, STR_NEWS_ITEM_RESEARCH_NEW_SCENERY_SET_AVAILABLE, entryIndex); - } + set_format_arg(0, rct_string_id, scenerySetEntry->name); + if (!gSilentResearch) { + if (gConfigNotifications.ride_researched) { + news_item_add_to_queue(NEWS_ITEM_RESEARCH, STR_NEWS_ITEM_RESEARCH_NEW_SCENERY_SET_AVAILABLE, entryIndex); } }