add RADAR_NUM_ROLLS

ChangeRollsToHolds fix

stepmania/src/GameConstantsAndTypes.cpp

@@ -22,6 +22,7 @@ static const CString RadarCategoryNames[NUM_RADAR_CATEGORIES] = {
 	"Holds",
 	"Mines",
 	"Hands",
+	"Rolls"
 };
 XToString( RadarCategory, NUM_RADAR_CATEGORIES );
 XToThemedString( RadarCategory, NUM_RADAR_CATEGORIES );

stepmania/src/GameConstantsAndTypes.h

@@ -28,6 +28,7 @@ enum RadarCategory
 	RADAR_NUM_HOLDS,
 	RADAR_NUM_MINES,
 	RADAR_NUM_HANDS,
+	RADAR_NUM_ROLLS,
 	NUM_RADAR_CATEGORIES	// leave this at the end
 };
 #define FOREACH_RadarCategory( rc ) FOREACH_ENUM( RadarCategory, NUM_RADAR_CATEGORIES, rc )

stepmania/src/NoteDataUtil.cpp

@@ -540,6 +540,7 @@ void NoteDataUtil::GetRadarValues( const NoteData &in, float fSongSeconds, Radar
 		case RADAR_NUM_HOLDS:			out[rc] = (float) in.GetNumHoldNotes();				break;
 		case RADAR_NUM_MINES:			out[rc] = (float) in.GetNumMines();					break;
 		case RADAR_NUM_HANDS:			out[rc] = (float) in.GetNumHands();					break;
+		case RADAR_NUM_ROLLS:			out[rc] = (float) in.GetNumRolls();					break;
 		default:	ASSERT(0);
 		}
 	}
@@ -645,7 +646,7 @@ void NoteDataUtil::ChangeRollsToHolds( NoteData &in, int iStartIndex, int iEndIn
 			if( begin->second.type != TapNote::hold_head ||
 				begin->second.subType != TapNote::hold_head_roll )
 				continue;
-			begin->second.subType != TapNote::hold_head_hold;
+			begin->second.subType = TapNote::hold_head_hold;
 		}
 	}
 }

stepmania/src/Steps.cpp

@@ -114,7 +114,7 @@ float Steps::PredictMeter() const
 	const float RadarCoeffs[NUM_RADAR_CATEGORIES] =
 	{
 		10.1f, 5.27f,-0.905f, -1.10f, 2.86f,
-		0,0,0,0,0
+		0,0,0,0,0,0
 	};
 	for( int r = 0; r < NUM_RADAR_CATEGORIES; ++r )
 		pMeter += this->GetRadarValues()[r] * RadarCoeffs[r];