mirror of
https://github.com/ZDoom/gzdoom.git
synced 2024-11-14 08:31:23 +00:00
Merge pull request #203 from Edward850/ps-disconnect
Allow players to be popped in packet-server
This commit is contained in:
commit
0bd331b34b
1 changed files with 28 additions and 16 deletions
|
@ -669,25 +669,38 @@ void PlayerIsGone (int netnode, int netconsole)
|
||||||
{
|
{
|
||||||
int i;
|
int i;
|
||||||
|
|
||||||
if (!nodeingame[netnode])
|
if (nodeingame[netnode])
|
||||||
return;
|
{
|
||||||
|
for (i = netnode + 1; i < doomcom.numnodes; ++i)
|
||||||
|
{
|
||||||
|
if (nodeingame[i])
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
if (i == doomcom.numnodes)
|
||||||
|
{
|
||||||
|
doomcom.numnodes = netnode;
|
||||||
|
}
|
||||||
|
|
||||||
for (i = netnode + 1; i < doomcom.numnodes; ++i)
|
if (playeringame[netconsole])
|
||||||
{
|
{
|
||||||
if (nodeingame[i])
|
players[netconsole].playerstate = PST_GONE;
|
||||||
break;
|
}
|
||||||
|
nodeingame[netnode] = false;
|
||||||
|
nodejustleft[netnode] = false;
|
||||||
}
|
}
|
||||||
if (i == doomcom.numnodes)
|
else if (nodejustleft[netnode]) // Packet Server
|
||||||
{
|
{
|
||||||
doomcom.numnodes = netnode;
|
if (netnode + 1 == doomcom.numnodes)
|
||||||
|
{
|
||||||
|
doomcom.numnodes = netnode;
|
||||||
|
}
|
||||||
|
if (playeringame[netconsole])
|
||||||
|
{
|
||||||
|
players[netconsole].playerstate = PST_GONE;
|
||||||
|
}
|
||||||
|
nodejustleft[netnode] = false;
|
||||||
}
|
}
|
||||||
|
else return;
|
||||||
if (playeringame[netconsole])
|
|
||||||
{
|
|
||||||
players[netconsole].playerstate = PST_GONE;
|
|
||||||
}
|
|
||||||
nodeingame[netnode] = false;
|
|
||||||
nodejustleft[netnode] = false;
|
|
||||||
|
|
||||||
if (netconsole == Net_Arbitrator)
|
if (netconsole == Net_Arbitrator)
|
||||||
{
|
{
|
||||||
|
@ -790,7 +803,6 @@ void GetPackets (void)
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
nodeingame[netnode] = false;
|
nodeingame[netnode] = false;
|
||||||
playeringame[netconsole] = false;
|
|
||||||
nodejustleft[netnode] = true;
|
nodejustleft[netnode] = true;
|
||||||
}
|
}
|
||||||
continue;
|
continue;
|
||||||
|
|
Loading…
Reference in a new issue