From 938a32a3c8901cbbd188b4595f98f5f6ba816c72 Mon Sep 17 00:00:00 2001 From: AJ Kelly Date: Sat, 30 Jul 2011 11:28:04 -0500 Subject: [PATCH 1/3] add delta-note to installer + CreatePackage --- Utils/CreatePackage.pl | 1 + sm-ssc.nsi | 3 +++ 2 files changed, 4 insertions(+) diff --git a/Utils/CreatePackage.pl b/Utils/CreatePackage.pl index 37881fd1e7..6b6335c2ca 100755 --- a/Utils/CreatePackage.pl +++ b/Utils/CreatePackage.pl @@ -171,6 +171,7 @@ my @files = ( "NoteSkins/pump/cmd-routine-p2", "NoteSkins/pump/complex", "NoteSkins/pump/default", + "NoteSkins/pump/delta-note", "NoteSkins/pump/frame5p", "NoteSkins/pump/newextra", "NoteSkins/pump/pad", 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" From 766f5de4ce94581186d24785f247c14764ea8a61 Mon Sep 17 00:00:00 2001 From: AJ Kelly Date: Sat, 30 Jul 2011 11:29:31 -0500 Subject: [PATCH 2/3] themers can define this now, I guess. --- src/BPMDisplay.cpp | 1 - 1 file changed, 1 deletion(-) 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 ) From 48dcd41fb6f55ff787652012a07aab0e485b1275 Mon Sep 17 00:00:00 2001 From: AJ Kelly Date: Sat, 30 Jul 2011 11:29:56 -0500 Subject: [PATCH 3/3] yeah, I made this comment --- src/FontCharAliases.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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;