various other cleanup
This commit is contained in:
@@ -48,9 +48,7 @@ public:
|
||||
float GetSecondsToDestination() const;
|
||||
int GetNumItems() const { return m_iNumItems; }
|
||||
|
||||
//
|
||||
// Commands
|
||||
//
|
||||
void PushSelf( lua_State *L );
|
||||
|
||||
protected:
|
||||
|
||||
+3
-3
@@ -102,7 +102,7 @@ void BGAnimation::LoadFromAniDir( const RString &_sAniDir )
|
||||
|
||||
if( DoesFileExist(sPathToIni) )
|
||||
{
|
||||
// This is a new style BGAnimation (using .ini)
|
||||
// This is a 3.9-style BGAnimation (using .ini)
|
||||
IniFile ini;
|
||||
ini.ReadFile( sPathToIni );
|
||||
|
||||
@@ -117,7 +117,7 @@ void BGAnimation::LoadFromAniDir( const RString &_sAniDir )
|
||||
}
|
||||
else
|
||||
{
|
||||
// This is an old style BGAnimation (not using .ini)
|
||||
// This is an 3.0 and before-style BGAnimation (not using .ini)
|
||||
|
||||
// loading a directory of layers
|
||||
vector<RString> asImagePaths;
|
||||
@@ -154,7 +154,7 @@ void BGAnimation::LoadFromNode( const XNode* pNode )
|
||||
ActorFrame::LoadFromNode( pNode );
|
||||
|
||||
/* Backwards-compatibility: if a "LengthSeconds" value is present, create a dummy
|
||||
* actor that sleeps for the given length of time. This will extend GetTweenTimeLeft. */
|
||||
* actor that sleeps for the given length of time. This will extend GetTweenTimeLeft. */
|
||||
float fLengthSeconds = 0;
|
||||
if( pNode->GetAttrValue( "LengthSeconds", fLengthSeconds ) )
|
||||
{
|
||||
|
||||
+1
-1
@@ -61,7 +61,7 @@ void Banner::LoadFromCachedBanner( const RString &sPath )
|
||||
}
|
||||
else
|
||||
{
|
||||
/* Try to load the low quality version. */
|
||||
// Try to load the low quality version.
|
||||
ID = BANNERCACHE->LoadCachedBanner( sPath );
|
||||
}
|
||||
|
||||
|
||||
+1
-1
@@ -260,7 +260,7 @@ void BitmapText::BuildChars()
|
||||
|
||||
void BitmapText::DrawChars( bool bUseStrokeTexture )
|
||||
{
|
||||
// bail if cropped all the way
|
||||
// bail if cropped all the way
|
||||
if( m_pTempState->crop.left + m_pTempState->crop.right >= 1 ||
|
||||
m_pTempState->crop.top + m_pTempState->crop.bottom >= 1 )
|
||||
return;
|
||||
|
||||
@@ -132,7 +132,7 @@ void CourseContentsList::SetItemFromGameState( Actor *pActor, int iCourseEntryIn
|
||||
s = ssprintf("%d", te->pSteps->GetMeter());
|
||||
dc = te->pSteps->GetDifficulty();
|
||||
}
|
||||
|
||||
|
||||
Message msg("SetSong");
|
||||
msg.SetParam( "PlayerNumber", pn );
|
||||
msg.SetParam( "Song", te->pSong );
|
||||
|
||||
+4
-4
@@ -33,10 +33,10 @@ public:
|
||||
|
||||
LunaLifeMeter()
|
||||
{
|
||||
ADD_METHOD( GetLife );
|
||||
ADD_METHOD( IsInDanger );
|
||||
ADD_METHOD( IsHot );
|
||||
ADD_METHOD( IsFailing );
|
||||
ADD_METHOD( GetLife );
|
||||
ADD_METHOD( IsInDanger );
|
||||
ADD_METHOD( IsHot );
|
||||
ADD_METHOD( IsFailing );
|
||||
}
|
||||
};
|
||||
|
||||
|
||||
+11
-11
@@ -17,14 +17,14 @@
|
||||
const int MAX_SONGS_TO_SHOW = 5; // In summary, we show last 3 stages, plus extra stages if passed
|
||||
enum JudgmentLine
|
||||
{
|
||||
JudgmentLine_W1,
|
||||
JudgmentLine_W2,
|
||||
JudgmentLine_W3,
|
||||
JudgmentLine_W4,
|
||||
JudgmentLine_W5,
|
||||
JudgmentLine_Miss,
|
||||
JudgmentLine_Held,
|
||||
JudgmentLine_MaxCombo,
|
||||
JudgmentLine_W1,
|
||||
JudgmentLine_W2,
|
||||
JudgmentLine_W3,
|
||||
JudgmentLine_W4,
|
||||
JudgmentLine_W5,
|
||||
JudgmentLine_Miss,
|
||||
JudgmentLine_Held,
|
||||
JudgmentLine_MaxCombo,
|
||||
NUM_JudgmentLine,
|
||||
JudgmentLine_Invalid
|
||||
};
|
||||
@@ -69,7 +69,7 @@ protected:
|
||||
|
||||
// grade area
|
||||
AutoActor m_sprGradeFrame[NUM_PLAYERS];
|
||||
GradeDisplay m_Grades[NUM_PLAYERS];
|
||||
GradeDisplay m_Grades[NUM_PLAYERS];
|
||||
|
||||
// points area
|
||||
bool m_bNewSongsUnlocked;
|
||||
@@ -91,7 +91,7 @@ protected:
|
||||
|
||||
// judgment area
|
||||
AutoActor m_sprSharedJudgmentLineLabels[NUM_JudgmentLine];
|
||||
RollingNumbers m_textJudgmentLineNumber[NUM_JudgmentLine][NUM_PLAYERS];
|
||||
RollingNumbers m_textJudgmentLineNumber[NUM_JudgmentLine][NUM_PLAYERS];
|
||||
|
||||
// stats area
|
||||
AutoActor m_sprDetailFrame[NUM_PLAYERS];
|
||||
@@ -99,7 +99,7 @@ protected:
|
||||
|
||||
// score area
|
||||
AutoActor m_sprScoreLabel;
|
||||
RollingNumbers m_textScore[NUM_PLAYERS];
|
||||
RollingNumbers m_textScore[NUM_PLAYERS];
|
||||
|
||||
// time area
|
||||
AutoActor m_sprTimeLabel;
|
||||
|
||||
@@ -66,13 +66,13 @@ public:
|
||||
// Lua
|
||||
void PushSelf( lua_State *L );
|
||||
|
||||
PlayerNumber m_pn;
|
||||
MultiPlayer m_mp;
|
||||
bool m_bIsDummy;
|
||||
PlayerNumber m_pn;
|
||||
MultiPlayer m_mp;
|
||||
bool m_bIsDummy;
|
||||
int m_iDummyIndex;
|
||||
int m_iAddToDifficulty; // if > 0, use the Nth harder Steps
|
||||
bool m_bPlayerEnabled; // IsEnabled cache for iterators
|
||||
PlayerState m_PlayerStateDummy;
|
||||
bool m_bPlayerEnabled; // IsEnabled cache for iterators
|
||||
PlayerState m_PlayerStateDummy;
|
||||
PlayerStageStats m_PlayerStageStatsDummy;
|
||||
SoundEffectControl m_SoundEffectControl;
|
||||
|
||||
@@ -83,8 +83,8 @@ public:
|
||||
BitmapText *m_ptextCourseSongNumber;
|
||||
BitmapText *m_ptextStepsDescription;
|
||||
|
||||
ScoreDisplay *m_pPrimaryScoreDisplay;
|
||||
ScoreDisplay *m_pSecondaryScoreDisplay;
|
||||
ScoreDisplay *m_pPrimaryScoreDisplay;
|
||||
ScoreDisplay *m_pSecondaryScoreDisplay;
|
||||
ScoreKeeper *m_pPrimaryScoreKeeper;
|
||||
ScoreKeeper *m_pSecondaryScoreKeeper;
|
||||
BitmapText *m_ptextPlayerOptions;
|
||||
|
||||
Reference in New Issue
Block a user