From 07c3a930e4514545f1e6aff890e3b56fc8e09416 Mon Sep 17 00:00:00 2001 From: Gymnasiast Date: Thu, 24 Dec 2020 18:07:58 +0100 Subject: [PATCH] Apply review requests --- data/language/en-GB.txt | 6 +++--- distribution/changelog.txt | 2 +- src/openrct2/config/Config.cpp | 6 ++++-- 3 files changed, 8 insertions(+), 6 deletions(-) diff --git a/data/language/en-GB.txt b/data/language/en-GB.txt index 8533df7a85..935493ef8b 100644 --- a/data/language/en-GB.txt +++ b/data/language/en-GB.txt @@ -3651,15 +3651,15 @@ STR_6396 :Disable screensaver and monitor power saving STR_6397 :If checked, screensaver and other monitor power saving features will be inhibited while OpenRCT2 is running. STR_6398 :File contains unsupported ride types. Please update to a newer version of OpenRCT2. STR_6399 :OpenRCT2 needs files from the original RollerCoaster Tycoon 2 in order to work. Please set the “game_path” variable in config.ini to the directory where you installed RollerCoaster Tycoon 2, then restart OpenRCT2. -STR_6400 :I have the GOG installer for RollerCoaster Tycoon 2 downloaded, but it is not installed +STR_6400 :I have the GOG offline installer for RollerCoaster Tycoon 2 downloaded, but it is not installed STR_6401 :I have RollerCoaster Tycoon 2 installed already STR_6402 :OpenRCT2 Data Setup STR_6403 :Select which applies best to you STR_6404 :Please select GOG RollerCoaster Tycoon 2 installer STR_6405 :Select GOG Installer STR_6406 :GOG RollerCoaster Tycoon 2 Installer -STR_6407 :This may take a few minutes -STR_6408 :Please install innoextract to extract GOG Installer +STR_6407 :This may take a few minutes. +STR_6408 :Please install innoextract to extract GOG Installer. ############# # Scenarios # diff --git a/distribution/changelog.txt b/distribution/changelog.txt index 0ad984c819..b74c8a4785 100644 --- a/distribution/changelog.txt +++ b/distribution/changelog.txt @@ -3,6 +3,7 @@ - Feature: [#6677] Add Discord RPC to macOS builds. - Feature: [#6844] Enhanced track designer with ability to add/remove scenery and footpaths. - Feature: [#11859] Add on-ride photo section to Air Powered Vertical and Reverse Freefall Coaster. +- Feature: [#12307] Allow extraction of GOG installer via innoextract (for Linux users). - Feature: [#13057] Make GameAction flags accessible by plugins. - Feature: [#13078] [Plugin] Add colour picker widget. - Feature: [#13376] Open custom window at specified tab. @@ -36,7 +37,6 @@ 0.3.2 (2020-11-01) ------------------------------------------------------------------------ -- Feature: [#12307] For Linux users, allow extraction of GOG installer via innoextract. - Feature: [#12110] Add Hybrid Coaster (Rocky Mountain Construction I-Box) track type. - Feature: [#12999] .sea (RCT Classic) scenarios are now listed in the “New Scenario” dialog. - Feature: [#13000] objective_options command for console. diff --git a/src/openrct2/config/Config.cpp b/src/openrct2/config/Config.cpp index 01dac05cad..a435b9d126 100644 --- a/src/openrct2/config/Config.cpp +++ b/src/openrct2/config/Config.cpp @@ -854,8 +854,10 @@ bool config_find_or_browse_install_directory() chosenOption = options[optionIndex]; } } - - chosenOption = hdd; + else + { + chosenOption = hdd; + } std::string installPath; if (chosenOption == hdd)