From 97c5c0e2c1564fb9cc0f940195dda296fba6db10 Mon Sep 17 00:00:00 2001 From: Chris Danford Date: Sat, 3 Jan 2004 21:44:14 +0000 Subject: [PATCH] add MercifulMines option --- stepmania/src/LifeMeterBar.cpp | 3 +++ stepmania/src/PrefsManager.cpp | 3 +++ stepmania/src/PrefsManager.h | 1 + 3 files changed, 7 insertions(+) diff --git a/stepmania/src/LifeMeterBar.cpp b/stepmania/src/LifeMeterBar.cpp index d6fc3144e0..2edffedbe9 100644 --- a/stepmania/src/LifeMeterBar.cpp +++ b/stepmania/src/LifeMeterBar.cpp @@ -456,6 +456,9 @@ void LifeMeterBar::ChangeLifeMine() ASSERT(0); } + if( PREFSMAN->m_bMercifulMines ) + m_fLifePercentage *= m_fLifePercentage; + ChangeLife( fDeltaLife ); } diff --git a/stepmania/src/PrefsManager.cpp b/stepmania/src/PrefsManager.cpp index af48f61b56..6c070f30ae 100644 --- a/stepmania/src/PrefsManager.cpp +++ b/stepmania/src/PrefsManager.cpp @@ -84,6 +84,7 @@ PrefsManager::PrefsManager() m_iMaxRegenComboAfterFail = 10; m_iMaxRegenComboAfterMiss = 10; m_bTwoPlayerRecovery = true; + m_bMercifulMines = true; m_iPercentScoreMarvelousWeight = 3; m_iPercentScorePerfectWeight = 2; @@ -311,6 +312,7 @@ void PrefsManager::ReadGlobalPrefsFromDisk() ini.GetValue( "Options", "MaxRegenComboAfterFail", m_iMaxRegenComboAfterFail ); ini.GetValue( "Options", "MaxRegenComboAfterMiss", m_iMaxRegenComboAfterMiss ); ini.GetValue( "Options", "TwoPlayerRecovery", m_bTwoPlayerRecovery ); + ini.GetValue( "Options", "MercifulMines", m_bMercifulMines ); ini.GetValue( "Options", "PercentScoreMarvelousWeight", m_iPercentScoreMarvelousWeight ); ini.GetValue( "Options", "PercentScorePerfectWeight", m_iPercentScorePerfectWeight ); @@ -494,6 +496,7 @@ void PrefsManager::SaveGlobalPrefsToDisk() const ini.SetValue( "Options", "MaxRegenComboAfterFail", m_iMaxRegenComboAfterFail ); ini.SetValue( "Options", "MaxRegenComboAfterMiss", m_iMaxRegenComboAfterMiss ); ini.SetValue( "Options", "TwoPlayerRecovery", m_bTwoPlayerRecovery ); + ini.SetValue( "Options", "MercifulMines", m_bMercifulMines ); ini.SetValue( "Options", "PercentScoreMarvelousWeight", m_iPercentScoreMarvelousWeight ); ini.SetValue( "Options", "PercentScorePerfectWeight", m_iPercentScorePerfectWeight ); diff --git a/stepmania/src/PrefsManager.h b/stepmania/src/PrefsManager.h index 0401e7ec35..799de440b3 100644 --- a/stepmania/src/PrefsManager.h +++ b/stepmania/src/PrefsManager.h @@ -79,6 +79,7 @@ public: int m_iMaxRegenComboAfterFail; int m_iMaxRegenComboAfterMiss; bool m_bTwoPlayerRecovery; + bool m_bMercifulMines; int m_iPercentScoreMarvelousWeight; int m_iPercentScorePerfectWeight; int m_iPercentScoreGreatWeight;