mirrors
/
OpenRCT2
mirror of https://github.com/OpenRCT2/OpenRCT2.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Clean up music credits window

This commit is contained in:
Marijn van der Werf 2016-07-27 00:04:37 +02:00
parent cb794ab3df
commit 8d1d699710
3 changed files with 102 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
data/language/en-GB.txt
View File

@ -2907,7 +2907,7 @@ STR_2896 :{WINDOW_COLOUR_2}Hypothermia: (Allister Brimble) copyright {COPYR
STR_2897 :{WINDOW_COLOUR_2}Last Sleigh Ride: (Allister Brimble) copyright {COPYRIGHT} Chris Sawyer
STR_2898 :{WINDOW_COLOUR_2}Pipes of Glencairn: (Allister Brimble) copyright {COPYRIGHT} Chris Sawyer
STR_2899 :{WINDOW_COLOUR_2}Traffic Jam: (Allister Brimble) copyright {COPYRIGHT} Chris Sawyer
STR_2900 :{WINDOW_COLOUR_2}
STR_2900 :<removed string - do not use>
STR_2901 :{WINDOW_COLOUR_2}(Samples courtesy of Spectrasonics {ENDQUOTES}Liquid Grooves{ENDQUOTES})
STR_2902 :{WINDOW_COLOUR_2}Toccata: (C.M.Widor, played by Peter James Adcock) recording {COPYRIGHT} Chris Sawyer
STR_2903 :{WINDOW_COLOUR_2}Space Rock: (Allister Brimble) copyright {COPYRIGHT} Chris Sawyer

45
src/localisation/string_ids.h
View File

@ -2301,9 +2301,50 @@ enum {
STR_LICENSED_TO_INFOGRAMES_INTERACTIVE_INC = 2861,
STR_MUSIC_ACKNOWLEDGEMENTS_ELLIPSIS = 2862,
STR_MUSIC_ACKNOWLEDGEMENTS = 2863,
STR_MUSIC_ACKNOWLEDGEMENTS_LINE_0 = 2864,
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_CREDITS_PUBLISHER_TILE = 2908,
STR_CREDITS_PUBLISHER_LINE_0 = 2909,
STR_CREDITS_PUBLISHER_LINE_1 = 2910,

76
src/windows/music_credits.c
View File

@ -34,6 +34,54 @@ rct_widget window_music_credits_widgets[] = {
{ WIDGETS_END },
};
static 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 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, int widgetIndex);
static void window_music_credits_scrollgetsize(rct_window *w, int scrollIndex, int *width, int *height);
static void window_music_credits_paint(rct_window *w, rct_drawpixelinfo *dpi);
@ -138,36 +186,28 @@ static void window_music_credits_paint(rct_window *w, rct_drawpixelinfo *dpi)
*/
static void window_music_credits_scrollpaint(rct_window *w, rct_drawpixelinfo *dpi, int scrollIndex)
{
// TODO: Clean up string addition
int x = 245;
int y = 2;
int string = STR_MUSIC_ACKNOWLEDGEMENTS_LINE_0;
for (int i = 0; i < 12; i++) {
gfx_draw_string_centred(dpi, string, x, y, 0, 0);
for (int i = 0; i < countof(music_credits); i++) {
gfx_draw_string_centred(dpi, music_credits[i], x, y, 0, 0);
y += 10;
if (i == 10) { // Add 4 more space before "Original recordings ...".
y += 4;
}
string += 1;
}
// Add 4 more space before "Original recordings ...".
y += 4;
gfx_draw_string_centred(dpi, STR_MUSIC_ACKNOWLEDGEMENTS_ORIGINAL_RECORDINGS, x, y, 0, 0);
y += 10;
// Draw the separator
y += 5;
gfx_fill_rect_inset(dpi, 4, y, 484, y+1, w->colours[1], 0x20);
y += 11;
for (int i = 0; i < 31; i++) {
if (i == 21) { // Move special courtesy to below Hypothermia.
gfx_draw_string_centred(dpi, string + 4, x, y, 0, 0);
y += 10;
continue;
} else if (i == 25) { // Remove special courtesy and blank line.
string += 2;
}
gfx_draw_string_centred(dpi, string, x, y, 0, 0);
for (int i = 0; i < countof(music_credits_rct2); i++) {
gfx_draw_string_centred(dpi, music_credits_rct2[i], x, y, 0, 0);
y += 10;
string += 1;
}
}