only accept gfx changes when we are in the gamestate GS_wait.

origin
stpohle 21 years ago
parent 440f754798
commit 6e99a34654

@ -179,14 +179,6 @@ do_joingame (struct pkg_joingame *p_jg, _net_addr * addr)
send_servermode (addr, i); // with this packet the client know it'S pl_nr send_servermode (addr, i); // with this packet the client know it'S pl_nr
addr->pl_nr = i; addr->pl_nr = i;
/* Send all connected players the new PlayerID, except to the new player
for (i = 0; i < MAX_PLAYERS; i++)
if (NET_CANSEND(i) && addr->pl_nr != i)
send_playerid (&players[i].net.addr, pl->name, pl->net.addr.host,
pl->net.addr.port, pl->net.addr.pl_nr, pl->gfx_nr,
pl->team_nr, pl->net.flags);
*/
} }
else if (GS_WAITRUNNING) { else if (GS_WAITRUNNING) {
@ -323,7 +315,8 @@ do_playerid (struct pkg_playerid *p_id, _net_addr * addr)
/* /*
* check if we have to update someones data * check if we have to update someones data
*/ */
else if ((GT_MP_PTPM && p_id->pl_nr >= 0 && p_id->pl_nr < MAX_PLAYERS && p_id->pl_nr != bman.p_nr && p_id->pl_nr != bman.p2_nr) else if ((GT_MP_PTPM && p_id->pl_nr >= 0 && p_id->pl_nr < MAX_PLAYERS &&
p_id->pl_nr != bman.p_nr && p_id->pl_nr != bman.p2_nr && bman.state == GS_wait)
|| (GT_MP_PTPS && p_id->pl_nr >= 0 && p_id->pl_nr < MAX_PLAYERS)) { || (GT_MP_PTPS && p_id->pl_nr >= 0 && p_id->pl_nr < MAX_PLAYERS)) {
pl = &players[p_id->pl_nr]; pl = &players[p_id->pl_nr];

Loading…
Cancel
Save