actions/itgmania212121
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

better interface

Browse Source
This commit is contained in:
Glenn Maynard
2006-08-16 21:36:15 +00:00
parent 65f492d38f
commit aec5736793
4 changed files with 41 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/DifficultyIcon.cpp
+28 -11
View File
@@ -17,6 +17,7 @@ REGISTER_ACTOR_CLASS(DifficultyIcon)
DifficultyIcon::DifficultyIcon()
{
m_bBlank = false;
m_PlayerNumber = PLAYER_1;
}
bool DifficultyIcon::Load( RString sPath )
@@ -59,30 +60,42 @@ void DifficultyIcon::LoadFromNode( const RString& sDir, const XNode* pNode )
Actor::LoadFromNode( sDir, pNode );
}
void DifficultyIcon::SetPlayer( PlayerNumber pn )
{
m_PlayerNumber = pn;
}
void DifficultyIcon::SetFromSteps( PlayerNumber pn, const Steps* pSteps )
{
SetPlayer( pn );
if( pSteps == NULL )
m_bBlank = true;
Unset();
else
SetFromDifficulty( pn, pSteps->GetDifficulty() );
SetFromDifficulty( pSteps->GetDifficulty() );
}
void DifficultyIcon::SetFromTrail( PlayerNumber pn, const Trail* pTrail )
{
SetPlayer( pn );
if( pTrail == NULL )
m_bBlank = true;
Unset();
else
SetFromDifficulty( pn, pTrail->m_CourseDifficulty );
SetFromDifficulty( pTrail->m_CourseDifficulty );
}
void DifficultyIcon::SetFromDifficulty( PlayerNumber pn, Difficulty dc )
void DifficultyIcon::Unset()
{
m_bBlank = true;
}
void DifficultyIcon::SetFromDifficulty( Difficulty dc )
{
m_bBlank = false;
switch( GetNumStates() )
{
case NUM_Difficulty: SetState( dc ); break;
case NUM_Difficulty*2: SetState( dc*2+pn ); break;
default: m_bBlank = true; break;
case NUM_Difficulty: SetState( dc ); break;
case NUM_Difficulty*2: SetState( dc*2+m_PlayerNumber ); break;
default: m_bBlank = true; break;
}
}
@@ -98,7 +111,7 @@ public:
{
if( lua_isnil(L,1) )
{
p->SetFromSteps( PLAYER_1, NULL );
p->Unset();
}
else
{
@@ -111,7 +124,7 @@ public:
{
if( lua_isnil(L,1) )
{
p->SetFromTrail( PLAYER_1, NULL );
p->Unset();
}
else
{
@@ -120,10 +133,14 @@ public:
}
return 0;
}
static int SetFromDifficulty( T* p, lua_State *L ) { p->SetFromDifficulty( PLAYER_1, (Difficulty)IArg(1) ); return 0; }
static int Unset( T* p, lua_State *L ) { p->Unset(); return 0; }
static int SetPlayer( T* p, lua_State *L ) { p->SetPlayer( (PlayerNumber)IArg(1) ); return 0; }
static int SetFromDifficulty( T* p, lua_State *L ) { p->SetFromDifficulty( (Difficulty)IArg(1) ); return 0; }
static void Register(lua_State *L)
{
ADD_METHOD( Unset );
ADD_METHOD( SetPlayer );
ADD_METHOD( SetFromSteps );
ADD_METHOD( SetFromTrail );
ADD_METHOD( SetFromDifficulty );
stepmania/src/DifficultyIcon.h
+4 -1
View File
@@ -21,15 +21,18 @@ public:
virtual void LoadFromNode( const RString& sDir, const XNode* pNode );
virtual Actor *Copy() const;
void SetPlayer( PlayerNumber pn );
void Unset();
void SetFromSteps( PlayerNumber pn, const Steps* pSteps );
void SetFromTrail( PlayerNumber pn, const Trail* pTrail );
void SetFromDifficulty( PlayerNumber pn, Difficulty dc );
void SetFromDifficulty( Difficulty dc );
// Lua
void PushSelf( lua_State *L );
protected:
bool m_bBlank;
PlayerNumber m_PlayerNumber;
};
#endif
stepmania/src/ScreenNetEvaluation.cpp
+4 -1
View File
@@ -190,7 +190,10 @@ void ScreenNetEvaluation::UpdateStats()
//Values greater than 6 will cause crash
if ( NSMAN->m_EvalPlayerData[m_iCurrentPlayer].difficulty < 6 )
m_DifficultyIcon[m_pActivePlayer].SetFromDifficulty( m_pActivePlayer, NSMAN->m_EvalPlayerData[m_iCurrentPlayer].difficulty );
{
m_DifficultyIcon[m_pActivePlayer].SetPlayer( m_pActivePlayer );
m_DifficultyIcon[m_pActivePlayer].SetFromDifficulty( NSMAN->m_EvalPlayerData[m_iCurrentPlayer].difficulty );
}
for (int j=0; j<NETNUMTAPSCORES; ++j)
{
stepmania/src/ScreenNetSelectMusic.cpp
+5 -2
View File
@@ -494,8 +494,11 @@ void ScreenNetSelectMusic::UpdateDifficulties( PlayerNumber pn )
m_DifficultyIcon[pn].SetFromSteps( pn, NULL ); //It will blank it out
return;
}
if ( ( m_DC[pn] < DIFFICULTY_EDIT ) && ( m_DC[pn] >= DIFFICULTY_BEGINNER ) )
m_DifficultyIcon[pn].SetFromDifficulty( pn, m_DC[pn] );
if ( m_DC[pn] < DIFFICULTY_EDIT && m_DC[pn] >= DIFFICULTY_BEGINNER )
{
m_DifficultyIcon[pn].SetPlayer( pn );
m_DifficultyIcon[pn].SetFromDifficulty( m_DC[pn] );
}
else
m_DifficultyIcon[pn].SetFromSteps( pn, NULL ); //It will blank it out