change radarvalues to ints

jameskr97 · May 3, 2017 · 47ca4f3 · 47ca4f3
1 parent d34bfe0
commit 47ca4f3
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 14 deletions.
diff --git a/src/RadarValues.h b/src/RadarValues.h
@@ -13,12 +13,12 @@ struct lua_State;
 struct RadarValues
 {
 private:
-	float m_Values[NUM_RadarCategory];
+	int m_Values[NUM_RadarCategory];
 public:
-	float operator[](RadarCategory cat) const { return m_Values[cat]; }
-	float& operator[](RadarCategory cat) { return m_Values[cat]; }
-	float operator[](int cat) const { return m_Values[cat]; }
-	float& operator[](int cat) { return m_Values[cat]; }
+	int operator[](RadarCategory cat) const { return m_Values[cat]; }
+	int& operator[](RadarCategory cat) { return m_Values[cat]; }
+	int operator[](int cat) const { return m_Values[cat]; }
+	int& operator[](int cat) { return m_Values[cat]; }
 
 	RadarValues();
 	void MakeUnknown();

diff --git a/src/Steps.cpp b/src/Steps.cpp
@@ -296,7 +296,7 @@ void Steps::TidyUpData()
 	}
 
 	if( GetMeter() < 1) // meter is invalid
-		SetMeter(static_cast<int>(PredictMeter()) );
+		SetMeter(static_cast<int>(1) );
 }
 
 void Steps::CalculateRadarValues( float fMusicLengthSeconds )
@@ -802,14 +802,14 @@ class LunaSteps: public Luna<Steps>
 			pn = Enum::Check<PlayerNumber>(L, 1);
 
 		RadarValues &rv = const_cast<RadarValues &>(p->GetRadarValues(pn));
-		relevants.push_back(static_cast<int>(rv[5]));  //notes
-		relevants.push_back(static_cast<int>(rv[7]));  //jumps
-		relevants.push_back(static_cast<int>(rv[10])); //hands
-		relevants.push_back(static_cast<int>(rv[8]));  //holds
-		relevants.push_back(static_cast<int>(rv[9]));  //mines
-		relevants.push_back(static_cast<int>(rv[11])); //rolls
-		relevants.push_back(static_cast<int>(rv[12])); //lifts
-		relevants.push_back(static_cast<int>(rv[13])); //fakes
+		relevants.push_back(rv[5]);  //notes
+		relevants.push_back(rv[7]);  //jumps
+		relevants.push_back(rv[10]); //hands
+		relevants.push_back(rv[8]);  //holds
+		relevants.push_back(rv[9]);  //mines
+		relevants.push_back(rv[11]); //rolls
+		relevants.push_back(rv[12]); //lifts
+		relevants.push_back(rv[13]); //fakes
 		LuaHelpers::CreateTableFromArray(relevants, L);
 		return 1;
 	}