diff options
| author | M. Kristall <mkpdev@gmail.com> | 2007-06-29 17:31:42 +0000 |
|---|---|---|
| committer | M. Kristall <mkpdev@gmail.com> | 2007-06-29 17:31:42 +0000 |
| commit | 2ed12926369e6f63f90b9db9ca87ac34ebec3164 (patch) | |
| tree | 4698816e31723532f4bd7f6d780dc9efa8e6a571 /src | |
| parent | dbfc4f5a76835c83ba4ad22de066ba31826543ca (diff) | |
* fix a silly issue in !passvote and !cancelvote that could potentially have
undesired effects
* correct some copy-paste action in my last commit
Diffstat (limited to 'src')
| -rw-r--r-- | src/game/g_admin.c | 8 | ||||
| -rw-r--r-- | src/game/g_cmds.c | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/src/game/g_admin.c b/src/game/g_admin.c index b2e526fb..d4325637 100644 --- a/src/game/g_admin.c +++ b/src/game/g_admin.c @@ -2656,10 +2656,10 @@ qboolean G_admin_cancelvote( gentity_t *ent, int skiparg ) CheckVote( ); level.teamVoteNo[ 0 ] = level.numConnectedClients; level.teamVoteYes[ 0 ] = 0; - CheckTeamVote( 0 ); + CheckTeamVote( PTE_HUMANS ); level.teamVoteNo[ 1 ] = level.numConnectedClients; level.teamVoteYes[ 1 ] = 0; - CheckTeamVote( 1 ); + CheckTeamVote( PTE_ALIENS ); AP( va( "print \"^3!cancelvote: ^7%s^7 decided that everyone voted No\n\"", ( ent ) ? ent->client->pers.netname : "console" ) ); return qtrue; @@ -2677,10 +2677,10 @@ qboolean G_admin_passvote( gentity_t *ent, int skiparg ) CheckVote( ); level.teamVoteYes[ 0 ] = level.numConnectedClients; level.teamVoteNo[ 0 ] = 0; - CheckTeamVote( 0 ); + CheckTeamVote( PTE_HUMANS ); level.teamVoteYes[ 1 ] = level.numConnectedClients; level.teamVoteNo[ 1 ] = 0; - CheckTeamVote( 1 ); + CheckTeamVote( PTE_ALIENS ); AP( va( "print \"^3!passvote: ^7%s^7 decided that everyone voted Yes\n\"", ( ent ) ? ent->client->pers.netname : "console" ) ); return qtrue; diff --git a/src/game/g_cmds.c b/src/game/g_cmds.c index 7b0751c0..0d7a7b65 100644 --- a/src/game/g_cmds.c +++ b/src/game/g_cmds.c @@ -1294,7 +1294,7 @@ void Cmd_CallTeamVote_f( gentity_t *ent ) if( !arg2[ 0 ] ) { trap_SendServerCommand( ent-g_entities, - "print \"callvote: no target\n\"" ); + "print \"callteamvote: no target\n\"" ); return; } |