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

Fix nonstop and challenge mode start.

Browse Source
This commit is contained in:
Josh Allen
2004-10-17 14:46:00 +00:00
parent 284da53723
commit 9012897737
1 changed files with 44 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/NetworkSyncServer.cpp
+44 -1
View File
@@ -160,7 +160,7 @@ void StepManiaLanServer::ParseData(PacketFunctions& Packet, const unsigned int c
case NSCGSR: case NSCGSR:
// Start Request // Start Request
Client[clientNum]->StartRequest(Packet); Client[clientNum]->StartRequest(Packet);
CheckReady(); CheckReady(); //This is what ACTUALLY starts the games
break; break;
case NSCGON: case NSCGON:
// GameOver // GameOver
@@ -273,10 +273,18 @@ void StepManiaLanServer::CheckReady()
//Only check clients that are starting (after ScreenNetMusicSelect before InGame). //Only check clients that are starting (after ScreenNetMusicSelect before InGame).
for (x = 0; (x < Client.size())&& canStart; ++x) for (x = 0; (x < Client.size())&& canStart; ++x)
{
if (Client[x]->isStarting) if (Client[x]->isStarting)
if (!Client[x]->GotStartRequest) if (!Client[x]->GotStartRequest)
canStart = false; canStart = false;
//For Start for courses
if (Client[x]->inNetMusicSelect == false)
if (Client[x]->hasSong == false)
if (Client[x]->GotStartRequest)
canStart = true;
}
if (canStart) if (canStart)
{ {
//(Test this) //(Test this)
@@ -290,18 +298,37 @@ void StepManiaLanServer::CheckReady()
//during the actual loop that starts the clients. This is in an atempt //during the actual loop that starts the clients. This is in an atempt
//to start all the clients as close together as possible. //to start all the clients as close together as possible.
for (x = 0; x < Client.size(); ++x) for (x = 0; x < Client.size(); ++x)
{
if (Client[x]->isStarting) if (Client[x]->isStarting)
{ {
Client[x]->clientSocket.blocking = true; Client[x]->clientSocket.blocking = true;
Client[x]->GotStartRequest = false; Client[x]->GotStartRequest = false;
} }
//For Start for courses
if (Client[x]->inNetMusicSelect == false)
if (Client[x]->hasSong == false)
if (Client[x]->GotStartRequest)
{
Client[x]->clientSocket.blocking = true;
Client[x]->GotStartRequest = false;
}
}
//Start clients waiting for a start between ScreenNetMusicSelect and the game. //Start clients waiting for a start between ScreenNetMusicSelect and the game.
for (x = 0; x < Client.size(); ++x) for (x = 0; x < Client.size(); ++x)
{
if (Client[x]->isStarting) if (Client[x]->isStarting)
SendValue(NSCGSR + NSServerOffset, x); SendValue(NSCGSR + NSServerOffset, x);
//For Start for courses
if (Client[x]->inNetMusicSelect == false)
if (Client[x]->hasSong == false)
SendValue(NSCGSR + NSServerOffset, x);
}
for (x = 0; x < Client.size(); ++x) for (x = 0; x < Client.size(); ++x)
{
if (Client[x]->isStarting) if (Client[x]->isStarting)
{ {
if (Client[x]->startPosition == 1) if (Client[x]->startPosition == 1)
@@ -314,6 +341,22 @@ void StepManiaLanServer::CheckReady()
} }
Client[x]->clientSocket.blocking = false; Client[x]->clientSocket.blocking = false;
} }
//For Start for courses
if (Client[x]->inNetMusicSelect == false)
if (Client[x]->hasSong == false)
{
if (Client[x]->startPosition == 1)
{
Client[x]->isStarting = false;
Client[x]->InGame = true;
Client[x]->lowerJudge = false;
//After we start the clients, clear each client's hasSong.
Client[x]->hasSong = false;
}
Client[x]->clientSocket.blocking = false;
}
}
} }
} }