From b96a00492112a8439a80df0c49e4e69b3366e73c Mon Sep 17 00:00:00 2001 From: Glenn Maynard Date: Tue, 5 Jul 2005 21:29:30 +0000 Subject: [PATCH] We've been trying to more or less keep note skin compatibility, but the format has gone somewhat out of hand, so let's give up a bit on that for the good of mankind ... All note elements that are allowed to be note colored *always* have a note type in the filename; if XIsNoteColor is off, "4th" is used. This way, we don't have different sets of filename rules, fixing clashes between skins and the fallback, and a number of things become simpler (many of which I'm still discovering, so I won't try to enumerate them here just now). Note skin updates coming ... --- stepmania/src/NoteDisplay.cpp | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/stepmania/src/NoteDisplay.cpp b/stepmania/src/NoteDisplay.cpp index 6367737c97..349c3ca57e 100644 --- a/stepmania/src/NoteDisplay.cpp +++ b/stepmania/src/NoteDisplay.cpp @@ -124,9 +124,7 @@ static map g_NoteResource; static NoteResource *MakeNoteResource( const CString &sButton, const CString &sElement, NoteType nt, bool bSpriteOnly ) { - CString sElementAndType = sElement; - if( nt != NOTE_TYPE_INVALID ) - sElementAndType += " " + NoteTypeToString(nt); + CString sElementAndType = sElement + " " + NoteTypeToString(nt); NoteSkinAndPath nsap( NOTESKIN->GetCurrentNoteSkin(), NOTESKIN->GetPath(sButton, sElementAndType) ); map::iterator it = g_NoteResource.find( nsap ); @@ -220,7 +218,7 @@ void NoteColorActor::Load( bool bIsNoteColor, const CString &sButton, const CStr } else { - m_p[0] = MakeRefcountedActor( sButton, sElement, NOTE_TYPE_INVALID ); + m_p[0] = MakeRefcountedActor( sButton, sElement, NOTE_TYPE_4TH ); } } @@ -260,7 +258,7 @@ void NoteColorSprite::Load( bool bIsNoteColor, const CString &sButton, const CSt } else { - m_p[0] = MakeRefcountedSprite( sButton, sElement, NOTE_TYPE_INVALID ); + m_p[0] = MakeRefcountedSprite( sButton, sElement, NOTE_TYPE_4TH ); } }