diff --git a/src/RadarValues.h b/src/RadarValues.h index 95cde9cf7b..bc916bea44 100644 --- 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 index 95df816bef..64f3b10a42 100644 --- a/src/Steps.cpp +++ b/src/Steps.cpp @@ -296,7 +296,7 @@ void Steps::TidyUpData() } if( GetMeter() < 1) // meter is invalid - SetMeter(static_cast(PredictMeter()) ); + SetMeter(static_cast(1) ); } void Steps::CalculateRadarValues( float fMusicLengthSeconds ) @@ -802,14 +802,14 @@ class LunaSteps: public Luna pn = Enum::Check(L, 1); RadarValues &rv = const_cast(p->GetRadarValues(pn)); - relevants.push_back(static_cast(rv[5])); //notes - relevants.push_back(static_cast(rv[7])); //jumps - relevants.push_back(static_cast(rv[10])); //hands - relevants.push_back(static_cast(rv[8])); //holds - relevants.push_back(static_cast(rv[9])); //mines - relevants.push_back(static_cast(rv[11])); //rolls - relevants.push_back(static_cast(rv[12])); //lifts - relevants.push_back(static_cast(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; }