comment/cleanup spree

This commit is contained in:
AJ Kelly
2010-08-22 13:24:32 -05:00
parent e96148f561
commit d53a8442d0
6 changed files with 21 additions and 24 deletions
+9 -8
View File
@@ -2073,19 +2073,20 @@ void Player::StepStrumHopo( int col, int row, const RageTimer &tm, bool bHeld, b
if( pTN->type == TapNote::attack && score > TNS_W4 )
score = TNS_W2; // sentinel
/* AI will generate misses here. Don't handle a miss like a regular note because
* we want the judgment animation to appear delayed. Instead, return early if
* AI generated a miss, and let UpdateTapNotesMissedOlderThan() detect and handle the
* misses. */
/* AI will generate misses here. Don't handle a miss like a regular
* note because we want the judgment animation to appear delayed.
* Instead, return early if AI generated a miss, and let
* UpdateTapNotesMissedOlderThan() detect and handle the misses. */
if( score == TNS_Miss )
return;
// Put some small, random amount in fNoteOffset so that demonstration
// show a mix of late and early.
// show a mix of late and early. - Chris (StepMania r15628)
//fNoteOffset = randomf( -0.1f, 0.1f );
// XXX: This is not the best thing to be doing. Random numbers should
// be generated based on score, so that they can logically match up
// with the current timing windows. -aj
// Since themes may use the offset in a visual graph, the above
// behavior is not the best thing to do. Instead, random numbers
// should be generated based on the TapNoteScore, so that they can
// logically match up with the current timing windows. -aj
{
float fWindowW1 = GetWindowSeconds(TW_W1);
float fWindowW2 = GetWindowSeconds(TW_W2);
+4 -4
View File
@@ -15,11 +15,11 @@ public:
virtual void SetScore( int iNewScore ) {}
virtual void OnLoadSong() {};
/* Notification of a tap note judgment. This *is* called for
* the head of hold notes. */
/* Notification of a tap note judgment. This *is* called for the head of
* hold notes. */
virtual void OnJudgment( TapNoteScore score ) {};
/* Notification of a hold judgment. tscore is the score
* received for the initial tap note. */
/* Notification of a hold judgment. tscore is the score received for the
* initial tap note. */
virtual void OnJudgment( HoldNoteScore score, TapNoteScore tscore ) {};
protected:
-2
View File
@@ -40,14 +40,12 @@ void ScoreDisplayAliveTime::LoadFromNode( const XNode* pNode )
void ScoreDisplayAliveTime::Update( float fDelta )
{
UpdateNumber();
BitmapText::Update( fDelta );
}
void ScoreDisplayAliveTime::HandleMessage( const Message &msg )
{
// TODO: Add handling of GoalComplete message
BitmapText::HandleMessage( msg );
}
+5 -5
View File
@@ -33,17 +33,17 @@ void ScoreDisplayCalories::LoadFromNode( const XNode* pNode )
LuaHelpers::Pop( L, m_PlayerNumber );
LUA->Release( L );
}
MESSAGEMAN->Subscribe( this, "Step" );
}
void ScoreDisplayCalories::Update( float fDelta )
{
// We have to set the initial text after StatsManager::CalcAccumPlayedStageStats
// We have to set the initial text after StatsManager::CalcAccumPlayedStageStats
// is called.
if( IsFirstUpdate() )
UpdateNumber();
RollingNumbers::Update( fDelta );
}
@@ -56,7 +56,7 @@ void ScoreDisplayCalories::HandleMessage( const Message &msg )
if( pn == m_PlayerNumber )
UpdateNumber();
}
RollingNumbers::HandleMessage( msg );
}
@@ -65,7 +65,7 @@ void ScoreDisplayCalories::UpdateNumber()
float fCals =
STATSMAN->GetAccumPlayedStageStats().m_player[m_PlayerNumber].m_fCaloriesBurned +
STATSMAN->m_CurStageStats.m_player[m_PlayerNumber].m_fCaloriesBurned;
SetTargetNumber( fCals );
}
+2 -4
View File
@@ -1,4 +1,4 @@
/* ScoreDisplayCalories - Shows point score during gameplay and some menus. */
/* ScoreDisplayCalories - Shows calorie score during gameplay and some menus. */
#ifndef ScoreDisplayCalories_H
#define ScoreDisplayCalories_H
@@ -22,9 +22,7 @@ public:
void UpdateNumber();
//
// Commands
//
// Lua
virtual void PushSelf( lua_State *L );
private:
+1 -1
View File
@@ -1,4 +1,4 @@
/* ScreenContinue - . */
/* ScreenContinue - A screen with a countdown that allows players to join/continue the game. */
#ifndef ScreenContinue_H
#define ScreenContinue_H