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

more work on Battle

Browse Source
This commit is contained in:
Chris Danford
2003-02-25 02:51:04 +00:00
parent 5f15c92404
commit 1fca3d67c5
17 changed files with 171 additions and 120 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/ScreenGameplay.cpp
+4 -4
View File
@@ -330,8 +330,6 @@ ScreenGameplay::ScreenGameplay( bool bDemonstration )
ASSERT(0);
}
GAMESTATE->m_Inventory[p].RefreshPossibleItems();
m_pScoreDisplay[p]->Init( (PlayerNumber)p );
m_pScoreDisplay[p]->SetXY( SCORE_X(p), SCORE_Y(p,bExtra) );
m_pScoreDisplay[p]->SetZoom( SCORE_ZOOM );
@@ -475,6 +473,8 @@ ScreenGameplay::ScreenGameplay( bool bDemonstration )
StartPlayingSong( 0, 0 );
}
m_Inventory.RefreshPossibleItems();
m_iRowLastCrossed = -1;
@@ -589,7 +589,7 @@ void ScreenGameplay::LoadNextSong()
NoteData pNewNoteData;
pStyleDef->GetTransformedNoteDataForStyle( (PlayerNumber)p, &pOriginalNoteData, &pNewNoteData );
m_Player[p].Load( (PlayerNumber)p, &pNewNoteData, m_pLifeMeter[p], m_pScoreDisplay[p] );
m_Player[p].Load( (PlayerNumber)p, &pNewNoteData, m_pLifeMeter[p], m_pScoreDisplay[p], &m_Inventory );
}
/* Set up song-specific graphics. */
@@ -1027,7 +1027,7 @@ void ScreenGameplay::Input( const DeviceInput& DeviceI, const InputEventType typ
}
if( iItemSlot != -1 )
GAMESTATE->m_Inventory[MenuI.player].UseItem( MenuI.player, iItemSlot );
m_Inventory.UseItem( MenuI.player, iItemSlot );
}
}