mirror of
https://github.com/OpenRCT2/OpenRCT2
synced 2025-12-23 07:43:01 +01:00
Remove Music Acknowledgements window (#15116)
It was of limited use to us anyway since we didn’t license the music ourselves, but now the actual track names and composers are shown in the Object Selection, the window lost its last bit of usefulness.
This commit is contained in:
Michael Steenbeek
committed by
GitHub
GitHub
parent
f3aac0bb96
commit
ab18612882
@@ -431,7 +431,6 @@
|
||||
C666EE701F37ACB10061AA04 /* LandRights.cpp in Sources */ = {isa = PBXBuildFile; fileRef = C666EE5A1F37ACB10061AA04 /* LandRights.cpp */; };
|
||||
C666EE711F37ACB10061AA04 /* MapGen.cpp in Sources */ = {isa = PBXBuildFile; fileRef = C666EE5B1F37ACB10061AA04 /* MapGen.cpp */; };
|
||||
C666EE721F37ACB10061AA04 /* Multiplayer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = C666EE5C1F37ACB10061AA04 /* Multiplayer.cpp */; };
|
||||
C666EE731F37ACB10061AA04 /* MusicCredits.cpp in Sources */ = {isa = PBXBuildFile; fileRef = C666EE5D1F37ACB10061AA04 /* MusicCredits.cpp */; };
|
||||
C666EE741F37ACB10061AA04 /* News.cpp in Sources */ = {isa = PBXBuildFile; fileRef = C666EE5E1F37ACB10061AA04 /* News.cpp */; };
|
||||
C666EE751F37ACB10061AA04 /* NewsOptions.cpp in Sources */ = {isa = PBXBuildFile; fileRef = C666EE5F1F37ACB10061AA04 /* NewsOptions.cpp */; };
|
||||
C666EE761F37ACB10061AA04 /* Options.cpp in Sources */ = {isa = PBXBuildFile; fileRef = C666EE601F37ACB10061AA04 /* Options.cpp */; };
|
||||
@@ -1552,7 +1551,6 @@
|
||||
C666EE5A1F37ACB10061AA04 /* LandRights.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = LandRights.cpp; sourceTree = "<group>"; };
|
||||
C666EE5B1F37ACB10061AA04 /* MapGen.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = MapGen.cpp; sourceTree = "<group>"; };
|
||||
C666EE5C1F37ACB10061AA04 /* Multiplayer.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = Multiplayer.cpp; sourceTree = "<group>"; };
|
||||
C666EE5D1F37ACB10061AA04 /* MusicCredits.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = MusicCredits.cpp; sourceTree = "<group>"; };
|
||||
C666EE5E1F37ACB10061AA04 /* News.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = News.cpp; sourceTree = "<group>"; };
|
||||
C666EE5F1F37ACB10061AA04 /* NewsOptions.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = NewsOptions.cpp; sourceTree = "<group>"; };
|
||||
C666EE601F37ACB10061AA04 /* Options.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = Options.cpp; sourceTree = "<group>"; };
|
||||
@@ -3271,7 +3269,6 @@
|
||||
C6D2BEE41F9BAACD008B557C /* MapTooltip.cpp */,
|
||||
C6D2BEE51F9BAACD008B557C /* MazeConstruction.cpp */,
|
||||
C666EE5C1F37ACB10061AA04 /* Multiplayer.cpp */,
|
||||
C666EE5D1F37ACB10061AA04 /* MusicCredits.cpp */,
|
||||
C6D2BEE91F9BB83B008B557C /* NetworkStatus.cpp */,
|
||||
C654DF231F69C0430040F43D /* NewCampaign.cpp */,
|
||||
C685E5141F8907840090598F /* NewRide.cpp */,
|
||||
@@ -3848,7 +3845,6 @@
|
||||
4CB991CD25CEE54500C692B4 /* ShortcutInput.cpp in Sources */,
|
||||
C68878C820289B710084B384 /* SwapFramebuffer.cpp in Sources */,
|
||||
C67CCD661FBBCFDB004FAE4C /* EditorBottomToolbar.cpp in Sources */,
|
||||
C666EE731F37ACB10061AA04 /* MusicCredits.cpp in Sources */,
|
||||
C654DF351F69C0430040F43D /* Park.cpp in Sources */,
|
||||
4C8BB68525533DB9005C8830 /* ZoomLevel.cpp in Sources */,
|
||||
C654DF3A1F69C0430040F43D /* TitleEditor.cpp in Sources */,
|
||||
|
||||
@@ -2055,51 +2055,6 @@ STR_2854 :{RED}Guests can’t get to the entrance of {STRINGID}!{NEWLINE}Cons
|
||||
STR_2855 :{RED}{STRINGID} has no path leading from its exit!{NEWLINE}Construct a path from the ride exit
|
||||
STR_2858 :Can’t start marketing campaign…
|
||||
STR_2861 :{WINDOW_COLOUR_2}Licensed to Infogrames Interactive Inc.
|
||||
STR_2862 :Music acknowledgements…
|
||||
STR_2863 :Music acknowledgements
|
||||
STR_2864 :{WINDOW_COLOUR_2}March - Children of the Regiment: (Fucik) non copyright
|
||||
STR_2865 :{WINDOW_COLOUR_2}Heyken’s Serenade: (J.Heyken) British Standard Music Coy; GEMA, BRITICO
|
||||
STR_2866 :{WINDOW_COLOUR_2}La Belle Espagnole: (Robert Vollstedt) non copyright
|
||||
STR_2867 :{WINDOW_COLOUR_2}Wedding Journey: (Traditional)
|
||||
STR_2868 :{WINDOW_COLOUR_2}Tales from the Vienna Woods: (Johann Strauss) non copyright
|
||||
STR_2869 :{WINDOW_COLOUR_2}Slavonic Dance: (Traditional)
|
||||
STR_2870 :{WINDOW_COLOUR_2}Das Alpenhorn: (Traditional)
|
||||
STR_2871 :{WINDOW_COLOUR_2}The Blond Sailor: (Traditional)
|
||||
STR_2872 :{WINDOW_COLOUR_2}Overture - Poet and Peasant: (Franz von Suppé) non copyright
|
||||
STR_2873 :{WINDOW_COLOUR_2}Waltz Medley: (Johann Strauss) non copyright
|
||||
STR_2874 :{WINDOW_COLOUR_2}Bella Bella Bimba: (Traditional)
|
||||
STR_2875 :{WINDOW_COLOUR_2}Original recordings (P) 1976 C.J.Mears Organization, used with consent
|
||||
STR_2876 :{WINDOW_COLOUR_2}RollerCoaster Tycoon 2 Title Music: (Allister Brimble) copyright © Chris Sawyer
|
||||
STR_2877 :{WINDOW_COLOUR_2}Dodgems Beat: (Allister Brimble) copyright © Chris Sawyer
|
||||
STR_2878 :{WINDOW_COLOUR_2}Mid Summer’s Heat: (Allister Brimble) copyright © Chris Sawyer
|
||||
STR_2879 :{WINDOW_COLOUR_2}Pharaoh’s Tomb: (Allister Brimble) copyright © Chris Sawyer
|
||||
STR_2880 :{WINDOW_COLOUR_2}Caesar’s March: (Allister Brimble) copyright © Chris Sawyer
|
||||
STR_2881 :{WINDOW_COLOUR_2}Drifting To Heaven: (Allister Brimble) copyright © Chris Sawyer
|
||||
STR_2882 :{WINDOW_COLOUR_2}Invaders: (Allister Brimble) copyright © Chris Sawyer
|
||||
STR_2883 :{WINDOW_COLOUR_2}Eternal Toybox: (Allister Brimble) copyright © Chris Sawyer
|
||||
STR_2884 :{WINDOW_COLOUR_2}Jungle Juice: (Allister Brimble) copyright © Chris Sawyer
|
||||
STR_2885 :{WINDOW_COLOUR_2}Ninja’s Noodles: (Allister Brimble) copyright © Chris Sawyer
|
||||
STR_2886 :{WINDOW_COLOUR_2}Voyage to Andromeda: (Allister Brimble) copyright © Chris Sawyer
|
||||
STR_2887 :{WINDOW_COLOUR_2}Brimble’s Beat: (Allister Brimble) copyright © Chris Sawyer
|
||||
STR_2888 :{WINDOW_COLOUR_2}Atlantis: (Allister Brimble) copyright © Chris Sawyer
|
||||
STR_2889 :{WINDOW_COLOUR_2}Wild West Kid: (Allister Brimble) copyright © Chris Sawyer
|
||||
STR_2890 :{WINDOW_COLOUR_2}Vampire’s Lair: (Allister Brimble) copyright © Chris Sawyer
|
||||
STR_2891 :{WINDOW_COLOUR_2}Blockbuster: (Allister Brimble) copyright © Chris Sawyer
|
||||
STR_2892 :{WINDOW_COLOUR_2}Airtime Rock: (Allister Brimble) copyright © Chris Sawyer
|
||||
STR_2893 :{WINDOW_COLOUR_2}Searchlight Rag: (Scott Joplin/Allister Brimble) copyright © Chris Sawyer
|
||||
STR_2894 :{WINDOW_COLOUR_2}Flight of Fantasy: (Steve Blenkinsopp) copyright © Chris Sawyer
|
||||
STR_2895 :{WINDOW_COLOUR_2}Big Rock: (Allister Brimble) copyright © Chris Sawyer
|
||||
STR_2896 :{WINDOW_COLOUR_2}Hypothermia: (Allister Brimble) copyright © Chris Sawyer
|
||||
STR_2897 :{WINDOW_COLOUR_2}Last Sleigh Ride: (Allister Brimble) copyright © Chris Sawyer
|
||||
STR_2898 :{WINDOW_COLOUR_2}Pipes of Glencairn: (Allister Brimble) copyright © Chris Sawyer
|
||||
STR_2899 :{WINDOW_COLOUR_2}Traffic Jam: (Allister Brimble) copyright © Chris Sawyer
|
||||
STR_2901 :{WINDOW_COLOUR_2}(Samples courtesy of Spectrasonics “Liquid Grooves”)
|
||||
STR_2902 :{WINDOW_COLOUR_2}Toccata: (C.M.Widor, played by Peter James Adcock) recording © Chris Sawyer
|
||||
STR_2903 :{WINDOW_COLOUR_2}Space Rock: (Allister Brimble) copyright © Chris Sawyer
|
||||
STR_2904 :{WINDOW_COLOUR_2}Manic Mechanic: (Allister Brimble) copyright © Chris Sawyer
|
||||
STR_2905 :{WINDOW_COLOUR_2}Techno Torture: (Allister Brimble) copyright © Chris Sawyer
|
||||
STR_2906 :{WINDOW_COLOUR_2}Sweat Dreams: (Allister Brimble) copyright © Chris Sawyer
|
||||
STR_2907 :{WINDOW_COLOUR_2}What shall we do with the Drunken Sailor: (Anon/Allister Brimble) copyright © Chris Sawyer
|
||||
STR_2971 :Main colour scheme
|
||||
STR_2972 :Alternative colour scheme 1
|
||||
STR_2973 :Alternative colour scheme 2
|
||||
|
||||
@@ -79,8 +79,6 @@ public:
|
||||
return window_mapgen_open();
|
||||
case WC_MULTIPLAYER:
|
||||
return window_multiplayer_open();
|
||||
case WC_MUSIC_CREDITS:
|
||||
return window_music_credits_open();
|
||||
case WC_CONSTRUCT_RIDE:
|
||||
return window_new_ride_open();
|
||||
case WC_PARK_INFORMATION:
|
||||
|
||||
@@ -147,7 +147,6 @@
|
||||
<ClCompile Include="windows\MapTooltip.cpp" />
|
||||
<ClCompile Include="windows\MazeConstruction.cpp" />
|
||||
<ClCompile Include="windows\Multiplayer.cpp" />
|
||||
<ClCompile Include="windows\MusicCredits.cpp" />
|
||||
<ClCompile Include="windows\NetworkStatus.cpp" />
|
||||
<ClCompile Include="windows\NewCampaign.cpp" />
|
||||
<ClCompile Include="windows\NewRide.cpp" />
|
||||
|
||||
@@ -51,9 +51,6 @@ enum WINDOW_ABOUT_WIDGET_IDX {
|
||||
WIDX_JOIN_DISCORD,
|
||||
WIDX_CONTRIBUTORS,
|
||||
WIDX_COPYRIGHT,
|
||||
|
||||
// About RCT2
|
||||
WIDX_MUSIC_CREDITS = WIDX_PAGE_START,
|
||||
};
|
||||
|
||||
#define WIDGETS_MAIN \
|
||||
@@ -78,7 +75,6 @@ static rct_widget window_about_openrct2_widgets[] = {
|
||||
|
||||
static rct_widget window_about_rct2_widgets[] = {
|
||||
WIDGETS_MAIN,
|
||||
MakeWidget({100, WH - TABHEIGHT}, {200, 14}, WindowWidgetType::Button, WindowColour::Secondary, STR_MUSIC_ACKNOWLEDGEMENTS_ELLIPSIS), // music credits button
|
||||
{ WIDGETS_END },
|
||||
};
|
||||
|
||||
@@ -92,7 +88,7 @@ static rct_widget *window_about_page_widgets[] = {
|
||||
|
||||
static uint64_t window_about_page_enabled_widgets[] = {
|
||||
DEFAULT_ENABLED_WIDGETS | (1ULL << WIDX_COPY_BUILD_INFO) | (1ULL << WIDX_CHANGELOG) | (1ULL << WIDX_JOIN_DISCORD),
|
||||
DEFAULT_ENABLED_WIDGETS | (1ULL << WIDX_MUSIC_CREDITS),
|
||||
DEFAULT_ENABLED_WIDGETS,
|
||||
};
|
||||
|
||||
static void window_about_openrct2_mouseup(rct_window *w, rct_widgetindex widgetIndex);
|
||||
@@ -253,9 +249,6 @@ static void window_about_rct2_mouseup(rct_window* w, rct_widgetindex widgetIndex
|
||||
case WIDX_TAB_ABOUT_RCT2:
|
||||
window_about_set_page(w, widgetIndex - WIDX_TAB_ABOUT_OPENRCT2);
|
||||
break;
|
||||
case WIDX_MUSIC_CREDITS:
|
||||
context_open_window(WC_MUSIC_CREDITS);
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -1,186 +0,0 @@
|
||||
/*****************************************************************************
|
||||
* Copyright (c) 2014-2020 OpenRCT2 developers
|
||||
*
|
||||
* For a complete list of all authors, please refer to contributors.md
|
||||
* Interested in contributing? Visit https://github.com/OpenRCT2/OpenRCT2
|
||||
*
|
||||
* OpenRCT2 is licensed under the GNU General Public License version 3.
|
||||
*****************************************************************************/
|
||||
|
||||
#include <iterator>
|
||||
#include <openrct2-ui/interface/Widget.h>
|
||||
#include <openrct2-ui/windows/Window.h>
|
||||
#include <openrct2/drawing/Drawing.h>
|
||||
#include <openrct2/interface/Colour.h>
|
||||
#include <openrct2/localisation/Localisation.h>
|
||||
|
||||
static constexpr const rct_string_id WINDOW_TITLE = STR_MUSIC_ACKNOWLEDGEMENTS;
|
||||
static constexpr const int32_t WH = 314;
|
||||
static constexpr const int32_t WW = 510;
|
||||
|
||||
// clang-format off
|
||||
enum WINDOW_MUSIC_CREDITS_WIDGET_IDX {
|
||||
WIDX_BACKGROUND,
|
||||
WIDX_TITLE,
|
||||
WIDX_CLOSE
|
||||
};
|
||||
|
||||
static rct_widget window_music_credits_widgets[] = {
|
||||
WINDOW_SHIM(WINDOW_TITLE, WW, WH),
|
||||
MakeWidget({4, 18}, {502, 292}, WindowWidgetType::Scroll, WindowColour::Primary, SCROLL_VERTICAL), // scroll
|
||||
{ WIDGETS_END },
|
||||
};
|
||||
|
||||
static constexpr const rct_string_id music_credits[] = {
|
||||
STR_MUSIC_ACKNOWLEDGEMENTS_TRACK_MARCH_CHILDREN_OF_THE_REGIMENT,
|
||||
STR_MUSIC_ACKNOWLEDGEMENTS_TRACK_HEYKENS_SERENADE,
|
||||
STR_MUSIC_ACKNOWLEDGEMENTS_TRACK_IN_CONTINENTAL_MOOD,
|
||||
STR_MUSIC_ACKNOWLEDGEMENTS_TRACK_WEDDING_JOURNEY,
|
||||
STR_MUSIC_ACKNOWLEDGEMENTS_TRACK_TALES_FROM_THE_VIENNA_WOODS,
|
||||
STR_MUSIC_ACKNOWLEDGEMENTS_TRACK_SLAVONIC_DANCE,
|
||||
STR_MUSIC_ACKNOWLEDGEMENTS_TRACK_DAS_ALPENHORN,
|
||||
STR_MUSIC_ACKNOWLEDGEMENTS_TRACK_THE_BLOND_SAILOR,
|
||||
STR_MUSIC_ACKNOWLEDGEMENTS_TRACK_OVERTURE_POET_AND_PEASANT,
|
||||
STR_MUSIC_ACKNOWLEDGEMENTS_TRACK_WALTZ_MEDLEY,
|
||||
STR_MUSIC_ACKNOWLEDGEMENTS_TRACK_BELLA_BELLA_BIMBA,
|
||||
};
|
||||
|
||||
static constexpr const rct_string_id music_credits_rct2[] = {
|
||||
STR_MUSIC_ACKNOWLEDGEMENTS_TRACK_RCT2_TITLE_MUSIC,
|
||||
STR_MUSIC_ACKNOWLEDGEMENTS_TRACK_DODGEMS_BEAT,
|
||||
STR_MUSIC_ACKNOWLEDGEMENTS_TRACK_MIS_SUMMERS_HEAT,
|
||||
STR_MUSIC_ACKNOWLEDGEMENTS_TRACK_PHARAOS_TOMB,
|
||||
STR_MUSIC_ACKNOWLEDGEMENTS_TRACK_CAESARS_MARCH,
|
||||
STR_MUSIC_ACKNOWLEDGEMENTS_TRACK_DRIFTING_TO_HEAVEN,
|
||||
STR_MUSIC_ACKNOWLEDGEMENTS_TRACK_INVADERS,
|
||||
STR_MUSIC_ACKNOWLEDGEMENTS_TRACK_ETERNAL_TOYBOX,
|
||||
STR_MUSIC_ACKNOWLEDGEMENTS_TRACK_JUNGLE_JUICE,
|
||||
STR_MUSIC_ACKNOWLEDGEMENTS_TRACK_NINJAS_NOODLES,
|
||||
STR_MUSIC_ACKNOWLEDGEMENTS_TRACK_VOYAGE_TO_ANDROMEDA,
|
||||
STR_MUSIC_ACKNOWLEDGEMENTS_TRACK_BRIMBLES_BEAT,
|
||||
STR_MUSIC_ACKNOWLEDGEMENTS_TRACK_ATLANTIS,
|
||||
STR_MUSIC_ACKNOWLEDGEMENTS_TRACK_WILD_WEST_KID,
|
||||
STR_MUSIC_ACKNOWLEDGEMENTS_TRACK_VAMPIRES_LAIR,
|
||||
STR_MUSIC_ACKNOWLEDGEMENTS_TRACK_BLOCKUBSTER,
|
||||
STR_MUSIC_ACKNOWLEDGEMENTS_TRACK_AIRTIME_ROCK,
|
||||
STR_MUSIC_ACKNOWLEDGEMENTS_TRACK_SEARCHLIGHT_RAG,
|
||||
STR_MUSIC_ACKNOWLEDGEMENTS_TRACK_FLIGHT_OF_FANTASY,
|
||||
STR_MUSIC_ACKNOWLEDGEMENTS_TRACK_BIG_ROCK,
|
||||
STR_MUSIC_ACKNOWLEDGEMENTS_TRACK_HYPOTHERMIA,
|
||||
STR_MUSIC_ACKNOWLEDGEMENTS_SAMPLES_COURTESY,
|
||||
STR_MUSIC_ACKNOWLEDGEMENTS_TRACK_LAST_SLEIGH_RIDE,
|
||||
STR_MUSIC_ACKNOWLEDGEMENTS_TRACK_PIPES_OF_GLENCAIRN,
|
||||
STR_MUSIC_ACKNOWLEDGEMENTS_TRACK_TRAFFIC_JAM,
|
||||
STR_MUSIC_ACKNOWLEDGEMENTS_TRACK_TOCCATA,
|
||||
STR_MUSIC_ACKNOWLEDGEMENTS_TRACK_SPACE_ROCK,
|
||||
STR_MUSIC_ACKNOWLEDGEMENTS_TRACK_MANIC_MECHANIC,
|
||||
STR_MUSIC_ACKNOWLEDGEMENTS_TRACK_TECHNO_TORTURE,
|
||||
STR_MUSIC_ACKNOWLEDGEMENTS_TRACK_SWEET_DREAMS,
|
||||
STR_MUSIC_ACKNOWLEDGEMENTS_TRACK_WHAT_SHALL_WE_DO_WITH_THE_DRUNKEN_SAILOR,
|
||||
};
|
||||
|
||||
static void window_music_credits_mouseup(rct_window *w, rct_widgetindex widgetIndex);
|
||||
static void window_music_credits_scrollgetsize(rct_window *w, int32_t scrollIndex, int32_t *width, int32_t *height);
|
||||
static void window_music_credits_paint(rct_window *w, rct_drawpixelinfo *dpi);
|
||||
static void window_music_credits_scrollpaint(rct_window *w, rct_drawpixelinfo *dpi, int32_t scrollIndex);
|
||||
|
||||
static rct_window_event_list window_music_credits_events([](auto& events)
|
||||
{
|
||||
events.mouse_up = &window_music_credits_mouseup;
|
||||
events.get_scroll_size = &window_music_credits_scrollgetsize;
|
||||
events.paint = &window_music_credits_paint;
|
||||
events.scroll_paint = &window_music_credits_scrollpaint;
|
||||
});
|
||||
// clang-format on
|
||||
|
||||
/**
|
||||
*
|
||||
* rct2: 0x0066D55B
|
||||
*/
|
||||
rct_window* window_music_credits_open()
|
||||
{
|
||||
rct_window* window;
|
||||
|
||||
// Check if window is already open
|
||||
window = window_bring_to_front_by_class(WC_MUSIC_CREDITS);
|
||||
if (window != nullptr)
|
||||
return window;
|
||||
|
||||
window = WindowCreateCentred(510, 314, &window_music_credits_events, WC_MUSIC_CREDITS, 0);
|
||||
|
||||
window->widgets = window_music_credits_widgets;
|
||||
window->enabled_widgets = 1ULL << WIDX_CLOSE;
|
||||
|
||||
WindowInitScrollWidgets(window);
|
||||
window->colours[0] = COLOUR_LIGHT_BLUE;
|
||||
window->colours[1] = COLOUR_LIGHT_BLUE;
|
||||
window->colours[2] = COLOUR_LIGHT_BLUE;
|
||||
|
||||
return window;
|
||||
}
|
||||
|
||||
/**
|
||||
*
|
||||
* rct2: 0x0066DB2C
|
||||
*/
|
||||
static void window_music_credits_mouseup(rct_window* w, rct_widgetindex widgetIndex)
|
||||
{
|
||||
switch (widgetIndex)
|
||||
{
|
||||
case WIDX_CLOSE:
|
||||
window_close(w);
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
*
|
||||
* rct2: 0x0066DB37
|
||||
*/
|
||||
static void window_music_credits_scrollgetsize(rct_window* w, int32_t scrollIndex, int32_t* width, int32_t* height)
|
||||
{
|
||||
int32_t lineHeight = font_get_line_height(FontSpriteBase::MEDIUM);
|
||||
*height = static_cast<int32_t>(std::size(music_credits) + std::size(music_credits_rct2)) * lineHeight + 12;
|
||||
}
|
||||
|
||||
/**
|
||||
*
|
||||
* rct2: 0x0066D7B9
|
||||
*/
|
||||
static void window_music_credits_paint(rct_window* w, rct_drawpixelinfo* dpi)
|
||||
{
|
||||
WindowDrawWidgets(w, dpi);
|
||||
}
|
||||
|
||||
/**
|
||||
*
|
||||
* rct2: 0x0066D7BF
|
||||
*/
|
||||
static void window_music_credits_scrollpaint(rct_window* w, rct_drawpixelinfo* dpi, int32_t scrollIndex)
|
||||
{
|
||||
int32_t lineHeight = font_get_line_height(FontSpriteBase::MEDIUM);
|
||||
|
||||
auto screenCoords = ScreenCoordsXY{ 245, 2 };
|
||||
|
||||
for (size_t i = 0; i < std::size(music_credits); i++)
|
||||
{
|
||||
DrawTextBasic(dpi, screenCoords, music_credits[i], nullptr, { TextAlignment::CENTRE });
|
||||
screenCoords.y += lineHeight;
|
||||
}
|
||||
|
||||
// Add 4 more space before "Original recordings ...".
|
||||
screenCoords.y += 4;
|
||||
DrawTextBasic(dpi, screenCoords, STR_MUSIC_ACKNOWLEDGEMENTS_ORIGINAL_RECORDINGS, nullptr, { TextAlignment::CENTRE });
|
||||
screenCoords.y += lineHeight;
|
||||
|
||||
// Draw the separator
|
||||
screenCoords.y += 5;
|
||||
gfx_fill_rect_inset(dpi, { 4, screenCoords.y, 484, screenCoords.y + 1 }, w->colours[1], INSET_RECT_FLAG_BORDER_INSET);
|
||||
screenCoords.y += lineHeight + 1;
|
||||
|
||||
for (size_t i = 0; i < std::size(music_credits_rct2); i++)
|
||||
{
|
||||
DrawTextBasic(dpi, screenCoords, music_credits_rct2[i], nullptr, { TextAlignment::CENTRE });
|
||||
screenCoords.y += lineHeight;
|
||||
}
|
||||
}
|
||||
@@ -54,7 +54,6 @@ rct_window* window_land_rights_open();
|
||||
rct_window* window_main_open();
|
||||
rct_window* window_mapgen_open();
|
||||
rct_window* window_multiplayer_open();
|
||||
rct_window* window_music_credits_open();
|
||||
rct_window* window_news_open();
|
||||
rct_window* window_news_options_open();
|
||||
rct_window* window_options_open();
|
||||
|
||||
@@ -418,8 +418,8 @@ enum
|
||||
WC_TOOLTIP = 5,
|
||||
WC_DROPDOWN = 6,
|
||||
WC_ABOUT = 8,
|
||||
WC_PUBLISHER_CREDITS = 9,
|
||||
WC_MUSIC_CREDITS = 10,
|
||||
// WC_PUBLISHER_CREDITS = 9,
|
||||
// WC_MUSIC_CREDITS = 10,
|
||||
WC_ERROR = 11,
|
||||
WC_RIDE = 12,
|
||||
WC_RIDE_CONSTRUCTION = 13,
|
||||
|
||||
@@ -2171,52 +2171,6 @@ enum
|
||||
STR_CANT_START_MARKETING_CAMPAIGN = 2858,
|
||||
// STR_2859 :Another instance of OpenRCT2 is already running
|
||||
STR_LICENSED_TO_INFOGRAMES_INTERACTIVE_INC = 2861,
|
||||
STR_MUSIC_ACKNOWLEDGEMENTS_ELLIPSIS = 2862,
|
||||
STR_MUSIC_ACKNOWLEDGEMENTS = 2863,
|
||||
STR_MUSIC_ACKNOWLEDGEMENTS_TRACK_MARCH_CHILDREN_OF_THE_REGIMENT = 2864,
|
||||
STR_MUSIC_ACKNOWLEDGEMENTS_TRACK_HEYKENS_SERENADE = 2865,
|
||||
STR_MUSIC_ACKNOWLEDGEMENTS_TRACK_IN_CONTINENTAL_MOOD = 2866,
|
||||
STR_MUSIC_ACKNOWLEDGEMENTS_TRACK_WEDDING_JOURNEY = 2867,
|
||||
STR_MUSIC_ACKNOWLEDGEMENTS_TRACK_TALES_FROM_THE_VIENNA_WOODS = 2868,
|
||||
STR_MUSIC_ACKNOWLEDGEMENTS_TRACK_SLAVONIC_DANCE = 2869,
|
||||
STR_MUSIC_ACKNOWLEDGEMENTS_TRACK_DAS_ALPENHORN = 2870,
|
||||
STR_MUSIC_ACKNOWLEDGEMENTS_TRACK_THE_BLOND_SAILOR = 2871,
|
||||
STR_MUSIC_ACKNOWLEDGEMENTS_TRACK_OVERTURE_POET_AND_PEASANT = 2872,
|
||||
STR_MUSIC_ACKNOWLEDGEMENTS_TRACK_WALTZ_MEDLEY = 2873,
|
||||
STR_MUSIC_ACKNOWLEDGEMENTS_TRACK_BELLA_BELLA_BIMBA = 2874,
|
||||
STR_MUSIC_ACKNOWLEDGEMENTS_ORIGINAL_RECORDINGS = 2875,
|
||||
STR_MUSIC_ACKNOWLEDGEMENTS_TRACK_RCT2_TITLE_MUSIC = 2876,
|
||||
STR_MUSIC_ACKNOWLEDGEMENTS_TRACK_DODGEMS_BEAT = 2877,
|
||||
STR_MUSIC_ACKNOWLEDGEMENTS_TRACK_MIS_SUMMERS_HEAT = 2878,
|
||||
STR_MUSIC_ACKNOWLEDGEMENTS_TRACK_PHARAOS_TOMB = 2879,
|
||||
STR_MUSIC_ACKNOWLEDGEMENTS_TRACK_CAESARS_MARCH = 2880,
|
||||
STR_MUSIC_ACKNOWLEDGEMENTS_TRACK_DRIFTING_TO_HEAVEN = 2881,
|
||||
STR_MUSIC_ACKNOWLEDGEMENTS_TRACK_INVADERS = 2882,
|
||||
STR_MUSIC_ACKNOWLEDGEMENTS_TRACK_ETERNAL_TOYBOX = 2883,
|
||||
STR_MUSIC_ACKNOWLEDGEMENTS_TRACK_JUNGLE_JUICE = 2884,
|
||||
STR_MUSIC_ACKNOWLEDGEMENTS_TRACK_NINJAS_NOODLES = 2885,
|
||||
STR_MUSIC_ACKNOWLEDGEMENTS_TRACK_VOYAGE_TO_ANDROMEDA = 2886,
|
||||
STR_MUSIC_ACKNOWLEDGEMENTS_TRACK_BRIMBLES_BEAT = 2887,
|
||||
STR_MUSIC_ACKNOWLEDGEMENTS_TRACK_ATLANTIS = 2888,
|
||||
STR_MUSIC_ACKNOWLEDGEMENTS_TRACK_WILD_WEST_KID = 2889,
|
||||
STR_MUSIC_ACKNOWLEDGEMENTS_TRACK_VAMPIRES_LAIR = 2890,
|
||||
STR_MUSIC_ACKNOWLEDGEMENTS_TRACK_BLOCKUBSTER = 2891,
|
||||
STR_MUSIC_ACKNOWLEDGEMENTS_TRACK_AIRTIME_ROCK = 2892,
|
||||
STR_MUSIC_ACKNOWLEDGEMENTS_TRACK_SEARCHLIGHT_RAG = 2893,
|
||||
STR_MUSIC_ACKNOWLEDGEMENTS_TRACK_FLIGHT_OF_FANTASY = 2894,
|
||||
STR_MUSIC_ACKNOWLEDGEMENTS_TRACK_BIG_ROCK = 2895,
|
||||
STR_MUSIC_ACKNOWLEDGEMENTS_TRACK_HYPOTHERMIA = 2896,
|
||||
STR_MUSIC_ACKNOWLEDGEMENTS_TRACK_LAST_SLEIGH_RIDE = 2897,
|
||||
STR_MUSIC_ACKNOWLEDGEMENTS_TRACK_PIPES_OF_GLENCAIRN = 2898,
|
||||
STR_MUSIC_ACKNOWLEDGEMENTS_TRACK_TRAFFIC_JAM = 2899,
|
||||
|
||||
STR_MUSIC_ACKNOWLEDGEMENTS_SAMPLES_COURTESY = 2901,
|
||||
STR_MUSIC_ACKNOWLEDGEMENTS_TRACK_TOCCATA = 2902,
|
||||
STR_MUSIC_ACKNOWLEDGEMENTS_TRACK_SPACE_ROCK = 2903,
|
||||
STR_MUSIC_ACKNOWLEDGEMENTS_TRACK_MANIC_MECHANIC = 2904,
|
||||
STR_MUSIC_ACKNOWLEDGEMENTS_TRACK_TECHNO_TORTURE = 2905,
|
||||
STR_MUSIC_ACKNOWLEDGEMENTS_TRACK_SWEET_DREAMS = 2906,
|
||||
STR_MUSIC_ACKNOWLEDGEMENTS_TRACK_WHAT_SHALL_WE_DO_WITH_THE_DRUNKEN_SAILOR = 2907,
|
||||
|
||||
STR_MAIN_COLOUR_SCHEME = 2971,
|
||||
STR_ALTERNATIVE_COLOUR_SCHEME_1 = 2972,
|
||||
|
||||
Reference in New Issue
Block a user