CONFLICT RESOLUTION (view entire LOG message to see):

GAMEMANAGER. we did different fixes. I merged the best of both ;)
EZ2DANCER columns now aligned correctly
EZ2DANCER stage screen stylization now underway
NOTE: This Release WILL NOT COMPILE. Some Members of RAGELOG and RAGESOUND have disappeared, and I don't know where to.
This commit is contained in:
Andrew Livy
2002-08-01 21:11:32 +00:00
parent 2d4eb7baff
commit 4343e5aebf
9 changed files with 329 additions and 35 deletions
+1 -1
View File
@@ -67,7 +67,7 @@ void NoteField::Load( NoteData* pNoteData, PlayerNumber pn, int iPixelsToDrawBeh
}
for( int i=0; i<MAX_HOLD_NOTES; i++ )
for( i=0; i<MAX_HOLD_NOTES; i++ )
m_fHoldNoteLife[i] = 1; // start with full life