mirrors/OpenRCT2
1
0
Fork 0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2026-01-06 06:32:56 +01:00
Code Issues Releases Wiki Activity

Create constants for music tunes

Browse Source
This commit is contained in:
Michael Steenbeek
2017-11-02 14:13:48 +01:00
parent 13dd00e386
commit 0b3da4b209
2 changed files with 98 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

82
src/openrct2/ride/ride.c
View File

@@ -2731,40 +2731,54 @@ rct_peep *ride_get_assigned_mechanic(Ride *ride)
#define MAKE_TUNEID_LIST(...) (uint8[]){(countof(((uint8[]){__VA_ARGS__}))), __VA_ARGS__}
// 0x009AEF28
static uint8 *ride_music_style_tuneids[] = {
MAKE_TUNEID_LIST(13), // MUSIC_STYLE_DODGEMS_BEAT
MAKE_TUNEID_LIST(0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12), // MUSIC_STYLE_FAIRGROUND_ORGAN
MAKE_TUNEID_LIST(15), // MUSIC_STYLE_ROMAN_FANFARE
MAKE_TUNEID_LIST(16), // MUSIC_STYLE_ORIENTAL
MAKE_TUNEID_LIST(17), // MUSIC_STYLE_MARTIAN
MAKE_TUNEID_LIST(18), // MUSIC_STYLE_JUNGLE_DRUMS
MAKE_TUNEID_LIST(19), // MUSIC_STYLE_EGYPTIAN
MAKE_TUNEID_LIST(20), // MUSIC_STYLE_TOYLAND
MAKE_TUNEID_LIST(21), // MUSIC_STYLE_CIRCUS_SHOW
MAKE_TUNEID_LIST(22), // MUSIC_STYLE_SPACE
MAKE_TUNEID_LIST(23), // MUSIC_STYLE_HORROR
MAKE_TUNEID_LIST(24), // MUSIC_STYLE_TECHNO
MAKE_TUNEID_LIST(25), // MUSIC_STYLE_GENTLE
MAKE_TUNEID_LIST(26), // MUSIC_STYLE_SUMMER
MAKE_TUNEID_LIST(27), // MUSIC_STYLE_WATER
MAKE_TUNEID_LIST(28), // MUSIC_STYLE_WILD_WEST
MAKE_TUNEID_LIST(29), // MUSIC_STYLE_JURASSIC
MAKE_TUNEID_LIST(30), // MUSIC_STYLE_ROCK
MAKE_TUNEID_LIST(31), // MUSIC_STYLE_RAGTIME
MAKE_TUNEID_LIST(32), // MUSIC_STYLE_FANTASY
MAKE_TUNEID_LIST(33), // MUSIC_STYLE_ROCK_STYLE_2
MAKE_TUNEID_LIST(34), // MUSIC_STYLE_ICE
MAKE_TUNEID_LIST(35), // MUSIC_STYLE_SNOW
MAKE_TUNEID_LIST(36), // MUSIC_STYLE_CUSTOM_MUSIC_1
MAKE_TUNEID_LIST(37), // MUSIC_STYLE_CUSTOM_MUSIC_2
MAKE_TUNEID_LIST(38), // MUSIC_STYLE_MEDIEVAL
MAKE_TUNEID_LIST(39), // MUSIC_STYLE_URBAN
MAKE_TUNEID_LIST(40), // MUSIC_STYLE_ORGAN
MAKE_TUNEID_LIST(41), // MUSIC_STYLE_MECHANICAL
MAKE_TUNEID_LIST(42), // MUSIC_STYLE_MODERN
MAKE_TUNEID_LIST(43), // MUSIC_STYLE_PIRATES
MAKE_TUNEID_LIST(44), // MUSIC_STYLE_ROCK_STYLE_3
MAKE_TUNEID_LIST(45), // MUSIC_STYLE_CANDY_STYLE
static uint8 * ride_music_style_tuneids[] =
{
MAKE_TUNEID_LIST(TUNE_DODGEMS_BEAT), // MUSIC_STYLE_DODGEMS_BEAT
MAKE_TUNEID_LIST( // MUSIC_STYLE_FAIRGROUND_ORGAN
TUNE_CHILDREN_OF_THE_REGIMENT,
TUNE_SERENADE_OP_21,
TUNE_IN_CONTINENTAL_MOOD,
TUNE_WEDDING_JOURNEY,
TUNE_TALES_FROM_THE_VIENNA_WOODS,
TUNE_SLAVONIC_DANCE,
TUNE_CSS_10,
TUNE_DAS_ALPENHORN,
TUNE_BELLA_BELLA_BIMBA,
TUNE_THE_BLOND_SAILOR,
TUNE_POET_AND_PEASANT_OVERTURE,
TUNE_WALTZ_MEDLEY,
TUNE_CSS_16),
MAKE_TUNEID_LIST(TUNE_CAESARS_MARCH), // MUSIC_STYLE_ROMAN_FANFARE
MAKE_TUNEID_LIST(TUNE_NINJAS_NOODLES), // MUSIC_STYLE_ORIENTAL
MAKE_TUNEID_LIST(TUNE_INVADERS), // MUSIC_STYLE_MARTIAN
MAKE_TUNEID_LIST(TUNE_JUNGLE_JUICE), // MUSIC_STYLE_JUNGLE_DRUMS
MAKE_TUNEID_LIST(TUNE_PHARAOHS_TOMB), // MUSIC_STYLE_EGYPTIAN
MAKE_TUNEID_LIST(TUNE_ETERNAL_TOYBOX), // MUSIC_STYLE_TOYLAND
MAKE_TUNEID_LIST(TUNE_CIRCUS_SHOW), // MUSIC_STYLE_CIRCUS_SHOW
MAKE_TUNEID_LIST(TUNE_VOYAGE_TO_ANDROMEDA), // MUSIC_STYLE_SPACE
MAKE_TUNEID_LIST(TUNE_VAMPIRES_LAIR), // MUSIC_STYLE_HORROR
MAKE_TUNEID_LIST(TUNE_BRIMBLES_BEAT), // MUSIC_STYLE_TECHNO
MAKE_TUNEID_LIST(TUNE_DRIFTING_TO_HEAVEN), // MUSIC_STYLE_GENTLE
MAKE_TUNEID_LIST(TUNE_MID_SUMMERS_HEAT), // MUSIC_STYLE_SUMMER
MAKE_TUNEID_LIST(TUNE_ATLANTIS), // MUSIC_STYLE_WATER
MAKE_TUNEID_LIST(TUNE_WILD_WEST_KID), // MUSIC_STYLE_WILD_WEST
MAKE_TUNEID_LIST(TUNE_BLOCKBUSTER), // MUSIC_STYLE_JURASSIC
MAKE_TUNEID_LIST(TUNE_AIRTIME_ROCK), // MUSIC_STYLE_ROCK
MAKE_TUNEID_LIST(TUNE_SEARCHLIGHT_RAG), // MUSIC_STYLE_RAGTIME
MAKE_TUNEID_LIST(TUNE_FLIGHT_OF_FANTASY), // MUSIC_STYLE_FANTASY
MAKE_TUNEID_LIST(TUNE_BIG_ROCK), // MUSIC_STYLE_ROCK_STYLE_2
MAKE_TUNEID_LIST(TUNE_HYPOTHERMIA), // MUSIC_STYLE_ICE
MAKE_TUNEID_LIST(TUNE_LAST_SLEIGH_RIDE), // MUSIC_STYLE_SNOW
MAKE_TUNEID_LIST(TUNE_CUSTOM_1), // MUSIC_STYLE_CUSTOM_MUSIC_1
MAKE_TUNEID_LIST(TUNE_CUSTOM_2), // MUSIC_STYLE_CUSTOM_MUSIC_2
MAKE_TUNEID_LIST(TUNE_PIPES_OF_GLENCAIRN), // MUSIC_STYLE_MEDIEVAL
MAKE_TUNEID_LIST(TUNE_TRAFFIC_JAM), // MUSIC_STYLE_URBAN
MAKE_TUNEID_LIST(TUNE_TOCCATA), // MUSIC_STYLE_ORGAN
MAKE_TUNEID_LIST(TUNE_MANIC_MECHANIC), // MUSIC_STYLE_MECHANICAL
MAKE_TUNEID_LIST(TUNE_TECHNO_TORTURE), // MUSIC_STYLE_MODERN
MAKE_TUNEID_LIST(TUNE_WHAT_SHALL_WE_DO_WITH_THE_DRUNKEN_SAILOR), // MUSIC_STYLE_PIRATES
MAKE_TUNEID_LIST(TUNE_SPACE_ROCK), // MUSIC_STYLE_ROCK_STYLE_3
MAKE_TUNEID_LIST(TUNE_SWEAT_DREAMS), // MUSIC_STYLE_CANDY_STYLE
};
/**

50
src/openrct2/ride/ride.h
View File

@@ -662,6 +662,56 @@ enum {
MUSIC_STYLE_COUNT
};
enum
{
TUNE_CHILDREN_OF_THE_REGIMENT, // 00
TUNE_SERENADE_OP_21, // 01
TUNE_IN_CONTINENTAL_MOOD, // 02
TUNE_WEDDING_JOURNEY, // 03
TUNE_TALES_FROM_THE_VIENNA_WOODS, // 04
TUNE_SLAVONIC_DANCE, // 05
TUNE_CSS_10, // 06, empty
TUNE_DAS_ALPENHORN, // 07
TUNE_BELLA_BELLA_BIMBA, // 08
TUNE_THE_BLOND_SAILOR, // 09
TUNE_POET_AND_PEASANT_OVERTURE, // 10
TUNE_WALTZ_MEDLEY, // 11
TUNE_CSS_16, // 12, empty
TUNE_DODGEMS_BEAT, // 13
TUNE_RCT2_THEME_MUSIC, // 14
TUNE_CAESARS_MARCH, // 15
TUNE_NINJAS_NOODLES, // 16
TUNE_INVADERS, // 17
TUNE_JUNGLE_JUICE, // 18
TUNE_PHARAOHS_TOMB, // 19
TUNE_ETERNAL_TOYBOX, // 20
TUNE_CIRCUS_SHOW, // 21
TUNE_VOYAGE_TO_ANDROMEDA, // 22
TUNE_VAMPIRES_LAIR, // 23
TUNE_BRIMBLES_BEAT, // 24
TUNE_DRIFTING_TO_HEAVEN, // 25
TUNE_MID_SUMMERS_HEAT, // 26
TUNE_ATLANTIS, // 27
TUNE_WILD_WEST_KID, // 28
TUNE_BLOCKBUSTER, // 29
TUNE_AIRTIME_ROCK, // 30
TUNE_SEARCHLIGHT_RAG, // 31
TUNE_FLIGHT_OF_FANTASY, // 32
TUNE_BIG_ROCK, // 33
TUNE_HYPOTHERMIA, // 34
TUNE_LAST_SLEIGH_RIDE, // 35
TUNE_CUSTOM_1, // 36
TUNE_CUSTOM_2, // 37
TUNE_PIPES_OF_GLENCAIRN, // 38
TUNE_TRAFFIC_JAM, // 39
TUNE_TOCCATA, // 40
TUNE_MANIC_MECHANIC, // 41
TUNE_TECHNO_TORTURE, // 42
TUNE_WHAT_SHALL_WE_DO_WITH_THE_DRUNKEN_SAILOR, // 43
TUNE_SPACE_ROCK, // 44
TUNE_SWEAT_DREAMS, // 45, (sic)
};
enum {
BREAKDOWN_NONE = 255,
BREAKDOWN_SAFETY_CUT_OUT = 0,