Properly disqualify a Replay Score

and remove frets from the Player ?????
jameskr97 · Sep 2, 2019 · 611781d · 611781d
1 parent e532fe9
commit 611781d
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 10 deletions.
diff --git a/src/Etterna/Actor/Gameplay/Player.cpp b/src/Etterna/Actor/Gameplay/Player.cpp
@@ -466,12 +466,6 @@ Player::Init(const std::string& sType,
 		ActorUtil::LoadAllCommands(*m_pNoteField, sType);
 		this->AddChild(m_pNoteField);
 	}
-
-	m_vbFretIsDown.resize(
-	  GAMESTATE->GetCurrentStyle(GetPlayerState()->m_PlayerNumber)
-		->m_iColsPerPlayer);
-	FOREACH(bool, m_vbFretIsDown, b)
-	*b = false;
 }
 /**
  * @brief Determine if a TapNote needs a tap note style judgment.

diff --git a/src/Etterna/Actor/Gameplay/Player.h b/src/Etterna/Actor/Gameplay/Player.h
@@ -277,8 +277,6 @@ class Player : public ActorFrame
 
 	RageSound m_soundMine;
 
-	vector<bool> m_vbFretIsDown;
-
 	vector<RageSound> m_vKeysounds;
 
 	ThemeMetric<float> GRAY_ARROWS_Y_STANDARD;

diff --git a/src/Etterna/Actor/Gameplay/PlayerReplay.cpp b/src/Etterna/Actor/Gameplay/PlayerReplay.cpp
@@ -17,13 +17,27 @@
 PlayerReplay::PlayerReplay(NoteData& nd, bool bVisibleParts)
   : Player(nd, bVisibleParts)
 {
+	// eh
 }
 
 PlayerReplay::~PlayerReplay()
 {
 	// dont have to do anything here
 }
 
+void
+PlayerReplay::Init(const std::string& sType,
+				   PlayerState* pPlayerState,
+				   PlayerStageStats* pPlayerStageStats,
+				   LifeMeter* pLM,
+				   ScoreKeeper* pPrimaryScoreKeeper)
+{
+	Player::Init(
+	  sType, pPlayerState, pPlayerStageStats, pLM, pPrimaryScoreKeeper);
+	if (m_pPlayerStageStats)
+		m_pPlayerStageStats->m_bDisqualified = true;
+}
+
 void
 PlayerReplay::UpdateHoldsAndRolls(
   float fDeltaTime,
@@ -182,8 +196,6 @@ PlayerReplay::CrossedRows(int iLastRowCrossed,
 			this->m_Timing->IsJudgableAtRow(iRow)) {
 			if (PlayerAI::GetReplayType() != 2) {
 				Step(iTrack, iRow, now, false, false);
-				if (m_pPlayerStageStats)
-					m_pPlayerStageStats->m_bDisqualified = true;
 			}
 		}
 

diff --git a/src/Etterna/Actor/Gameplay/PlayerReplay.h b/src/Etterna/Actor/Gameplay/PlayerReplay.h
@@ -10,6 +10,11 @@ class PlayerReplay : public Player
 	PlayerReplay(NoteData& nd, bool bVisibleParts = true);
 	~PlayerReplay() override;
 
+	void Init(const std::string& sType,
+			  PlayerState* pPlayerState,
+			  PlayerStageStats* pPlayerStageStats,
+			  LifeMeter* pLM,
+			  ScoreKeeper* pPrimaryScoreKeeper);
 	void Update(float fDeltaTime) override;
 	void CrossedRows(int iLastrowCrossed,
 					 const std::chrono::steady_clock::time_point& now) override;