From 7743d0e8e75162a9b5bd20b6082f4d7f4b97537f Mon Sep 17 00:00:00 2001 From: Michael Steenbeek Date: Mon, 20 Aug 2018 17:48:52 +0200 Subject: [PATCH] Prefer Steam and GOG installs to disc during autodetection Some people apparently have both a disc version and a Steam version of RCT2 installed. The problem is that the former does not always include the expansions, while the latter does. The same applies to RCT1. By checking for Steam/GOG versions first, these problems can be avoided. --- src/openrct2/config/Config.cpp | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/src/openrct2/config/Config.cpp b/src/openrct2/config/Config.cpp index 44c2d57f64..1396ae5ce9 100644 --- a/src/openrct2/config/Config.cpp +++ b/src/openrct2/config/Config.cpp @@ -609,13 +609,13 @@ namespace Config log_verbose("config_find_rct1_path(...)"); static constexpr const utf8* searchLocations[] = { + R"(C:\Program Files\Steam\steamapps\common\Rollercoaster Tycoon Deluxe)", + R"(C:\Program Files (x86)\Steam\steamapps\common\Rollercoaster Tycoon Deluxe)", R"(C:\GOG Games\RollerCoaster Tycoon Deluxe)", R"(C:\Program Files\GalaxyClient\Games\RollerCoaster Tycoon Deluxe)", - R"(C:\Program Files\Hasbro Interactive\RollerCoaster Tycoon)", - R"(C:\Program Files\Steam\steamapps\common\Rollercoaster Tycoon Deluxe)", R"(C:\Program Files (x86)\GalaxyClient\Games\RollerCoaster Tycoon Deluxe)", + R"(C:\Program Files\Hasbro Interactive\RollerCoaster Tycoon)", R"(C:\Program Files (x86)\Hasbro Interactive\RollerCoaster Tycoon)", - R"(C:\Program Files (x86)\Steam\steamapps\common\Rollercoaster Tycoon Deluxe)", }; for (const utf8* location : searchLocations) @@ -653,17 +653,17 @@ namespace Config log_verbose("config_find_rct2_path(...)"); static constexpr const utf8* searchLocations[] = { - R"(C:\GOG Games\RollerCoaster Tycoon 2 Triple Thrill Pack)", - R"(C:\Program Files\Atari\RollerCoaster Tycoon 2)", - R"(C:\Program Files\GalaxyClient\Games\RollerCoaster Tycoon 2 Triple Thrill Pack)", - R"(C:\Program Files\Infogrames\RollerCoaster Tycoon 2)", - R"(C:\Program Files\Infogrames Interactive\RollerCoaster Tycoon 2)", R"(C:\Program Files\Steam\steamapps\common\Rollercoaster Tycoon 2)", - R"(C:\Program Files (x86)\Atari\RollerCoaster Tycoon 2)", - R"(C:\Program Files (x86)\GalaxyClient\Games\RollerCoaster Tycoon 2 Triple Thrill Pack)", - R"(C:\Program Files (x86)\Infogrames\RollerCoaster Tycoon 2)", - R"(C:\Program Files (x86)\Infogrames Interactive\RollerCoaster Tycoon 2)", R"(C:\Program Files (x86)\Steam\steamapps\common\Rollercoaster Tycoon 2)" + R"(C:\GOG Games\RollerCoaster Tycoon 2 Triple Thrill Pack)", + R"(C:\Program Files\GalaxyClient\Games\RollerCoaster Tycoon 2 Triple Thrill Pack)", + R"(C:\Program Files (x86)\GalaxyClient\Games\RollerCoaster Tycoon 2 Triple Thrill Pack)", + R"(C:\Program Files\Atari\RollerCoaster Tycoon 2)", + R"(C:\Program Files (x86)\Atari\RollerCoaster Tycoon 2)", + R"(C:\Program Files\Infogrames\RollerCoaster Tycoon 2)", + R"(C:\Program Files (x86)\Infogrames\RollerCoaster Tycoon 2)", + R"(C:\Program Files\Infogrames Interactive\RollerCoaster Tycoon 2)", + R"(C:\Program Files (x86)\Infogrames Interactive\RollerCoaster Tycoon 2)", }; for (const utf8* location : searchLocations)