diff --git a/stepmania/src/NetworkSyncManager.cpp b/stepmania/src/NetworkSyncManager.cpp index 81bdada02c..db4a6cd5b3 100644 --- a/stepmania/src/NetworkSyncManager.cpp +++ b/stepmania/src/NetworkSyncManager.cpp @@ -69,10 +69,6 @@ NetworkSyncManager::NetworkSyncManager(int argc, char **argv) //AND the connection works //Halt until we know what server //version we're dealing with - if (((m_ServerVersion / 512) % 2) == 1) - FlashXMLStyle = true; - else - FlashXMLStyle = false; LOG->Info("Server Version: %d",m_ServerVersion); } @@ -158,39 +154,7 @@ void NetworkSyncManager::ReportScore(int playerID, int step, int score, int comb SendNetPack.m_life=m_playerLife[playerID]; //Send packet to server - if (FlashXMLStyle) - { - netHolderFlash FlashSendPack; - FlashSendPack.data[72]='\0'; - int i=0; - for (i=0;i<72;i++) - FlashSendPack.data[i] = ' '; - CString TID; - FlashSendPack.data[0]='D'; - TID = ssprintf("%d",playerID); - for (i=0;isend((char*)&FlashSendPack,sizeof(netHolderFlash)); - - } else - NetPlayerClient->send((char*)&SendNetPack, sizeof(netHolder)); + NetPlayerClient->send((char*)&SendNetPack, sizeof(netHolder)); } @@ -209,16 +173,7 @@ void NetworkSyncManager::ReportSongOver() SendNetPack.m_life=0; - if (FlashXMLStyle) - { - netHolderFlash FlashSendPack; - FlashSendPack.data[72]='\0'; - for ( int i=0;i<72;i++) - FlashSendPack.data[i] = ' '; - FlashSendPack.data[0] = 'E'; - NetPlayerClient->send((char*)&FlashSendPack,sizeof(netHolderFlash)); - } else - NetPlayerClient->send((char*)&SendNetPack, sizeof(netHolder)); + NetPlayerClient->send((char*)&SendNetPack, sizeof(netHolder)); return; } @@ -239,16 +194,7 @@ void NetworkSyncManager::StartRequest() SendNetPack.m_step=0; SendNetPack.m_life=0; - if (FlashXMLStyle) - { - netHolderFlash FlashSendPack; - FlashSendPack.data[72]='\0'; - for (int i=0;i<72;i++) - FlashSendPack.data[i] = ' '; - FlashSendPack.data[0] = 'S'; - NetPlayerClient->send((char*)&FlashSendPack,sizeof(netHolderFlash)); - } else - NetPlayerClient->send((char*)&SendNetPack, sizeof(netHolder)); + NetPlayerClient->send((char*)&SendNetPack, sizeof(netHolder)); LOG->Info("Waiting for RECV"); diff --git a/stepmania/src/NetworkSyncManager.h b/stepmania/src/NetworkSyncManager.h index 3818bd5472..d325e5dcfa 100644 --- a/stepmania/src/NetworkSyncManager.h +++ b/stepmania/src/NetworkSyncManager.h @@ -36,12 +36,9 @@ private: int m_step; int m_score; int m_combo; - - bool FlashXMLStyle; //Append 4 0s at end of packet. - //For FLASH client. - + bool useSMserver; - + EzSockets *NetPlayerClient; int m_ServerVersion; //ServerVersion