Set player count to 1 and fix gameplay issue stemming from that

...Time to kill player 2 once and for all.
etternagame · Dec 20, 2018 · 6525281 · 6525281
1 parent 50e168f
commit 6525281
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 21 deletions.
diff --git a/src/AutoKeysounds.cpp b/src/AutoKeysounds.cpp
@@ -113,15 +113,13 @@ AutoKeysounds::LoadAutoplaySoundsInto(RageSoundReader_Chain* pChain)
 void
 AutoKeysounds::LoadTracks(const Song* pSong,
 						  RageSoundReader*& pShared,
-						  RageSoundReader*& pPlayer1,
-						  RageSoundReader*& pPlayer2)
+						  RageSoundReader*& pPlayer1)
 {
 	// If we have two players, prefer a three-track sound; otherwise prefer a
 	// two-track sound.
 	// bool bTwoPlayers = GAMESTATE->GetNumPlayersEnabled() == 2;
 
 	pPlayer1 = nullptr;
-	pPlayer2 = nullptr;
 	pShared = nullptr;
 
 	vector<RString> vsMusicFile;
@@ -197,7 +195,7 @@ AutoKeysounds::FinishLoading()
 	Song* pSong = GAMESTATE->m_pCurSong;
 
 	vector<RageSoundReader*> apSounds;
-	LoadTracks(pSong, m_pSharedSound, m_pPlayerSounds[0], m_pPlayerSounds[1]);
+	LoadTracks(pSong, m_pSharedSound, m_pPlayerSounds[0]);
 
 	// Load autoplay sounds, if any.
 	{
@@ -234,15 +232,6 @@ AutoKeysounds::FinishLoading()
 		apSounds.push_back(m_pPlayerSounds[0]);
 	}
 
-	if (m_pPlayerSounds[1] != nullptr) {
-		m_pPlayerSounds[1] =
-		  new RageSoundReader_PitchChange(m_pPlayerSounds[1]);
-		m_pPlayerSounds[1] =
-		  new RageSoundReader_PostBuffering(m_pPlayerSounds[1]);
-		m_pPlayerSounds[1] = new RageSoundReader_Pan(m_pPlayerSounds[1]);
-		apSounds.push_back(m_pPlayerSounds[1]);
-	}
-
 	if (apSounds.size() > 1) {
 		auto* pMerge = new RageSoundReader_Merge;
 

diff --git a/src/AutoKeysounds.h b/src/AutoKeysounds.h
@@ -30,8 +30,7 @@ class AutoKeysounds
 	void LoadAutoplaySoundsInto(RageSoundReader_Chain* pChain);
 	static void LoadTracks(const Song* pSong,
 						   RageSoundReader*& pGlobal,
-						   RageSoundReader*& pPlayer1,
-						   RageSoundReader*& pPlayer2);
+						   RageSoundReader*& pPlayer1);
 
 	NoteData m_ndAutoKeysoundsOnly[NUM_PLAYERS];
 	vector<RageSound> m_vKeysounds;

diff --git a/src/PlayerNumber.cpp b/src/PlayerNumber.cpp
@@ -4,8 +4,7 @@
 #include "PlayerNumber.h"
 
 static const char* PlayerNumberNames[] = {
-	"P1",
-	"P2"
+	"P1"
 };
 XToString(PlayerNumber);
 XToLocalizedString(PlayerNumber);

diff --git a/src/PlayerNumber.h b/src/PlayerNumber.h
@@ -1,4 +1,4 @@
-/* PlayerNumber - A simple type representing a player. */
+/* PlayerNumber - A simple type representing a player. */
 
 #ifndef PlayerNumber_H
 #define PlayerNumber_H
@@ -9,8 +9,7 @@
 enum PlayerNumber
 {
 	PLAYER_1 = 0,
-	PLAYER_2,
-	NUM_PlayerNumber,	// leave this at the end
+	NUM_PlayerNumber, // leave this at the end
 	PlayerNumber_Invalid
 };
 const PlayerNumber NUM_PLAYERS = NUM_PlayerNumber;
@@ -23,7 +22,7 @@ LuaDeclareType(PlayerNumber);
 /** @brief A foreach loop to handle the different players. */
 #define FOREACH_PlayerNumber(pn) FOREACH_ENUM(PlayerNumber, pn)
 
-const PlayerNumber	OPPOSITE_PLAYER[NUM_PLAYERS] = { PLAYER_1 };
+const PlayerNumber OPPOSITE_PLAYER[NUM_PLAYERS] = { PLAYER_1 };
 
 enum MultiPlayer
 {