From 69472768945f1629b9e52b9ab1f68bf8d6731ab5 Mon Sep 17 00:00:00 2001 From: Brandon W Date: Thu, 23 Jan 2025 11:45:45 -0500 Subject: [PATCH] Add fix and note for Routine chart loading in edit mode. --- src/EditModePlayerManager.cpp | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/src/EditModePlayerManager.cpp b/src/EditModePlayerManager.cpp index 72c3eb78d6..3dc671421e 100644 --- a/src/EditModePlayerManager.cpp +++ b/src/EditModePlayerManager.cpp @@ -10,7 +10,13 @@ void EditModePlayerManager::AddPlayers(const NoteData& note_data) { - FOREACH_EnabledPlayer(pn){ + FOREACH_EnabledPlayer(pn) { + // In case of a routine chart, both players are actually seen as + // enabled. This isn't desired, since the playerState and inputs in + // routine charts eventually collapse down only to P1. + if ((GAMESTATE->GetCurrentStyle(GAMESTATE->GetMasterPlayerNumber())->m_StyleType == StyleType_TwoPlayersSharedSides) && pn != PLAYER_1) { + continue; + } players_[pn] = std::make_shared(); PlayerPlus& player = *players_[pn];