actions/itgmania212121
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Refactor SwitchToDifficulty/SwitchToPreferredDifficulty

Browse Source
This commit is contained in:
D.J. Rideout
2025-02-11 21:48:54 -08:00
committed by teejusb
parent ae2f4060f5
commit f2809028de
2 changed files with 74 additions and 120 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/ScreenSelectMusic.cpp
+72 -120
View File
@@ -1627,78 +1627,88 @@ void ScreenSelectMusic::AfterStepsOrTrailChange( const std::vector<PlayerNumber>
}
}
void ScreenSelectMusic::SwitchPlayerStepDifficulty(PlayerNumber pn, Difficulty d)
{
// Find the closest match to the given difficulty and StepsType.
int iCurDifference = -1;
int& iSelection = m_iSelection[pn];
int i = 0;
for (Steps* s : m_vpSteps)
{
// If the current steps are listed, use them.
if (GAMESTATE->m_pCurSteps[pn] == s)
{
iSelection = i;
break;
}
if (d != Difficulty_Invalid)
{
int iDifficultyDifference = std::abs(s->GetDifficulty() - d);
int iStepsTypeDifference = 0;
if (GAMESTATE->m_PreferredStepsType != StepsType_Invalid)
iStepsTypeDifference = std::abs(s->m_StepsType - GAMESTATE->m_PreferredStepsType);
int iTotalDifference = iStepsTypeDifference * NUM_Difficulty + iDifficultyDifference;
if (iCurDifference == -1 || iTotalDifference < iCurDifference)
{
iSelection = i;
iCurDifference = iTotalDifference;
}
}
i += 1;
}
CLAMP(iSelection, 0, m_vpSteps.size() - 1);
}
void ScreenSelectMusic::SwitchPlayerCourseDifficulty(PlayerNumber pn, Difficulty d)
{
// Find the closest match to the given difficulty.
int iCurDifference = -1;
int& iSelection = m_iSelection[pn];
int i = 0;
for (Trail* t : m_vpTrails)
{
// If the current trail is listed, use it.
if (GAMESTATE->m_pCurTrail[pn] == m_vpTrails[i])
{
iSelection = i;
break;
}
if (d != Difficulty_Invalid && GAMESTATE->m_PreferredStepsType != StepsType_Invalid)
{
int iDifficultyDifference = std::abs(t->m_CourseDifficulty - d);
int iStepsTypeDifference = std::abs(t->m_StepsType - GAMESTATE->m_PreferredStepsType);
int iTotalDifference = iStepsTypeDifference * NUM_CourseDifficulty + iDifficultyDifference;
if (iCurDifference == -1 || iTotalDifference < iCurDifference)
{
iSelection = i;
iCurDifference = iTotalDifference;
}
}
i += 1;
}
CLAMP(iSelection, 0, m_vpTrails.size() - 1);
}
void ScreenSelectMusic::SwitchToDifficulty(Difficulty d)
{
if (!GAMESTATE->m_pCurCourse)
{
FOREACH_HumanPlayer(pn)
{
// Find the closest match to the given difficulty and StepsType.
int iCurDifference = -1;
int& iSelection = m_iSelection[pn];
int i = 0;
for (Steps* s : m_vpSteps)
{
// If the current steps are listed, use them.
if (GAMESTATE->m_pCurSteps[pn] == s)
{
iSelection = i;
break;
}
if (d != Difficulty_Invalid)
{
int iDifficultyDifference = std::abs(s->GetDifficulty() - d);
int iStepsTypeDifference = 0;
if (GAMESTATE->m_PreferredStepsType != StepsType_Invalid)
iStepsTypeDifference = std::abs(s->m_StepsType - GAMESTATE->m_PreferredStepsType);
int iTotalDifference = iStepsTypeDifference * NUM_Difficulty + iDifficultyDifference;
if (iCurDifference == -1 || iTotalDifference < iCurDifference)
{
iSelection = i;
iCurDifference = iTotalDifference;
}
}
i += 1;
}
CLAMP(iSelection, 0, m_vpSteps.size() - 1);
SwitchPlayerStepDifficulty(pn, d);
}
}
else
{
FOREACH_HumanPlayer(pn)
{
// Find the closest match to the given difficulty.
int iCurDifference = -1;
int& iSelection = m_iSelection[pn];
int i = 0;
for (Trail* t : m_vpTrails)
{
// If the current trail is listed, use it.
if (GAMESTATE->m_pCurTrail[pn] == m_vpTrails[i])
{
iSelection = i;
break;
}
if (d != Difficulty_Invalid && GAMESTATE->m_PreferredStepsType != StepsType_Invalid)
{
int iDifficultyDifference = std::abs(t->m_CourseDifficulty - d);
int iStepsTypeDifference = std::abs(t->m_StepsType - GAMESTATE->m_PreferredStepsType);
int iTotalDifference = iStepsTypeDifference * NUM_CourseDifficulty + iDifficultyDifference;
if (iCurDifference == -1 || iTotalDifference < iCurDifference)
{
iSelection = i;
iCurDifference = iTotalDifference;
}
}
i += 1;
}
CLAMP(iSelection, 0, m_vpTrails.size() - 1);
SwitchPlayerCourseDifficulty(pn, d);
}
}
@@ -1715,72 +1725,14 @@ void ScreenSelectMusic::SwitchToPreferredDifficulty()
{
FOREACH_HumanPlayer( pn )
{
// Find the closest match to the user's preferred difficulty and StepsType.
int iCurDifference = -1;
int &iSelection = m_iSelection[pn];
int i = 0;
for (Steps *s : m_vpSteps)
{
// If the current steps are listed, use them.
if( GAMESTATE->m_pCurSteps[pn] == s )
{
iSelection = i;
break;
}
if( GAMESTATE->m_PreferredDifficulty[pn] != Difficulty_Invalid )
{
int iDifficultyDifference = std::abs( s->GetDifficulty() - GAMESTATE->m_PreferredDifficulty[pn] );
int iStepsTypeDifference = 0;
if( GAMESTATE->m_PreferredStepsType != StepsType_Invalid )
iStepsTypeDifference = std::abs( s->m_StepsType - GAMESTATE->m_PreferredStepsType );
int iTotalDifference = iStepsTypeDifference * NUM_Difficulty + iDifficultyDifference;
if( iCurDifference == -1 || iTotalDifference < iCurDifference )
{
iSelection = i;
iCurDifference = iTotalDifference;
}
}
i += 1;
}
CLAMP( iSelection, 0, m_vpSteps.size()-1 );
SwitchPlayerStepDifficulty(pn, GAMESTATE->m_PreferredDifficulty[pn]);
}
}
else
{
FOREACH_HumanPlayer( pn )
{
// Find the closest match to the user's preferred difficulty.
int iCurDifference = -1;
int &iSelection = m_iSelection[pn];
int i = 0;
for (Trail *t : m_vpTrails)
{
// If the current trail is listed, use it.
if( GAMESTATE->m_pCurTrail[pn] == m_vpTrails[i] )
{
iSelection = i;
break;
}
if( GAMESTATE->m_PreferredCourseDifficulty[pn] != Difficulty_Invalid && GAMESTATE->m_PreferredStepsType != StepsType_Invalid )
{
int iDifficultyDifference = std::abs( t->m_CourseDifficulty - GAMESTATE->m_PreferredCourseDifficulty[pn] );
int iStepsTypeDifference = std::abs( t->m_StepsType - GAMESTATE->m_PreferredStepsType );
int iTotalDifference = iStepsTypeDifference * NUM_CourseDifficulty + iDifficultyDifference;
if( iCurDifference == -1 || iTotalDifference < iCurDifference )
{
iSelection = i;
iCurDifference = iTotalDifference;
}
}
i += 1;
}
CLAMP( iSelection, 0, m_vpTrails.size()-1 );
SwitchPlayerCourseDifficulty(pn, GAMESTATE->m_PreferredCourseDifficulty[pn]);
}
}
src/ScreenSelectMusic.h
+2
View File
@@ -65,6 +65,8 @@ protected:
void ChangeSteps( PlayerNumber pn, int dir );
void AfterStepsOrTrailChange( const std::vector<PlayerNumber> &vpns );
void SwitchPlayerStepDifficulty(PlayerNumber pn, Difficulty d);
void SwitchPlayerCourseDifficulty(PlayerNumber pn, Difficulty d);
void SwitchToDifficulty(Difficulty d);
void SwitchToPreferredDifficulty();
void AfterMusicChange();