From b97a0ad172b4663e3fbd6f4aa8e5645766ac5cb6 Mon Sep 17 00:00:00 2001
From: Charles Lohr <cnlohr@users.sourceforge.net>
Date: Thu, 2 Sep 2004 04:54:54 +0000
Subject: [PATCH] Cleanup and change around... maybe this will work better?

---
 stepmania/src/NetworkSyncManager.cpp |  7 ++---
 stepmania/src/NetworkSyncServer.cpp  | 45 ++++++++++------------------
 2 files changed, 18 insertions(+), 34 deletions(-)

diff --git a/stepmania/src/NetworkSyncManager.cpp b/stepmania/src/NetworkSyncManager.cpp
index 7667556ed3..4ce7d8f865 100644
--- a/stepmania/src/NetworkSyncManager.cpp
+++ b/stepmania/src/NetworkSyncManager.cpp
@@ -517,16 +517,13 @@ void NetworkSyncManager::ProcessInput()
 				int PlayersInPack = m_packet.Read1();
 				for (int i=0;i<PlayersInPack;i++)
 					m_EvalPlayerData[i].score = m_packet.Read4();
-				for (int i=0;i<PlayersInPack;i++)
-					LOG->Info("P%d Score:%d",i,m_EvalPlayerData[i].score);
 				for (int i=0;i<PlayersInPack;i++)
 					m_EvalPlayerData[i].grade = m_packet.Read1();
 				for (int i=0;i<PlayersInPack;i++)
 					m_EvalPlayerData[i].difficulty = (Difficulty) m_packet.Read1();
-				for (int i=0;i<PlayersInPack; i++)
-					for (int j=0;j<NETNUMTAPSCORES;j++) {
+				for (int j=0;j<NETNUMTAPSCORES;j++) 
+					for (int i=0;i<PlayersInPack; i++)
 						m_EvalPlayerData[i].tapScores[j] = m_packet.Read2();
-					}
 			}
 			break;
 		case 5: //Scoreboard Update
diff --git a/stepmania/src/NetworkSyncServer.cpp b/stepmania/src/NetworkSyncServer.cpp
index 15c58f04d0..37402b15e3 100644
--- a/stepmania/src/NetworkSyncServer.cpp
+++ b/stepmania/src/NetworkSyncServer.cpp
@@ -187,15 +187,15 @@ void GameClient::StartRequest(PacketFunctions &Packet) {
 	gameInfo.artist = Packet.ReadNT();
 	gameInfo.course = Packet.ReadNT();
 
-	Player[0].score = 0;
-	Player[0].combo = 0;
-	Player[0].projgrade = 0;
-	Player[1].score = 0;
-	Player[1].combo = 0;
-	Player[1].projgrade = 0;
+	for (int i=0; i<2 ; i++)
+	{
+		Player[i].score = 0;
+		Player[i].combo = 0;
+		Player[i].projgrade = 0;
+		Player[i].maxCombo = 0;
 
-	memset((void*)Player[0].steps, 0, sizeof(int)*8);
-	memset((void*)Player[1].steps, 0, sizeof(int)*8);
+		memset((void*)Player[i].steps, 0, sizeof(int)*9);
+	}
 
 	Ready = true;
 	InGame = true;
@@ -241,32 +241,19 @@ void StepManiaLanServer::GameOver(PacketFunctions &Packet, int clientNum) {
 		Reply.ClearPacket();
 		Reply.Write1( 4+128 );
 		Reply.Write1(numPlayers);
-		//I can't get the following area to work with out the {}.
-		for (int x = 0; x < numPlayers; x++) {
+		for (int x = 0; x < numPlayers; x++) 
 			Reply.Write4(playersPtr[x]->score);
-//			LOG->Info("SCORE: %d", playersPtr[x]->score);
-		}
-		for (int x = 0; x < numPlayers; x++) {
+		for (int x = 0; x < numPlayers; x++) 
 			Reply.Write1(playersPtr[x]->projgrade);
-//			LOG->Info("Grade: %d", playersPtr[x]->projgrade);
-		}
-		for (int x = 0; x < numPlayers; x++) {
+		for (int x = 0; x < numPlayers; x++) 
 			Reply.Write1(playersPtr[x]->diff);
-//			LOG->Info("Diff: %d", playersPtr[x]->diff);
-		}
-		for (int x = 0; x < numPlayers; x++) {
-			for (int y = 6; y >= 1; y--) {
-				//Dont send NoGoods
-				//Send in reverse
+		for (int y = 6; y >= 1; y--)
+			for (int x = 0; x<numPlayers; x++)
 				Reply.Write2(playersPtr[x]->steps[y]);
-//				LOG->Info("step %d: %d", y, playersPtr[x]->steps[y]);
-			}
+		for (int x = 0; x < numPlayers; x++) 
 			Reply.Write2(playersPtr[x]->steps[8]);  //Tack on OK
-		}
-		for (int x = 0; x < numPlayers; x++) {
+		for (int x = 0; x < numPlayers; x++) 
 			Reply.Write2(playersPtr[x]->maxCombo);
-//			LOG->Info("MaxCombo: %d", playersPtr[x]->maxCombo);
-		}
 		SendToAllClients(Reply);
 	}
 }
@@ -532,7 +519,7 @@ void StepManiaLanServer::SelectSong(PacketFunctions &Packet, int clientNum) {
 		Client[clientNum].hasSong = true;
 
 	//Only play if everyone has the same song and the host has select the same song twice.
-	if (CheckHasSongState()&&SecondSameSelect) {
+	if ( CheckHasSongState() && SecondSameSelect && (clientNum == 0) ) {
 		Reply.ClearPacket();
 		Reply.Write1(136);
 		Reply.Write1(2);