From 015ffb7c850606d8a11b0d8ac976aabe30aa001e Mon Sep 17 00:00:00 2001
From: Josh Allen <axlecrusher@users.sourceforge.net>
Date: Thu, 2 Sep 2004 00:37:03 +0000
Subject: [PATCH] Fixed bugs in ScreenNetEvaluation and in server game over.

---
 stepmania/src/NetworkSyncManager.cpp | 18 ++++++++++++++++--
 stepmania/src/NetworkSyncServer.cpp  | 12 +++++++++---
 2 files changed, 25 insertions(+), 5 deletions(-)

diff --git a/stepmania/src/NetworkSyncManager.cpp b/stepmania/src/NetworkSyncManager.cpp
index 7ed924817a..627bfb2da8 100644
--- a/stepmania/src/NetworkSyncManager.cpp
+++ b/stepmania/src/NetworkSyncManager.cpp
@@ -517,13 +517,27 @@ 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 j=0;j<NETNUMTAPSCORES;j++)
-					for (int i=0;i<PlayersInPack;i++)
+				for (int i=0;i<PlayersInPack; i++)
+					for (int j=0;j<NETNUMTAPSCORES;j++) {
 						m_EvalPlayerData[i].tapScores[j] = m_packet.Read2();
+					//	m_EvalPlayerData[i].tapScores[0] = 0;
+					//	m_EvalPlayerData[i].tapScores[1] = 1;
+					//	m_EvalPlayerData[i].tapScores[2] = 2;
+					//	m_EvalPlayerData[i].tapScores[3] = 3;
+					//	m_EvalPlayerData[i].tapScores[4] = 4;
+					//	m_EvalPlayerData[i].tapScores[5] = 5;
+					//	m_EvalPlayerData[i].tapScores[6] = 6;
+					//	m_EvalPlayerData[i].tapScores[7] = 7;
+					}
+			
+			
+			
 			}
 			break;
 		case 5: //Scoreboard Update
diff --git a/stepmania/src/NetworkSyncServer.cpp b/stepmania/src/NetworkSyncServer.cpp
index 2bf6cb9d8d..1c65760b78 100644
--- a/stepmania/src/NetworkSyncServer.cpp
+++ b/stepmania/src/NetworkSyncServer.cpp
@@ -193,6 +193,9 @@ void GameClient::StartRequest(PacketFunctions &Packet) {
 	Player[1].combo = 0;
 	Player[1].projgrade = 0;
 
+	memset((void*)Player[0].steps, 0, sizeof(int)*8);
+	memset((void*)Player[1].steps, 0, sizeof(int)*8);
+
 	Ready = true;
 	InGame = true;
 }
@@ -223,7 +226,7 @@ void StepManiaLanServer::GameOver(PacketFunctions &Packet, int clientNum) {
 
 	Client[clientNum].Ready = false;
 	Client[clientNum].InGame = false;
-	for (int x = 0; (x < NUMBERCLIENTS)&&(allOver != false); x++) {
+	for (int x = 0; (x < NUMBERCLIENTS)&&(allOver); x++) {
 		if (Client[x].Used == true) {
 			if ((Client[x].InGame == true)) {
 				allOver = false;
@@ -235,6 +238,7 @@ void StepManiaLanServer::GameOver(PacketFunctions &Packet, int clientNum) {
 	if (allOver) {
 		numPlayers = SortStats(playersPtr);
 		Reply.ClearPacket();
+		Reply.Write1( 4+128 );
 		Reply.Write1(numPlayers);
 		for (int x = 0; x < numPlayers; x++) {
 			Reply.Write4(playersPtr[x]->score);
@@ -246,12 +250,14 @@ void StepManiaLanServer::GameOver(PacketFunctions &Packet, int clientNum) {
 			Reply.Write1(playersPtr[x]->diff);
 		}
 		for (int x = 0; x < numPlayers; x++) {
-			for (int y = 0; y < 6; y++) {
+			for (int y = 6; y >= 0; y--) {
+				//Dont send NoGoods
+				//Send in reverse
 				Reply.Write2(playersPtr[x]->steps[y]);
 			}
 		}
 		for (int x = 0; x < numPlayers; x++) {
-			Reply.Write1(playersPtr[x]->maxCombo);
+			Reply.Write2(playersPtr[x]->maxCombo);
 		}
 		SendNetPacket(clientNum, (char*)Reply.Data, Reply.Position);
 	}