diff --git a/Themes/_fallback/metrics.ini b/Themes/_fallback/metrics.ini index d5a6276eda..226466f68e 100644 --- a/Themes/_fallback/metrics.ini +++ b/Themes/_fallback/metrics.ini @@ -2361,9 +2361,9 @@ Mines,4="mod,attackmines;name,AttackMines" Attacks="3" AttacksDefault="mod,songattacks" -Attacks,3="mod,no randomattacks,no songattacks;name,Off" -Attacks,2="mod,randomattacks;name,RandomAttacks" Attacks,1="name,SongAttacks" +Attacks,2="mod,randomattacks;name,RandomAttacks" +Attacks,3="mod,no randomattacks,no songattacks;name,Off" PlayerAutoPlay="2" PlayerAutoPlayDefault="mod,no playerautoplay" diff --git a/src/PlayerOptions.cpp b/src/PlayerOptions.cpp index 51d89090d3..4976a5134d 100644 --- a/src/PlayerOptions.cpp +++ b/src/PlayerOptions.cpp @@ -37,7 +37,7 @@ void PlayerOptions::Init() m_fBlind = 0; m_SpeedfBlind = 1.0f; m_fCover = 0; m_SpeedfCover = 1.0f; m_fRandAttack = 0; m_SpeedfRandAttack = 1.0f; - m_fSongAttack = 0; m_SpeedfSongAttack = 1.0f; + m_fSongAttack = 1; m_SpeedfSongAttack = 1.0f; m_fPlayerAutoPlay = 0; m_SpeedfPlayerAutoPlay = 1.0f; m_bSetTiltOrSkew = false; m_fPerspectiveTilt = 0; m_SpeedfPerspectiveTilt = 1.0f; diff --git a/src/PlayerOptions.h b/src/PlayerOptions.h index 9f4017bc42..d1c8f2ee98 100644 --- a/src/PlayerOptions.h +++ b/src/PlayerOptions.h @@ -27,7 +27,7 @@ public: m_fBlind(0), m_SpeedfBlind(1.0f), m_fCover(0), m_SpeedfCover(1.0f), m_fRandAttack(0), m_SpeedfRandAttack(1.0f), - m_fSongAttack(0), m_SpeedfSongAttack(1.0f), + m_fSongAttack(1), m_SpeedfSongAttack(1.0f), m_fPlayerAutoPlay(0), m_SpeedfPlayerAutoPlay(1.0f), m_bSetTiltOrSkew(false), m_fPerspectiveTilt(0), m_SpeedfPerspectiveTilt(1.0f),