Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Select OpenMusic by default when opening a new scenario #19785

Merged
merged 4 commits into from
Aug 28, 2023
Merged

Select OpenMusic by default when opening a new scenario #19785

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
5adbea9
Select OpenMusic by default when opening a new scenario
karst Mar 30, 2023
c23362d
Add new OpenMusic tunes
karst May 19, 2023
0dafa3c
Add OpenMusic to DefaultObjects
karst Aug 25, 2023
dca49cc
Amend changelog
karst Aug 25, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
1 change: 1 addition & 0 deletions distribution/changelog.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
8 changes: 8 additions & 0 deletions src/openrct2/object/DefaultObjects.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
2 changes: 1 addition & 1 deletion src/openrct2/object/DefaultObjects.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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];
8 changes: 8 additions & 0 deletions src/openrct2/rct12/RCT12.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -750,6 +750,14 @@ static constexpr std::string_view _musicStyles[] = {
"rct2.music.pirate",
"rct2.music.rock3",
"rct2.music.candy",
"openrct2.music.galaxy",
karst marked this conversation as resolved.
Show resolved Hide resolved
"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)
Expand Down