From 72cf10f1a594acb9cb521b6f6adafaadf9c757f9 Mon Sep 17 00:00:00 2001 From: Jason Felds Date: Sat, 7 Oct 2006 11:36:13 +0000 Subject: [PATCH] VC8 fix: inline if wasn't working. Old code is still commented in there. --- stepmania/src/ScreenOptionsEditCourseEntry.cpp | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/stepmania/src/ScreenOptionsEditCourseEntry.cpp b/stepmania/src/ScreenOptionsEditCourseEntry.cpp index c3f22b29cc..d8d179624b 100644 --- a/stepmania/src/ScreenOptionsEditCourseEntry.cpp +++ b/stepmania/src/ScreenOptionsEditCourseEntry.cpp @@ -242,8 +242,14 @@ void ScreenOptionsEditCourseEntry::HandleScreenMessage( const ScreenMessage SM ) Song *pSong = ce.pSong; Steps *pSteps; StepsType st = GAMESTATE->m_stEdit; - CourseDifficulty cd = CourseDifficulty( ce.stepsCriteria.m_difficulty == Difficulty_Invalid ? - GAMESTATE->m_cdEdit : ce.stepsCriteria.m_difficulty ); + CourseDifficulty cd; + if( (CourseDifficulty)ce.stepsCriteria.m_difficulty == (CourseDifficulty)Difficulty_Invalid ) + cd = CourseDifficulty( GAMESTATE->m_cdEdit ); + else + cd = CourseDifficulty( ce.stepsCriteria.m_difficulty ); + + //CourseDifficulty cd = CourseDifficulty( ce.stepsCriteria.m_difficulty == Difficulty_Invalid ? + // GAMESTATE->m_cdEdit : ce.stepsCriteria.m_difficulty ); if( pSong == NULL ) pSong = m_pLongSong;