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

Cleanup and change around... maybe this will work better?

Browse Source
This commit is contained in:
Charles Lohr
2004-09-02 04:54:54 +00:00
parent 67554e252a
commit b97a0ad172
2 changed files with 18 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/NetworkSyncManager.cpp
+1 -4
View File
@@ -517,17 +517,14 @@ void NetworkSyncManager::ProcessInput()
int PlayersInPack = m_packet.Read1(); int PlayersInPack = m_packet.Read1();
for (int i=0;i<PlayersInPack;i++) for (int i=0;i<PlayersInPack;i++)
m_EvalPlayerData[i].score = m_packet.Read4(); m_EvalPlayerData[i].score = m_packet.Read4();
for (int i=0;i<PlayersInPack;i++)
LOG->Info("P%d Score:%d",i,m_EvalPlayerData[i].score);
for (int i=0;i<PlayersInPack;i++) for (int i=0;i<PlayersInPack;i++)
m_EvalPlayerData[i].grade = m_packet.Read1(); m_EvalPlayerData[i].grade = m_packet.Read1();
for (int i=0;i<PlayersInPack;i++) for (int i=0;i<PlayersInPack;i++)
m_EvalPlayerData[i].difficulty = (Difficulty) m_packet.Read1(); m_EvalPlayerData[i].difficulty = (Difficulty) m_packet.Read1();
for (int j=0;j<NETNUMTAPSCORES;j++)
for (int i=0;i<PlayersInPack; i++) for (int i=0;i<PlayersInPack; i++)
for (int j=0;j<NETNUMTAPSCORES;j++) {
m_EvalPlayerData[i].tapScores[j] = m_packet.Read2(); m_EvalPlayerData[i].tapScores[j] = m_packet.Read2();
} }
}
break; break;
case 5: //Scoreboard Update case 5: //Scoreboard Update
{ //Ease scope { //Ease scope
stepmania/src/NetworkSyncServer.cpp
+16 -29
View File
@@ -187,15 +187,15 @@ void GameClient::StartRequest(PacketFunctions &Packet) {
gameInfo.artist = Packet.ReadNT(); gameInfo.artist = Packet.ReadNT();
gameInfo.course = Packet.ReadNT(); gameInfo.course = Packet.ReadNT();
Player[0].score = 0; for (int i=0; i<2 ; i++)
Player[0].combo = 0; {
Player[0].projgrade = 0; Player[i].score = 0;
Player[1].score = 0; Player[i].combo = 0;
Player[1].combo = 0; Player[i].projgrade = 0;
Player[1].projgrade = 0; Player[i].maxCombo = 0;
memset((void*)Player[0].steps, 0, sizeof(int)*8); memset((void*)Player[i].steps, 0, sizeof(int)*9);
memset((void*)Player[1].steps, 0, sizeof(int)*8); }
Ready = true; Ready = true;
InGame = true; InGame = true;
@@ -241,32 +241,19 @@ void StepManiaLanServer::GameOver(PacketFunctions &Packet, int clientNum) {
Reply.ClearPacket(); Reply.ClearPacket();
Reply.Write1( 4+128 ); Reply.Write1( 4+128 );
Reply.Write1(numPlayers); Reply.Write1(numPlayers);
//I can't get the following area to work with out the {}. for (int x = 0; x < numPlayers; x++)
for (int x = 0; x < numPlayers; x++) {
Reply.Write4(playersPtr[x]->score); Reply.Write4(playersPtr[x]->score);
// LOG->Info("SCORE: %d", playersPtr[x]->score); for (int x = 0; x < numPlayers; x++)
}
for (int x = 0; x < numPlayers; x++) {
Reply.Write1(playersPtr[x]->projgrade); Reply.Write1(playersPtr[x]->projgrade);
// LOG->Info("Grade: %d", playersPtr[x]->projgrade); for (int x = 0; x < numPlayers; x++)
}
for (int x = 0; x < numPlayers; x++) {
Reply.Write1(playersPtr[x]->diff); Reply.Write1(playersPtr[x]->diff);
// LOG->Info("Diff: %d", playersPtr[x]->diff); for (int y = 6; y >= 1; y--)
} for (int x = 0; x<numPlayers; x++)
for (int x = 0; x < numPlayers; x++) {
for (int y = 6; y >= 1; y--) {
//Dont send NoGoods
//Send in reverse
Reply.Write2(playersPtr[x]->steps[y]); Reply.Write2(playersPtr[x]->steps[y]);
// LOG->Info("step %d: %d", y, playersPtr[x]->steps[y]); for (int x = 0; x < numPlayers; x++)
}
Reply.Write2(playersPtr[x]->steps[8]); //Tack on OK Reply.Write2(playersPtr[x]->steps[8]); //Tack on OK
} for (int x = 0; x < numPlayers; x++)
for (int x = 0; x < numPlayers; x++) {
Reply.Write2(playersPtr[x]->maxCombo); Reply.Write2(playersPtr[x]->maxCombo);
// LOG->Info("MaxCombo: %d", playersPtr[x]->maxCombo);
}
SendToAllClients(Reply); SendToAllClients(Reply);
} }
} }
@@ -532,7 +519,7 @@ void StepManiaLanServer::SelectSong(PacketFunctions &Packet, int clientNum) {
Client[clientNum].hasSong = true; Client[clientNum].hasSong = true;
//Only play if everyone has the same song and the host has select the same song twice. //Only play if everyone has the same song and the host has select the same song twice.
if (CheckHasSongState()&&SecondSameSelect) { if ( CheckHasSongState() && SecondSameSelect && (clientNum == 0) ) {
Reply.ClearPacket(); Reply.ClearPacket();
Reply.Write1(136); Reply.Write1(136);
Reply.Write1(2); Reply.Write1(2);