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

Refactor GetTitleMusicDescriptor back to one function

This commit is contained in:
Hielke Morsink 2023-05-15 00:42:47 +02:00 committed by Ted John
parent 0a8c804347
commit edd31163b0
1 changed files with 26 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

53
src/openrct2/audio/Audio.cpp
View File

@ -269,35 +269,34 @@ namespace OpenRCT2::Audio
}
}
static ObjectEntryDescriptor GetTitleMusicDescriptor(TitleMusicKind kind)
{
switch (kind)
{
default:
return {};
case TitleMusicKind::RCT1:
return ObjectEntryDescriptor(ObjectType::Audio, AudioObjectIdentifiers::RCT1Title);
case TitleMusicKind::RCT2:
return ObjectEntryDescriptor(ObjectType::Audio, AudioObjectIdentifiers::RCT2Title);
case TitleMusicKind::OpenRCT2:
return ObjectEntryDescriptor(ObjectType::Audio, AudioObjectIdentifiers::OpenRCT2Title);
case TitleMusicKind::Random:
switch (UtilRand() % 3)
{
case 0:
return GetTitleMusicDescriptor(TitleMusicKind::RCT1);
case 1:
return GetTitleMusicDescriptor(TitleMusicKind::RCT2);
case 2:
default:
return GetTitleMusicDescriptor(TitleMusicKind::OpenRCT2);
}
}
}
static ObjectEntryDescriptor GetTitleMusicDescriptor()
{
return GetTitleMusicDescriptor(gConfigSound.TitleMusic);
static constexpr std::array selectableAudioIds{
AudioObjectIdentifiers::OpenRCT2Title,
AudioObjectIdentifiers::RCT1Title,
AudioObjectIdentifiers::RCT2Title,
};
int32_t IdIndex{};
switch (gConfigSound.TitleMusic)
{
default:
case TitleMusicKind::OpenRCT2:
IdIndex = 0;
break;
case TitleMusicKind::RCT1:
IdIndex = 1;
break;
case TitleMusicKind::RCT2:
IdIndex = 2;
break;
case TitleMusicKind::Random:
IdIndex = UtilRand() % std::size(selectableAudioIds);
break;
case TitleMusicKind::None:
return {};
}
return ObjectEntryDescriptor(ObjectType::Audio, selectableAudioIds[IdIndex]);
}
void PlayTitleMusic()