actions/itgmania212121
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Remove ReportTiming and send note offset into ReportScore

Browse Source
This commit is contained in:
Josh Allen
2006-07-22 03:27:39 +00:00
parent 6180a2762a
commit 6a191e1f23
2 changed files with 4 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/NetworkSyncManager.cpp
+3 -9
View File
@@ -16,8 +16,7 @@ void NetworkSyncManager::PostStartUp(const RString& ServerIP ) { }
bool NetworkSyncManager::Connect(const RString& addy, unsigned short port) { return false; } bool NetworkSyncManager::Connect(const RString& addy, unsigned short port) { return false; }
RString NetworkSyncManager::GetServerName() { return RString(); } RString NetworkSyncManager::GetServerName() { return RString(); }
void NetworkSyncManager::ReportNSSOnOff(int i) { } void NetworkSyncManager::ReportNSSOnOff(int i) { }
void NetworkSyncManager::ReportTiming(float offset, int PlayerNumber) { } void NetworkSyncManager::ReportScore(int playerID, int step, int score, int combo, float offset) { }
void NetworkSyncManager::ReportScore(int playerID, int step, int score, int combo) { }
void NetworkSyncManager::ReportSongOver() { } void NetworkSyncManager::ReportSongOver() { }
void NetworkSyncManager::ReportStyle() {} void NetworkSyncManager::ReportStyle() {}
void NetworkSyncManager::StartRequest(short position) { } void NetworkSyncManager::StartRequest(short position) { }
@@ -302,12 +301,7 @@ RString NetworkSyncManager::GetServerName()
return m_ServerName; return m_ServerName;
} }
void NetworkSyncManager::ReportTiming(float offset, int PlayerNumber) void NetworkSyncManager::ReportScore(int playerID, int step, int score, int combo, float offset)
{
m_lastOffset[PlayerNumber] = offset;
}
void NetworkSyncManager::ReportScore(int playerID, int step, int score, int combo)
{ {
if (!useSMserver) //Make sure that we are using the network if (!useSMserver) //Make sure that we are using the network
return; 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 //ASSUMED: No step will be more than 16 seconds off center
//If assumption false: read 16 seconds either direction //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) if (iOffset>65535)
iOffset=65535; iOffset=65535;
stepmania/src/NetworkSyncManager.h
+1 -5
View File
@@ -92,8 +92,7 @@ public:
~NetworkSyncManager(); ~NetworkSyncManager();
//If "useSMserver" then send score to server //If "useSMserver" then send score to server
void ReportTiming(float offset, int PlayerNumber); void ReportScore(int playerID, int step, int score, int combo, float offset);
void ReportScore(int playerID, int step, int score, int combo);
void ReportSongOver(); //Report to server that song is over void ReportSongOver(); //Report to server that song is over
void ReportStyle(); //Report to server the style, players, and names void ReportStyle(); //Report to server the style, players, and names
void ReportNSSOnOff(int i); //Report song selection screen on/off void ReportNSSOnOff(int i); //Report song selection screen on/off
@@ -164,9 +163,6 @@ private:
void StartUp(); 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_playerID; //these are currently unused, but need to stay
int m_step; int m_step;
int m_score; int m_score;