From 2ed12926369e6f63f90b9db9ca87ac34ebec3164 Mon Sep 17 00:00:00 2001
From: "M. Kristall" <mkpdev@gmail.com>
Date: Fri, 29 Jun 2007 17:31:42 +0000
Subject: * fix a silly issue in !passvote and !cancelvote that could
potentially have undesired effects * correct some copy-paste action in my
last commit
---
src/game/g_admin.c | 8 ++++----
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;
}
--
cgit