ubergames
/
rpgxef
mirror of https://github.com/UberGames/rpgxEF.git
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Manual merge of a loophole fix for the voting system.

This commit is contained in:
Walter Julius Hennecke 2014-02-20 23:15:13 +01:00
parent ec81239d22
commit 666490cfbf
1 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
code/game/g_cmds.c
View File

@ -984,6 +984,7 @@ static void Cmd_Team_f( gentity_t *ent ) {
char send[100];
gentity_t *other;
clientSession_t *sess = &ent->client->sess;
qboolean voted = qfalse;
//RPG-X: Redtechie - haha to stupid to change teams!
if ( g_classData[sess->sessionClass].isn00b )
@ -1029,8 +1030,16 @@ static void Cmd_Team_f( gentity_t *ent ) {
sess->losses++;
}
// check and save if this player has already voted
voted = ent->client->ps.eFlags & EF_VOTED;
//if this is a manual change, not an assimilation, uninitialize the clInitStatus data
SetTeam( ent, s );
SetTeam(ent, s);
// restore previous vote state if a vote is running
if (voted && level.voteTime) {
ent->client->ps.eFlags |= EF_VOTED;
}
ent->client->switchTeamTime = level.time + 2000;
}