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

remove RegenComboAfterFail. It was only for TwoPlayerRecovery.

Browse Source
This commit is contained in:
Glenn Maynard
2006-11-09 09:06:41 +00:00
parent 444108b3d6
commit 40573d9fb0
3 changed files with 0 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/LifeMeterBar.cpp
-10
View File
@@ -254,16 +254,6 @@ void LifeMeterBar::ChangeLife( float fDeltaLife )
break; break;
} }
// check if this step would empty the bar
if( m_fLifePercentage + fDeltaLife <= 0 && m_fLifePercentage > 0 )
{
/* Increase by m_iRegenComboAfterFail; never push it beyond m_iMaxRegenComboAfterFail
* but don't reduce it if it's already past. */
int iNewComboToRegainLife = m_iComboToRegainLife + PREFSMAN->m_iRegenComboAfterFail;
iNewComboToRegainLife = min( (int)PREFSMAN->m_iMaxRegenComboAfterFail, iNewComboToRegainLife );
m_iComboToRegainLife = max( m_iComboToRegainLife, iNewComboToRegainLife );
}
m_fLifePercentage += fDeltaLife; m_fLifePercentage += fDeltaLife;
CLAMP( m_fLifePercentage, 0, 1 ); CLAMP( m_fLifePercentage, 0, 1 );
AfterLifeChanged(); AfterLifeChanged();
stepmania/src/PrefsManager.cpp
-2
View File
@@ -296,9 +296,7 @@ PrefsManager::PrefsManager() :
m_fLifeDifficultyScale ( "LifeDifficultyScale", 1.0f ), m_fLifeDifficultyScale ( "LifeDifficultyScale", 1.0f ),
m_iRegenComboAfterFail ( "RegenComboAfterFail", 10 ),
m_iRegenComboAfterMiss ( "RegenComboAfterMiss", 5 ), m_iRegenComboAfterMiss ( "RegenComboAfterMiss", 5 ),
m_iMaxRegenComboAfterFail ( "MaxRegenComboAfterFail", 10 ),
m_iMaxRegenComboAfterMiss ( "MaxRegenComboAfterMiss", 10 ), m_iMaxRegenComboAfterMiss ( "MaxRegenComboAfterMiss", 10 ),
m_bMercifulDrain ( "MercifulDrain", true ), // negative life deltas are scaled by the players life percentage m_bMercifulDrain ( "MercifulDrain", true ), // negative life deltas are scaled by the players life percentage
m_bMinimum1FullSongInCourses ( "Minimum1FullSongInCourses", false ), // FEoS for 1st song, FailImmediate thereafter m_bMinimum1FullSongInCourses ( "Minimum1FullSongInCourses", false ), // FEoS for 1st song, FailImmediate thereafter
stepmania/src/PrefsManager.h
-2
View File
@@ -138,9 +138,7 @@ public:
Preference<float> m_fLifeDifficultyScale; Preference<float> m_fLifeDifficultyScale;
// Whoever added these: Please add a comment saying what they do. -Chris // Whoever added these: Please add a comment saying what they do. -Chris
Preference<int> m_iRegenComboAfterFail;
Preference<int> m_iRegenComboAfterMiss; Preference<int> m_iRegenComboAfterMiss;
Preference<int> m_iMaxRegenComboAfterFail;
Preference<int> m_iMaxRegenComboAfterMiss; Preference<int> m_iMaxRegenComboAfterMiss;
Preference<bool> m_bMercifulDrain; // negative life deltas are scaled by the players life percentage Preference<bool> m_bMercifulDrain; // negative life deltas are scaled by the players life percentage
Preference<bool> m_bMinimum1FullSongInCourses; // FEoS for 1st song, FailImmediate thereafter Preference<bool> m_bMinimum1FullSongInCourses; // FEoS for 1st song, FailImmediate thereafter