moved PlayerNumber into a separate header to reduce dependences on GameConstantsAndTypes.h

default mappings for menu buttons
items in battle now have a duration
fix VC6 compile errors

stepmania/src/Combo.cpp

@@ -159,13 +159,16 @@ void Combo::SetScore( TapNoteScore score, int iNumNotesInThisRow, Inventory* pIn
 	case TNS_BOO:
 	case TNS_MISS:
 		{
-			// end combo
-			bool bItemAcquired = false;
-			if( pInventory )
-				bItemAcquired = pInventory->OnComboBroken( m_PlayerNumber, m_iCurCombo );
-
-			if( !bItemAcquired  && m_iCurCombo>50 )		// don't play "combo stopped" if we got an item
-				SCREENMAN->SendMessageToTopScreen( SM_ComboStopped, 0 );
+			// don't play "combo stopped" in battle
+			switch( GAMESTATE->m_PlayMode )
+			{
+			case PLAY_MODE_BATTLE:
+				if( pInventory )
+					pInventory->OnComboBroken( m_PlayerNumber, m_iCurCombo );
+			default:
+				if( m_iCurCombo>50 )
+					SCREENMAN->SendMessageToTopScreen( SM_ComboStopped, 0 );
+			}
 
 			m_iCurCombo = 0;