fuckin merges reverted

2011-03-14 19:30:41 -05:00
parent 96b90ee086
commit 4efd7886ed
122 changed files with 701 additions and 802 deletions
@@ -48,12 +48,15 @@ public:
 	} /** @brief The Song's locked status. */ m_Locked;

 	/** @brief Set up the initial criteria. */
-	StepsCriteria(): m_difficulty(Difficulty_Invalid),
-		m_iLowMeter(-1), m_iHighMeter(-1),
-		m_st(StepsType_Invalid), m_Locked(Locked_DontCare)
+	StepsCriteria()
 	{
+		m_difficulty = Difficulty_Invalid;
+		m_iLowMeter = -1;
+		m_iHighMeter = -1;
 		//m_fLowBPM = -1;
 		//m_fHighBPM = -1;
+		m_st = StepsType_Invalid;
+		m_Locked = Locked_DontCare;
 	}

 	/**