From 74ab5104840c4ddb4c49971995737cc063c6d1f2 Mon Sep 17 00:00:00 2001 From: Glenn Maynard Date: Thu, 3 Jun 2004 20:02:46 +0000 Subject: [PATCH] fix warnings --- stepmania/src/CourseUtil.cpp | 2 +- stepmania/src/PaneDisplay.cpp | 1 - stepmania/src/ScreenNameEntryTraditional.cpp | 1 - 3 files changed, 1 insertion(+), 3 deletions(-) diff --git a/stepmania/src/CourseUtil.cpp b/stepmania/src/CourseUtil.cpp index aa4a6dc159..bc9e1e0401 100644 --- a/stepmania/src/CourseUtil.cpp +++ b/stepmania/src/CourseUtil.cpp @@ -150,7 +150,7 @@ void CourseUtil::SortCoursePointerArrayByAvgDifficulty( vector &apCours for(unsigned i = 0; i < apCourses.size(); ++i) { Trail* pTrail = apCourses[i]->GetTrail( GAMESTATE->GetCurrentStyleDef()->m_StepsType, COURSE_DIFFICULTY_REGULAR ); - course_sort_val[apCourses[i]] = pTrail->GetMeter(); + course_sort_val[apCourses[i]] = (float) pTrail->GetMeter(); } sort( apCourses.begin(), apCourses.end(), CompareCoursePointersByTitle ); stable_sort( apCourses.begin(), apCourses.end(), CompareCoursePointersBySortValueAscending ); diff --git a/stepmania/src/PaneDisplay.cpp b/stepmania/src/PaneDisplay.cpp index afef82540c..c11aeb3971 100644 --- a/stepmania/src/PaneDisplay.cpp +++ b/stepmania/src/PaneDisplay.cpp @@ -153,7 +153,6 @@ void PaneDisplay::SetContent( PaneContents c ) const Song *pSong = GAMESTATE->m_pCurSong; const Steps *pSteps = GAMESTATE->m_pCurSteps[m_PlayerNumber]; - StepsType st = GAMESTATE->GetCurrentStyleDef()->m_StepsType; const Course *pCourse = GAMESTATE->m_pCurCourse; const Trail *pTrail = GAMESTATE->m_pCurTrail[m_PlayerNumber]; diff --git a/stepmania/src/ScreenNameEntryTraditional.cpp b/stepmania/src/ScreenNameEntryTraditional.cpp index a6ee7f8b7c..91266965a5 100644 --- a/stepmania/src/ScreenNameEntryTraditional.cpp +++ b/stepmania/src/ScreenNameEntryTraditional.cpp @@ -322,7 +322,6 @@ ScreenNameEntryTraditional::ScreenNameEntryTraditional( CString sClassName ) : S Song* pSong = ss.pSong; Steps* pSteps = ss.pSteps[p]; Course* pCourse = GAMESTATE->m_pCurCourse; - StepsType st = GAMESTATE->GetCurrentStyleDef()->m_StepsType; Trail* pTrail = GAMESTATE->m_pCurTrail[p]; int iHighScoreIndex = -1; // -1 means "out of ranking"