work around odd compiler problem

This commit is contained in:
Glenn Maynard
2004-06-19 23:04:10 +00:00
parent 48408e4da5
commit ec3268c86c
4 changed files with 8 additions and 4 deletions
+2 -1
View File
@@ -27,7 +27,8 @@ void GhostArrowRow::Load( PlayerNumber pn, CString NoteSkin, float fYReverseOffs
// init arrows
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 == "")
Button = NoteSkinManager::ColToButtonName(c);
+2 -1
View File
@@ -130,7 +130,8 @@ void NoteDisplay::Load( int iColNum, PlayerNumber pn, CString NoteSkin, float fY
m_fYReverseOffsetPixels = fYReverseOffsetPixels;
/* 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 == "")
Button = NoteSkinManager::ColToButtonName(iColNum);
+2 -1
View File
@@ -204,7 +204,8 @@ void PlayerMinus::Load( PlayerNumber pn, const NoteData* pNoteData, LifeMeter* p
int 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
+2 -1
View File
@@ -20,7 +20,8 @@ bool ReceptorArrow::Load( CString NoteSkin, PlayerNumber pn, int iColNo )
m_PlayerNumber = pn;
m_iColNo = iColNo;
CString sButton = g_NoteFieldMode[pn].GrayButtonNames[iColNo];
NoteFieldMode &mode = g_NoteFieldMode[pn];
CString sButton = mode.GrayButtonNames[iColNo];
if( sButton == "" )
sButton = NoteSkinManager::ColToButtonName( iColNo );