From 50a62f11c4436fc4f77158a46b7b9780a640f453 Mon Sep 17 00:00:00 2001 From: AJ Kelly Date: Wed, 11 Aug 2010 02:17:29 -0500 Subject: [PATCH] comment + cleanup --- src/ActorSound.cpp | 5 ++--- src/CourseContentsList.h | 2 +- src/DancingCharacters.h | 1 + src/GhostArrowRow.h | 4 ++-- src/ScreenPackagesSSC.cpp | 4 ++-- src/ScreenPackagesSSC.h | 2 +- 6 files changed, 9 insertions(+), 9 deletions(-) diff --git a/src/ActorSound.cpp b/src/ActorSound.cpp index 481ee2c2f7..c750739353 100644 --- a/src/ActorSound.cpp +++ b/src/ActorSound.cpp @@ -14,14 +14,13 @@ void ActorSound::Load( const RString &sPath ) void ActorSound::Play() { - // This fix makes possible to stop and pause actorsounds, also because - // sometimes stacking sounds is annoying -DaisuMaster + // This fix makes it possible to stop and pause ActorSounds. (Also, + // sometimes stacking sounds is annoying.) -DaisuMaster if( m_Sound.IsPlaying() ) { m_Sound.PlayCopy(); return; } - m_Sound.StartPlaying(); } diff --git a/src/CourseContentsList.h b/src/CourseContentsList.h index cbf15dc00c..f0b38cbb04 100644 --- a/src/CourseContentsList.h +++ b/src/CourseContentsList.h @@ -11,7 +11,7 @@ class CourseContentsList : public ActorScroller public: ~CourseContentsList(); virtual CourseContentsList *Copy() const; - + void LoadFromNode( const XNode* pNode ); void SetFromGameState(); diff --git a/src/DancingCharacters.h b/src/DancingCharacters.h index 17d0a359be..64b1fbe06b 100644 --- a/src/DancingCharacters.h +++ b/src/DancingCharacters.h @@ -1,3 +1,4 @@ +/* DancingCharacters - Characters that react to how the players are doing. */ #ifndef DancingCharacters_H #define DancingCharacters_H diff --git a/src/GhostArrowRow.h b/src/GhostArrowRow.h index 79ba756c08..7fdd604343 100644 --- a/src/GhostArrowRow.h +++ b/src/GhostArrowRow.h @@ -17,11 +17,11 @@ public: virtual void DrawPrimitives(); void Load( const PlayerState* pPlayerState, float fYReverseOffset ); - + void DidTapNote( int iCol, TapNoteScore tns, bool bBright ); void DidHoldNote( int iCol, HoldNoteScore hns, bool bBright ); void SetHoldShowing( int iCol, const TapNote &tn ); - + protected: float m_fYReverseOffsetPixels; const PlayerState* m_pPlayerState; diff --git a/src/ScreenPackagesSSC.cpp b/src/ScreenPackagesSSC.cpp index 778cbec060..7e8123d3f1 100644 --- a/src/ScreenPackagesSSC.cpp +++ b/src/ScreenPackagesSSC.cpp @@ -19,7 +19,7 @@ void ScreenPackagesSSC::HandleScreenMessage( const ScreenMessage SM ) SCREENMAN->SetNewScreen( THEME->GetMetric (m_sName, "PrevScreen") ); else if( SM ==SM_GoToNextScreen ) SCREENMAN->SetNewScreen( THEME->GetMetric (m_sName, "NextScreen") ); - + ScreenWithMenuElements::HandleScreenMessage( SM ); } @@ -46,7 +46,7 @@ void ScreenPackagesSSC::DrawPrimitives() } RString ScreenPackagesSSC::JSONParse( const RString &string_in ) -{ +{ /* json++ stuff here */ return ""; } diff --git a/src/ScreenPackagesSSC.h b/src/ScreenPackagesSSC.h index c2761794c8..7ae4f1d821 100644 --- a/src/ScreenPackagesSSC.h +++ b/src/ScreenPackagesSSC.h @@ -16,7 +16,7 @@ public: /* Input stuff */ virtual void Input( const InputEventPlus &input ); - virtual void MenuBack( const InputEventPlus &input ); + virtual void MenuBack( const InputEventPlus &input ); virtual void HandleScreenMessage( const ScreenMessage SM ); virtual void Update(float f);