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

Finish up the difficulty chage Sean was working on.

Browse Source
This commit is contained in:
Thad Ward
2003-08-29 02:04:13 +00:00
parent 229c656d25
commit 79b669d3bc
2 changed files with 14 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/BeginnerHelper.cpp
+13 -13
View File
@@ -95,8 +95,6 @@ void BeginnerHelper::Initialize( int iDancePadType )
this->AddChild(&m_sStepCircle[sc]); this->AddChild(&m_sStepCircle[sc]);
}*/ }*/
Steps *Blahness;
// Load the DancePad // Load the DancePad
m_mDancePad.SetHorizAlign( align_left ); m_mDancePad.SetHorizAlign( align_left );
m_mDancePad.SetRotationX( DANCEPAD_ANGLE ); m_mDancePad.SetRotationX( DANCEPAD_ANGLE );
@@ -112,17 +110,15 @@ void BeginnerHelper::Initialize( int iDancePadType )
for( int pl=0; pl<NUM_PLAYERS; pl++ ) // Load players for( int pl=0; pl<NUM_PLAYERS; pl++ ) // Load players
{ {
if( !GAMESTATE->IsPlayerEnabled(pl))
continue;
// if there is no character set, try loading a random one. // if there is no character set, try loading a random one.
if( GAMESTATE->m_pCurCharacters[pl] == NULL ) if( GAMESTATE->m_pCurCharacters[pl] == NULL )
{ {
GAMESTATE->m_pCurCharacters[pl] = GAMESTATE->GetRandomCharacter(); GAMESTATE->m_pCurCharacters[pl] = GAMESTATE->GetRandomCharacter();
} }
LOG->Trace( "Blahness" );
Blahness = GAMESTATE->m_pCurNotes[pl];
LOG->Trace( "Blahness2" );
LOG->Trace( "Players: %d, Player: %d",NUM_PLAYERS,pl );
LOG->Trace ("Blahness Difficulty: %d",Blahness->GetDifficulty() );
if( GAMESTATE->m_pCurNotes[pl]->GetDifficulty() == DIFFICULTY_BEGINNER && GAMESTATE->m_pCurCharacters[pl] != NULL ) if( GAMESTATE->m_pCurNotes[pl]->GetDifficulty() == DIFFICULTY_BEGINNER && GAMESTATE->m_pCurCharacters[pl] != NULL )
{ {
// Load textures // Load textures
@@ -224,11 +220,9 @@ void BeginnerHelper::Update( float fDeltaTime )
if(!m_bInitialized) if(!m_bInitialized)
return; return;
float beat = fDeltaTime * GAMESTATE->m_fCurBPS;
for(int pn = 0; pn < NUM_PLAYERS; pn++ ) for(int pn = 0; pn < NUM_PLAYERS; pn++ )
{ {
if( (!GAMESTATE->IsPlayerEnabled(pn)) || (GAMESTATE->m_pCurNotes[pn]->GetDifficulty() != DIFFICULTY_BEGINNER) ) if( !( GAMESTATE->IsPlayerEnabled(pn) && GAMESTATE->m_pCurNotes[pn]->GetDifficulty() == DIFFICULTY_BEGINNER) )
continue; // skip continue; // skip
int iStep = 0; int iStep = 0;
@@ -253,11 +247,17 @@ void BeginnerHelper::Update( float fDeltaTime )
ActorFrame::Update( fDeltaTime ); ActorFrame::Update( fDeltaTime );
m_mDancePad.Update( fDeltaTime ); m_mDancePad.Update( fDeltaTime );
m_sFlash.Update( fDeltaTime ); m_sFlash.Update( fDeltaTime );
for( int scu=0; scu<NUM_PLAYERS*2; scu++ )
m_sStepCircle[scu].Update( beat ); float beat = fDeltaTime * GAMESTATE->m_fCurBPS;
for( int pu=0; pu<NUM_PLAYERS; pu++ ) for( int pu=0; pu<NUM_PLAYERS; pu++ )
{
if(!GAMESTATE->IsPlayerEnabled(pu))
continue;
m_mDancer[pu].Update( beat ); //Update dancers m_mDancer[pu].Update( beat ); //Update dancers
for( int scu=0; scu<2; scu++ )
m_sStepCircle[pu+scu].Update( beat );
}
} }
stepmania/src/ScreenGameplay.cpp
+1 -1
View File
@@ -784,7 +784,7 @@ void ScreenGameplay::LoadNextSong()
bool anybeginners = false; bool anybeginners = false;
for( int pb=0; pb<NUM_PLAYERS; pb++ ) for( int pb=0; pb<NUM_PLAYERS; pb++ )
if( GAMESTATE->IsPlayerEnabled(pb) && GAMESTATE->m_PreferredDifficulty[pb] == DIFFICULTY_BEGINNER ) if( GAMESTATE->IsPlayerEnabled(pb) && GAMESTATE->m_pCurNotes[pb]->GetDifficulty() == DIFFICULTY_BEGINNER )
{ {
anybeginners = true; anybeginners = true;
m_BeginnerHelper.AddPlayer( pb, &m_Player[pb] ); m_BeginnerHelper.AddPlayer( pb, &m_Player[pb] );