From 978e91655769bf82513c25a37217c34567314a1a Mon Sep 17 00:00:00 2001 From: Jonathan Payne Date: Wed, 19 Oct 2011 21:51:54 -0700 Subject: [PATCH] [br:Defualt] do not show incompletename entry; add comment for addition notetype --- Themes/_fallback/Scripts/02 Branches.lua | 4 +++- src/NoteDisplay.cpp | 9 ++++++++- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/Themes/_fallback/Scripts/02 Branches.lua b/Themes/_fallback/Scripts/02 Branches.lua index cc2a816ea8..2b502cd493 100644 --- a/Themes/_fallback/Scripts/02 Branches.lua +++ b/Themes/_fallback/Scripts/02 Branches.lua @@ -190,6 +190,8 @@ Branch = { return IsNetConnected() and "ScreenTitleMenu" or "ScreenTitleMenu" end, AfterSaveSummary = function() - return GAMESTATE:AnyPlayerHasRankingFeats() and "ScreenNameEntryTraditional" or "ScreenGameOver" + return "ScreenGameOver" +-- [[ Enable when Finished ]] +-- return GAMESTATE:AnyPlayerHasRankingFeats() and "ScreenNameEntryTraditional" or "ScreenGameOver" end, } diff --git a/src/NoteDisplay.cpp b/src/NoteDisplay.cpp index d71b845198..b7ac1940f4 100644 --- a/src/NoteDisplay.cpp +++ b/src/NoteDisplay.cpp @@ -252,6 +252,7 @@ void NoteDisplay::Load( int iColNum, const PlayerState* pPlayerState, float fYRe // "normal" note types m_TapNote.Load( sButton, "Tap Note" ); + //m_TapAdd.Load( sButton, "Tap Addition" ); m_TapMine.Load( sButton, "Tap Mine" ); m_TapLift.Load( sButton, "Tap Lift" ); m_TapFake.Load( sButton, "Tap Fake" ); @@ -744,7 +745,13 @@ void NoteDisplay::DrawTap(const TapNote& tn, int iCol, float fBeat, { Actor* pActor = NULL; NotePart part = NotePart_Tap; - + /* + if( tn.source == TapNote::addition ) + { + pActor = GetTapActor( m_TapAddition, NotePart_Addition, fBeat ); + part = NotePart_Addition; + } + */ if( tn.type == TapNote::lift ) { pActor = GetTapActor( m_TapLift, NotePart_Lift, fBeat );