ETTP report options/eval enter/leave

src/NetworkSyncManager.cpp

@@ -38,6 +38,10 @@ std::map<ETTClientMessageTypes, std::string> ettClientMessageMap = {
 	{ ettpc_missingchart, "missingchart" },
 	{ ettpc_startingchart, "startingchart" },
 	{ ettpc_notstartingchart, "notstartingchart" },
+	{ ettpc_openoptions, "openoptions" },
+	{ ettpc_closeoptions, "closeoptions" },
+	{ ettpc_openeval, "openeval" },
+	{ ettpc_closeeval, "closeeval" },
 };
 std::map<std::string, ETTServerMessageTypes> ettServerMessageMap = {
 	{ "hello", ettps_hello },
@@ -69,36 +73,12 @@ void NetworkSyncManager::OnMusicSelect()
 {
 }
 void NetworkSyncManager::OffMusicSelect() { }
-void NetworkSyncManager::OnRoomSelect()
-{
-	if (curProtocol != nullptr)
-		curProtocol->OnRoomSelect();
-}
-void NetworkSyncManager::OffRoomSelect()
-{
-	if (curProtocol != nullptr)
-		curProtocol->OffRoomSelect();
-}
-void NetworkSyncManager::OnOptions()
-{
-	if (curProtocol != nullptr)
-		curProtocol->OnOptions();
-}
-void NetworkSyncManager::OffOptions()
-{
-	if (curProtocol != nullptr)
-		curProtocol->OffOptions();
-}
-void NetworkSyncManager::OnEval()
-{
-	if (curProtocol != nullptr)
-		curProtocol->OnEval();
-}
-void NetworkSyncManager::OffEval()
-{
-	if (curProtocol != nullptr)
-		curProtocol->OffEval();
-}
+void NetworkSyncManager::OnRoomSelect() { }
+void NetworkSyncManager::OffRoomSelect() { }
+void NetworkSyncManager::OnOptions() { }
+void NetworkSyncManager::OffOptions() { }
+void NetworkSyncManager::OnEval() { }
+void NetworkSyncManager::OffEval() { }
 void NetworkSyncManager::ReportScore( int playerID, int step, int score, int combo, float offset ) { }
 void NetworkSyncManager::ReportSongOver() { }
 void NetworkSyncManager::ReportStyle() {}
@@ -266,6 +246,44 @@ void SMOProtocol::OffOptions()
 	ReportPlayerOptions();
 }
 
+
+void ETTProtocol::OffEval()
+{
+	if (ws == nullptr)
+		return;
+	json j;
+	j["type"] = ettClientMessageMap[ettpc_closeeval];
+	j["id"] = msgId++;
+	ws->send(j.dump().c_str());
+}
+void ETTProtocol::OnEval()
+{
+	if (ws == nullptr)
+		return;
+	json j;
+	j["type"] = ettClientMessageMap[ettpc_openeval];
+	j["id"] = msgId++;
+	ws->send(j.dump().c_str());
+}
+void ETTProtocol::OnOptions()
+{
+	if (ws == nullptr)
+		return;
+	json j;
+	j["type"] = ettClientMessageMap[ettpc_openoptions];
+	j["id"] = msgId++;
+	ws->send(j.dump().c_str());
+}
+void ETTProtocol::OffOptions()
+{
+	if (ws == nullptr)
+		return;
+	json j;
+	j["type"] = ettClientMessageMap[ettpc_closeoptions];
+	j["id"] = msgId++;
+	ws->send(j.dump().c_str());
+}
+
 void SMOProtocol::close()
 {
 	serverVersion = 0;

src/NetworkSyncManager.h

@@ -118,7 +118,11 @@ enum ETTClientMessageTypes {
 	ettpc_haschart,
 	ettpc_missingchart,
 	ettpc_startingchart,
-	ettpc_notstartingchart,
+	ettpc_notstartingchart, 
+	ettpc_openoptions, 
+	ettpc_closeoptions, 
+	ettpc_openeval, 
+	ettpc_closeeval, 
 	ettpc_end
 };
 /** @brief A special foreach loop going through each NSScoreBoardColumn. */
@@ -249,6 +253,10 @@ class ETTProtocol : public NetProtocol { // Websockets using uwebsockets sending
 	void ReportSongOver(NetworkSyncManager* n) override;
 	void SelectUserSong(NetworkSyncManager* n, Song* song) override;
 	void StartRequest(NetworkSyncManager* n, short position) override;
+	void OnOptions() override;
+	void OffOptions() override;
+	void OnEval() override;
+	void OffEval() override;
 	/*
 	void ReportScore(NetworkSyncManager* n, int playerID, int step, int score, int combo, float offset, int numNotes) override;
 	void ReportScore(NetworkSyncManager* n, int playerID, int step, int score, int combo, float offset) override;