Add a preference to not clear combo between songs. (not currently
listed in options menus)
This commit is contained in:
@@ -192,7 +192,11 @@ void GameState::ResetMusicStatistics()
|
|||||||
|
|
||||||
void GameState::ResetStageStatistics()
|
void GameState::ResetStageStatistics()
|
||||||
{
|
{
|
||||||
|
StageStats OldStats = GAMESTATE->m_CurStageStats;
|
||||||
m_CurStageStats = StageStats();
|
m_CurStageStats = StageStats();
|
||||||
|
if( GetStageIndex() > 0 && PREFSMAN->m_bComboContinuesBetweenSongs )
|
||||||
|
memcpy( GAMESTATE->m_CurStageStats.iCurCombo, OldStats .iCurCombo, sizeof(OldStats.iCurCombo) );
|
||||||
|
|
||||||
RemoveAllActiveAttacks();
|
RemoveAllActiveAttacks();
|
||||||
RemoveAllInventory();
|
RemoveAllInventory();
|
||||||
m_fOpponentHealthPercent = 1;
|
m_fOpponentHealthPercent = 1;
|
||||||
|
|||||||
@@ -120,6 +120,8 @@ PrefsManager::PrefsManager()
|
|||||||
* stage CRS files) don't get it changed around on them. */
|
* stage CRS files) don't get it changed around on them. */
|
||||||
m_bPickExtraStage = false;
|
m_bPickExtraStage = false;
|
||||||
|
|
||||||
|
m_bComboContinuesBetweenSongs = false;
|
||||||
|
|
||||||
// default to old sort order
|
// default to old sort order
|
||||||
m_iCourseSortOrder = COURSE_SORT_SONGS;
|
m_iCourseSortOrder = COURSE_SORT_SONGS;
|
||||||
m_bMoveRandomToEnd = false;
|
m_bMoveRandomToEnd = false;
|
||||||
@@ -230,6 +232,7 @@ void PrefsManager::ReadGlobalPrefsFromDisk( bool bSwitchToLastPlayedGame )
|
|||||||
ini.GetValueB( "Options", "JointPremium", m_bJointPremium );
|
ini.GetValueB( "Options", "JointPremium", m_bJointPremium );
|
||||||
ini.GetValueI( "Options", "BoostAppPriority", m_iBoostAppPriority );
|
ini.GetValueI( "Options", "BoostAppPriority", m_iBoostAppPriority );
|
||||||
ini.GetValueB( "Options", "PickExtraStage", m_bPickExtraStage );
|
ini.GetValueB( "Options", "PickExtraStage", m_bPickExtraStage );
|
||||||
|
ini.GetValueB( "Options", "ComboContinuesBetweenSongs", m_bComboContinuesBetweenSongs );
|
||||||
ini.GetValueF( "Options", "LongVerSeconds", m_fLongVerSongSeconds );
|
ini.GetValueF( "Options", "LongVerSeconds", m_fLongVerSongSeconds );
|
||||||
ini.GetValueF( "Options", "MarathonVerSeconds", m_fMarathonVerSongSeconds );
|
ini.GetValueF( "Options", "MarathonVerSeconds", m_fMarathonVerSongSeconds );
|
||||||
ini.GetValueI( "Options", "ShowSongOptions", (int&)m_ShowSongOptions );
|
ini.GetValueI( "Options", "ShowSongOptions", (int&)m_ShowSongOptions );
|
||||||
@@ -346,6 +349,7 @@ void PrefsManager::SaveGlobalPrefsToDisk()
|
|||||||
ini.SetValueB( "Options", "JointPremium", m_bJointPremium );
|
ini.SetValueB( "Options", "JointPremium", m_bJointPremium );
|
||||||
ini.SetValueI( "Options", "BoostAppPriority", m_iBoostAppPriority );
|
ini.SetValueI( "Options", "BoostAppPriority", m_iBoostAppPriority );
|
||||||
ini.SetValueB( "Options", "PickExtraStage", m_bPickExtraStage );
|
ini.SetValueB( "Options", "PickExtraStage", m_bPickExtraStage );
|
||||||
|
ini.SetValueB( "Options", "ComboContinuesBetweenSongs", m_bComboContinuesBetweenSongs );
|
||||||
ini.SetValueF( "Options", "LongVerSeconds", m_fLongVerSongSeconds );
|
ini.SetValueF( "Options", "LongVerSeconds", m_fLongVerSongSeconds );
|
||||||
ini.SetValueF( "Options", "MarathonVerSeconds", m_fMarathonVerSongSeconds );
|
ini.SetValueF( "Options", "MarathonVerSeconds", m_fMarathonVerSongSeconds );
|
||||||
ini.SetValueI( "Options", "ShowSongOptions", m_ShowSongOptions );
|
ini.SetValueI( "Options", "ShowSongOptions", m_ShowSongOptions );
|
||||||
|
|||||||
@@ -69,6 +69,7 @@ public:
|
|||||||
int m_iCoinsPerCredit;
|
int m_iCoinsPerCredit;
|
||||||
bool m_bJointPremium;
|
bool m_bJointPremium;
|
||||||
bool m_bPickExtraStage;
|
bool m_bPickExtraStage;
|
||||||
|
bool m_bComboContinuesBetweenSongs;
|
||||||
float m_fLongVerSongSeconds;
|
float m_fLongVerSongSeconds;
|
||||||
float m_fMarathonVerSongSeconds;
|
float m_fMarathonVerSongSeconds;
|
||||||
enum Maybe { ASK = -1, NO = 0, YES = 1 };
|
enum Maybe { ASK = -1, NO = 0, YES = 1 };
|
||||||
|
|||||||
Reference in New Issue
Block a user