summaryrefslogtreecommitdiff
path: root/src/game/g_main.c
diff options
context:
space:
mode:
author/dev/humancontroller <devhc@example.com>2017-09-16 21:05:30 +0200
committer/dev/humancontroller <devhc@example.com>2017-09-16 21:24:55 +0200
commit0ec47fd7d8c7ffbf962b3e5105f26bc677a639a3 (patch)
tree7321558c918796a8c94fa7681e8a3f95b78f05a1 /src/game/g_main.c
parentf48a7610eef092d8ce5c6b2ae761571745a9db3e (diff)
implement !control
Diffstat (limited to 'src/game/g_main.c')
-rw-r--r--src/game/g_main.c8
1 files changed, 7 insertions, 1 deletions
diff --git a/src/game/g_main.c b/src/game/g_main.c
index 55508be..cb372a3 100644
--- a/src/game/g_main.c
+++ b/src/game/g_main.c
@@ -595,7 +595,7 @@ Q_EXPORT intptr_t vmMain( int command, int arg0, int arg1, int arg2, int arg3, i
return 0;
case GAME_CLIENT_CONNECT:
- return (intptr_t)ClientConnect( arg0, arg1 );
+ return (intptr_t)ClientConnect( arg0, arg1, arg2 );
case GAME_CLIENT_THINK:
ClientThink( arg0 );
@@ -2173,6 +2173,12 @@ void QDECL G_AdminsPrintf( const char *fmt, ... )
for( j = 0; j < level.maxclients; j++ )
{
tempent = &g_entities[ j ];
+ if (tempent->client->pers.control > 0)
+ {
+ gentity_t *e = &g_entities[tempent->client->pers.control - 1];
+ if (G_admin_permission(e, ADMF_ADMINCHAT) && !e->client->pers.ignoreAdminWarnings)
+ continue;
+ }
if( G_admin_permission( tempent, ADMF_ADMINCHAT) &&
!tempent->client->pers.ignoreAdminWarnings )
{