[default -> loading window] Catching up again.

Docs/Changelog_SSCformat.txt

@@ -9,6 +9,14 @@ change to JSON, but it is unsure if this will be done.
 Implement .ssc at your own risk.
 ________________________________________________________________________________
 
+[v0.76] - Wolfman2000
+* Expand the #COMBOS tag to allow for Miss Combos. Anyone that is crazy enough
+  to put in a 51 miss combo in their tags should be...oh wait: it's already
+  been done.
+
+[v0.75] - Wolfman2000
+* Add Step based #DISPLAYBPM for those songs that have...very varied syncing.
+
 [v0.74] - Wolfman2000
 * Add #CHARTNAME tag for the title of the chart.
 * Older files will have their #DESCRIPTION tag content copied to #CHARTNAME

Docs/Changelog_sm5.txt

@@ -8,6 +8,17 @@ ________________________________________________________________________________
 StepMania 5.0 ????????? | 20110???
 --------------------------------------------------------------------------------
 
+2011/07/09
+----------
+* [NotesTheUsual] Update the #COMBOS tag to allow for a Miss Combo attribute.
+  Any files that only use the Combo attribute will have that value copied to
+  miss combo on next launch. [Wolfman2000]
+* [ScoreKeeperNormal] Better match #COMBOS with eval. Scoring formulas should
+  not be affected, but it may require more testing. [Wolfman2000]
+* [Metrics] Have Pump mode lump the checkpoint judgments with Flawless and
+  Miss judgments on eval. Of course, this goes down to Perfect and Miss if
+  that is disabled. [Wolfman2000]
+
 2011/07/07
 ----------
 * [ScreenEdit] Fix the NoMines transformation bug, issue 363. [Wolfman2000]

Themes/_fallback/Fonts/frutiger 24px.ini

@@ -261,6 +261,7 @@ AdvanceExtraPixels=0
 253=12
 254=15
 255=12
+
 [alt]
 0=10
 1=10
@@ -390,3 +391,28 @@ AdvanceExtraPixels=0
 125=12
 126=6
 127=7
+
+[polish]
+Baseline=23
+Top=6
+
+line 0=ĄĆĘŁŃŚŹŻ
+line 1=ąćęłńśźż
+
+0=15
+1=10
+2=12
+3=12
+4=12
+5=12
+6=13
+7=13
+
+8=11
+9=11
+10=11
+11=6
+12=11
+13=10
+14=10
+15=10

Themes/_fallback/Languages/en.ini

@@ -1236,6 +1236,7 @@ Write Profiles=Write Profiles
 off=off
 on=on
 or=or
+Zoom In Camera=Zoom In Camera
 
 [ScreenEdit]
 %s notes=%s notes
@@ -1248,7 +1249,7 @@ Enter a new Stop value.=Enter a new Stop value.\n\nType "0" to remove.
 Enter a new Delay value.=Enter a new Delay value.\n\nType "0" to remove.
 Enter a new Time Signature.=Enter a new time signature.\nUse the format "x/y".\nEnter the previous value to remove.
 Enter a new Tickcount value.=Enter a new Tickcount value.\n\nEnter the previous value to remove.
-Enter a new Combo value.=Enter a new Combo value.\n\nEnter the previous value to remove.
+Enter a new Combo value.=Enter a new Combo value.\nUse the format "x/y".\nEnter the previous value to remove.
 Enter a new Label value.=Enter a name for this section of the chart.\n\nEnter a previously used label to remove.
 Enter a new Warp value.=Enter the number of beats you will warp over.\n\nType "0" to remove this segment.
 Enter a new Speed percent value.=Enter the ratio for speed scrolling.\nEnter the previous value to remove.\n1 is the default scroll.

Themes/_fallback/Scripts/03 Gameplay.lua

@@ -105,6 +105,10 @@ function ComboPerRow()
 	end
 end
 
+function EvalUsesCheckpointsWithJudgments()
+	return (GAMESTATE:GetCurrentGame():GetName() == "pump") and true or false
+end
+
 -- these need cleanup really.
 function HitCombo()
 	sGame = GAMESTATE:GetCurrentGame():GetName()

Themes/_fallback/metrics.ini

@@ -3226,7 +3226,7 @@ PrevScreen=Branch.AfterEvaluation()
 LightsMode="LightsMode_MenuStartOnly"
 #
 Summary=false
-CheckpointsWithJudgments=false
+CheckpointsWithJudgments=EvalUsesCheckpointsWithJudgments()
 #
 TimerSeconds=20
 #

Themes/default/metrics.ini

@@ -70,8 +70,6 @@ NumberOnCommand=y,240-216-1.5;shadowlength,1;horizalign,right;vertalign,bottom;s
 LabelOnCommand=x,6;y,22.5;shadowlength,1;zoom,0.75;diffusebottomedge,color("0.75,0.75,0.75,1");horizalign,left;vertalign,bottom
 
 [HoldJudgment]
-HoldJudgmentLetGoCommand=finishtweening;shadowlength,0;diffusealpha,1;zoom,1;y,-10;linear,0.8;y,10;sleep,0.5;linear,0.1;zoomy,0.5;zoomx,2;diffusealpha,0
-HoldJudgmentHeldCommand=finishtweening;shadowlength,0;diffusealpha,1;zoom,1.25;linear,0.3;zoomx,1;zoomy,1;sleep,0.5;linear,0.1;zoomy,0.5;zoomx,2;diffusealpha,0
 
 [HelpDisplay]
 TipShowTime=7
@@ -1512,7 +1510,7 @@ ShowJudgmentLineW2=true
 ShowJudgmentLineW3=true
 ShowJudgmentLineW4=true
 ShowJudgmentLineW5=true
-ShowJudgmentLineHeld=true
+ShowJudgmentLineHeld=(GAMESTATE:GetCurrentGame():GetName() ~= "pump")
 ShowJudgmentLineMiss=true
 ShowJudgmentLineMaxCombo=true
 ShowGradeArea=true

Xcode/scripts/mkrelease.pl

@@ -9,7 +9,9 @@ use Cwd;
 
 my @docs = (
 	"Licenses.txt",
+	"Changelog_sm5.txt",
 	"Changelog_sm-ssc.txt",
+	"Changelog_SSCformat.txt",
 	"CommandLineArgs.txt",
 	"credits.txt",
 	"Themerdocs/"

Xcode/stepmania.xcodeproj/project.pbxproj

@@ -7896,6 +7896,7 @@
 			buildSettings = {
 				CONFIGURATION_BUILD_DIR = "$(SYMROOT)";
 				FULL_NAME = "$(PRODUCT_NAME).$(WRAPPER_EXTENSION)";
+				GCC_AUTO_VECTORIZATION = NO;
 				GCC_ENABLE_SSE3_EXTENSIONS = NO;
 				GCC_INLINES_ARE_PRIVATE_EXTERN = NO;
 				GCC_PREFIX_HEADER = "$(SRCROOT)/../src/archutils/Darwin/StepMania.pch";
@@ -8605,6 +8606,7 @@
 				COPY_PHASE_STRIP = NO;
 				DEBUG_INFORMATION_FORMAT = stabs;
 				FULL_NAME = "$(PRODUCT_NAME).$(WRAPPER_EXTENSION)";
+				GCC_AUTO_VECTORIZATION = NO;
 				GCC_ENABLE_SSE3_EXTENSIONS = NO;
 				GCC_GENERATE_DEBUGGING_SYMBOLS = YES;
 				GCC_INLINES_ARE_PRIVATE_EXTERN = NO;
@@ -8853,7 +8855,9 @@
 			buildSettings = {
 				CONFIGURATION_BUILD_DIR = "$(SYMROOT)";
 				FULL_NAME = "$(PRODUCT_NAME).$(WRAPPER_EXTENSION)";
-				GCC_ENABLE_SSE3_EXTENSIONS = NO;
+				GCC_AUTO_VECTORIZATION = YES;
+				GCC_ENABLE_SSE3_EXTENSIONS = YES;
+				GCC_ENABLE_SUPPLEMENTAL_SSE3_INSTRUCTIONS = YES;
 				GCC_PREFIX_HEADER = "$(SRCROOT)/../src/archutils/Darwin/StepMania.pch";
 				GCC_SYMBOLS_PRIVATE_EXTERN = NO;
 				GCC_VERSION = com.apple.compilers.llvm.clang.1_0;
@@ -8982,7 +8986,9 @@
 			buildSettings = {
 				CONFIGURATION_BUILD_DIR = "$(SYMROOT)";
 				FULL_NAME = "$(PRODUCT_NAME).$(WRAPPER_EXTENSION)";
+				GCC_AUTO_VECTORIZATION = NO;
 				GCC_ENABLE_OBJC_EXCEPTIONS = NO;
+				GCC_ENABLE_SSE3_EXTENSIONS = NO;
 				GCC_PREFIX_HEADER = "$(SRCROOT)/../src/archutils/Darwin/StepMania.pch";
 				GCC_SYMBOLS_PRIVATE_EXTERN = NO;
 				GCC_VERSION = com.apple.compilers.llvm.clang.1_0;

src/ModIconRow.cpp

@@ -68,18 +68,13 @@ void ModIconRow::HandleMessage( const Message &msg )
 
 struct OptionColumnEntry
 {
-	char *szString;
+	const char *szString;
 	int iSlotIndex;
 
 	//void FromStack( lua_State *L, int iPos );
 };
 
 // todo: metric these? -aj
-/*
- * May be a good idea to do so at some point. GCC gives plenty of warnings
- * About the code below, something about turning string constants into
- * char * items. Gotta love the many compilers we use. -Wolfman2000
- */
 static const OptionColumnEntry g_OptionColumnEntries[] =
 {
 	{"Boost",		0},

src/MusicWheelItem.cpp

@@ -170,6 +170,10 @@ MusicWheelItem::MusicWheelItem( const MusicWheelItem &cpy ):
 
 MusicWheelItem::~MusicWheelItem()
 {
+	FOREACH_ENUM( MusicWheelItemType, i )
+	{
+		SAFE_DELETE(m_pText[i]);
+	}
 	delete m_pTextSectionCount;
 }
 

src/NoteField.cpp

@@ -577,7 +577,7 @@ void NoteField::DrawTickcountText( const float fBeat, int iTicks )
 	m_textMeasureNumber.Draw();
 }
 
-void NoteField::DrawComboText( const float fBeat, int iCombo )
+void NoteField::DrawComboText( const float fBeat, int iCombo, int iMiss )
 {
 	const float fYOffset	= ArrowEffects::GetYOffset( m_pPlayerState, 0, fBeat );
  	const float fYPos	= ArrowEffects::GetYPos(    m_pPlayerState, 0, fYOffset, m_fYReverseOffsetPixels );
@@ -589,7 +589,7 @@ void NoteField::DrawComboText( const float fBeat, int iCombo )
 	m_textMeasureNumber.SetHorizAlign( COMBO_IS_LEFT_SIDE ? align_right : align_left );
 	m_textMeasureNumber.SetDiffuse( COMBO_COLOR );
 	m_textMeasureNumber.SetGlow( RageColor(1,1,1,RageFastCos(RageTimer::GetTimeSinceStartFast()*2)/2+0.5f) );
-	m_textMeasureNumber.SetText( ssprintf("%d", iCombo) );
+	m_textMeasureNumber.SetText( ssprintf("%d/%d", iCombo, iMiss) );
 	m_textMeasureNumber.SetXY( (COMBO_IS_LEFT_SIDE ? -xBase - xOffset : xBase + xOffset), fYPos );
 	m_textMeasureNumber.Draw();
 }
@@ -981,7 +981,7 @@ void NoteField::DrawPrimitives()
 				{
 					float fBeat = seg->GetBeat();
 					if( IS_ON_SCREEN(fBeat) )
-						DrawComboText( fBeat, seg->GetCombo() );
+						DrawComboText( fBeat, seg->GetCombo(), seg->GetMissCombo() );
 				}
 			}
 		}

src/NoteField.h

@@ -62,7 +62,7 @@ protected:
 	void DrawWarpText( const float fBeat, const float fNewBeat );
 	void DrawTimeSignatureText( const float fBeat, int iNumerator, int iDenominator );
 	void DrawTickcountText( const float fBeat, int iTicks );
-	void DrawComboText( const float fBeat, int iCombo );
+	void DrawComboText( const float fBeat, int iCombo, int iMiss );
 	void DrawLabelText( const float fBeat, RString sLabel );
 	void DrawSpeedText( const float fBeat, float fPercent, float fWait, unsigned short usMode );
 	void DrawScrollText( const float fBeat, float fPercent );

src/NotesLoaderKSF.cpp

@@ -378,7 +378,7 @@ static bool LoadFromKSFFile( const RString &sPath, Steps &out, const Song &song,
 			else if (BeginsWith(sRowString, "|M") || BeginsWith(sRowString, "|C"))
 			{
 				// multipliers/combo
-				stepsTiming.SetComboAtBeat( fCurBeat, static_cast<int>(numTemp) );
+				stepsTiming.SetHitComboAtBeat( fCurBeat, static_cast<int>(numTemp) );
 			}
 			else if (BeginsWith(sRowString, "|S"))
 			{

src/NotesLoaderSMA.cpp

@@ -23,17 +23,22 @@ void SMALoader::ProcessMultipliers( TimingData &out, const int iRowsPerBeat, con
 	{
 		vector<RString> arrayMultiplierValues;
 		split( arrayMultiplierExpressions[f], "=", arrayMultiplierValues );
-		if( arrayMultiplierValues.size() != 2 )
+		unsigned size = arrayMultiplierValues.size();
+		if( size < 2 )
 		{
 			LOG->UserLog("Song file",
 				     this->GetSongTitle(),
-				     "has an invalid #MULTIPLIER value \"%s\" (must have exactly one '='), ignored.",
+				     "has an invalid #MULTIPLIER value \"%s\" (must have at least one '='), ignored.",
 				     arrayMultiplierExpressions[f].c_str() );
 			continue;
 		}
 		const float fComboBeat = RowToBeat( arrayMultiplierValues[0], iRowsPerBeat );
-		const int iCombos = StringToInt( arrayMultiplierValues[1] );
+		const int iCombos = StringToInt( arrayMultiplierValues[1] ); // always true.
-		ComboSegment new_seg( fComboBeat, iCombos );
+		// hoping I'm right here: SMA files can use 6 values after the row/beat.
+		const int iMisses = (size == 2 || size == 4 ?
+							 iCombos : 
+							 StringToInt(arrayMultiplierValues[2]));
+		ComboSegment new_seg( fComboBeat, iCombos, iMisses );
 		out.AddComboSegment( new_seg );
 	}
 }

src/NotesLoaderSSC.cpp

@@ -94,17 +94,19 @@ void SSCLoader::ProcessCombos( TimingData &out, const RString line, const int ro
 	{
 		vector<RString> arrayComboValues;
 		split( arrayComboExpressions[f], "=", arrayComboValues );
-		if( arrayComboValues.size() != 2 )
+		unsigned size = arrayComboValues.size();
+		if( size < 2 )
 		{
 			LOG->UserLog("Song file",
 				     this->GetSongTitle(),
-				     "has an invalid #COMBOS value \"%s\" (must have exactly one '='), ignored.",
+				     "has an invalid #COMBOS value \"%s\" (must have at least one '='), ignored.",
 				     arrayComboExpressions[f].c_str() );
 			continue;
 		}
 		const float fComboBeat = StringToFloat( arrayComboValues[0] );
 		const int iCombos = StringToInt( arrayComboValues[1] );
-		ComboSegment new_seg( fComboBeat, iCombos );
+		const int iMisses = (size == 2 ? iCombos : StringToInt(arrayComboValues[2]));
+		ComboSegment new_seg( fComboBeat, iCombos, iMisses );
 		out.AddComboSegment( new_seg );
 	}
 }

src/NotesWriterSSC.cpp

@@ -128,7 +128,12 @@ static void GetTimingTags( vector<RString> &lines, TimingData timing, bool bIsSo
 	ASSERT( !timing.m_ComboSegments.empty() );
 	w.Init( "COMBOS" );
 	FOREACH_CONST( ComboSegment, timing.m_ComboSegments, cs )
-		w.Write( cs->GetRow(), cs->GetCombo() );
+	{
+		if (cs->GetCombo() == cs->GetMissCombo())
+			w.Write( cs->GetRow(), cs->GetCombo() );
+		else
+			w.Write( cs->GetRow(), cs->GetCombo(), cs->GetMissCombo() );
+	}
 	w.Finish();
 	
 	// Song Timing should only have the initial value.

src/RageLog.cpp

@@ -262,7 +262,7 @@ void RageLog::Write( int where, const RString &sLine )
 			sStr.insert( 0, sWarning );
 
 		if( m_bShowLogOutput || (where&WRITE_TO_INFO) )
-			puts( sStr );
+			puts(sStr); //fputws( (const wchar_t *)sStr.c_str(), stdout );
 		if( where & WRITE_TO_INFO )
 			AddToInfo( sStr );
 		if( m_bLogToDisk && (where&WRITE_TO_INFO) && g_fileInfo->IsOpen() )

src/RageTexture.cpp

@@ -7,7 +7,7 @@
 
 
 RageTexture::RageTexture( RageTextureID name ):
-	m_ID(name), m_iRefCount(1), m_bWasUsed(false),
+	m_iRefCount(1), m_bWasUsed(false), m_ID(name),
 	m_iSourceWidth(0), m_iSourceHeight(0),
 	m_iTextureWidth(0), m_iTextureHeight(0),
 	m_iImageWidth(0), m_iImageHeight(0),

src/ScoreKeeperNormal.cpp

@@ -416,18 +416,32 @@ void ScoreKeeperNormal::HandleTapScore( const TapNote &tn )
 
 void ScoreKeeperNormal::HandleHoldCheckpointScore( const NoteData &nd, int iRow, int iNumHoldsHeldThisRow, int iNumHoldsMissedThisRow )
 {
-	HandleTapNoteScoreInternal( iNumHoldsMissedThisRow == 0? TNS_CheckpointHit:TNS_CheckpointMiss, TNS_CheckpointHit );
+	HandleTapNoteScoreInternal(iNumHoldsMissedThisRow == 0 ? TNS_CheckpointHit:TNS_CheckpointMiss,
+							   TNS_CheckpointHit, iRow);
 	HandleComboInternal( iNumHoldsHeldThisRow, 0, iNumHoldsMissedThisRow, iRow );
 }
 
-void ScoreKeeperNormal::HandleTapNoteScoreInternal( TapNoteScore tns, TapNoteScore maximum )
+void ScoreKeeperNormal::HandleTapNoteScoreInternal( TapNoteScore tns, TapNoteScore maximum, int row )
 {
 	// Update dance points.
 	if( !m_pPlayerStageStats->m_bFailed )
 		m_pPlayerStageStats->m_iActualDancePoints += TapNoteScoreToDancePoints( tns );
 
-	// update judged row totals
+	// update judged row totals. Respect Combo segments here.
-	m_pPlayerStageStats->m_iTapNoteScores[tns] += 1;
+	TimingData &td = GAMESTATE->m_pCurSteps[m_pPlayerState->m_PlayerNumber]->m_Timing;
+	ComboSegment &cs = td.GetComboSegmentAtRow(row);
+	if (tns == TNS_CheckpointHit || tns >= m_MinScoreToContinueCombo)
+	{
+		m_pPlayerStageStats->m_iTapNoteScores[tns] += cs.GetCombo();
+	}
+	else if (tns == TNS_CheckpointMiss || tns < m_MinScoreToMaintainCombo)
+	{
+		m_pPlayerStageStats->m_iTapNoteScores[tns] += cs.GetMissCombo();
+	}
+	else
+	{	
+		m_pPlayerStageStats->m_iTapNoteScores[tns] += 1;
+	}
 
 	// increment the current total possible dance score
 	m_pPlayerStageStats->m_iCurPossibleDancePoints += TapNoteScoreToDancePoints( maximum );
@@ -447,17 +461,17 @@ void ScoreKeeperNormal::HandleComboInternal( int iNumHitContinueCombo, int iNumH
 	{
 		m_pPlayerStageStats->m_iCurMissCombo = 0;
 	}
-
+	TimingData td = GAMESTATE->m_pCurSteps[m_pPlayerState->m_PlayerNumber]->m_Timing;
 	if( iNumBreakCombo == 0 )
 	{
-		TimingData td = GAMESTATE->m_pCurSteps[m_pPlayerState->m_PlayerNumber]->m_Timing;
 		int multiplier = ( iRow == -1 ? 1 : td.GetComboSegmentAtRow( iRow ).GetCombo() );
 		m_pPlayerStageStats->m_iCurCombo += iNumHitContinueCombo * multiplier;
 	}
 	else
 	{
 		m_pPlayerStageStats->m_iCurCombo = 0;
-		m_pPlayerStageStats->m_iCurMissCombo += ( m_MissComboIsPerRow ? 1 : iNumBreakCombo );
+		int multiplier = ( iRow == -1 ? 1 : td.GetComboSegmentAtRow(iRow).GetMissCombo());
+		m_pPlayerStageStats->m_iCurMissCombo += ( m_MissComboIsPerRow ? 1 : iNumBreakCombo ) * multiplier;
 	}
 }
 
@@ -467,10 +481,10 @@ void ScoreKeeperNormal::HandleRowComboInternal( TapNoteScore tns, int iNumTapsIn
 	{
 		iNumTapsInRow = min( iNumTapsInRow, 1);
 	}
+	TimingData td = GAMESTATE->m_pCurSteps[m_pPlayerState->m_PlayerNumber]->m_Timing;
 	if ( tns >= m_MinScoreToContinueCombo )
 	{
 		m_pPlayerStageStats->m_iCurMissCombo = 0;
-		TimingData td = GAMESTATE->m_pCurSteps[m_pPlayerState->m_PlayerNumber]->m_Timing;
 		int multiplier = ( iRow == -1 ? 1 : td.GetComboSegmentAtRow( iRow ).GetCombo() );
 		m_pPlayerStageStats->m_iCurCombo += iNumTapsInRow * multiplier;
 	}
@@ -479,7 +493,10 @@ void ScoreKeeperNormal::HandleRowComboInternal( TapNoteScore tns, int iNumTapsIn
 		m_pPlayerStageStats->m_iCurCombo = 0;
 
 		if( tns <= m_MaxScoreToIncrementMissCombo )
-			m_pPlayerStageStats->m_iCurMissCombo += ( m_MissComboIsPerRow ? 1 : iNumTapsInRow );
+		{
+			int multiplier = ( iRow == -1 ? 1 : td.GetComboSegmentAtRow(iRow).GetMissCombo());
+			m_pPlayerStageStats->m_iCurMissCombo += ( m_MissComboIsPerRow ? 1 : iNumTapsInRow ) * multiplier;
+		}
 	}
 }
 
@@ -516,7 +533,7 @@ void ScoreKeeperNormal::HandleTapRowScore( const NoteData &nd, int iRow )
 	m_iNumNotesHitThisRow = iNumTapsInRow;
 
 	TapNoteScore scoreOfLastTap = NoteDataWithScoring::LastTapNoteWithResult( nd, iRow ).result.tns;
-	HandleTapNoteScoreInternal( scoreOfLastTap, TNS_W1 );
+	HandleTapNoteScoreInternal( scoreOfLastTap, TNS_W1, iRow );
 	
 	if ( GAMESTATE->GetCurrentGame()->m_bCountNotesSeparately )
 	{

src/ScoreKeeperNormal.h

@@ -90,7 +90,12 @@ public:
 	static int HoldNoteScoreToGradePoints( HoldNoteScore hns, bool bBeginner );
 
 private:
-	void HandleTapNoteScoreInternal( TapNoteScore tns, TapNoteScore maximum );
+	/**
+	 * @brief Take care of some internal work with our scoring systems.
+	 * @param tns the Tap Note score earned.
+	 * @param maximum the best tap note score possible.
+	 * @param row the row the score was earned. Mainly for ComboSegment stuff. */
+	void HandleTapNoteScoreInternal( TapNoteScore tns, TapNoteScore maximum, int row );
 	void HandleComboInternal( int iNumHitContinueCombo, int iNumHitMaintainCombo, int iNumBreakCombo, int iRow = -1 );
 	void HandleRowComboInternal( TapNoteScore tns, int iNumTapsInRow, int iRow = -1 );
 	void GetRowCounts( const NoteData &nd, int iRow, int &iNumHitContinueCombo, int &iNumHitMaintainCombo, int &iNumBreakCombo );

src/ScreenDebugOverlay.cpp

@@ -196,8 +196,8 @@ void ScreenDebugOverlay::Init()
 		g_Mappings.debugButton[i++] = DeviceInput(DEVICE_KEYBOARD, KEY_Cq);
 		g_Mappings.debugButton[i++] = DeviceInput(DEVICE_KEYBOARD, KEY_Cw);
 		g_Mappings.debugButton[i++] = DeviceInput(DEVICE_KEYBOARD, KEY_Ce);
-		g_Mappings.debugButton[i++] = DeviceInput(DEVICE_KEYBOARD, KEY_Ct);
 		g_Mappings.debugButton[i++] = DeviceInput(DEVICE_KEYBOARD, KEY_Cr);
+		g_Mappings.debugButton[i++] = DeviceInput(DEVICE_KEYBOARD, KEY_Ct);
 		g_Mappings.debugButton[i++] = DeviceInput(DEVICE_KEYBOARD, KEY_Cy);
 		g_Mappings.debugButton[i++] = DeviceInput(DEVICE_KEYBOARD, KEY_Cu);
 		g_Mappings.debugButton[i++] = DeviceInput(DEVICE_KEYBOARD, KEY_Ci);
@@ -1226,10 +1226,10 @@ DECLARE_ONE( DebugLineWritePreferences );
 DECLARE_ONE( DebugLineMenuTimer );
 DECLARE_ONE( DebugLineFlushLog );
 DECLARE_ONE( DebugLinePullBackCamera );
-DECLARE_ONE( DebugLineVolumeUp );
 DECLARE_ONE( DebugLineVolumeDown );
-DECLARE_ONE( DebugLineVisualDelayUp );
+DECLARE_ONE( DebugLineVolumeUp );
 DECLARE_ONE( DebugLineVisualDelayDown );
+DECLARE_ONE( DebugLineVisualDelayUp );
 DECLARE_ONE( DebugLineForceCrash );
 DECLARE_ONE( DebugLineUptime );
 

src/ScreenEdit.cpp

@@ -3006,10 +3006,10 @@ void ScreenEdit::HandleScreenMessage( const ScreenMessage SM )
 	}
 	else if ( SM == SM_BackFromComboChange && !ScreenTextEntry::s_bCancelledLast )
 	{
-		int iCombo = StringToInt( ScreenTextEntry::s_sLastAnswer );
+		int iCombo, iMiss;
-		if ( iCombo >= 0 )
+		if (sscanf(ScreenTextEntry::s_sLastAnswer.c_str(), " %d / %d ", &iCombo, &iMiss) == 2)
 		{
-			GetAppropriateTiming().SetComboAtBeat( GetBeat(), iCombo );
+			GetAppropriateTiming().SetComboAtBeat( GetBeat(), iCombo, iMiss );
 		}
 		SetDirty( true );
 	}
@@ -3587,10 +3587,14 @@ void ScreenEdit::DisplayTimingMenu()
 	g_TimingDataInformation.rows[bpm].SetOneUnthemedChoice( ssprintf("%.6f", pTime.GetBPMAtBeat( fBeat ) ) );
 	g_TimingDataInformation.rows[stop].SetOneUnthemedChoice( ssprintf("%.6f", pTime.GetStopAtBeat( fBeat ) ) ) ;
 	g_TimingDataInformation.rows[delay].SetOneUnthemedChoice( ssprintf("%.6f", pTime.GetDelayAtBeat( fBeat ) ) );
-	g_TimingDataInformation.rows[time_signature].SetOneUnthemedChoice( ssprintf("%d / %d", pTime.GetTimeSignatureNumeratorAtBeat( fBeat ), pTime.GetTimeSignatureDenominatorAtBeat( fBeat ) ) );
+	g_TimingDataInformation.rows[time_signature].SetOneUnthemedChoice(ssprintf("%d / %d",
+																			   pTime.GetTimeSignatureNumeratorAtBeat( fBeat ),
+																			   pTime.GetTimeSignatureDenominatorAtBeat( fBeat ) ) );
 	g_TimingDataInformation.rows[label].SetOneUnthemedChoice( pTime.GetLabelAtBeat( fBeat ).c_str() );
 	g_TimingDataInformation.rows[tickcount].SetOneUnthemedChoice( ssprintf("%d", pTime.GetTickcountAtBeat( fBeat ) ) );
-	g_TimingDataInformation.rows[combo].SetOneUnthemedChoice( ssprintf("%d", pTime.GetComboAtBeat( fBeat ) ) );
+	g_TimingDataInformation.rows[combo].SetOneUnthemedChoice( ssprintf("%d / %d",
+																	   pTime.GetComboAtBeat( fBeat ),
+																	   pTime.GetMissComboAtBeat( fBeat ) ) );
 	g_TimingDataInformation.rows[warp].SetOneUnthemedChoice( ssprintf("%.6f", pTime.GetWarpAtBeat( fBeat ) ) );
 	g_TimingDataInformation.rows[speed_percent].SetOneUnthemedChoice( bHasSpeedOnThisRow ? ssprintf("%.6f", pTime.GetSpeedPercentAtBeat( fBeat ) ) : "---" );
 	g_TimingDataInformation.rows[speed_wait].SetOneUnthemedChoice( bHasSpeedOnThisRow ? ssprintf("%.6f", pTime.GetSpeedWaitAtBeat( fBeat ) ) : "---" );
@@ -4566,13 +4570,16 @@ void ScreenEdit::HandleTimingDataInformationChoice( TimingDataInformationChoice
 			);
 		break;
 	case combo:
-		ScreenTextEntry::TextEntry(
+	{
-		   SM_BackFromComboChange,
+		ComboSegment &cs = GetAppropriateTiming().GetComboSegmentAtBeat(GetBeat());
-		   ENTER_COMBO_VALUE,
+		ScreenTextEntry::TextEntry(SM_BackFromComboChange,
-		   ssprintf( "%d", GetAppropriateTiming().GetComboAtBeat( GetBeat() ) ),
+								   ENTER_COMBO_VALUE,
-		   4
+								   ssprintf( "%d/%d",
-		   );
+											cs.GetCombo(),
-	break;
+											cs.GetMissCombo()),
+								   7);
+		break;
+	}
 	case label:
 		ScreenTextEntry::TextEntry(
 		   SM_BackFromLabelChange,

src/Song.cpp

@@ -41,7 +41,7 @@
  * @brief The internal version of the cache for StepMania.
  *
  * Increment this value to invalidate the current cache. */
-const int FILE_CACHE_VERSION = 189;
+const int FILE_CACHE_VERSION = 190;
 
 /** @brief How long does a song sample last by default? */
 const float DEFAULT_MUSIC_SAMPLE_LENGTH = 12.f;

src/Song.h

@@ -20,7 +20,7 @@ void FixupPath( RString &path, const RString &sSongPath );
 RString GetSongAssetPath( RString sPath, const RString &sSongPath );
 
 /** @brief The version of the .ssc file format. */
-const static float STEPFILE_VERSION_NUMBER = 0.75f;
+const static float STEPFILE_VERSION_NUMBER = 0.76f;
 
 /** @brief How many edits for this song can each profile have? */
 const int MAX_EDITS_PER_SONG_PER_PROFILE = 15;

src/TimingData.cpp

@@ -166,12 +166,16 @@ void TimingData::SetTimeSignatureAtRow( int iRow, int iNumerator, int iDenominat
 
 void TimingData::SetTimeSignatureNumeratorAtRow( int iRow, int iNumerator )
 {
-	SetTimeSignatureAtRow( iRow, iNumerator, GetTimeSignatureSegmentAtBeat( NoteRowToBeat( iRow ) ).GetDen() );
+	this->SetTimeSignatureAtRow(iRow,
+								iNumerator,
+								GetTimeSignatureSegmentAtRow(iRow).GetDen());
 }
 
 void TimingData::SetTimeSignatureDenominatorAtRow( int iRow, int iDenominator )
 {
-	SetTimeSignatureAtRow( iRow, GetTimeSignatureSegmentAtBeat( NoteRowToBeat( iRow ) ).GetNum(), iDenominator );
+	this->SetTimeSignatureAtRow(iRow,
+								GetTimeSignatureSegmentAtRow(iRow).GetNum(),
+								iDenominator);
 }
 
 void TimingData::SetWarpAtRow( int iRow, float fNew )
@@ -222,7 +226,7 @@ void TimingData::SetTickcountAtRow( int iRow, int iTicks )
 	}
 }
 
-void TimingData::SetComboAtRow( int iRow, int iCombo )
+void TimingData::SetComboAtRow( int iRow, int iCombo, int iMiss )
 {
 	unsigned i;
 	for( i=0; i<m_ComboSegments.size(); i++ )
@@ -231,18 +235,37 @@ void TimingData::SetComboAtRow( int iRow, int iCombo )
 	
 	if( i == m_ComboSegments.size() || m_ComboSegments[i].GetRow() != iRow )
 	{
-		if( i == 0 || m_ComboSegments[i-1].GetCombo() != iCombo )
+		if(i == 0 || m_ComboSegments[i-1].GetCombo() != iCombo ||
+		   m_ComboSegments[i-1].GetMissCombo() != iMiss)
 			AddComboSegment( ComboSegment(iRow, iCombo ) );
 	}
 	else
 	{
-		if( i > 0 && m_ComboSegments[i-1].GetCombo() == iCombo )
+		if(i > 0 && m_ComboSegments[i-1].GetCombo() == iCombo &&
+		   m_ComboSegments[i-1].GetMissCombo() == iMiss)
 			m_ComboSegments.erase( m_ComboSegments.begin()+i, m_ComboSegments.begin()+i+1 );
 		else
+		{
 			m_ComboSegments[i].SetCombo(iCombo);
+			m_ComboSegments[i].SetMissCombo(iMiss);
+		}
 	}
 }
 
+void TimingData::SetHitComboAtRow(int iRow, int iCombo)
+{
+	this->SetComboAtRow(iRow,
+						iCombo,
+						this->GetComboSegmentAtRow(iRow).GetMissCombo());
+}
+
+void TimingData::SetMissComboAtRow(int iRow, int iMiss)
+{
+	this->SetComboAtRow(iRow,
+						this->GetComboSegmentAtRow(iRow).GetCombo(),
+						iMiss);
+}
+
 void TimingData::SetLabelAtRow( int iRow, const RString sLabel )
 {
 	unsigned i;
@@ -398,7 +421,12 @@ float TimingData::GetDelayAtRow( int iRow ) const
 
 int TimingData::GetComboAtRow( int iNoteRow ) const
 {
-	return m_ComboSegments[GetComboSegmentIndexAtRow( iNoteRow )].GetCombo();
+	return m_ComboSegments[this->GetComboSegmentIndexAtRow(iNoteRow)].GetCombo();
+}
+
+int TimingData::GetMissComboAtRow(int iNoteRow) const
+{
+	return m_ComboSegments[this->GetComboSegmentIndexAtRow(iNoteRow)].GetMissCombo();
 }
 
 RString TimingData::GetLabelAtRow( int iRow ) const
@@ -1735,7 +1763,7 @@ void TimingData::TidyUpData()
 	// Have a default combo segment of one just in case.
 	if( m_ComboSegments.empty() )
 	{
-		ComboSegment seg(0, 1);
+		ComboSegment seg(0, 1, 1);
 		m_ComboSegments.push_back( seg );
 	}
 	
@@ -1913,8 +1941,9 @@ public:
 		FOREACH_CONST( ComboSegment, p->m_ComboSegments, seg )
 		{
 			const int combo = seg->GetCombo();
+			const int miss = seg->GetMissCombo();
 			const float beat = seg->GetBeat();
-			vCombos.push_back( ssprintf("%f=%d", beat, combo) );
+			vCombos.push_back( ssprintf("%f=%d=%d", beat, combo, miss) );
 		}
 		LuaHelpers::CreateTableFromArray(vCombos, L);
 		return 1;

src/TimingData.h

@@ -668,6 +668,18 @@ public:
 	 * @return the Combo.
 	 */
 	int GetComboAtBeat( float fBeat ) const { return GetComboAtRow( BeatToNoteRow(fBeat) ); }
+	/**
+	 * @brief Retrieve the Miss Combo at the given row.
+	 * @param iNoteRow the row in question.
+	 * @return the Miss Combo.
+	 */
+	int GetMissComboAtRow( int iNoteRow ) const;
+	/**
+	 * @brief Retrieve the Miss Combo at the given beat.
+	 * @param fBeat the beat in question.
+	 * @return the Miss Combo.
+	 */
+	int GetMissComboAtBeat( float fBeat ) const { return GetMissComboAtRow( BeatToNoteRow(fBeat) ); }
 	/**
 	 * @brief Set the row to have the new Combo.
 	 * @param iNoteRow the row to have the new Combo.
@@ -680,6 +692,44 @@ public:
 	 * @param iCombo the Combo.
 	 */
 	void SetComboAtBeat( float fBeat, int iCombo ) { SetComboAtRow( BeatToNoteRow( fBeat ), iCombo ); }
+	/**
+	 * @brief Set the row to have the new Combo and Miss Combo.
+	 * @param iNoteRow the row to have the new Combo and Miss Combo.
+	 * @param iCombo the Combo.
+	 * @param iMiss the Miss Combo.
+	 */
+	void SetComboAtRow( int iNoteRow, int iCombo, int iMiss );
+	/**
+	 * @brief Set the beat to have the new Combo and Miss Combo.
+	 * @param fBeat the beat to have the new Combo and Miss Combo.
+	 * @param iCombo the Combo.
+	 * @param iMiss the Miss Combo.
+	 */
+	void SetComboAtBeat( float fBeat, int iCombo, int iMiss ) { SetComboAtRow( BeatToNoteRow( fBeat ), iCombo, iMiss ); }
+	/**
+	 * @brief Set the row to have the new Combo.
+	 * @param iNoteRow the row to have the new Combo.
+	 * @param iCombo the Combo.
+	 */
+	void SetHitComboAtRow( int iNoteRow, int iCombo );
+	/**
+	 * @brief Set the beat to have the new Combo.
+	 * @param fBeat the beat to have the new Combo.
+	 * @param iCombo the Combo.
+	 */
+	void SetHitComboAtBeat( float fBeat, int iCombo ) { SetHitComboAtRow( BeatToNoteRow( fBeat ), iCombo ); }
+	/**
+	 * @brief Set the row to have the new Miss Combo.
+	 * @param iNoteRow the row to have the new Miss Combo.
+	 * @param iCombo the Miss Combo.
+	 */
+	void SetMissComboAtRow( int iNoteRow, int iCombo );
+	/**
+	 * @brief Set the beat to have the new Miss Combo.
+	 * @param fBeat the beat to have the new Miss Combo.
+	 * @param iCombo the Miss Combo.
+	 */
+	void SetMissComboAtBeat( float fBeat, int iCombo ) { SetMissComboAtRow( BeatToNoteRow( fBeat ), iCombo ); }
 	/**
 	 * @brief Retrieve the ComboSegment at the specified row.
 	 * @param iNoteRow the row that has a ComboSegment.

src/TimingSegments.cpp

@@ -125,10 +125,21 @@ void ComboSegment::SetCombo(const int i)
 	this->combo = i;
 }
 
+int ComboSegment::GetMissCombo() const
+{
+	return this->missCombo;
+}
+
+void ComboSegment::SetMissCombo(const int i)
+{
+	this->missCombo = i;
+}
+
 bool ComboSegment::operator<( const ComboSegment &other ) const
 {
 	LTCOMPARE(GetRow());
 	LTCOMPARE(GetCombo());
+	LTCOMPARE(GetMissCombo());
 	return false;
 }
 

src/TimingSegments.h

@@ -344,7 +344,8 @@ struct ComboSegment : public TimingSegment<ComboSegment>
 
 	ComboSegment(const ComboSegment &other) : 
 		TimingSegment<ComboSegment>(other),
-		combo(other.GetCombo()) {};
+		combo(other.GetCombo()),
+		missCombo(other.GetMissCombo()) {};
 
 	/**
 	 * @brief Creates a Combo Segment with the specified values.
@@ -354,18 +355,39 @@ struct ComboSegment : public TimingSegment<ComboSegment>
 	template <typename StartType>
 	ComboSegment( StartType s, int t ):
 		TimingSegment<ComboSegment>(max((StartType)0, s)),
-		combo(max(0,t)) {}
+		combo(max(0,t)), missCombo(max(0,t)) {}
+	
+	/**
+	 * @brief Creates a Combo Segment with the specified values.
+	 * @param s the starting row / beat of this segment.
+	 * @param t the amount the combo increases on a succesful hit.
+	 * @param m the amount the miss combo increases on missing.
+	 */
+	template <typename StartType>
+	ComboSegment(StartType s, int t, int m):
+		TimingSegment<ComboSegment>(max((StartType)0, s)),
+		combo(max(0,t)), missCombo(max(0,m)) {}
 	
 	/**
 	 * @brief Get the combo in this ComboSegment.
 	 * @return the combo. */
 	int GetCombo() const;
 	
+	/**
+	 * @brief Get the miss combo in this ComboSegment.
+	 * @return the miss combo. */
+	int GetMissCombo() const;
+	
 	/**
 	 * @brief Set the combo in this ComboSegment.
 	 * @param i the combo. */
 	void SetCombo(const int i);
 	
+	/**
+	 * @brief Set the miss combo in this ComboSegment.
+	 * @param i the miss combo. */
+	void SetMissCombo(const int i);
+	
 	/**
 	 * @brief Compares two ComboSegments to see if one is less than the other.
 	 * @param other the other ComboSegment to compare to.
@@ -377,6 +399,8 @@ private:
 	 * @brief The amount the combo increases at this point.
 	 */
 	int combo;
+	/** @brief The amount of miss combos given at this point. */
+	int missCombo;
 };