actions/itgmania212121
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Rename to MinTNSToScoreNotes for the preference

Browse Source
This commit is contained in:
teejusb
2023-06-15 00:36:42 -07:00
parent d07cb4c02f
commit 492b391282
1 changed files with 16 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/Player.cpp
+16 -18
View File
@@ -146,21 +146,19 @@ void TimingWindowSecondsInit( std::size_t /*TimingWindow*/ i, RString &sNameOut,
} }
} }
TapNoteScore MinTnsToScoreTapNote(int i) { TapNoteScore ValidateMinTNSToScoreNotes(TapNoteScore tns) {
switch (i) { switch (tns) {
case 1: case TNS_W1:
return TNS_W1; case TNS_W2:
case 2: case TNS_W3:
return TNS_W2; case TNS_W4:
case 3: case TNS_W5:
return TNS_W3; case TNS_None:
case 4: break;
return TNS_W4;
case 5:
return TNS_W5;
default: default:
return TNS_None; return TNS_None;
} }
return tns;
} }
static Preference<float> m_fTimingWindowScale ( "TimingWindowScale", 1.0f ); static Preference<float> m_fTimingWindowScale ( "TimingWindowScale", 1.0f );
@@ -170,7 +168,7 @@ static Preference<float> m_fTimingWindowJump ( "TimingWindowJump", 0.25 );
static Preference<float> m_fMaxInputLatencySeconds ( "MaxInputLatencySeconds", 0.0 ); static Preference<float> m_fMaxInputLatencySeconds ( "MaxInputLatencySeconds", 0.0 );
static Preference<bool> g_bEnableAttackSoundPlayback ( "EnableAttackSounds", true ); static Preference<bool> g_bEnableAttackSoundPlayback ( "EnableAttackSounds", true );
static Preference<bool> g_bEnableMineSoundPlayback ( "EnableMineHitSound", true ); static Preference<bool> g_bEnableMineSoundPlayback ( "EnableMineHitSound", true );
static Preference<int> g_iMinTnsToScoreTapNote ( "MinTnsToScoreTapNote", 3 ); // Default to great and above. Use -1 to indicate None. static Preference<TapNoteScore> g_MinTNSToScoreNotes ( "MinTNSToScoreNotes", TNS_W3 ); // Default to great and above.
/** @brief How much life is in a hold note when you start on it? */ /** @brief How much life is in a hold note when you start on it? */
ThemeMetric<float> INITIAL_HOLD_LIFE ( "Player", "InitialHoldLife" ); ThemeMetric<float> INITIAL_HOLD_LIFE ( "Player", "InitialHoldLife" );
@@ -2490,15 +2488,15 @@ void Player::Step( int col, int row, const RageTimer &tm, bool bHeld, bool bRele
if( score != TNS_None) if( score != TNS_None)
{ {
TapNoteScore minTnsToScore = MinTnsToScoreTapNote(g_iMinTnsToScoreTapNote); TapNoteScore minTnsToScore = ValidateMinTNSToScoreNotes(g_MinTNSToScoreNotes);
bool badTns = false; bool badTns = false;
if (minTnsToScore != TNS_None) { if (minTnsToScore != TNS_None) {
switch (score) { switch (score) {
case TNS_W5:
case TNS_W4:
case TNS_W3:
case TNS_W2:
case TNS_W1: case TNS_W1:
case TNS_W2:
case TNS_W3:
case TNS_W4:
case TNS_W5:
if (score < minTnsToScore) { if (score < minTnsToScore) {
badTns = true; badTns = true;
} }