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

Fixed conflicts to merge kickbox in.

Browse Source
This commit is contained in:
Kyzentun
2015-01-27 18:03:41 -07:00
parent 80a02b40bb cf66c5e78d
commit 40b25e6220
269 changed files with 2639 additions and 514 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/GhostArrowRow.cpp
+6 -5
View File
@@ -15,17 +15,18 @@ void GhostArrowRow::Load( const PlayerState* pPlayerState, float fYReverseOffset
m_pPlayerState = pPlayerState;
m_fYReverseOffsetPixels = fYReverseOffset;
const Style* pStyle = GAMESTATE->GetCurrentStyle();
const PlayerNumber pn = m_pPlayerState->m_PlayerNumber;
const Style* pStyle = GAMESTATE->GetCurrentStyle(pn);
NOTESKIN->SetPlayerNumber( pn );
// init arrows
for( int c=0; c<pStyle->m_iColsPerPlayer; c++ )
{
const RString &sButton = GAMESTATE->GetCurrentStyle()->ColToButtonName( c );
const RString &sButton = GAMESTATE->GetCurrentStyle(pn)->ColToButtonName( c );
const GameInput GameI = GAMESTATE->GetCurrentStyle()->StyleInputToGameInput( c, pn );
NOTESKIN->SetGameController( GameI.controller );
vector<GameInput> GameI;
GAMESTATE->GetCurrentStyle(pn)->StyleInputToGameInput( c, pn, GameI );
NOTESKIN->SetGameController( GameI[0].controller );
m_bHoldShowing.push_back( TapNoteSubType_Invalid );
m_bLastHoldShowing.push_back( TapNoteSubType_Invalid );
@@ -89,7 +90,7 @@ void GhostArrowRow::Update( float fDeltaTime )
void GhostArrowRow::DrawPrimitives()
{
const Style* pStyle = GAMESTATE->GetCurrentStyle();
const Style* pStyle = GAMESTATE->GetCurrentStyle(m_pPlayerState->m_PlayerNumber);
for( unsigned i=0; i<m_Ghost.size(); i++ )
{
const int c = pStyle->m_iColumnDrawOrder[i];