diff --git a/stepmania/src/NetworkSyncManager.cpp b/stepmania/src/NetworkSyncManager.cpp index 32387a4047..18fbd3b1fc 100644 --- a/stepmania/src/NetworkSyncManager.cpp +++ b/stepmania/src/NetworkSyncManager.cpp @@ -16,8 +16,7 @@ void NetworkSyncManager::PostStartUp(const RString& ServerIP ) { } bool NetworkSyncManager::Connect(const RString& addy, unsigned short port) { return false; } RString NetworkSyncManager::GetServerName() { return RString(); } void NetworkSyncManager::ReportNSSOnOff(int i) { } -void NetworkSyncManager::ReportTiming(float offset, int PlayerNumber) { } -void NetworkSyncManager::ReportScore(int playerID, int step, int score, int combo) { } +void NetworkSyncManager::ReportScore(int playerID, int step, int score, int combo, float offset) { } void NetworkSyncManager::ReportSongOver() { } void NetworkSyncManager::ReportStyle() {} void NetworkSyncManager::StartRequest(short position) { } @@ -302,12 +301,7 @@ RString NetworkSyncManager::GetServerName() return m_ServerName; } -void NetworkSyncManager::ReportTiming(float offset, int PlayerNumber) -{ - m_lastOffset[PlayerNumber] = offset; -} - -void NetworkSyncManager::ReportScore(int playerID, int step, int score, int combo) +void NetworkSyncManager::ReportScore(int playerID, int step, int score, int combo, float offset) { if (!useSMserver) //Make sure that we are using the network return; @@ -336,7 +330,7 @@ void NetworkSyncManager::ReportScore(int playerID, int step, int score, int comb // //ASSUMED: No step will be more than 16 seconds off center //If assumption false: read 16 seconds either direction - int iOffset = int((m_lastOffset[playerID]+16.384)*2000.0); + int iOffset = int((offset+16.384)*2000.0); if (iOffset>65535) iOffset=65535; diff --git a/stepmania/src/NetworkSyncManager.h b/stepmania/src/NetworkSyncManager.h index e89f1fd912..f6b6a9b0d4 100644 --- a/stepmania/src/NetworkSyncManager.h +++ b/stepmania/src/NetworkSyncManager.h @@ -92,8 +92,7 @@ public: ~NetworkSyncManager(); //If "useSMserver" then send score to server - void ReportTiming(float offset, int PlayerNumber); - void ReportScore(int playerID, int step, int score, int combo); + void ReportScore(int playerID, int step, int score, int combo, float offset); void ReportSongOver(); //Report to server that song is over void ReportStyle(); //Report to server the style, players, and names void ReportNSSOnOff(int i); //Report song selection screen on/off @@ -164,9 +163,6 @@ private: void StartUp(); - float m_lastOffset[2]; //This is used to determine how much - //the last step was off. - int m_playerID; //these are currently unused, but need to stay int m_step; int m_score;