From 837af903e854f2d176db2e9d68e8fcb0a9f2be78 Mon Sep 17 00:00:00 2001
From: Chris Danford <chrisdanford@users.sourceforge.net>
Date: Mon, 20 Mar 2006 19:38:47 +0000
Subject: [PATCH] merciful is a bool, not a float

---
 stepmania/src/PrefsManager.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/stepmania/src/PrefsManager.h b/stepmania/src/PrefsManager.h
index 136cfe68c3..596170a65c 100644
--- a/stepmania/src/PrefsManager.h
+++ b/stepmania/src/PrefsManager.h
@@ -103,7 +103,7 @@ public:
 
 	// super meter used in rave
 	Preference1D<float>	m_fSuperMeterPercentChange;
-	Preference<float>	m_bMercifulSuperMeter;	// negative super deltas are scaled by the players life percentage
+	Preference<bool>	m_bMercifulSuperMeter;	// negative super deltas are scaled by the players life percentage
 
 	// time meter used in survival
 	Preference1D<float>	m_fTimeMeterSecondsChange;