From 1fd7483cddbfdb780a46678149df8508a9b336a8 Mon Sep 17 00:00:00 2001
From: Charles Lohr <cnlohr@users.sourceforge.net>
Date: Mon, 6 Sep 2004 03:54:04 +0000
Subject: [PATCH] Added: support for player options at evaluation-time

---
 stepmania/Docs/SMLanProtocol.txt      | 2 ++
 stepmania/src/NetworkSyncManager.cpp  | 2 ++
 stepmania/src/NetworkSyncManager.h    | 1 +
 stepmania/src/ScreenNetEvaluation.cpp | 2 ++
 4 files changed, 7 insertions(+)

diff --git a/stepmania/Docs/SMLanProtocol.txt b/stepmania/Docs/SMLanProtocol.txt
index 9c1e5e4d36..4d0ea816ef 100644
--- a/stepmania/Docs/SMLanProtocol.txt
+++ b/stepmania/Docs/SMLanProtocol.txt
@@ -202,6 +202,8 @@ NOTE: Server responces always add 128, thus a server responce for no operation
     2		marvelous (All players)
     2		ok (All players)
     2		max_combo (All players)
+    NT		Player's options
+	<Other player's options>
 
 
 005: 	Scoreboard update
diff --git a/stepmania/src/NetworkSyncManager.cpp b/stepmania/src/NetworkSyncManager.cpp
index 9c2f39876f..f35d05503e 100644
--- a/stepmania/src/NetworkSyncManager.cpp
+++ b/stepmania/src/NetworkSyncManager.cpp
@@ -537,6 +537,8 @@ void NetworkSyncManager::ProcessInput()
 				for (int j=0;j<NETNUMTAPSCORES;j++) 
 					for (int i=0;i<PlayersInPack; i++)
 						m_EvalPlayerData[i].tapScores[j] = m_packet.Read2();
+				for (int i=0;i<PlayersInPack;i++)
+					m_EvalPlayerData[i].playerOptions = m_packet.ReadNT();
 				SCREENMAN->SendMessageToTopScreen( SM_GotEval );
 			}
 			break;
diff --git a/stepmania/src/NetworkSyncManager.h b/stepmania/src/NetworkSyncManager.h
index 01ae593652..dcc1e64b48 100644
--- a/stepmania/src/NetworkSyncManager.h
+++ b/stepmania/src/NetworkSyncManager.h
@@ -20,6 +20,7 @@ struct EndOfGame_PlayerData
 	int grade;
 	Difficulty difficulty;
 	int tapScores[NETNUMTAPSCORES];	//This will be a const soon enough
+	CString playerOptions;
 };
 
 enum NSScoreBoardColumn
diff --git a/stepmania/src/ScreenNetEvaluation.cpp b/stepmania/src/ScreenNetEvaluation.cpp
index 2c0d94fd9f..65eea20643 100644
--- a/stepmania/src/ScreenNetEvaluation.cpp
+++ b/stepmania/src/ScreenNetEvaluation.cpp
@@ -136,4 +136,6 @@ void ScreenNetEvaluation::UpdateStats()
 		int iNumDigits = (j==max_combo) ? MAX_COMBO_NUM_DIGITS : 4;
 		m_textJudgeNumbers[j][m_pActivePlayer].SetText( ssprintf( "%*d", iNumDigits, NSMAN->m_EvalPlayerData[m_iCurrentPlayer].tapScores[j] ) );
 	}
+
+	m_textPlayerOptions[NUM_PLAYERS].SetText( NSMAN->m_EvalPlayerData[m_iCurrentPlayer].playerOptions );
 }