mirrors/OpenRCT2
1
0
Fork 0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2026-01-21 22:13:07 +01:00
Code Issues Releases Wiki Activity

Apply clang-format.

Browse Source
This commit is contained in:
Aaron van Geffen
2020-01-20 22:35:51 +01:00
parent 914c07a711
commit acc6cffad3
3 changed files with 30 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
src/openrct2/title/TitleScreen.cpp
View File

@@ -228,47 +228,59 @@ void TitleScreen::TitleInitialise()
}
if (gConfigInterface.random_title_sequence)
{
bool RCT1Installed = false, RCT1AAInstalled = false, RCT1LLInstalled = false;
int RCT1Count = 0;
size_t scenarioCount = scenario_repository_get_count();
for (size_t s = 0; s < scenarioCount; s++ ) {
if (scenario_repository_get_by_index(s)->source_game == SCENARIO_SOURCE_RCT1) {
for (size_t s = 0; s < scenarioCount; s++)
{
if (scenario_repository_get_by_index(s)->source_game == SCENARIO_SOURCE_RCT1)
{
RCT1Count++;
}
if (scenario_repository_get_by_index(s)->source_game == SCENARIO_SOURCE_RCT1_AA) {
if (scenario_repository_get_by_index(s)->source_game == SCENARIO_SOURCE_RCT1_AA)
{
RCT1AAInstalled = true;
}
if (scenario_repository_get_by_index(s)->source_game == SCENARIO_SOURCE_RCT1_LL) {
if (scenario_repository_get_by_index(s)->source_game == SCENARIO_SOURCE_RCT1_LL)
{
RCT1LLInstalled = true;
}
}
//Mega Park can show up in the scenario list even if RCT1 has been uninstalled, so it must be greater than 1
if (RCT1Count > 1) {
// Mega Park can show up in the scenario list even if RCT1 has been uninstalled, so it must be greater than 1
if (RCT1Count > 1)
{
RCT1Installed = true;
}
int32_t random = 0;
bool safeSequence = false;
std::string RCT1String = format_string(STR_TITLE_SEQUENCE_RCT1, gCommonFormatArgs);
std::string RCT1AAString = format_string(STR_TITLE_SEQUENCE_RCT1_AA, gCommonFormatArgs);
std::string RCT1LLString = format_string(STR_TITLE_SEQUENCE_RCT1_AA_LL, gCommonFormatArgs);
//Ensure the random sequence chosen isn't from RCT1 or expansion if the player doesn't have it installed
while (!safeSequence) {
// Ensure the random sequence chosen isn't from RCT1 or expansion if the player doesn't have it installed
while (!safeSequence)
{
size_t total = TitleSequenceManager::GetCount();
random = util_rand() % (int32_t)total;
const utf8* scName = title_sequence_manager_get_name(random);
safeSequence = true;
if (scName == RCT1String) {
if (scName == RCT1String)
{
safeSequence = RCT1Installed;
} if (scName == RCT1AAString) {
}
if (scName == RCT1AAString)
{
safeSequence = RCT1AAInstalled;
} if (scName == RCT1LLString) {
}
if (scName == RCT1LLString)
{
safeSequence = RCT1LLInstalled;
}
}
ChangePresetSequence(random);
}
size_t seqId = title_get_config_sequence();
if (seqId == SIZE_MAX)