Make v60 replays actually use offsets

etternagame · Nov 15, 2018 · 5f18c63 · 5f18c63
1 parent a6563b0
commit 5f18c63
Showing 1 changed file with 83 additions and 8 deletions.
diff --git a/src/Player.cpp b/src/Player.cpp
@@ -762,6 +762,11 @@ Player::Load()
 		SendComboMessages(m_pPlayerStageStats->m_iCurCombo,
 						  m_pPlayerStageStats->m_iCurMissCombo);
 
+	// If we are in a replay, attempt to load the real tapper stuff
+	if (GamePreferences::m_AutoPlay == PC_REPLAY) {
+		PlayerAI::SetUpExactTapMap(m_Timing);
+	}
+
 	SAFE_DELETE(m_pIterNeedsTapJudging);
 	m_pIterNeedsTapJudging = new NoteData::all_tracks_iterator(
 	  m_NoteData.GetTapNoteRangeAllTracks(iNoteRow, MAX_NOTE_ROW));
@@ -929,6 +934,66 @@ Player::Update(float fDeltaTime)
 	if (m_bPaused)
 		return;
 
+	// Fake steps in Replay mode, but only if we have column data.
+	if (m_pPlayerState->m_PlayerController == PC_REPLAY &&
+		PlayerAI::pScoreData->GetReplayType() == 2) {
+
+		// Giant copy paste from Step() that simply determines how far to search
+		// in the past or future.
+		/*int searchDistance;
+		static const float StepSearchDistance = GetMaxStepDistanceSeconds();
+		int skipstart = nerv[10];
+		if (iSongRow < skipstart ||
+			iSongRow > static_cast<int>(nerv.size()) - 10) {
+			searchDistance =
+			  max(BeatToNoteRow(m_Timing->GetBeatFromElapsedTime(
+					m_pPlayerState->m_Position.m_fMusicSeconds +
+					StepSearchDistance)) -
+					iSongRow,
+				  iSongRow - BeatToNoteRow(m_Timing->GetBeatFromElapsedTime(
+							   m_pPlayerState->m_Position.m_fMusicSeconds -
+							   StepSearchDistance))) +
+			  ROWS_PER_BEAT;
+		} else {
+			if (nerv[nervpos] < iSongRow && nervpos < nerv.size())
+				nervpos += 1;
+			size_t SearchIndexBehind = nervpos;
+			size_t SearchIndexAhead = nervpos;
+			float SearchBeginTime = m_Timing->WhereUAtBro(nerv[nervpos]);
+			while (SearchIndexBehind > 1 &&
+				   SearchBeginTime -
+					   m_Timing->WhereUAtBro(nerv[SearchIndexBehind - 1]) <
+					 StepSearchDistance)
+				SearchIndexBehind -= 1;
+			while (SearchIndexAhead > 1 && SearchIndexAhead + 1 > nerv.size() &&
+				   m_Timing->WhereUAtBro(nerv[SearchIndexAhead + 1]) -
+					   SearchBeginTime <
+					 StepSearchDistance)
+				SearchIndexAhead += 1;
+			int MaxLookBehind = nerv[nervpos] - nerv[SearchIndexBehind];
+			int MaxLookAhead = nerv[SearchIndexAhead] - nerv[nervpos];
+			if (nervpos > 0)
+				searchDistance =
+				  (max(MaxLookBehind, MaxLookAhead) + ROWS_PER_BEAT);
+		}
+
+
+
+		int toTap = PlayerAI::DetermineNextTapColumn(iSongRow, searchDistance,
+		m_Timing); if (toTap != -1)
+		{
+			Step(toTap, iSongRow, now, false, false);
+		}
+		*/
+		if (PlayerAI::TapExistsAtOrBeforeThisRow(iSongRow)) {
+			vector<TapReplayResult> trrVector =
+			  PlayerAI::GetTapsAtOrBeforeRow(iSongRow);
+			for (TapReplayResult trr : trrVector) {
+				Step(trr.track, trr.row, now, false, false);
+			}
+		}
+	}
+
 	// update pressed flag
 	const int iNumCols =
 	  GAMESTATE->GetCurrentStyle(GetPlayerState()->m_PlayerNumber)
@@ -2216,9 +2281,10 @@ Player::Step(int col,
 		DEBUG_ASSERT(iter != m_NoteData.end(col));
 		pTN = &iter->second;
 
-		// We don't really have to care if we are releasing on a non-lift, right?
-		// This fixes a weird noteskin bug with tap explosions.
-		if (PREFSMAN->m_bFullTapExplosions && bRelease && pTN->type != TapNoteType_Lift)
+		// We don't really have to care if we are releasing on a non-lift,
+		// right? This fixes a weird noteskin bug with tap explosions.
+		if (PREFSMAN->m_bFullTapExplosions && bRelease &&
+			pTN->type != TapNoteType_Lift)
 			return;
 
 		switch (m_pPlayerState->m_PlayerController) {
@@ -2377,11 +2443,16 @@ Player::Step(int col,
 					score = TNS_None;
 					fNoteOffset = -1.f;
 				} else {
+					if (PlayerAI::GetReplayType() == 2) {
+						iRowOfOverlappingNoteOrRow = row;
+					}
 					fNoteOffset = PlayerAI::GetTapNoteOffsetForReplay(
-					  pTN, iRowOfOverlappingNoteOrRow, col);
+						  pTN, iRowOfOverlappingNoteOrRow, col);
 					if (fNoteOffset == -2.f) // we hit a mine
 					{
 						score = TNS_HitMine;
+						PlayerAI::RemoveTapFromVectors(
+						  iRowOfOverlappingNoteOrRow, col);
 					} else if (pTN->type == TapNoteType_Mine) // we are looking
 															  // at a mine but
 															  // missed it
@@ -2804,10 +2875,14 @@ Player::CrossedRows(int iLastRowCrossed,
 				tn.type != TapNoteType_AutoKeysound &&
 				tn.result.tns == TNS_None &&
 				this->m_Timing->IsJudgableAtRow(iRow)) {
-				Step(iTrack, iRow, now, false, false);
-				if (m_pPlayerState->m_PlayerController == PC_AUTOPLAY) {
-					if (m_pPlayerStageStats)
-						m_pPlayerStageStats->m_bDisqualified = true;
+				if ((m_pPlayerState->m_PlayerController == PC_REPLAY &&
+					 PlayerAI::GetReplayType() != 2) ||
+					m_pPlayerState->m_PlayerController == PC_AUTOPLAY) {
+					Step(iTrack, iRow, now, false, false);
+					if (m_pPlayerState->m_PlayerController == PC_AUTOPLAY) {
+						if (m_pPlayerStageStats)
+							m_pPlayerStageStats->m_bDisqualified = true;
+					}
 				}
 			}
 		}