Skip to content

Commit 890ee87

Browse files
author
Sam Feeney
committed
turns out we need a little padding
1 parent 6e5bb29 commit 890ee87

File tree

1 file changed

+4
-3
lines changed

1 file changed

+4
-3
lines changed

src/Player.cpp

+4-3
Original file line numberDiff line numberDiff line change
@@ -2110,19 +2110,18 @@ void Player::Step( int col, int row, const RageTimer &tm, bool bHeld, bool bRele
21102110

21112111
int iStepSearchRows;
21122112
static const float StepSearchDistance = GetMaxStepDistanceSeconds();
2113+
vector<int> nerv = GAMESTATE->m_pCurSteps[pn]->GetNonEmptyRowVector();
21132114

2114-
if (iSongRow < 1) {
2115+
if (iSongRow < 100 || iSongRow > nerv.size() -10 ) {
21152116
iStepSearchRows = max(BeatToNoteRow(m_Timing->GetBeatFromElapsedTime(m_pPlayerState->m_Position.m_fMusicSeconds + StepSearchDistance)) - iSongRow,
21162117
iSongRow - BeatToNoteRow(m_Timing->GetBeatFromElapsedTime(m_pPlayerState->m_Position.m_fMusicSeconds - StepSearchDistance))) + ROWS_PER_BEAT;
2117-
21182118
}
21192119
else
21202120
{
21212121
/* Buncha bullshit that speeds up searching for the rows that we're concerned about judging taps within
21222122
by avoiding the invocation of the incredibly slow getbeatfromelapsedtime. Needs to be cleaned up a lot,
21232123
whole system does. Only in use if sequential assumption remains valid. - Mina */
21242124

2125-
vector<int> nerv = GAMESTATE->m_pCurSteps[pn]->GetNonEmptyRowVector();
21262125
if (nerv[nervpos] < iSongRow && nervpos < nerv.size())
21272126
nervpos += 1;
21282127

@@ -3142,6 +3141,7 @@ void Player::SetJudgment( int iRow, int iTrack, const TapNote &tn, TapNoteScore
31423141
msg.SetParam( "NoteRow", iRow);
31433142
msg.SetParam( "Type", RString("Tap"));
31443143
msg.SetParam( "TapNoteOffset", tn.result.fTapNoteOffset );
3144+
msg.SetParam( "Val", m_pPlayerStageStats->m_iTapNoteScores[tns] + 1);
31453145

31463146
if (tns != TNS_Miss)
31473147
msg.SetParam("Offset", tn.result.fTapNoteOffset * 1000); // don't send out 0 ms offsets for misses, multiply by 1000 for convenience - Mina
@@ -3194,6 +3194,7 @@ void Player::SetHoldJudgment( TapNote &tn, int iTrack )
31943194
msg.SetParam( "HoldNoteScore", tn.HoldResult.hns );
31953195
msg.SetParam( "Judgment", tn.HoldResult.hns);
31963196
msg.SetParam( "Type", RString("Hold"));
3197+
msg.SetParam( "Val", m_pPlayerStageStats->m_iHoldNoteScores[tn.HoldResult.hns] + 1);
31973198

31983199
Lua* L = LUA->Get();
31993200
tn.PushSelf(L);

0 commit comments

Comments
 (0)