git-svn-id: https://svn.eduke32.com/eduke32@1135 1a8010ca-5511-0410-912e-c29ae57300e0

This commit is contained in:
terminx 2008-11-14 12:05:44 +00:00
parent 2413c7027e
commit 4f029a0097

View file

@ -1511,13 +1511,16 @@ void waitforeverybody()
if (numplayers < 2) return;
packbuf[0] = 250;
for (i=connecthead;i>=0;i=connectpoint2[i])
{
if (i != myconnectindex) sendpacket(i,packbuf,1);
if ((!networkmode) && (myconnectindex != connecthead)) break; //slaves in M/S mode only send to master
}
g_player[myconnectindex].playerreadyflag++;
if ((networkmode == 1) || (!networkmode && (myconnectindex != connecthead)))
for (i=connecthead;i>=0;i=connectpoint2[i])
{
if (i != myconnectindex) sendpacket(i,packbuf,1);
if ((!networkmode) && (myconnectindex != connecthead)) break; //slaves in M/S mode only send to master
}
if (ud.multimode > 1)
{
setgamepalette(g_player[myconnectindex].ps, titlepal, 11);
@ -1549,10 +1552,23 @@ void waitforeverybody()
{
if (g_player[i].playerreadyflag < g_player[myconnectindex].playerreadyflag) break;
if ((!networkmode) && (myconnectindex != connecthead))
return;
{
i = -1; break;
}
//slaves in M/S mode only wait for master
}
if (i < 0) return;
if (i < 0)
{
if (!networkmode && myconnectindex == connecthead)
for (i=connecthead;i>=0;i=connectpoint2[i])
{
packbuf[0] = 250;
if (i != myconnectindex) sendpacket(i,packbuf,1);
}
setgamepalette(g_player[myconnectindex].ps, palette, 11);
return;
}
}
}