Merge pull request OpenRCT2#19785 from karst/openmusic-default

Select OpenMusic by default when opening a new scenario
733737 · Aug 28, 2023 · b56d8a5 · b56d8a5
2 parents b75275d + dca49cc
commit b56d8a5
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 1 deletion.
diff --git a/distribution/changelog.txt b/distribution/changelog.txt
@@ -5,6 +5,7 @@
 - Feature: [OpenMusic#41] Official Title Theme by Allister Brimble.
 - Improved: [#20119, #20243] Add new colour presets to several roller coasters (using the new colours).
 - Improved: [#20393, #20410] Add Cyrillic characters Ґґ, Ѕѕ, Єє, Іі, Її, and Јј to the sprite font. 
+- Change: [#19785] OpenMusic is now selected by default when opening SC4/SC6 - or creating new - scenarios.
 - Change: [#20110] Fix a few RCT1 build height parity discrepancies.
 - Change: [#20550] Change SEK conversion rate from 1 GBP to 0.1 GBP.
 - Fix: [#6152] Camera and UI are no longer locked at 40 Hz, providing a smoother experience.

diff --git a/src/openrct2/object/DefaultObjects.cpp b/src/openrct2/object/DefaultObjects.cpp
@@ -113,6 +113,14 @@ const std::string_view DefaultSelectedObjects[] = {
     "rct2.music.pirate",
     "rct2.music.rock3",
     "rct2.music.candy",
+    "openrct2.music.galaxy",
+    "openrct2.music.acid",
+    "openrct2.music.dodgems",
+    "openrct2.music.blizzard",
+    "openrct2.music.extraterrestrial",
+    "openrct2.music.fairground2",
+    "openrct2.music.ragtime2",
+    "openrct2.music.prehistoric",
 
     // Footpath surfaces
     "rct2.footpath_surface.tarmac",

diff --git a/src/openrct2/object/DefaultObjects.h b/src/openrct2/object/DefaultObjects.h
@@ -12,5 +12,5 @@
 #include "Object.h"
 
 extern const std::string_view MinimumRequiredObjects[2];
-extern const std::string_view DefaultSelectedObjects[103];
+extern const std::string_view DefaultSelectedObjects[111];
 extern const std::string_view DesignerSelectedObjects[39];
diff --git a/src/openrct2/rct12/RCT12.cpp b/src/openrct2/rct12/RCT12.cpp
@@ -750,6 +750,14 @@ static constexpr std::string_view _musicStyles[] = {
     "rct2.music.pirate",
     "rct2.music.rock3",
     "rct2.music.candy",
+    "openrct2.music.galaxy",
+    "openrct2.music.acid",
+    "openrct2.music.dodgems",
+    "openrct2.music.blizzard",
+    "openrct2.music.extraterrestrial",
+    "openrct2.music.fairground2",
+    "openrct2.music.ragtime2",
+    "openrct2.music.prehistoric",
 };
 
 std::string_view GetStationIdentifierFromStyle(uint8_t style)