...fix it properly instead of rushing into it at 1am
This commit is contained in:
parent
823497ea06
commit
4f23b84f92
|
@ -2531,12 +2531,12 @@ static void Command_Teamchange_f(void)
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (players[consoleplayer].spectator && !NetPacket.packet.newteam)
|
if (players[consoleplayer].spectator)
|
||||||
error = !(players[consoleplayer].pflags & PF_WANTSTOJOIN);
|
error = !(NetPacket.packet.newteam || (players[consoleplayer].pflags & PF_WANTSTOJOIN));
|
||||||
else if (G_GametypeHasTeams() && NetPacket.packet.newteam == (unsigned)players[consoleplayer].ctfteam)
|
else if (G_GametypeHasTeams())
|
||||||
error = true;
|
error = (NetPacket.packet.newteam == (unsigned)players[consoleplayer].ctfteam);
|
||||||
else if (G_GametypeHasSpectators() && !players[consoleplayer].spectator && NetPacket.packet.newteam == 3)
|
else if (G_GametypeHasSpectators() && !players[consoleplayer].spectator)
|
||||||
error = true;
|
error = (NetPacket.packet.newteam == 3);
|
||||||
#ifdef PARANOIA
|
#ifdef PARANOIA
|
||||||
else
|
else
|
||||||
I_Error("Invalid gametype after initial checks!");
|
I_Error("Invalid gametype after initial checks!");
|
||||||
|
@ -2622,12 +2622,12 @@ static void Command_Teamchange2_f(void)
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (players[secondarydisplayplayer].spectator && !NetPacket.packet.newteam)
|
if (players[secondarydisplayplayer].spectator)
|
||||||
error = !(players[secondarydisplayplayer].pflags & PF_WANTSTOJOIN);
|
error = !(NetPacket.packet.newteam || (players[secondarydisplayplayer].pflags & PF_WANTSTOJOIN));
|
||||||
else if (G_GametypeHasTeams() && NetPacket.packet.newteam == (unsigned)players[secondarydisplayplayer].ctfteam)
|
else if (G_GametypeHasTeams())
|
||||||
error = true;
|
error = (NetPacket.packet.newteam == (unsigned)players[secondarydisplayplayer].ctfteam);
|
||||||
else if (G_GametypeHasSpectators() && !players[secondarydisplayplayer].spectator && NetPacket.packet.newteam == 3)
|
else if (G_GametypeHasSpectators() && !players[secondarydisplayplayer].spectator)
|
||||||
error = true;
|
error = (NetPacket.packet.newteam == 3);
|
||||||
#ifdef PARANOIA
|
#ifdef PARANOIA
|
||||||
else
|
else
|
||||||
I_Error("Invalid gametype after initial checks!");
|
I_Error("Invalid gametype after initial checks!");
|
||||||
|
@ -2713,12 +2713,12 @@ static void Command_Teamchange3_f(void)
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (players[thirddisplayplayer].spectator && !NetPacket.packet.newteam)
|
if (players[thirddisplayplayer].spectator)
|
||||||
error = !(players[thirddisplayplayer].pflags & PF_WANTSTOJOIN);
|
error = !(NetPacket.packet.newteam || (players[thirddisplayplayer].pflags & PF_WANTSTOJOIN));
|
||||||
else if (G_GametypeHasTeams() && NetPacket.packet.newteam == (unsigned)players[thirddisplayplayer].ctfteam)
|
else if (G_GametypeHasTeams())
|
||||||
error = true;
|
error = (NetPacket.packet.newteam == (unsigned)players[thirddisplayplayer].ctfteam);
|
||||||
else if (G_GametypeHasSpectators() && !players[thirddisplayplayer].spectator && NetPacket.packet.newteam == 3)
|
else if (G_GametypeHasSpectators() && !players[thirddisplayplayer].spectator)
|
||||||
error = true;
|
error = (NetPacket.packet.newteam == 3);
|
||||||
#ifdef PARANOIA
|
#ifdef PARANOIA
|
||||||
else
|
else
|
||||||
I_Error("Invalid gametype after initial checks!");
|
I_Error("Invalid gametype after initial checks!");
|
||||||
|
@ -2804,12 +2804,12 @@ static void Command_Teamchange4_f(void)
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (players[fourthdisplayplayer].spectator && !NetPacket.packet.newteam)
|
if (players[fourthdisplayplayer].spectator)
|
||||||
error = !(players[fourthdisplayplayer].pflags & PF_WANTSTOJOIN);
|
error = !(NetPacket.packet.newteam || (players[fourthdisplayplayer].pflags & PF_WANTSTOJOIN));
|
||||||
else if (G_GametypeHasTeams() && NetPacket.packet.newteam == (unsigned)players[fourthdisplayplayer].ctfteam)
|
else if (G_GametypeHasTeams())
|
||||||
error = true;
|
error = (NetPacket.packet.newteam == (unsigned)players[fourthdisplayplayer].ctfteam);
|
||||||
else if (G_GametypeHasSpectators() && !players[fourthdisplayplayer].spectator && NetPacket.packet.newteam == 3)
|
else if (G_GametypeHasSpectators() && !players[fourthdisplayplayer].spectator)
|
||||||
error = true;
|
error = (NetPacket.packet.newteam == 3);
|
||||||
#ifdef PARANOIA
|
#ifdef PARANOIA
|
||||||
else
|
else
|
||||||
I_Error("Invalid gametype after initial checks!");
|
I_Error("Invalid gametype after initial checks!");
|
||||||
|
|
Loading…
Reference in New Issue