various other cleanup
This commit is contained in:
@@ -48,9 +48,7 @@ public:
|
|||||||
float GetSecondsToDestination() const;
|
float GetSecondsToDestination() const;
|
||||||
int GetNumItems() const { return m_iNumItems; }
|
int GetNumItems() const { return m_iNumItems; }
|
||||||
|
|
||||||
//
|
|
||||||
// Commands
|
// Commands
|
||||||
//
|
|
||||||
void PushSelf( lua_State *L );
|
void PushSelf( lua_State *L );
|
||||||
|
|
||||||
protected:
|
protected:
|
||||||
|
|||||||
+3
-3
@@ -102,7 +102,7 @@ void BGAnimation::LoadFromAniDir( const RString &_sAniDir )
|
|||||||
|
|
||||||
if( DoesFileExist(sPathToIni) )
|
if( DoesFileExist(sPathToIni) )
|
||||||
{
|
{
|
||||||
// This is a new style BGAnimation (using .ini)
|
// This is a 3.9-style BGAnimation (using .ini)
|
||||||
IniFile ini;
|
IniFile ini;
|
||||||
ini.ReadFile( sPathToIni );
|
ini.ReadFile( sPathToIni );
|
||||||
|
|
||||||
@@ -117,7 +117,7 @@ void BGAnimation::LoadFromAniDir( const RString &_sAniDir )
|
|||||||
}
|
}
|
||||||
else
|
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
|
// loading a directory of layers
|
||||||
vector<RString> asImagePaths;
|
vector<RString> asImagePaths;
|
||||||
@@ -154,7 +154,7 @@ void BGAnimation::LoadFromNode( const XNode* pNode )
|
|||||||
ActorFrame::LoadFromNode( pNode );
|
ActorFrame::LoadFromNode( pNode );
|
||||||
|
|
||||||
/* Backwards-compatibility: if a "LengthSeconds" value is present, create a dummy
|
/* 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;
|
float fLengthSeconds = 0;
|
||||||
if( pNode->GetAttrValue( "LengthSeconds", fLengthSeconds ) )
|
if( pNode->GetAttrValue( "LengthSeconds", fLengthSeconds ) )
|
||||||
{
|
{
|
||||||
|
|||||||
+1
-1
@@ -61,7 +61,7 @@ void Banner::LoadFromCachedBanner( const RString &sPath )
|
|||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
/* Try to load the low quality version. */
|
// Try to load the low quality version.
|
||||||
ID = BANNERCACHE->LoadCachedBanner( sPath );
|
ID = BANNERCACHE->LoadCachedBanner( sPath );
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
+4
-4
@@ -33,10 +33,10 @@ public:
|
|||||||
|
|
||||||
LunaLifeMeter()
|
LunaLifeMeter()
|
||||||
{
|
{
|
||||||
ADD_METHOD( GetLife );
|
ADD_METHOD( GetLife );
|
||||||
ADD_METHOD( IsInDanger );
|
ADD_METHOD( IsInDanger );
|
||||||
ADD_METHOD( IsHot );
|
ADD_METHOD( IsHot );
|
||||||
ADD_METHOD( IsFailing );
|
ADD_METHOD( IsFailing );
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|||||||
@@ -69,7 +69,7 @@ protected:
|
|||||||
|
|
||||||
// grade area
|
// grade area
|
||||||
AutoActor m_sprGradeFrame[NUM_PLAYERS];
|
AutoActor m_sprGradeFrame[NUM_PLAYERS];
|
||||||
GradeDisplay m_Grades[NUM_PLAYERS];
|
GradeDisplay m_Grades[NUM_PLAYERS];
|
||||||
|
|
||||||
// points area
|
// points area
|
||||||
bool m_bNewSongsUnlocked;
|
bool m_bNewSongsUnlocked;
|
||||||
@@ -91,7 +91,7 @@ protected:
|
|||||||
|
|
||||||
// judgment area
|
// judgment area
|
||||||
AutoActor m_sprSharedJudgmentLineLabels[NUM_JudgmentLine];
|
AutoActor m_sprSharedJudgmentLineLabels[NUM_JudgmentLine];
|
||||||
RollingNumbers m_textJudgmentLineNumber[NUM_JudgmentLine][NUM_PLAYERS];
|
RollingNumbers m_textJudgmentLineNumber[NUM_JudgmentLine][NUM_PLAYERS];
|
||||||
|
|
||||||
// stats area
|
// stats area
|
||||||
AutoActor m_sprDetailFrame[NUM_PLAYERS];
|
AutoActor m_sprDetailFrame[NUM_PLAYERS];
|
||||||
@@ -99,7 +99,7 @@ protected:
|
|||||||
|
|
||||||
// score area
|
// score area
|
||||||
AutoActor m_sprScoreLabel;
|
AutoActor m_sprScoreLabel;
|
||||||
RollingNumbers m_textScore[NUM_PLAYERS];
|
RollingNumbers m_textScore[NUM_PLAYERS];
|
||||||
|
|
||||||
// time area
|
// time area
|
||||||
AutoActor m_sprTimeLabel;
|
AutoActor m_sprTimeLabel;
|
||||||
|
|||||||
@@ -66,13 +66,13 @@ public:
|
|||||||
// Lua
|
// Lua
|
||||||
void PushSelf( lua_State *L );
|
void PushSelf( lua_State *L );
|
||||||
|
|
||||||
PlayerNumber m_pn;
|
PlayerNumber m_pn;
|
||||||
MultiPlayer m_mp;
|
MultiPlayer m_mp;
|
||||||
bool m_bIsDummy;
|
bool m_bIsDummy;
|
||||||
int m_iDummyIndex;
|
int m_iDummyIndex;
|
||||||
int m_iAddToDifficulty; // if > 0, use the Nth harder Steps
|
int m_iAddToDifficulty; // if > 0, use the Nth harder Steps
|
||||||
bool m_bPlayerEnabled; // IsEnabled cache for iterators
|
bool m_bPlayerEnabled; // IsEnabled cache for iterators
|
||||||
PlayerState m_PlayerStateDummy;
|
PlayerState m_PlayerStateDummy;
|
||||||
PlayerStageStats m_PlayerStageStatsDummy;
|
PlayerStageStats m_PlayerStageStatsDummy;
|
||||||
SoundEffectControl m_SoundEffectControl;
|
SoundEffectControl m_SoundEffectControl;
|
||||||
|
|
||||||
@@ -83,8 +83,8 @@ public:
|
|||||||
BitmapText *m_ptextCourseSongNumber;
|
BitmapText *m_ptextCourseSongNumber;
|
||||||
BitmapText *m_ptextStepsDescription;
|
BitmapText *m_ptextStepsDescription;
|
||||||
|
|
||||||
ScoreDisplay *m_pPrimaryScoreDisplay;
|
ScoreDisplay *m_pPrimaryScoreDisplay;
|
||||||
ScoreDisplay *m_pSecondaryScoreDisplay;
|
ScoreDisplay *m_pSecondaryScoreDisplay;
|
||||||
ScoreKeeper *m_pPrimaryScoreKeeper;
|
ScoreKeeper *m_pPrimaryScoreKeeper;
|
||||||
ScoreKeeper *m_pSecondaryScoreKeeper;
|
ScoreKeeper *m_pSecondaryScoreKeeper;
|
||||||
BitmapText *m_ptextPlayerOptions;
|
BitmapText *m_ptextPlayerOptions;
|
||||||
|
|||||||
Reference in New Issue
Block a user