summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorkai <kai@zittrig.eu>2020-05-27 20:46:14 +0100
committerkai <kai@zittrig.eu>2020-05-27 20:46:14 +0100
commit36071f24f3dcb6c9924a00c146bf6700588400ba (patch)
tree126a620fb8e8ce1107ebd1dd6c86c7a839ba2743 /src
parentc3e18a0c7c4aa9b5a4f5e42180a5566a3d435a64 (diff)
allow /call[team]vote from the chat, not just console
Diffstat (limited to 'src')
-rw-r--r--src/game/g_cmds.c45
-rw-r--r--src/game/g_local.h2
2 files changed, 38 insertions, 9 deletions
diff --git a/src/game/g_cmds.c b/src/game/g_cmds.c
index 3f38305..bd3db85 100644
--- a/src/game/g_cmds.c
+++ b/src/game/g_cmds.c
@@ -1441,6 +1441,19 @@ static void Cmd_Say_f( gentity_t *ent )
}
}
+ if( !Q_stricmpn( args, "say /callvote", 13 ) ||
+ !Q_stricmpn( args, "say_team /callvote", 18 ) )
+ {
+ Cmd_CallVote_f( ent );
+ return;
+ }
+
+ if( !Q_stricmpn( args, "say /callteamvote", 17 ) ||
+ !Q_stricmpn( args, "say_team /callteamvote", 22 ) )
+ {
+ Cmd_CallTeamVote_f( ent );
+ return;
+ }
if( trap_Argc( ) < 2 )
return;
@@ -1523,6 +1536,7 @@ Cmd_CallVote_f
void Cmd_CallVote_f( gentity_t *ent )
{
int i;
+ int skipargs = 0;
char arg1[ MAX_STRING_TOKENS ];
char arg2[ MAX_STRING_TOKENS ];
int clientNum = -1;
@@ -1530,9 +1544,15 @@ void Cmd_CallVote_f( gentity_t *ent )
char *arg1plus;
char *arg2plus;
char message[ MAX_STRING_CHARS ];
- char targetname[ MAX_NAME_LENGTH] = "";
- char reason[ MAX_STRING_CHARS ] = "";
+ char targetname[ MAX_NAME_LENGTH] = "";
+ char reason[ MAX_STRING_CHARS ] = "";
char *ptr = NULL;
+ char cmd[ 12 ];
+
+ G_SayArgv( 0, cmd, sizeof( cmd ) );
+
+ if( !Q_stricmp( cmd, "say" ) || !Q_stricmp( cmd, "say_team" ) )
+ skipargs = 1;
arg1plus = G_SayConcatArgs( 1 );
arg2plus = G_SayConcatArgs( 2 );
@@ -1609,8 +1629,8 @@ void Cmd_CallVote_f( gentity_t *ent )
}
// make sure it is a valid command to vote on
- trap_Argv( 1, arg1, sizeof( arg1 ) );
- trap_Argv( 2, arg2, sizeof( arg2 ) );
+ G_SayArgv( 1 + skipargs, arg1, sizeof( arg1 ) );
+ G_SayArgv( 2 + skipargs, arg2, sizeof( arg2 ) );
if( strchr( arg1plus, ';' ) )
{
@@ -2202,17 +2222,24 @@ Cmd_CallTeamVote_f
void Cmd_CallTeamVote_f( gentity_t *ent )
{
int i, team, cs_offset = 0;
+ int skipargs = 0;
char arg1[ MAX_STRING_TOKENS ];
char arg2[ MAX_STRING_TOKENS ];
int clientNum = -1;
char name[ MAX_NETNAME ];
char message[ MAX_STRING_CHARS ];
- char targetname[ MAX_NAME_LENGTH] = "";
- char reason[ MAX_STRING_CHARS ] = "";
+ char targetname[ MAX_NAME_LENGTH] = "";
+ char reason[ MAX_STRING_CHARS ] = "";
char *arg1plus;
char *arg2plus;
char *ptr = NULL;
- int numVoters = 0;
+ int numVoters = 0;
+ char cmd[ 12 ];
+
+ G_SayArgv( 0, cmd, sizeof( cmd ) );
+
+ if( !Q_stricmp( cmd, "say" ) || !Q_stricmp( cmd, "say_team" ) )
+ skipargs = 1;
arg1plus = G_SayConcatArgs( 1 );
arg2plus = G_SayConcatArgs( 2 );
@@ -2276,8 +2303,8 @@ void Cmd_CallTeamVote_f( gentity_t *ent )
}
// make sure it is a valid command to vote on
- trap_Argv( 1, arg1, sizeof( arg1 ) );
- trap_Argv( 2, arg2, sizeof( arg2 ) );
+ G_SayArgv( 1 + skipargs, arg1, sizeof( arg1 ) );
+ G_SayArgv( 2 + skipargs, arg2, sizeof( arg2 ) );
if( strchr( arg1plus, ';' ) )
{
diff --git a/src/game/g_local.h b/src/game/g_local.h
index e5463c5..af2a790 100644
--- a/src/game/g_local.h
+++ b/src/game/g_local.h
@@ -882,6 +882,8 @@ void G_ChangeTeam( gentity_t *ent, pTeam_t newTeam );
void G_SanitiseString( char *in, char *out, int len );
void G_PrivateMessage( gentity_t *ent );
char *G_statsString( statsCounters_t *sc, pTeam_t *pt );
+void Cmd_CallVote_f( gentity_t *ent );
+void Cmd_CallTeamVote_f( gentity_t *ent );
void Cmd_Share_f( gentity_t *ent );
void Cmd_Donate_f( gentity_t *ent );
void Cmd_TeamVote_f( gentity_t *ent );