cleanup

tweaks

NoteSkins/pump/default/NoteSkin.lua

@@ -8,6 +8,11 @@ Noteskin.bBlanks = {
 	["Roll Tail Inactive"] = true;
 	["Roll Tail Inactive"] = true;
 }
+Noteskin.PartsToRotate = {
+	--["elemenu"] = true|false;
+	["Roll Head Active"] = false;
+	["Roll Head Inactive"] = false;
+}
 Noteskin.ElementRedirs = {
 	--["element"] = "redirected_element";
 	["Hold Head Active"] = "Tap Note";
@@ -89,8 +94,13 @@ local function func()
 	
 	local t = LoadActor(path)
 	
+	local bRotate = Noteskin.PartsToRotate[ElementToLoad]
+	--rotate by default
+	if bRotate == nil then bRotate = true end
+	if bRotate then
 		t.BaseRotationX=Noteskin.BaseRotX[sButton]
 		t.BaseRotationY=Noteskin.BaseRotY[sButton]
+	end
 	
 	return t
 end

src/GhostArrowRow.cpp

@@ -97,6 +97,8 @@ void GhostArrowRow::DidTapNote( int iCol, TapNoteScore tns, bool bBright )
 
 	Message msg("ColumnJudgment");
 	msg.SetParam( "TapNoteScore", tns );
+	// This may be useful for popn styled judgment :) -DaisuMaster
+	msg.SetParam( "Column", iCol );
 	if( bBright )
 		msg.SetParam( "Bright", true );
 	m_Ghost[iCol]->HandleMessage( msg );
@@ -115,6 +117,7 @@ void GhostArrowRow::DidHoldNote( int iCol, HoldNoteScore hns, bool bBright )
 	ASSERT( iCol >= 0  &&  iCol < (int) m_Ghost.size() );
 	Message msg("ColumnJudgment");
 	msg.SetParam( "HoldNoteScore", hns );
+	msg.SetParam( "Column", iCol );
 	if( bBright )
 		msg.SetParam( "Bright", true );
 	m_Ghost[iCol]->HandleMessage( msg );

src/NoteField.cpp

@@ -942,9 +942,7 @@ void NoteField::FadeToFail()
 		// don't fade all over again if this is called twice
 }
 void NoteField::Step( int iCol, TapNoteScore score ) { m_pCurDisplay->m_ReceptorArrowRow.Step( iCol, score ); }
-void NoteField::SetPressed( int iCol ) {
+void NoteField::SetPressed( int iCol ) { m_pCurDisplay->m_ReceptorArrowRow.SetPressed( iCol ); }
-	m_pCurDisplay->m_ReceptorArrowRow.SetPressed( iCol );
-}
 void NoteField::DidTapNote( int iCol, TapNoteScore score, bool bBright ) { m_pCurDisplay->m_GhostArrowRow.DidTapNote( iCol, score, bBright ); }
 void NoteField::DidHoldNote( int iCol, HoldNoteScore score, bool bBright ) { m_pCurDisplay->m_GhostArrowRow.DidHoldNote( iCol, score, bBright ); }
 

src/NotesLoaderKSF.cpp

@@ -220,8 +220,7 @@ static bool LoadFromKSFFile( const RString &sPath, Steps &out, const Song &song,
 		}
 
 		// Why do this? Rows made with precise DM05 tags can go up to 13 too -DaisuMaster
-		if( sRowString.size() != 13 )
+		//if( sRowString.size() != 13 )
-		{
 		if( bKIUCompliant )
 		{
 			LOG->UserLog( "Song file", sPath, "has illegal syntax \"%s\" which can't be in KIU complient files.",
@@ -250,7 +249,6 @@ static bool LoadFromKSFFile( const RString &sPath, Steps &out, const Song &song,
 			//return false;
 			continue;
 		}
-		}
 
 		// Half-doubles is offset; "0011111100000".
 		if( out.m_StepsType == StepsType_pump_halfdouble )
@@ -555,8 +553,6 @@ static bool LoadGlobalData( const RString &sPath, Song &out, bool &bKIUCompliant
 			}
 
 			// This is where the DMRequired test will take place.
-			if( NoteRowString.size() != 13)
-			{
 			if (BeginsWith(NoteRowString, "|T") || BeginsWith(NoteRowString, "|B") ||
 				BeginsWith(NoteRowString, "|D") || BeginsWith(NoteRowString, "|E") )
 			{
@@ -601,14 +597,9 @@ static bool LoadGlobalData( const RString &sPath, Song &out, bool &bKIUCompliant
 			}
 			else
 			{
-					// Quit while we're ahead if any bad syntax is spotted.
+				//ignore whatever else...
-					//LOG->UserLog( "Song file", sPath, "has an invalid RowString \"%s\".",
-					//			NoteRowString.c_str() );
-					//return false;
-					//how about no? :D -DaisuMaster
 				continue;
 			}
-			}
 
 			fCurBeat += 1.0f / iTickCount;
 		}