add bAllowHopo to fix hopo highlighing showing for Game types that don't support hopos
This commit is contained in:
@@ -33,6 +33,7 @@ public:
|
|||||||
const char *m_szName;
|
const char *m_szName;
|
||||||
|
|
||||||
bool m_bCountNotesSeparately; // Count multiple notes in a row as separate notes or as one note
|
bool m_bCountNotesSeparately; // Count multiple notes in a row as separate notes or as one note
|
||||||
|
bool m_bAllowHopos; // allow Hammer-ons and Pull-offs? Only useful for guitar type input.
|
||||||
InputScheme m_InputScheme;
|
InputScheme m_InputScheme;
|
||||||
|
|
||||||
TapNoteScore MapTapNoteScore( TapNoteScore tns ) const;
|
TapNoteScore MapTapNoteScore( TapNoteScore tns ) const;
|
||||||
|
|||||||
@@ -116,6 +116,7 @@ static Game g_Games[NUM_GAMES] =
|
|||||||
{ // GAME_DANCE
|
{ // GAME_DANCE
|
||||||
"dance", // m_szName
|
"dance", // m_szName
|
||||||
false, // m_bCountNotesSeparately
|
false, // m_bCountNotesSeparately
|
||||||
|
false, // m_bAllowHopos
|
||||||
{ // m_InputScheme
|
{ // m_InputScheme
|
||||||
"dance", // m_szName
|
"dance", // m_szName
|
||||||
NUM_DANCE_BUTTONS, // m_iButtonsPerController
|
NUM_DANCE_BUTTONS, // m_iButtonsPerController
|
||||||
@@ -168,6 +169,7 @@ static Game g_Games[NUM_GAMES] =
|
|||||||
{ // GAME_PUMP
|
{ // GAME_PUMP
|
||||||
"pump", // m_szName
|
"pump", // m_szName
|
||||||
false, // m_bCountNotesSeparately
|
false, // m_bCountNotesSeparately
|
||||||
|
false, // m_bAllowHopos
|
||||||
{ // m_InputScheme
|
{ // m_InputScheme
|
||||||
"pump", // m_szName
|
"pump", // m_szName
|
||||||
NUM_PUMP_BUTTONS, // m_iButtonsPerController
|
NUM_PUMP_BUTTONS, // m_iButtonsPerController
|
||||||
@@ -219,6 +221,7 @@ static Game g_Games[NUM_GAMES] =
|
|||||||
{
|
{
|
||||||
"ez2", // m_szName
|
"ez2", // m_szName
|
||||||
false, // m_bCountNotesSeparately
|
false, // m_bCountNotesSeparately
|
||||||
|
false, // m_bAllowHopos
|
||||||
{ // m_InputScheme
|
{ // m_InputScheme
|
||||||
"ez2", // m_szName
|
"ez2", // m_szName
|
||||||
NUM_EZ2_BUTTONS, // m_iButtonsPerController
|
NUM_EZ2_BUTTONS, // m_iButtonsPerController
|
||||||
@@ -272,6 +275,7 @@ static Game g_Games[NUM_GAMES] =
|
|||||||
{ // GAME_PARA
|
{ // GAME_PARA
|
||||||
"para", // m_szName
|
"para", // m_szName
|
||||||
false, // m_bCountNotesSeparately
|
false, // m_bCountNotesSeparately
|
||||||
|
false, // m_bAllowHopos
|
||||||
{ // m_InputScheme
|
{ // m_InputScheme
|
||||||
"para", // m_szName
|
"para", // m_szName
|
||||||
NUM_PARA_BUTTONS, // m_iButtonsPerController
|
NUM_PARA_BUTTONS, // m_iButtonsPerController
|
||||||
@@ -323,6 +327,7 @@ static Game g_Games[NUM_GAMES] =
|
|||||||
{ // GAME_DS3DDX
|
{ // GAME_DS3DDX
|
||||||
"ds3ddx", // m_szName
|
"ds3ddx", // m_szName
|
||||||
false, // m_bCountNotesSeparately
|
false, // m_bCountNotesSeparately
|
||||||
|
false, // m_bAllowHopos
|
||||||
{ // m_InputScheme
|
{ // m_InputScheme
|
||||||
"ds3ddx", // m_szName
|
"ds3ddx", // m_szName
|
||||||
NUM_DS3DDX_BUTTONS, // m_iButtonsPerController
|
NUM_DS3DDX_BUTTONS, // m_iButtonsPerController
|
||||||
@@ -377,6 +382,7 @@ static Game g_Games[NUM_GAMES] =
|
|||||||
{ // GAME_BEAT
|
{ // GAME_BEAT
|
||||||
"beat", // m_szName
|
"beat", // m_szName
|
||||||
true, // m_bCountNotesSeparately
|
true, // m_bCountNotesSeparately
|
||||||
|
false, // m_bAllowHopos
|
||||||
{ // m_InputScheme
|
{ // m_InputScheme
|
||||||
"beat", // m_szName
|
"beat", // m_szName
|
||||||
NUM_BEAT_BUTTONS, // m_iButtonsPerController
|
NUM_BEAT_BUTTONS, // m_iButtonsPerController
|
||||||
@@ -432,6 +438,7 @@ static Game g_Games[NUM_GAMES] =
|
|||||||
{ // GAME_MANIAX
|
{ // GAME_MANIAX
|
||||||
"maniax", // m_szName
|
"maniax", // m_szName
|
||||||
false, // m_bCountNotesSeparately
|
false, // m_bCountNotesSeparately
|
||||||
|
false, // m_bAllowHopos
|
||||||
{ // m_InputScheme
|
{ // m_InputScheme
|
||||||
"maniax", // m_szName
|
"maniax", // m_szName
|
||||||
NUM_MANIAX_BUTTONS, // m_iButtonsPerController
|
NUM_MANIAX_BUTTONS, // m_iButtonsPerController
|
||||||
@@ -482,6 +489,7 @@ static Game g_Games[NUM_GAMES] =
|
|||||||
{ // GAME_TECHNO
|
{ // GAME_TECHNO
|
||||||
"techno", // m_szName
|
"techno", // m_szName
|
||||||
false, // m_bCountNotesSeparately
|
false, // m_bCountNotesSeparately
|
||||||
|
false, // m_bAllowHopos
|
||||||
{ // m_InputScheme
|
{ // m_InputScheme
|
||||||
"techno", // m_szName
|
"techno", // m_szName
|
||||||
NUM_TECHNO_BUTTONS, // m_iButtonsPerController
|
NUM_TECHNO_BUTTONS, // m_iButtonsPerController
|
||||||
@@ -537,6 +545,7 @@ static Game g_Games[NUM_GAMES] =
|
|||||||
{ // GAME_POPN
|
{ // GAME_POPN
|
||||||
"popn", // m_szName
|
"popn", // m_szName
|
||||||
true, // m_bCountNotesSeparately
|
true, // m_bCountNotesSeparately
|
||||||
|
false, // m_bAllowHopos
|
||||||
{ // m_InputScheme
|
{ // m_InputScheme
|
||||||
"popn", // m_szName
|
"popn", // m_szName
|
||||||
NUM_POPN_BUTTONS, // m_iButtonsPerController
|
NUM_POPN_BUTTONS, // m_iButtonsPerController
|
||||||
@@ -592,6 +601,7 @@ static Game g_Games[NUM_GAMES] =
|
|||||||
{ // GAME_LIGHTS
|
{ // GAME_LIGHTS
|
||||||
"lights", // m_szName
|
"lights", // m_szName
|
||||||
false, // m_bCountNotesSeparately
|
false, // m_bCountNotesSeparately
|
||||||
|
false, // m_bAllowHopos
|
||||||
{ // m_InputScheme
|
{ // m_InputScheme
|
||||||
"lights", // m_szName
|
"lights", // m_szName
|
||||||
NUM_LIGHTS_BUTTONS, // m_iButtonsPerController
|
NUM_LIGHTS_BUTTONS, // m_iButtonsPerController
|
||||||
|
|||||||
@@ -392,7 +392,8 @@ void Player::Load()
|
|||||||
NoteDataUtil::TransformNoteData( m_NoteData, m_pPlayerState->m_PlayerOptions.GetStage(), GAMESTATE->GetCurrentStyle()->m_StepsType );
|
NoteDataUtil::TransformNoteData( m_NoteData, m_pPlayerState->m_PlayerOptions.GetStage(), GAMESTATE->GetCurrentStyle()->m_StepsType );
|
||||||
|
|
||||||
const Song* pSong = GAMESTATE->m_pCurSong;
|
const Song* pSong = GAMESTATE->m_pCurSong;
|
||||||
NoteDataUtil::SetHopoPossibleFlags( pSong, m_NoteData );
|
if( GAMESTATE->m_pCurGame->m_bAllowHopos )
|
||||||
|
NoteDataUtil::SetHopoPossibleFlags( pSong, m_NoteData );
|
||||||
|
|
||||||
switch( GAMESTATE->m_PlayMode )
|
switch( GAMESTATE->m_PlayMode )
|
||||||
{
|
{
|
||||||
|
|||||||
Reference in New Issue
Block a user