diff --git a/sm-ssc.nsi b/sm-ssc.nsi index f0644064db..f4da899011 100644 --- a/sm-ssc.nsi +++ b/sm-ssc.nsi @@ -318,6 +318,7 @@ Section "Main Section" SecMain RMDir /r "$INSTDIR\NoteSkins\pump\cmd-routine-p2" RMDir /r "$INSTDIR\NoteSkins\pump\complex" RMDir /r "$INSTDIR\NoteSkins\pump\default" + RMDir /r "$INSTDIR\NoteSkins\pump\delta-note" RMDir /r "$INSTDIR\NoteSkins\pump\frame5p" RMDir /r "$INSTDIR\NoteSkins\pump\newextra" RMDir /r "$INSTDIR\NoteSkins\pump\rhythm" @@ -364,6 +365,7 @@ Section "Main Section" SecMain File /r /x CVS /x .svn "NoteSkins\pump\cmd-routine-p2" File /r /x CVS /x .svn "NoteSkins\pump\complex" File /r /x CVS /x .svn "NoteSkins\pump\default" + File /r /x CVS /x .svn "NoteSkins\pump\delta-note" File /r /x CVS /x .svn "NoteSkins\pump\frame5p" File /r /x CVS /x .svn "NoteSkins\pump\newextra" File /r /x CVS /x .svn "NoteSkins\pump\rhythm" @@ -767,6 +769,7 @@ Section "Uninstall" RMDir /r "$INSTDIR\NoteSkins\pump\cmd-routine-p2" RMDir /r "$INSTDIR\NoteSkins\pump\complex" RMDir /r "$INSTDIR\NoteSkins\pump\default" + RMDir /r "$INSTDIR\NoteSkins\pump\delta-note" RMDir /r "$INSTDIR\NoteSkins\pump\frame5p" RMDir /r "$INSTDIR\NoteSkins\pump\newextra" RMDir /r "$INSTDIR\NoteSkins\pump\rhythm" diff --git a/src/BPMDisplay.cpp b/src/BPMDisplay.cpp index a891f7161f..075e017baa 100644 --- a/src/BPMDisplay.cpp +++ b/src/BPMDisplay.cpp @@ -220,7 +220,6 @@ void BPMDisplay::SetBpmFromCourse( const Course* pCourse ) // GetTranslitFullTitle because "Crashinfo.txt is garbled because of the ANSI output as usual." -f ASSERT_M( pTrail, ssprintf("Course '%s' has no trail for StepsType '%s'", pCourse->GetTranslitFullTitle().c_str(), StringConversion::ToString(st).c_str() ) ); - // todo: let themers define this. -aj m_fCycleTime = (float)COURSE_CYCLE_SPEED; if( (int)pTrail->m_vEntries.size() > CommonMetrics::MAX_COURSE_ENTRIES_BEFORE_VARIOUS ) diff --git a/src/FontCharAliases.cpp b/src/FontCharAliases.cpp index bfe774ac51..4130295eda 100644 --- a/src/FontCharAliases.cpp +++ b/src/FontCharAliases.cpp @@ -81,8 +81,8 @@ static void InitCharAliases() #define INTERNAL 0xE000 - // todo: convert this into a vector? that way we can dynamically add - // to the list easier. -aj(?) + // todo: convert this into a vector? + // that way we can dynamically add to the list easier. -aj // Hiragana: struct alias { const char *str;