summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIronClawTrem <louie.nutman@gmail.com>2020-03-24 20:29:36 +0000
committerIronClawTrem <louie.nutman@gmail.com>2020-03-24 20:29:36 +0000
commitb929503e0cbc50b7d78788b90cf9120be3ef9ad9 (patch)
tree2ecd558a3c5b1b1eb0d53efee8cda1eec2567418
parent6f002b78af7b5417cbed34da6214fa6e307b69ea (diff)
Revert "Revert "use an or statement instead""HEADmaster
This reverts commit 6f002b78af7b5417cbed34da6214fa6e307b69ea.
-rw-r--r--src/game/g_admin.c7
1 files changed, 2 insertions, 5 deletions
diff --git a/src/game/g_admin.c b/src/game/g_admin.c
index 0695781..4271dd8 100644
--- a/src/game/g_admin.c
+++ b/src/game/g_admin.c
@@ -5752,11 +5752,8 @@ qboolean G_admin_listplayers( gentity_t *ent, int skiparg )
Q_strncpyz( guidless, "G", sizeof( guidless ) );
}
muted[ 0 ] = '\0';
- if( G_admin_permission( &g_entities[ i ], ADMF_NO_VOTE ) )
- {
- Q_strncpyz( muted, "V", sizeof( muted ) );
- }
- if( G_admin_permission( &g_entities[ i ], ADMF_FAKE_NO_VOTE ) )
+ if( G_admin_permission( &g_entities[ i ], ADMF_NO_VOTE )
+ || G_admin_permission( &g_entities[ i ], ADMF_FAKE_NO_VOTE ) )
{
Q_strncpyz( muted, "V", sizeof( muted ) );
}