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/ReceptorArrowRow.cpp
+2 -2
View File
@@ -19,7 +19,7 @@ void ReceptorArrowRow::Load( const PlayerState* pPlayerState, float fYReverseOff
m_pPlayerState = pPlayerState;
m_fYReverseOffsetPixels = fYReverseOffset;
const Style* pStyle = GAMESTATE->GetCurrentStyle();
const Style* pStyle = GAMESTATE->GetCurrentStyle(pPlayerState->m_PlayerNumber);
for( int c=0; c<pStyle->m_iColsPerPlayer; c++ )
{
@@ -69,7 +69,7 @@ void ReceptorArrowRow::Update( float fDeltaTime )
void ReceptorArrowRow::DrawPrimitives()
{
const Style* pStyle = GAMESTATE->GetCurrentStyle();
const Style* pStyle = GAMESTATE->GetCurrentStyle(m_pPlayerState->m_PlayerNumber);
for( unsigned i=0; i<m_ReceptorArrow.size(); i++ )
{
const int c = pStyle->m_iColumnDrawOrder[i];