fix VC7 compile errors

stepmania/src/Model.cpp

@@ -128,7 +128,7 @@ bool Model::LoadMilkshapeAscii( CString sPath )
 
                 strcpy( mesh.szName, szName );
 //                mesh.nFlags = nFlags;
-                mesh.nMaterialIndex = nIndex;
+                mesh.nMaterialIndex = (byte)nIndex;
 
                 //
                 // vertices
@@ -173,7 +173,7 @@ bool Model::LoadMilkshapeAscii( CString sPath )
 //                  vertex.nFlags = nFlags;
                     memcpy( vertex.Vertex, Vertex, sizeof(vertex.Vertex) );
                     memcpy( vertex.uv, uv, sizeof(vertex.uv) );
-                    vertex.nBoneIndex = nIndex;
+                    vertex.nBoneIndex = (byte)nIndex;
 					AddPointToBounds (Vertex, m_vMins, m_vMaxs);
                 }
 
@@ -547,7 +547,7 @@ bool Model::LoadMilkshapeAscii( CString sPath )
 
     // Setup temp vertices
 	m_vTempVerticesByBone.resize( m_pModel->Meshes.size() );
-	for (i = 0; i < m_pModel->Meshes.size(); i++)
+	for (i = 0; i < (int)m_pModel->Meshes.size(); i++)
     {
 		msMesh& Mesh = m_pModel->Meshes[i];
 		m_vTempVerticesByBone[i].resize( Mesh.Vertices.size() );
@@ -703,13 +703,13 @@ bool Model::LoadMilkshapeAsciiBones( CString sPath )
 
 	// ignore "Frames:" in file
 	m_pModel->nTotalFrames = 0;
-    for (int i = 0; i < m_pModel->Bones.size(); i++)
+    for (int i = 0; i < (int)m_pModel->Bones.size(); i++)
     {
 		msBone& Bone = m_pModel->Bones[i];
-		for( int j=0; j<Bone.PositionKeys.size(); j++ )
+		for( int j=0; j<(int)Bone.PositionKeys.size(); j++ )
 		{
-			m_pModel->nTotalFrames = max( m_pModel->nTotalFrames, Bone.PositionKeys[j].fTime );
+			m_pModel->nTotalFrames = max( m_pModel->nTotalFrames, (int)Bone.PositionKeys[j].fTime+1 );
-			m_pModel->nTotalFrames = max( m_pModel->nTotalFrames, Bone.RotationKeys[j].fTime );
+			m_pModel->nTotalFrames = max( m_pModel->nTotalFrames, (int)Bone.RotationKeys[j].fTime+1 );
 		}
 	}
 
@@ -850,7 +850,7 @@ Model::SetupBones ()
 		}
 	}
 
-	for (i = 0; i < m_pModel->Meshes.size(); i++)
+	for (i = 0; i < (int)m_pModel->Meshes.size(); i++)
 	{
 		msMesh *pMesh = &m_pModel->Meshes[i];
 		for (j = 0; j < (int)pMesh->Vertices.size(); j++)
@@ -997,14 +997,14 @@ void Model::Update( float fDelta )
 	Actor::Update( fDelta );
 	AdvanceFrame( fDelta );
 	if( m_pModel )
-		for( int i=0; i<m_pModel->Materials.size(); i++ )
+		for( int i=0; i<(int)m_pModel->Materials.size(); i++ )
 			m_pModel->Materials[i].aniTexture.Update( fDelta );
 }
 
 void Model::SetState( int iNewState )
 {
 	if( m_pModel )
-		for( int i=0; i<m_pModel->Materials.size(); i++ )
+		for( int i=0; i<(int)m_pModel->Materials.size(); i++ )
 			m_pModel->Materials[i].aniTexture.SetState( iNewState );
 }
 
@@ -1012,7 +1012,7 @@ int Model::GetNumStates()
 {
 	int iMaxStates = 0;
 	if( m_pModel )
-		for( int i=0; i<m_pModel->Materials.size(); i++ )
+		for( int i=0; i<(int)m_pModel->Materials.size(); i++ )
 			iMaxStates = max( iMaxStates, m_pModel->Materials[i].aniTexture.GetNumStates() );
 	return iMaxStates;
 }

stepmania/src/Player.cpp

@@ -581,10 +581,10 @@ void Player::CrossedRow( int iNoteRow )
 
 void Player::RandomiseNotes( int iNoteRow )
 {
-	int NewNoteRow = iNoteRow + 50 / GAMESTATE->m_PlayerOptions[m_PlayerNumber].m_fScrollSpeed; // change the row to look ahead from based upon their speed mod
+	int NewNoteRow = (int)(iNoteRow + 50 / GAMESTATE->m_PlayerOptions[m_PlayerNumber].m_fScrollSpeed); // change the row to look ahead from based upon their speed mod
 	// check to see if they're at the crossed row
-	int EmptyNoteCol = -1;
+//	int EmptyNoteCol = -1;
-	int WaitingForEmptyColumn = -1;
+//	int WaitingForEmptyColumn = -1;
 
 	bool b_updatenotedata = false;
 	int iNumOfTracks = GetNumTracks();

stepmania/src/ScreenEvaluation.cpp

@@ -212,7 +212,7 @@ ScreenEvaluation::ScreenEvaluation( CString sClassName, Type type ) : Screen(sCl
 
 			RankingCategory cat[NUM_PLAYERS];
 			int iRankingIndex[NUM_PLAYERS];
-			float	fTotalDP;
+			float	fTotalDP = 0;
 			for( int p=0; p<NUM_PLAYERS; p++ )
 			{
 				float fAverageMeter = stageStats.iMeter[p] / (float)PREFSMAN->m_iNumArcadeStages;

stepmania/src/ScreenHowToPlay.cpp

@@ -18,7 +18,7 @@
 #include "SongManager.h"
 #include "NoteFieldPositioning.h"
 
-#define BPMSPEED				THEME->GetMetricI("ScreenHowToPlay","ScrollBPM")
+#define BPMSPEED				THEME->GetMetricF("ScreenHowToPlay","ScrollBPM")
 
 ScreenHowToPlay::ScreenHowToPlay() : ScreenAttract("ScreenHowToPlay")
 {
@@ -63,7 +63,7 @@ ScreenHowToPlay::ScreenHowToPlay() : ScreenAttract("ScreenHowToPlay")
 	pND->SetTapNote( 2, ROWS_PER_BEAT*46,    TAP_TAP );
 
 	m_pSong = new Song;
-	m_pSong->AddBPMSegment( BPMSegment(0,BPMSPEED) );
+	m_pSong->AddBPMSegment( BPMSegment(0.0,BPMSPEED) );
 	m_pSong->AddStopSegment( StopSegment(12,2) );
 	m_pSong->AddStopSegment( StopSegment(16,2) );
 	m_pSong->AddStopSegment( StopSegment(20,2) );

stepmania/src/ScreenSelectMode.cpp

@@ -29,8 +29,8 @@ Chris Danford
 
 #define ELEM_SPACING	THEME->GetMetricI("ScreenSelectMode","ElementSpacing")
 #define INCLUDE_DOUBLE_IN_JP	THEME->GetMetricI("ScreenSelectMode","IncludeDoubleInJointPremium")
-#define SCROLLING_LIST_X	THEME->GetMetricI("ScreenSelectMode","ScrollingListX")
+#define SCROLLING_LIST_X	THEME->GetMetricF("ScreenSelectMode","ScrollingListX")
-#define SCROLLING_LIST_Y	THEME->GetMetricI("ScreenSelectMode","ScrollingListY")
+#define SCROLLING_LIST_Y	THEME->GetMetricF("ScreenSelectMode","ScrollingListY")
 #define GUIDE_X		THEME->GetMetricF("ScreenSelectMode", "GuideX")
 #define GUIDE_Y		THEME->GetMetricF("ScreenSelectMode", "GuideY")
 #define USECONFIRM THEME->GetMetricI("ScreenSelectMode","UseConfirm")

stepmania/src/StepMania.vcproj

@@ -518,6 +518,9 @@ cl /Zl /nologo /c verstub.cpp /Fo$(IntDir)\
 			<File
 				RelativePath="ScreenTitleMenu.h">
 			</File>
+			<File
+				RelativePath="ScreenUnlock.cpp">
+			</File>
 			<File
 				RelativePath="ScreenUnlock.h">
 			</File>
@@ -1617,6 +1620,12 @@ cl /Zl /nologo /c verstub.cpp /Fo$(IntDir)\
 			<File
 				RelativePath="Model.h">
 			</File>
+			<File
+				RelativePath="ModelTypes.cpp">
+			</File>
+			<File
+				RelativePath="ModelTypes.h">
+			</File>
 			<File
 				RelativePath="Quad.h">
 			</File>
@@ -1708,6 +1717,12 @@ cl /Zl /nologo /c verstub.cpp /Fo$(IntDir)\
 			<File
 				RelativePath=".\ThemeManager.h">
 			</File>
+			<File
+				RelativePath="UnlockSystem.cpp">
+			</File>
+			<File
+				RelativePath="UnlockSystem.h">
+			</File>
 		</Filter>
 		<File
 			RelativePath="StepMania.xpm">