work around odd compiler problem
This commit is contained in:
@@ -27,7 +27,8 @@ void GhostArrowRow::Load( PlayerNumber pn, CString NoteSkin, float fYReverseOffs
|
|||||||
// init arrows
|
// init arrows
|
||||||
for( int c=0; c<m_iNumCols; c++ )
|
for( int c=0; c<m_iNumCols; c++ )
|
||||||
{
|
{
|
||||||
CString Button = g_NoteFieldMode[m_PlayerNumber].GhostButtonNames[c];
|
NoteFieldMode &mode = g_NoteFieldMode[pn];
|
||||||
|
CString Button = mode.GhostButtonNames[c];
|
||||||
if(Button == "")
|
if(Button == "")
|
||||||
Button = NoteSkinManager::ColToButtonName(c);
|
Button = NoteSkinManager::ColToButtonName(c);
|
||||||
|
|
||||||
|
|||||||
@@ -130,7 +130,8 @@ void NoteDisplay::Load( int iColNum, PlayerNumber pn, CString NoteSkin, float fY
|
|||||||
m_fYReverseOffsetPixels = fYReverseOffsetPixels;
|
m_fYReverseOffsetPixels = fYReverseOffsetPixels;
|
||||||
|
|
||||||
/* Normally, this is empty and we use the style table entry via ColToButtonName. */
|
/* Normally, this is empty and we use the style table entry via ColToButtonName. */
|
||||||
CString Button = g_NoteFieldMode[m_PlayerNumber].NoteButtonNames[iColNum];
|
NoteFieldMode &mode = g_NoteFieldMode[pn];
|
||||||
|
CString Button = mode.NoteButtonNames[iColNum];
|
||||||
if(Button == "")
|
if(Button == "")
|
||||||
Button = NoteSkinManager::ColToButtonName(iColNum);
|
Button = NoteSkinManager::ColToButtonName(iColNum);
|
||||||
|
|
||||||
|
|||||||
@@ -204,7 +204,8 @@ void PlayerMinus::Load( PlayerNumber pn, const NoteData* pNoteData, LifeMeter* p
|
|||||||
int c;
|
int c;
|
||||||
for( c=0; c<pStyleDef->m_iColsPerPlayer; c++ )
|
for( c=0; c<pStyleDef->m_iColsPerPlayer; c++ )
|
||||||
{
|
{
|
||||||
m_HoldJudgment[c].Command( g_NoteFieldMode[pn].m_HoldJudgmentCmd[c] );
|
NoteFieldMode &mode = g_NoteFieldMode[pn];
|
||||||
|
m_HoldJudgment[c].Command( mode.m_HoldJudgmentCmd[c] );
|
||||||
}
|
}
|
||||||
|
|
||||||
// Need to set Y positions of all these elements in Update since
|
// Need to set Y positions of all these elements in Update since
|
||||||
|
|||||||
@@ -20,7 +20,8 @@ bool ReceptorArrow::Load( CString NoteSkin, PlayerNumber pn, int iColNo )
|
|||||||
m_PlayerNumber = pn;
|
m_PlayerNumber = pn;
|
||||||
m_iColNo = iColNo;
|
m_iColNo = iColNo;
|
||||||
|
|
||||||
CString sButton = g_NoteFieldMode[pn].GrayButtonNames[iColNo];
|
NoteFieldMode &mode = g_NoteFieldMode[pn];
|
||||||
|
CString sButton = mode.GrayButtonNames[iColNo];
|
||||||
if( sButton == "" )
|
if( sButton == "" )
|
||||||
sButton = NoteSkinManager::ColToButtonName( iColNo );
|
sButton = NoteSkinManager::ColToButtonName( iColNo );
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user